Merge remote-tracking branch 'origin/ulSNRs' into develop

Conflicts:
	openair2/ENB_APP/MACRLC_paramdef.h
	openair2/LAYER2/MAC/mac.h
This commit is contained in:
Cedric Roux
2018-06-18 16:01:25 +02:00
10 changed files with 45 additions and 27 deletions
@@ -164,6 +164,8 @@ MACRLCs = (
num_cc = 1;
tr_s_preference = "local_L1";
tr_n_preference = "local_RRC";
puSch10xSnr = 200;
puCch10xSnr = 200;
}
);
@@ -199,6 +199,8 @@ MACRLCs = (
tr_s_preference = "local_L1";
tr_n_preference = "local_RRC";
phy_test_mode = 1;
puSch10xSnr = 200;
puCch10xSnr = 200;
}
);