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

Removed Rime ping command to save flash space, added the single-hop Rime debug commands instead

Browse source
This commit is contained in:
adamdunkels 2009-10-27 14:13:30 +00:00
parent b0a92c5f4e
commit 6a8443b46b
1 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
examples/sky-shell/sky-shell.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: sky-shell.c,v 1.10 2009/03/12 21:58:21 adamdunkels Exp $ * $Id: sky-shell.c,v 1.11 2009/10/27 14:13:30 adamdunkels Exp $
*/ */
/** /**
@ -167,6 +167,7 @@ struct sky_alldata_msg {
PROCESS_THREAD(shell_sky_alldata_process, ev, data) PROCESS_THREAD(shell_sky_alldata_process, ev, data)
{ {
static unsigned long last_cpu, last_lpm, last_transmit, last_listen; static unsigned long last_cpu, last_lpm, last_transmit, last_listen;
unsigned long cpu, lpm, transmit, listen;
struct sky_alldata_msg msg; struct sky_alldata_msg msg;
struct neighbor *n; struct neighbor *n;
PROCESS_BEGIN(); PROCESS_BEGIN();
@ -183,11 +184,24 @@ PROCESS_THREAD(shell_sky_alldata_process, ev, data)
energest_flush(); energest_flush();
msg.cpu = energest_type_time(ENERGEST_TYPE_CPU) - last_cpu; cpu = energest_type_time(ENERGEST_TYPE_CPU) - last_cpu;
msg.lpm = energest_type_time(ENERGEST_TYPE_LPM) - last_lpm; lpm = energest_type_time(ENERGEST_TYPE_LPM) - last_lpm;
msg.transmit = energest_type_time(ENERGEST_TYPE_TRANSMIT) - last_transmit; transmit = energest_type_time(ENERGEST_TYPE_TRANSMIT) - last_transmit;
msg.listen = energest_type_time(ENERGEST_TYPE_LISTEN) - last_listen; listen = energest_type_time(ENERGEST_TYPE_LISTEN) - last_listen;
/* Make sure that the values are within 16 bits. */
while(cpu >= 65536ul || lpm >= 65536ul ||
transmit >= 65536ul || listen >= 65536ul) {
cpu /= 2;
lpm /= 2;
transmit /= 2;
listen /= 2;
}
msg.cpu = cpu;
msg.lpm = lpm;
msg.transmit = transmit;
msg.listen = listen;
last_cpu = energest_type_time(ENERGEST_TYPE_CPU); last_cpu = energest_type_time(ENERGEST_TYPE_CPU);
last_lpm = energest_type_time(ENERGEST_TYPE_LPM); last_lpm = energest_type_time(ENERGEST_TYPE_LPM);
@ -217,12 +231,14 @@ PROCESS_THREAD(sky_shell_process, ev, data)
shell_blink_init(); shell_blink_init();
shell_file_init(); shell_file_init();
shell_coffee_init(); shell_coffee_init();
/* shell_download_init();
shell_rime_sendcmd_init();*/
shell_ps_init(); shell_ps_init();
shell_reboot_init(); shell_reboot_init();
shell_rime_init(); shell_rime_init();
shell_rime_netcmd_init(); shell_rime_netcmd_init();
shell_rime_ping_init(); /* shell_rime_ping_init();*/
/*shell_rime_debug_init();*/ shell_rime_debug_init();
shell_rime_sniff_init(); shell_rime_sniff_init();
shell_sky_init(); shell_sky_init();
shell_text_init(); shell_text_init();