Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-07-24 11:29:10 +00:00
Code Issues Projects Releases Wiki Activity

fixed for new sensors API

Browse Source
This commit is contained in:
joxe 2010-01-14 15:03:28 +00:00
parent a6abcbe578
commit d39234cfd9
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
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.12 2009/12/06 23:28:25 adamdunkels Exp $ * $Id: sky-shell.c,v 1.13 2010/01/14 15:03:28 joxe Exp $
*/ */
/** /**
@ -48,7 +48,7 @@
#include "net/rime.h" #include "net/rime.h"
#include "dev/cc2420.h" #include "dev/cc2420.h"
#include "dev/leds.h" #include "dev/leds.h"
#include "dev/light.h" #include "dev/light-sensor.h"
#include "dev/sht11.h" #include "dev/sht11.h"
#include "dev/battery-sensor.h" #include "dev/battery-sensor.h"
@ -176,8 +176,8 @@ PROCESS_THREAD(shell_sky_alldata_process, ev, data)
msg.len = sizeof(struct sky_alldata_msg) / sizeof(uint16_t); msg.len = sizeof(struct sky_alldata_msg) / sizeof(uint16_t);
msg.clock = clock_time(); msg.clock = clock_time();
msg.timesynch_time = timesynch_time(); msg.timesynch_time = timesynch_time();
msg.light1 = sensors_light1(); msg.light1 = light_sensor.value(0);
msg.light2 = sensors_light2(); msg.light2 = light_sensor.value(1);
msg.temp = sht11_temp(); msg.temp = sht11_temp();
msg.humidity = sht11_humidity(); msg.humidity = sht11_humidity();
msg.rssi = do_rssi(); msg.rssi = do_rssi();
@ -248,6 +248,8 @@ PROCESS_THREAD(sky_shell_process, ev, data)
shell_register_command(&sky_alldata_command); shell_register_command(&sky_alldata_command);
light_sensor.configure(SENSORS_ACTIVE, (void *) 1);
#if DEBUG_SNIFFERS #if DEBUG_SNIFFERS
rime_sniffer_add(&s); rime_sniffer_add(&s);
#endif /* DEBUG_SNIFFERS */ #endif /* DEBUG_SNIFFERS */