change ta advance

executables/nr-ru.c

@@ -659,7 +659,8 @@ void rx_rf(RU_t *ru,int *frame,int *slot) {
 
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ, 0 );
   proc->timestamp_rx = ts-ru->ts_offset;
-
+  if (((*frame &1) == 0) && (*slot == 0))
+  LOG_D(PHY, "rx rf: frame %d %d, stamprx %lu\n",*frame, *slot, proc->timestamp_rx );
   //AssertFatal(rxs == fp->samples_per_subframe,
   //"rx_rf: Asked for %d samples, got %d from USRP\n",fp->samples_per_subframe,rxs);
   if (rxs != samples_per_slot) LOG_E(PHY, "rx_rf: Asked for %d samples, got %d from USRP\n",samples_per_slot,rxs);
@@ -668,7 +669,7 @@ void rx_rf(RU_t *ru,int *frame,int *slot) {
     samples_per_slot_prev = fp->get_samples_per_slot((*slot-1)%fp->slots_per_frame,fp);
 
     if (proc->timestamp_rx - old_ts != samples_per_slot_prev) {
-      LOG_D(PHY,"rx_rf: rfdevice timing drift of %"PRId64" samples (ts_off %"PRId64")\n",proc->timestamp_rx - old_ts - samples_per_slot_prev,ru->ts_offset);
+      LOG_W(PHY,"rx_rf: rfdevice timing drift of %"PRId64" samples (ts_off %"PRId64")\n",proc->timestamp_rx - old_ts - samples_per_slot_prev,ru->ts_offset);
       ru->ts_offset += (proc->timestamp_rx - old_ts - samples_per_slot_prev);
       proc->timestamp_rx = ts-ru->ts_offset;
     }
@@ -819,8 +820,13 @@ void tx_rf(RU_t *ru,int frame,int slot, uint64_t timestamp) {
                                       siglen+sf_extension,
                                       ru->nb_tx,
                                       flags);
-    LOG_D(PHY,"[TXPATH] RU %d aa %d tx_rf, writing to TS %llu, %d.%d, unwrapped_frame %d, slot %d, flags %d, siglen+sf_extension %d, returned %d, E %f\n",ru->idx,i,
-	  (long long unsigned int)(timestamp+ru->ts_offset-ru->openair0_cfg.tx_sample_advance-sf_extension),frame,slot,proc->frame_tx_unwrap,slot, flags, siglen+sf_extension, txs,10*log10((double)signal_energy(txp[0],siglen+sf_extension)));
+    int ene = signal_energy(txp[0],siglen+sf_extension);
+    if ((ene > 1000)&& (slot != 0))
+    {
+      short * p = (short *)txp[0];                                  
+     LOG_D(PHY,"[TXPATH] RU %d aa %d tx_rf, writing to TS %llu, %d.%d, unwrapped_frame %d, slot %d, flags %d, siglen+sf_extension %d, returned %d, E %f, %d,%d\n",ru->idx,i,
+	  (long long unsigned int)(timestamp+ru->ts_offset-ru->openair0_cfg.tx_sample_advance-sf_extension),frame,slot,proc->frame_tx_unwrap,slot, flags, siglen+sf_extension, txs,10*log10((double)ene), p[0], p[1]);
+    }
     VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE, 0 );
       //AssertFatal(txs == 0,"trx write function error %d\n", txs);
   

openair1/PHY/impl_defs_top.h

@@ -248,7 +248,8 @@
 #ifdef BIT8_TX
 #define AMP_SHIFT 7
 #else
-#define AMP_SHIFT 9
+//#define AMP_SHIFT 9
+#define AMP_SHIFT 11
 #endif
 
 #define AMP ((1)<<AMP_SHIFT)

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c

@@ -242,6 +242,7 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP, frame_t frame, sub_frame_
 
   // This schedules the DCI for Downlink and PDSCH
   start_meas(&gNB->schedule_dlsch);
+  if (slot == 10)
   nr_schedule_ue_spec(module_idP, frame, slot, &sched_info->DL_req, &sched_info->TX_req);
   stop_meas(&gNB->schedule_dlsch);
 

radio/DPDKRF/dpdkrf_oai.c

@@ -216,7 +216,7 @@ int device_init(openair0_device *device, openair0_config_t *openair0_cfg) {
     switch ((int)openair0_cfg->sample_rate) {
     case 122880000:
         openair0_cfg->samples_per_packet    = 122880;
-        openair0_cfg->tx_sample_advance     = 70;
+        openair0_cfg->tx_sample_advance     = 1232;//1232;
         openair0_cfg[0].tx_bw               = 100e6;
         openair0_cfg[0].rx_bw               = 100e6;
         break;