Merge branch 'embms_merge_final' of https://github.com/softwareradiosystems/srsLTE into embms_merge_final

srsue/src/mac/mac.cc

@@ -246,6 +246,8 @@ void mac::mch_decoded_ok(uint32_t len)
   if (pcap) {
     pcap->write_dl_mch(mch_payload_buffer, len, true, phy_h->get_current_tti());
   }
+
+  metrics.rx_brate += len*8;
 }
 
 void mac::tb_decoded(bool ack, uint32_t tb_idx, srslte_rnti_type_t rnti_type, uint32_t harq_pid)

srsue/src/metrics_csv.cc

@@ -72,7 +72,7 @@ void metrics_csv::set_metrics(ue_metrics_t &metrics, const uint32_t period_usec)
 {
   if (file.is_open() && ue != NULL) {
     if(n_reports == 0) {
-      file << "time;rsrp;pl;cfo;dl_mcs;dl_snr;dl_turbo;dl_brate;dl_bler;ul_ta,ul_mcs;ul_buff;ul_brate;ul_bler;rf_o;rf_u;rf_l;is_attached\n";
+      file << "time;rsrp;pl;cfo;dl_mcs;dl_snr;dl_turbo;dl_brate;dl_bler;ul_ta;ul_mcs;ul_buff;ul_brate;ul_bler;rf_o;rf_u;rf_l;is_attached\n";
     }
     file << (metrics_report_period*n_reports) << ";";
     file << float_to_string(metrics.phy.dl.rsrp, 2);