Merge branch 'master' into soft_demod_volk

lte/phy/examples/pdsch_ue.c

@@ -219,10 +219,11 @@ int main(int argc, char **argv) {
 
       // Plot and Printf
       if (!(sf_cnt % 10)) {       
-        printf("CFO: %+.4f KHz, SFO: %+.4f Khz, NOI: %.2f Errors: %4d/%4d, BLER: %.1e, Texec: %.2f\r",
+        printf("CFO: %+.4f KHz, SFO: %+.4f Khz, NOI: %.2f Errors: %4d/%4d/%4d, BLER: %.1e, Texec: %.2f\r",
                 ue_sync_get_cfo(&iodev.sframe)/1000, ue_sync_get_sfo(&iodev.sframe)/1000, 
                 pdsch_average_noi(&ue_dl.pdsch),
-                (int) ue_dl.pkt_errors, (int) ue_dl.pkts_total, (float) ue_dl.pkt_errors / ue_dl.pkts_total, 
+                (int) ue_dl.pkt_errors, (int) ue_dl.pkts_total, (int) ue_dl.nof_trials, 
+               (float) ue_dl.pkt_errors / ue_dl.pkts_total, 
                mean_exec_time);                
       }      
       #ifndef DISABLE_GRAPHICS

lte/phy/include/liblte/phy/ue/ue_celldetect.h

@@ -67,7 +67,7 @@
 
 #define CS_FRAME_UNALIGNED     -3
 #define CS_CELL_DETECTED        2
-#define CS_CELL_NOT_DETECTED    1
+#define CS_CELL_NOT_DETECTED    3
 
 typedef struct LIBLTE_API {
   uint32_t cell_id; 

lte/phy/lib/phch/src/pdsch.c

@@ -590,7 +590,7 @@ int pdsch_decode_tb(pdsch_t *q, char *data, uint32_t tbs, uint32_t nb_e,
     par_tx = bit_unpack(&p_parity, 24);
 
     if (!par_rx) {
-      printf("\n\tCAUTION!! Received all-zero transport block\n\n");
+      INFO("\n\tCAUTION!! Received all-zero transport block\n\n", 0);
     }
 
     if (par_rx == par_tx) {

lte/phy/lib/ue/src/ue_celldetect.c

@@ -211,7 +211,7 @@ int ue_celldetect_scan(ue_celldetect_t * q,
     for (uint32_t nf=0;nf<nof_input_frames;nf++) {
       sync_set_N_id_2(&q->sfind, q->current_N_id_2);
 
-      DEBUG("[%3d/%3d]: Searching cells with N_id_2=%d. %d frames\n", 
+      INFO("[%3d/%3d]: Searching cells with N_id_2=%d. %d frames\n", 
            q->current_nof_detected, q->current_nof_total, q->current_N_id_2, nof_input_frames);
 
       /* Find peak and cell id */