Radio Tx handles more overlap/gap cases

lib/include/srslte/interfaces/radio_interfaces.h

@@ -92,7 +92,7 @@ public:
    * @param buffer Is the object that contains the pointers to all RF channels
    * @param nof_samples Number of samples to transmit on all carriers and antennas
    * @param tx_time Time to transmit all signals
-   * @return
+   * @return it returns true if the transmission was successful, otherwise it returns false
    */
   virtual bool tx(rf_buffer_interface& buffer, const uint32_t& nof_samples, const srslte_timestamp_t& tx_time) = 0;
 

lib/include/srslte/radio/radio.h

@@ -228,11 +228,14 @@ private:
   std::vector<double> cur_tx_freqs = {};
   std::vector<double> cur_rx_freqs = {};
 
+  constexpr static double tx_max_gap_zeros = 4e-3; ///< Maximum transmission gap to fill with zeros, otherwise the burst
+                                                   ///< shall be stopped
+
   // Define default values for known radios
   constexpr static double uhd_default_tx_adv_samples    = 98;
   constexpr static double uhd_default_tx_adv_offset_sec = 4 * 1e-6;
 
-  constexpr static double blade_default_tx_adv_samples     = 27;
+  constexpr static int    blade_default_tx_adv_samples    = 27;
   constexpr static double blade_default_tx_adv_offset_sec = 1e-6;
 
   /**

lib/src/radio/radio.cc

@@ -265,9 +265,12 @@ bool radio::tx(rf_buffer_interface& buffer, const uint32_t& nof_samples_, const
   uint32_t nof_samples   = nof_samples_;
   uint32_t sample_offset = 0;
 
+  // Return instantly if the radio module is not initialised
   if (!is_initialized) {
     return false;
   }
+
+  // Copy timestamp and add Tx time offset calibration
   srslte_timestamp_t tx_time = tx_time_;
   if (!tx_adv_negative) {
     srslte_timestamp_sub(&tx_time, 0, tx_adv_sec);
@@ -275,25 +278,55 @@ bool radio::tx(rf_buffer_interface& buffer, const uint32_t& nof_samples_, const
     srslte_timestamp_add(&tx_time, 0, tx_adv_sec);
   }
 
-  // Calculate Tx gap if it is not start of the burst
+  // Calculate transmission overlap/gap if it is not start of the burst
   if (not is_start_of_burst) {
-    srslte_timestamp_t tx_gap = end_of_burst_time;
+    // Calculates transmission time overlap with previous transmission
-    srslte_timestamp_sub(&tx_gap, tx_time.full_secs, tx_time.frac_secs);
+    srslte_timestamp_t ts_overlap = end_of_burst_time;
-    int32_t past_nsamples = (int32_t)round(cur_tx_srate * srslte_timestamp_real(&tx_gap));
+    srslte_timestamp_sub(&ts_overlap, tx_time.full_secs, tx_time.frac_secs);
+
+    // Calculates number of overlap samples with previous transmission
+    int32_t past_nsamples = (int32_t)round(cur_tx_srate * srslte_timestamp_real(&ts_overlap));
 
-    // Negative gap, trimming first samples by setting a sample offset. Otherwise, ignore
+    // if past_nsamples is positive, the current transmission overlaps with the previous transmission. If it is negative
+    // there is a gap between the previous transmission and the current transmission.
     if (past_nsamples > 0) {
-      // If the gap is larger than the amount of samples to transmit, return without doing anything else
+      // If the overlap length is greater than the current transmission length, it means the whole transmission is in
+      // the past and it shall be ignored
       if ((int32_t)nof_samples < past_nsamples) {
         return true;
       }
 
-      // Update transmission parameters
+      // Trim the first past_nsamples
-      sample_offset = (uint32_t)past_nsamples;
+      sample_offset = (uint32_t)past_nsamples;     // Sets an offset for moving first samples offset
+      tx_time       = end_of_burst_time;           // Keeps same transmission time
+      nof_samples   = nof_samples - past_nsamples; // Subtracts the number of trimmed samples
+
+    } else if (past_nsamples < 0) {
+      // if the gap is bigger than TX_MAX_GAP_ZEROS, stop burst
+      if (fabs(srslte_timestamp_real(&ts_overlap)) > tx_max_gap_zeros) {
+        tx_end();
+      } else {
+        // Otherwise, transmit zeros
+        uint32_t gap_nsamples = abs(past_nsamples);
+        while (gap_nsamples > 0) {
+          // Transmission cannot exceed SRSLTE_SF_LEN_MAX (zeros buffer size limitation)
+          uint32_t nzeros = SRSLTE_MIN(gap_nsamples, SRSLTE_SF_LEN_MAX);
+
+          // Zeros transmission
+          int ret = srslte_rf_send_timed2(
+              &rf_device, zeros, nzeros, end_of_burst_time.full_secs, end_of_burst_time.frac_secs, false, false);
+          if (ret < SRSLTE_SUCCESS) {
+            return false;
+          }
+
+          // Substract gap samples
+          gap_nsamples -= nzeros;
+
+          // Increase timestamp
+          srslte_timestamp_add(&end_of_burst_time, 0, (double)nzeros / cur_tx_srate);
+        }
+      }
     }
-    // this aligns with the next packet for the case where the nof_samples was not the amount requested, removing the gap between packets by adding samples
-    tx_time = end_of_burst_time;
-    nof_samples -= past_nsamples;
   }
 
   // Save possible end of burst time
@@ -561,11 +594,10 @@ void radio::set_tx_srate(const double& srate)
         log_h->console(
             "\nWarning TX/RX time offset for sampling rate %.0f KHz not calibrated. Using interpolated value\n\n",
             cur_tx_srate);
-        tx_adv_sec = blade_default_tx_adv_samples * (1 / cur_tx_srate) + blade_default_tx_adv_offset_sec;
+        nsamples = blade_default_tx_adv_samples + blade_default_tx_adv_offset_sec * cur_tx_srate;
       }
     } else if (!strcmp(srslte_rf_name(&rf_device), "zmq")) {
-      log_h->console("\nWarning TX/RX time offset has not been calibrated for device %s. Set a value manually\n\n",
+      nsamples = 0;
-                     srslte_rf_name(&rf_device));
     }
   } else {
     nsamples = tx_adv_nsamples;