Merge branch 'master' into uplink

srslte/examples/cell_measurement.c

@@ -313,7 +313,7 @@ int main(int argc, char **argv) {
               fprintf(stderr, "Error decoding UE DL\n");fflush(stdout);
               return -1;
             } else if (n == 0) {
-              printf("CFO: %+6.4f KHz, SFO: %+6.4f Khz, NOI: %.2f, PDCCH-Det: %.3f\r",
+              printf("CFO: %+6.4f kHz, SFO: %+6.4f kHz, NOI: %.2f, PDCCH-Det: %.3f\r",
                       srslte_ue_sync_get_cfo(&ue_sync)/1000, srslte_ue_sync_get_sfo(&ue_sync)/1000, 
                       srslte_sch_average_noi(&ue_dl.pdsch.dl_sch),
                       (float) ue_dl.nof_detected/nof_trials);                
@@ -355,7 +355,7 @@ int main(int argc, char **argv) {
         // Plot and Printf
         if ((nframes%10) == 0) {
 
-          printf("CFO: %+8.4f KHz, SFO: %+8.4f Khz, RSSI: %5.1f dBm, RSSI/ref-symbol: %+5.1f dBm, "
+          printf("CFO: %+8.4f kHz, SFO: %+8.4f kHz, RSSI: %5.1f dBm, RSSI/ref-symbol: %+5.1f dBm, "
                  "RSRP: %+5.1f dBm, RSRQ: %5.1f dB, SNR: %5.1f dB\r",
                 srslte_ue_sync_get_cfo(&ue_sync)/1000, srslte_ue_sync_get_sfo(&ue_sync)/1000, 
                 10*log10(rssi*1000) - rx_gain_offset,                                  

srslte/examples/pdsch_ue.c

@@ -570,7 +570,7 @@ int main(int argc, char **argv) {
             if (gain < 0) {
               gain = 10*log10(srslte_agc_get_gain(&ue_sync.agc)); 
             }
-            printf("CFO: %+6.2f KHz, "
+            printf("CFO: %+6.2f kHz, "
                    "SNR: %4.1f dB, "
                    "PDCCH-Miss: %5.2f%%, PDSCH-BLER: %5.2f%%\r",
                    

srslte/examples/tutorial_examples/pss.c

@@ -296,7 +296,7 @@ int main(int argc, char **argv) {
     frame_cnt++;
    
     printf("[%5d]: Pos: %5d, PSR: %4.1f (~%4.1f) Pdet: %4.2f, "
-           "FA: %4.2f, CFO: %+4.1f KHz SSSmiss: %4.2f/%4.2f/%4.2f CPNorm: %.0f\%\r", 
+           "FA: %4.2f, CFO: %+4.1f kHz SSSmiss: %4.2f/%4.2f/%4.2f CPNorm: %.0f\%\r", 
            frame_cnt, 
            peak_idx, 
            peak_value, mean_peak,

srslte/lib/ch_estimation/refsignal_ul.c

@@ -692,13 +692,13 @@ int srslte_refsignal_srs_send_cs(uint32_t subframe_config, uint32_t sf_idx) {
       } else {
         return 0; 
       }
-    } else if (subframe_config == 8) {
+    } else if (subframe_config == 7) {
       if (((sf_idx%tsfc)==0) || ((sf_idx%tsfc)==1)){
         return 1; 
       } else {
         return 0; 
       }
-    } else if (subframe_config == 9) {
+    } else if (subframe_config == 8) {
       if (((sf_idx%tsfc)==2) || ((sf_idx%tsfc)==3)){
         return 1; 
       } else {

srslte/lib/sync/sync.c

@@ -471,7 +471,7 @@ srslte_sync_find_ret_t srslte_sync_find(srslte_sync_t *q, cf_t *input, uint32_t
       ret = SRSLTE_SYNC_NOFOUND;
     }
     
-    DEBUG("SYNC ret=%d N_id_2=%d find_offset=%d frame_len=%d, pos=%d peak=%.2f threshold=%.2f sf_idx=%d, CFO=%.3f KHz\n",
+    DEBUG("SYNC ret=%d N_id_2=%d find_offset=%d frame_len=%d, pos=%d peak=%.2f threshold=%.2f sf_idx=%d, CFO=%.3f kHz\n",
          ret, q->N_id_2, find_offset, q->frame_size, peak_pos, q->peak_value, 
          q->threshold, q->sf_idx, 15*(q->cfo_i+q->mean_cfo));
 

srslte/lib/sync/test/pss_file.c

@@ -293,7 +293,7 @@ int main(int argc, char **argv) {
     frame_cnt++;
    
     printf("[%5d]: Pos: %5d, PSR: %4.1f (~%4.1f) Pdet: %4.2f, "
-           "FA: %4.2f, CFO: %+4.1f KHz SSSmiss: %4.2f/%4.2f/%4.2f CPNorm: %.0f%%\r", 
+           "FA: %4.2f, CFO: %+4.1f kHz SSSmiss: %4.2f/%4.2f/%4.2f CPNorm: %.0f%%\r", 
            frame_cnt, 
            peak_idx - flen/10, 
            peak_value, mean_peak,

srslte/lib/sync/test/pss_usrp.c

@@ -301,7 +301,7 @@ int main(int argc, char **argv) {
     }
 
     printf("[%5d]: Pos: %5d (%d-%d), PSR: %4.1f (~%4.1f) Pdet: %4.2f, "
-           "FA: %4.2f, CFO: %+4.1f KHz, SFO: %+.2f Hz SSSmiss: %4.2f/%4.2f/%4.2f CPNorm: %.0f%%\r", 
+           "FA: %4.2f, CFO: %+4.1f kHz, SFO: %+.2f Hz SSSmiss: %4.2f/%4.2f/%4.2f CPNorm: %.0f%%\r", 
            frame_cnt, 
            peak_idx, min_peak_, max_peak_,
            peak_value, mean_peak,

srslte/lib/ue/ue_sync.c

@@ -44,7 +44,7 @@ cf_t dummy[MAX_TIME_OFFSET];
 #define TRACK_MAX_LOST          4
 #define TRACK_FRAME_SIZE        32
 #define FIND_NOF_AVG_FRAMES     4
-#define DEFAULT_SAMPLE_OFFSET_CORRECT_PERIOD  10
+#define DEFAULT_SAMPLE_OFFSET_CORRECT_PERIOD  5
 #define DEFAULT_SFO_EMA_COEFF                 0.1
 
 cf_t dummy_offset_buffer[1024*1024];
@@ -80,7 +80,7 @@ int srslte_ue_sync_init_file(srslte_ue_sync_t *q, uint32_t nof_prb, char *file_n
       goto clean_exit;
     }
     
-    INFO("Offseting input file by %d samples and %.1f KHz\n", offset_time, offset_freq/1000);
+    INFO("Offseting input file by %d samples and %.1f kHz\n", offset_time, offset_freq/1000);
     
     srslte_filesource_read(&q->file_source, dummy_offset_buffer, offset_time);
     srslte_ue_sync_reset(q);