* adding additional tests for 10MHz and 20MHz channel BW

* applying patches 8 and 9 contributed from S. Held


git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6536 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
Navid Nikaein
2015-02-12 15:03:13 +00:00
parent f757f2eb4a
commit 9ba19119a5
53 changed files with 366 additions and 275 deletions
+4 -2
View File
@@ -1565,7 +1565,8 @@ void update_topo_model(Event_t event) {
oai_emulation->topology_config.mobility.UE_mobility.sumo_config.end = new_mobility_model->UE_mobility.sumo_config.end;
oai_emulation->topology_config.mobility.UE_mobility.sumo_config.step = new_mobility_model->UE_mobility.sumo_config.step; // 1000ms
oai_emulation->topology_config.mobility.UE_mobility.sumo_config.hport = new_mobility_model->UE_mobility.sumo_config.hport;
}
} else {
// event.key is not NULL
if(!strcmp((char *) event.key, "UE_mobility_type"))
{
sprintf(oai_emulation->topology_config.mobility.UE_mobility.UE_mobility_type.selected_option, "%s", new_mobility_model->UE_mobility.UE_mobility_type.selected_option);
@@ -1669,7 +1670,7 @@ oai_emulation->topology_config.mobility.UE_mobility.UE_moving_dynamics.max_speed
}
else if(!strcmp((char *) event.key, "sumo_config_file"))
{
sprintf(oai_emulation->topology_config.mobility.UE_mobility.sumo_config.file,"%s/UTIL/OMG/SUMO/SCENARIOS/scen.sumo.cfg",getenv("OPENAIR2_DIR"));
snprintf( oai_emulation->topology_config.mobility.UE_mobility.sumo_config.file, 256, "%s/UTIL/OMG/SUMO/SCENARIOS/scen.sumo.cfg", getenv("OPENAIR2_DIR") );
}
else if(!strcmp((char *) event.key, "sumo_config_start"))
{
@@ -1691,6 +1692,7 @@ oai_emulation->topology_config.mobility.UE_mobility.UE_moving_dynamics.max_speed
{
sprintf(oai_emulation->topology_config.mobility.UE_mobility.sumo_config.hip,"127.0.1.1");
}
}
}