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

change some examples for iris

Browse source
This commit is contained in:
HATATANI Shinta 2011-07-18 19:53:18 +09:00
parent 3c168cc395
commit 04b4ff157f
4 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/shell/shell-ps.c
View file

@ -58,7 +58,7 @@ PROCESS_THREAD(shell_ps_process, ev, data)
shell_output_str(&ps_command, "Processes:", "");
for(p = PROCESS_LIST(); p != NULL; p = p->next) {
shell_output_str(&ps_command, (char *)p->name, "");
shell_output_str(&ps_command, PROCESS_NAME_STRING(p), "");
}
PROCESS_END();

22
examples/example-shell/example-shell.c
View file

@ -65,31 +65,31 @@ PROCESS_THREAD(example_shell_process, ev, data)
/*shell_coffee_init();*/
shell_download_init();
/*shell_exec_init();*/
shell_file_init();
shell_httpd_init();
shell_irc_init();
//shell_file_init();
//shell_httpd_init();
//shell_irc_init();
shell_netfile_init();
/*shell_ping_init();*/ /* uIP ping */
shell_power_init();
/*shell_profile_init();*/
shell_ps_init();
/*shell_reboot_init();*/
shell_rime_debug_init();
shell_rime_netcmd_init();
shell_rime_ping_init(); /* Rime ping */
shell_rime_sendcmd_init();
shell_rime_sniff_init();
shell_rime_init();
//shell_rime_debug_init();
//shell_rime_netcmd_init();
//shell_rime_ping_init(); /* Rime ping */
//shell_rime_sendcmd_init();
//shell_rime_sniff_init();
//shell_rime_init();
/*shell_rsh_init();*/
shell_run_init();
shell_sendtest_init();
/*shell_sky_init();*/
shell_tcpsend_init();
shell_text_init();
shell_time_init();
//shell_time_init();
shell_udpsend_init();
shell_vars_init();
shell_wget_init();
//shell_wget_init();
shell_tweet_init();
PROCESS_END();

4
examples/ipv6/rpl-border-router/Makefile
View file

@ -6,7 +6,7 @@ WITH_UIP6=1
UIP_CONF_IPV6=1
#Override inclusion of internal webserver with make WITH_WEBSERVER=0
WITH_WEBSERVER=1
WITH_WEBSERVER=0
ifeq ($(WITH_WEBSERVER), 0)
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
@ -23,7 +23,7 @@ $(CONTIKI)/tools/tunslip6: $(CONTIKI)/tools/tunslip6.c
(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
connect-router: $(CONTIKI)/tools/tunslip6
sudo $(CONTIKI)/tools/tunslip6 aaaa::1/64
sudo $(CONTIKI)/tools/tunslip6 aaaa::1/64 -s /ttyUSB1
connect-router-cooja: $(CONTIKI)/tools/tunslip6
sudo $(CONTIKI)/tools/tunslip6 -a 127.0.0.1 aaaa::1/64

8
examples/ipv6/rpl-border-router/border-router.c
View file

@ -43,7 +43,8 @@
#include "net/rpl/rpl.h"
#include "net/netstack.h"
#include "dev/button-sensor.h"
//#include "dev/button-sensor.h"
//#include "sys/pt.h"
#include "dev/slip.h"
/* For internal webserver Makefile must set APPS += webserver and PROJECT_SOURCEFILES += httpd-simple.c */
@ -216,7 +217,7 @@ PROCESS_THREAD(border_router_process, ev, data)
process_start(&webserver_nogui_process, NULL);
#endif
SENSORS_ACTIVATE(button_sensor);
//SENSORS_ACTIVATE(button_sensor);
PRINTF("RPL-Border router started\n");
@ -243,10 +244,11 @@ PROCESS_THREAD(border_router_process, ev, data)
while(1) {
PROCESS_YIELD();
if (ev == sensors_event && data == &button_sensor) {
/*if (ev == sensors_event && data == &button_sensor) {
PRINTF("Initiating global repair\n");
rpl_repair_dag(rpl_get_dag(RPL_ANY_INSTANCE));
}
*/
}
PROCESS_END();