Merge branch 'master' into develop

Conflicts: targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.exmimo2.conf
2016-11-24 17:14:44 +01:00
parent af2ad0682f f15426d75c
commit 3b7a9400f2
1 changed files with 5 additions and 2 deletions
@@ -38,8 +38,9 @@ eNBs =
        Nid_cell_mbsfn          			      = 0;
        nb_antennas_tx          			      = 1;
        nb_antennas_rx          			      = 1;
-        tx_gain                                            = 10;//25;
-        rx_gain                                            = 120;
+	nb_antenna_ports				      = 1;
+        tx_gain                                            = 10; //25;
+        rx_gain                                            = 10; //20;
        prach_root              			      = 0;
        prach_config_index      			      = 0;
        prach_high_speed        			      = "DISABLE";
@@ -100,6 +101,8 @@ eNBs =
        ue_TimersAndConstants_t311			      = 10000;
        ue_TimersAndConstants_n310			      = 20;
        ue_TimersAndConstants_n311			      = 1;
+
+	ue_TransmissionMode				      = 1;
      }
    );