diff --git a/common/utils/T/T_messages.txt b/common/utils/T/T_messages.txt
index 85441722b0ecd78f72fffcedf04b9be67451b829..09ed098ee0fb591bc2fa1b878601d9eec14ca6de 100644
--- a/common/utils/T/T_messages.txt
+++ b/common/utils/T/T_messages.txt
@@ -93,7 +93,7 @@ ID = ENB_MAC_UE_UL_PDU
FORMAT = int,eNB_ID : int,CC_id : int,rnti : int,frame : int,subframe : int,harq_pid : int,sdu_length : int,num_ce : int,num_sdu
ID = ENB_MAC_UE_UL_PDU_WITH_DATA
DESC = MAC uplink UE received PDU
- GROUP = ALL:MAC:ENB:HEAVY
+ GROUP = ALL:MAC:ENB
FORMAT = int,eNB_ID : int,CC_id : int,rnti : int,frame : int,subframe : int,harq_pid : int,sdu_length : int,num_ce : int,num_sdu : buffer,data
ID = ENB_MAC_UE_UL_SDU
DESC = MAC uplink UE received SDU
@@ -805,6 +805,85 @@ ID = LEGACY_CLI_TRACE
GROUP = ALL:LEGACY_CLI:LEGACY_GROUP_TRACE:LEGACY
FORMAT = string,log
+#################
+#### UE LOGS ####
+#################
+#general logs
+ID = UE_MASTER_TICK
+ DESC = UE master tick - one tick per ms, to be used as "reference clock", mostly for ticktime view
+ GROUP = ALL:GENERAL:UE
+ FORMAT = int,eNB_ID : int,frame : int,subframe
+
+#PHY logs
+ID = UE_PHY_UL_TICK
+ DESC = UE uplink tick - one tick per ms at start of uplink processing
+ GROUP = ALL:PHY:GRAPHIC:UE
+ FORMAT = int,eNB_ID : int,frame : int,subframe
+ID = UE_PHY_DL_TICK
+ DESC = UE downlink tick - one tick per ms at start of downlink processing
+ GROUP = ALL:PHY:GRAPHIC:UE
+ FORMAT = int,eNB_ID : int,frame : int,subframe
+ID = UE_PHY_DLSCH_UE_DCI
+ DESC = UE downlink UE specific DCI as sent by the PHY layer
+ GROUP = ALL:PHY:GRAPHIC:UE
+ FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,dci_format : int,harq_pid : int,mcs : int,TBS
+ID = UE_PHY_DLSCH_UE_ACK
+ DESC = UE downlink UE ACK as seen by the PHY layer in process_HARQ_feedback
+ GROUP = ALL:PHY:GRAPHIC:UE
+ FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
+ID = UE_PHY_DLSCH_UE_NACK
+ DESC = UE downlink UE NACK as seen by the PHY layer in process_HARQ_feedback
+ GROUP = ALL:PHY:GRAPHIC:UE
+ FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
+ID = UE_PHY_ULSCH_UE_DCI
+ DESC = UE uplink UE specific DCI as sent by the PHY layer
+ GROUP = ALL:PHY:GRAPHIC:UE
+ FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid : int,mcs : int,round : int,first_rb : int,nb_rb : int,TBS
+ID = UE_PHY_ULSCH_UE_ACK
+ DESC = UE uplink UE ACK as seen by the PHY layer
+ GROUP = ALL:PHY:GRAPHIC:UE
+ FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
+ID = UE_PHY_ULSCH_UE_NACK
+ DESC = UE uplink UE NACK as seen by the PHY layer
+ GROUP = ALL:PHY:GRAPHIC:UE
+ FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
+ID = UE_PHY_INPUT_SIGNAL
+ DESC = UE received signal in the time domain for a duration of 1ms
+ GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
+ FORMAT = int,eNB_ID : int,frame : int,subframe : int,antenna : buffer,rxdata
+ID = UE_PHY_DL_CHANNEL_ESTIMATE
+ DESC = UE channel estimation in the time domain
+ GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
+ FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,antenna : buffer,chest_t
+ID = UE_PHY_PDCCH_IQ
+ DESC = UE PDCCH received IQ data
+ GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
+ FORMAT = int,nb_rb : int,NB_RB_DL : int,symbols_per_tti : buffer,rxdataF_comp
+ID = UE_PHY_PDCCH_ENERGY
+ DESC = UE PDSCH 1 energy and threshold
+ GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
+ FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,pdcch_ch_level00 : int,pdcch_ch_level01 : int,pdcch_ch_level10: int,pdcch_ch_level11
+ID = UE_PHY_PDSCH_IQ
+ DESC = UE PDSCH received IQ data
+ GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
+ FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,nb_rb : int,N_RB_UL : int,symbols_per_tti : buffer,pusch_comp
+ID = UE_PHY_PDSCH_ENERGY
+ DESC = UE PDSCH 1 energy and threshold
+ GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
+ FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,pdsch_ch_level00 : int,pdsch_ch_level01 : int,pdsch_ch_level10: int,pdsch_ch_level11
+ID = UE_PHY_PUSCH_TX_POWER
+ DESC = UE PUSCH tx power
+ GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
+ FORMAT = int,eNB_ID : int,UE_id : int,frame : int,subframe : int,p0_pusch : int,ampl: int,g_pusch: int,pl: int,nb_rb
+ID = UE_PHY_PUCCH_TX_POWER
+ DESC = UE PDSCH 1 energy and threshold
+ GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
+ FORMAT = int,eNB_ID : int,UE_id : int,frame : int,subframe : int,p0_pucch : int,ampl: int,g_pucch: int,pl
+ID = UE_PHY_MEAS
+ DESC = UE PHY measurements
+ GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
+ FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,rsrp : int,rssi : int,snr: int,rx_power: int,noise_power: int,w_cqi: int,freq_offset
+
#for debug/test - not used
ID = first
ID = buf_test
@@ -963,6 +1042,10 @@ ID = VCD_VARIABLE_TRX_TST
DESC = VCD variable TRX_TST
GROUP = ALL:VCD:ENB:VCD_VARIABLE
FORMAT = ulong,value
+ID = VCD_VARIABLE_TRX_WRITE_FLAGS
+ DESC = VCD variable TRX_WRITE_FLAGS
+ GROUP = ALL:VCD:ENB:VCD_VARIABLE
+ FORMAT = ulong,value
ID = VCD_VARIABLE_TX_TS
DESC = VCD variable TX_TS
GROUP = ALL:VCD:ENB:VCD_VARIABLE
@@ -1267,13 +1350,29 @@ ID = VCD_VARIABLE_UE0_SFN7
DESC = VCD variable UE0_SFN7
GROUP = ALL:VCD:ENB:VCD_VARIABLE
FORMAT = ulong,value
+ID = VCD_VARIABLE_UE_PDCP_FLUSH_SIZE
+ DESC = VCD variable UE_PDCP_FLUSH_SIZE
+ GROUP = ALL:VCD:ENB:UE:VCD_VARIABLE
+ FORMAT = ulong,value
+ID = VCD_VARIABLE_UE_PDCP_FLUSH_ERR
+ DESC = VCD variable UE_PDCP_FLUSH_ERR
+ GROUP = ALL:VCD:ENB:UE:VCD_VARIABLE
+ FORMAT = ulong,value
ID = VCD_VARIABLE_UE0_TRX_READ_NS
DESC = VCD variable UE0_TRX_READ_NS
- GROUP = ALL:VCD:ENB:VCD_VARIABLE
+ GROUP = ALL:VCD:UE:VCD_VARIABLE
FORMAT = ulong,value
ID = VCD_VARIABLE_UE0_TRX_WRITE_NS
DESC = VCD variable UE0_TRX_WRITE_NS
- GROUP = ALL:VCD:ENB:VCD_VARIABLE
+ GROUP = ALL:VCD:UE:VCD_VARIABLE
+ FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_TRX_READ_NS_MISSING
+ DESC = VCD variable UE0_TRX_READ_NS_MISSING
+ GROUP = ALL:VCD:UE:VCD_VARIABLE
+ FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_TRX_WRITE_NS_MISSING
+ DESC = VCD variable UE0_TRX_WRITE_NS_MISSING
+ GROUP = ALL:VCD:UE:VCD_VARIABLE
FORMAT = ulong,value
#functions
@@ -1326,8 +1425,12 @@ ID = VCD_FUNCTION_TRX_WRITE_SF9
DESC = VCD function TRX_WRITE_SF9
GROUP = ALL:VCD:UE:VCD_FUNCTION
FORMAT = int,value
-ID = VCD_FUNCTION_UE_SIGNAL_COND_RXTX
- DESC = VCD function UE_SIGNAL_COND_RXTX
+ID = VCD_FUNCTION_UE_SIGNAL_COND_RXTX0
+ DESC = VCD function UE_SIGNAL_COND_RXTX0
+ GROUP = ALL:VCD:UE:VCD_FUNCTION
+ FORMAT = int,value
+ID = VCD_FUNCTION_UE_SIGNAL_COND_RXTX1
+ DESC = VCD function UE_SIGNAL_COND_RXTX1
GROUP = ALL:VCD:UE:VCD_FUNCTION
FORMAT = int,value
ID = VCD_FUNCTION_UE_WAIT_COND_RXTX0
@@ -1674,6 +1777,10 @@ ID = VCD_FUNCTION_UE_ULSCH_ENCODING
DESC = VCD function UE_ULSCH_ENCODING
GROUP = ALL:VCD:UE:VCD_FUNCTION
FORMAT = int,value
+ID = VCD_FUNCTION_UE_ULSCH_ENCODING_FILL_CQI
+ DESC = VCD function UE_ULSCH_ENCODING_FILL_CQI
+ GROUP = ALL:VCD:UE:VCD_FUNCTION
+ FORMAT = int,value
ID = VCD_FUNCTION_UE_ULSCH_SCRAMBLING
DESC = VCD function UE_ULSCH_SCRAMBLING
GROUP = ALL:VCD:UE:VCD_FUNCTION
@@ -1814,10 +1921,10 @@ ID = VCD_FUNCTION_RLC_DATA_REQ
DESC = VCD function RLC_DATA_REQ
GROUP = ALL:VCD:ENB:VCD_FUNCTION
FORMAT = int,value
-ID = VCD_FUNCTION_RLC_DATA_IND
- DESC = VCD function RLC_DATA_IND
- GROUP = ALL:VCD:ENB:VCD_FUNCTION
- FORMAT = int,value
+#ID = VCD_FUNCTION_RLC_DATA_IND
+# DESC = VCD function RLC_DATA_IND
+# GROUP = ALL:VCD:ENB:VCD_FUNCTION
+# FORMAT = int,value
ID = VCD_FUNCTION_MAC_RLC_STATUS_IND
DESC = VCD function MAC_RLC_STATUS_IND
GROUP = ALL:VCD:ENB:VCD_FUNCTION
@@ -1862,6 +1969,22 @@ ID = VCD_FUNCTION_PDCP_VALIDATE_SECURITY
DESC = VCD function PDCP_VALIDATE_SECURITY
GROUP = ALL:VCD:ENB:VCD_FUNCTION
FORMAT = int,value
+ID = VCD_FUNCTION_PDCP_FIFO_READ
+ DESC = VCD function PDCP_FIFO_READ
+ GROUP = ALL:VCD:ENB:VCD_FUNCTION
+ FORMAT = int,value
+ID = VCD_FUNCTION_PDCP_FIFO_READ_BUFFER
+ DESC = VCD function PDCP_FIFO_READ_BUFFER
+ GROUP = ALL:VCD:ENB:VCD_FUNCTION
+ FORMAT = int,value
+ID = VCD_FUNCTION_PDCP_FIFO_FLUSH
+ DESC = VCD function PDCP_FIFO_FLUSH
+ GROUP = ALL:VCD:ENB:VCD_FUNCTION
+ FORMAT = int,value
+ID = VCD_FUNCTION_PDCP_FIFO_FLUSH_BUFFER
+ DESC = VCD function PDCP_FIFO_FLUSH_BUFFER
+ GROUP = ALL:VCD:ENB:VCD_FUNCTION
+ FORMAT = int,value
ID = VCD_FUNCTION_RRC_RX_TX
DESC = VCD function RRC_RX_TX
GROUP = ALL:VCD:ENB:VCD_FUNCTION
@@ -1938,82 +2061,3 @@ ID = VCD_FUNCTION_RECV_IF5
DESC = VCD function RECV_IF5
GROUP = ALL:VCD:ENB:VCD_FUNCTION
FORMAT = int,value
-
-#################
-#### UE LOGS ####
-#################
-#general logs
-ID = UE_MASTER_TICK
- DESC = UE master tick - one tick per ms, to be used as "reference clock", mostly for ticktime view
- GROUP = ALL:GENERAL:UE
- FORMAT = int,eNB_ID : int,frame : int,subframe
-
-#PHY logs
-ID = UE_PHY_UL_TICK
- DESC = UE uplink tick - one tick per ms at start of uplink processing
- GROUP = ALL:PHY:GRAPHIC:UE
- FORMAT = int,eNB_ID : int,frame : int,subframe
-ID = UE_PHY_DL_TICK
- DESC = UE downlink tick - one tick per ms at start of downlink processing
- GROUP = ALL:PHY:GRAPHIC:UE
- FORMAT = int,eNB_ID : int,frame : int,subframe
-ID = UE_PHY_DLSCH_UE_DCI
- DESC = UE downlink UE specific DCI as sent by the PHY layer
- GROUP = ALL:PHY:GRAPHIC:UE
- FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,dci_format : int,harq_pid : int,mcs : int,TBS
-ID = UE_PHY_DLSCH_UE_ACK
- DESC = UE downlink UE ACK as seen by the PHY layer in process_HARQ_feedback
- GROUP = ALL:PHY:GRAPHIC:UE
- FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
-ID = UE_PHY_DLSCH_UE_NACK
- DESC = UE downlink UE NACK as seen by the PHY layer in process_HARQ_feedback
- GROUP = ALL:PHY:GRAPHIC:UE
- FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
-ID = UE_PHY_ULSCH_UE_DCI
- DESC = UE uplink UE specific DCI as sent by the PHY layer
- GROUP = ALL:PHY:GRAPHIC:UE
- FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid : int,mcs : int,round : int,first_rb : int,nb_rb : int,TBS
-ID = UE_PHY_ULSCH_UE_ACK
- DESC = UE uplink UE ACK as seen by the PHY layer
- GROUP = ALL:PHY:GRAPHIC:UE
- FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
-ID = UE_PHY_ULSCH_UE_NACK
- DESC = UE uplink UE NACK as seen by the PHY layer
- GROUP = ALL:PHY:GRAPHIC:UE
- FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
-ID = UE_PHY_INPUT_SIGNAL
- DESC = UE received signal in the time domain for a duration of 1ms
- GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
- FORMAT = int,eNB_ID : int,frame : int,subframe : int,antenna : buffer,rxdata
-ID = UE_PHY_DL_CHANNEL_ESTIMATE
- DESC = UE channel estimation in the time domain
- GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
- FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,antenna : buffer,chest_t
-ID = UE_PHY_PDCCH_IQ
- DESC = UE PDCCH received IQ data
- GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
- FORMAT = int,nb_rb : int,NB_RB_DL : int,symbols_per_tti : buffer,rxdataF_comp
-ID = UE_PHY_PDCCH_ENERGY
- DESC = UE PDSCH 1 energy and threshold
- GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
- FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,pdcch_ch_level00 : int,pdcch_ch_level01 : int,pdcch_ch_level10: int,pdcch_ch_level11
-ID = UE_PHY_PDSCH_IQ
- DESC = UE PDSCH received IQ data
- GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
- FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,nb_rb : int,N_RB_UL : int,symbols_per_tti : buffer,pusch_comp
-ID = UE_PHY_PDSCH_ENERGY
- DESC = UE PDSCH 1 energy and threshold
- GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
- FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,pdsch_ch_level00 : int,pdsch_ch_level01 : int,pdsch_ch_level10: int,pdsch_ch_level11
-ID = UE_PHY_PUSCH_TX_POWER
- DESC = UE PUSCH tx power
- GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
- FORMAT = int,eNB_ID : int,UE_id : int,frame : int,subframe : int,p0_pusch : int,ampl: int,g_pusch: int,pl: int,nb_rb
-ID = UE_PHY_PUCCH_TX_POWER
- DESC = UE PDSCH 1 energy and threshold
- GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
- FORMAT = int,eNB_ID : int,UE_id : int,frame : int,subframe : int,p0_pucch : int,ampl: int,g_pucch: int,pl
-ID = UE_PHY_MEAS
- DESC = UE PHY measurements
- GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
- FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,rsrp : int,rssi : int,snr: int,rx_power: int,noise_power: int,w_cqi: int,freq_offset