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

Updated to use new Collect neighbor api

Browse source
This commit is contained in:
adamdunkels 2010-09-08 19:32:42 +00:00
parent 4e0744954a
commit 51477dae23
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
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.19 2010/03/19 13:26:54 adamdunkels Exp $ * $Id: sky-shell.c,v 1.20 2010/09/08 19:32:42 adamdunkels Exp $
*/ */
/** /**
@ -191,7 +191,6 @@ PROCESS_THREAD(shell_sky_alldata_process, ev, data)
msg.light2 = light_sensor.value(LIGHT_SENSOR_TOTAL_SOLAR); msg.light2 = light_sensor.value(LIGHT_SENSOR_TOTAL_SOLAR);
msg.temp = sht11_sensor.value(SHT11_SENSOR_TEMP); msg.temp = sht11_sensor.value(SHT11_SENSOR_TEMP);
msg.humidity = sht11_sensor.value(SHT11_SENSOR_HUMIDITY); msg.humidity = sht11_sensor.value(SHT11_SENSOR_HUMIDITY);
// msg.rssi = do_rssi();
energest_flush(); energest_flush();
@ -225,7 +224,7 @@ PROCESS_THREAD(shell_sky_alldata_process, ev, data)
n = collect_neighbor_best(); n = collect_neighbor_best();
if(n != NULL) { if(n != NULL) {
rimeaddr_copy(&msg.best_neighbor, &n->addr); rimeaddr_copy(&msg.best_neighbor, &n->addr);
msg.best_neighbor_etx = collect_neighbor_etx(n); msg.best_neighbor_etx = collect_neighbor_rtmetric(n) - n->rtmetric;
msg.best_neighbor_rtmetric = n->rtmetric; msg.best_neighbor_rtmetric = n->rtmetric;
} }
msg.battery_voltage = battery_sensor.value(0); msg.battery_voltage = battery_sensor.value(0);
@ -244,8 +243,6 @@ static void
periodic_debug(void *ptr) periodic_debug(void *ptr)
{ {
ctimer_set(ptr, 2 * CLOCK_SECOND, periodic_debug, ptr); ctimer_set(ptr, 2 * CLOCK_SECOND, periodic_debug, ptr);
contikimac_debug_print();
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
PROCESS_THREAD(sky_shell_process, ev, data) PROCESS_THREAD(sky_shell_process, ev, data)
@ -253,14 +250,9 @@ PROCESS_THREAD(sky_shell_process, ev, data)
static struct ctimer c; static struct ctimer c;
PROCESS_BEGIN(); PROCESS_BEGIN();
// ctimer_set(&c, 2 * CLOCK_SECOND, periodic_debug, &c);
/* powertrace_start(10 * CLOCK_SECOND); /* powertrace_start(10 * CLOCK_SECOND);
powertrace_sniff(POWERTRACE_ON);*/ powertrace_sniff(POWERTRACE_ON);*/
cc2420_set_channel(26);
// cc2420_set_cca_threshold(-10);
serial_shell_init(); serial_shell_init();
shell_blink_init(); shell_blink_init();
/* shell_file_init(); /* shell_file_init();
@ -271,8 +263,9 @@ PROCESS_THREAD(sky_shell_process, ev, data)
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_debug_runicast_init();*/
/* shell_rime_sniff_init();*/ /* shell_rime_sniff_init();*/
shell_sky_init(); shell_sky_init();
shell_power_init(); shell_power_init();