Merge branch 'develop' into feature-21-TM7

2016-11-21 12:08:30 +01:00
parent 5c5c336300 e86b3e31c7
commit e450941f7a
11 changed files with 215 additions and 12 deletions
@@ -61,6 +61,10 @@ ID = ENB_PHY_PUCCH_1_ENERGY
    DESC = eNodeB PUCCH 1 energy and threshold
    GROUP = ALL:PHY:GRAPHIC:HEAVY:ENB
    FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,energy : int,threshold
+ID = ENB_PHY_PHICH
+    DESC = eNodeB PHICH
+    GROUP = ALL:PHY:ENB
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid : int,NGROUP : int,NSF : int,ngroup : int,nseq : int,ACK : int,first_rb : int,n_DMRS

 #MAC logs
 ID = ENB_MAC_UE_DL_SDU