Revert "temporarily enabling beamforming also for FR1 + some logs (revert this commit before MR)"

This reverts commit 87a8a94ae90e364a5334657d417cf25ca058fa73.

executables/nr-ru.c

@@ -752,16 +752,16 @@ void tx_rf(RU_t *ru,int frame,int slot, uint64_t timestamp) {
         flags = 3; // end of burst
     }
 
-    //if (fp->freq_range==nr_FR2) {
+    if (fp->freq_range==nr_FR2) {
       // the beam index is written in bits 8-10 of the flags
       // bit 11 enables the gpio programming
       // currently we switch beams every 10 slots (should = 1 TDD period in FR2) and we take the beam index of the first symbol of the first slot of this period
       int beam=0;
-      //if (slot%10==0) {
+      if (slot%10==0) {
 	if (ru->common.beam_id[0][slot*fp->symbols_per_slot] < 8) {
 	  beam = ru->common.beam_id[0][slot*fp->symbols_per_slot] | 8;
 	}
-	//}
+      }
       /*
       if (slot==0 || slot==40) beam=0|8;
       if (slot==10 || slot==50) beam=1|8;
@@ -769,10 +769,11 @@ void tx_rf(RU_t *ru,int frame,int slot, uint64_t timestamp) {
       if (slot==30 || slot==70) beam=3|8;
       */
       flags |= beam<<8;
-      //}
 
       LOG_D(HW,"slot %d, beam %d\n",slot,ru->common.beam_id[0][slot*fp->symbols_per_slot]);
 
+    }
+    
     VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_TRX_WRITE_FLAGS, flags ); 
     VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_TX0_RU, frame );
     VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_TTI_NUMBER_TX0_RU, slot );

targets/ARCH/rfsimulator/simulator.c

@@ -419,12 +419,7 @@ static int rfsimulator_write_internal(rfsimulator_state_t *t, openair0_timestamp
   if (!alreadyLocked)
     pthread_mutex_lock(&Sockmutex);
 
-  int flags_lsb = flags&0xff;
-  int flags_msb = (flags>>8)&0xff;
-  int beam_enabled = (flags_msb>>3)&1;
-  int beam_id = flags_msb&7;
-  LOG_I(HW,"sending %d samples at time: %ld, beam_enabled %d, beam_id %d\n", nsamps, timestamp, beam_enabled, beam_id);
-
+  LOG_D(HW,"sending %d samples at time: %ld\n", nsamps, timestamp);
 
   for (int i=0; i<FD_SETSIZE; i++) {
     buffer_t *b=&t->buf[i];