deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixed simulation files to be closer to defaults in configuration

Browse source
This commit is contained in:
Joakim Eriksson 2015-10-02 07:41:57 +02:00
parent 09c624dcd3
commit ab4a0e08c7
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
regression-tests/12-rpl/04-rpl-large-network.csc
View file

@ -1,4 +1,3 @@
<<<<<<< 1d90b9290e293eedcb6451dd86c474ec168f688c
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<simconf> <simconf>
<project EXPORT="discard">[APPS_DIR]/mrm</project> <project EXPORT="discard">[APPS_DIR]/mrm</project>
@ -7058,4 +7057,4 @@ while(true) {&#xD;
<location_x>603</location_x> <location_x>603</location_x>
<location_y>43</location_y> <location_y>43</location_y>
</plugin> </plugin>
</simconf> </simconf>

7
regression-tests/21-large-rpl/code/node/client.c
View file

@ -105,6 +105,13 @@ PROCESS_THREAD(http_example_process, ev, data)
http_socket_get(&s, "http://www.contiki-os.org/", 0, 0, http_socket_get(&s, "http://www.contiki-os.org/", 0, 0,
callback, NULL); callback, NULL);
connect = 0; connect = 0;
} else if(connect) {
connect++;
/* If connect have been "tried" 5 timer we quit trying now... */
if(connect > 5) {
restart();
connect = 0;
}
} }
} }

4
regression-tests/21-large-rpl/code/router/project-conf.h
View file

@ -7,5 +7,5 @@
#undef NBR_TABLE_CONF_MAX_NEIGHBORS #undef NBR_TABLE_CONF_MAX_NEIGHBORS
#define NBR_TABLE_CONF_MAX_NEIGHBORS 8 #define NBR_TABLE_CONF_MAX_NEIGHBORS 8
#define RPL_CONF_DEFAULT_LIFETIME_UNIT 60 /* #define RPL_CONF_DEFAULT_LIFETIME_UNIT 60 */
#define RPL_CONF_DEFAULT_LIFETIME 3 /* #define RPL_CONF_DEFAULT_LIFETIME 10 */