From 2d0802de729c3139ed6cafa6562a9f26f5b43848 Mon Sep 17 00:00:00 2001 From: adamdunkels Date: Thu, 14 Jan 2010 20:15:34 +0000 Subject: [PATCH] Activate the light sensor before obtaining the value, deactivate it afterwards --- examples/sky-shell/sky-shell.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/sky-shell/sky-shell.c b/examples/sky-shell/sky-shell.c index 769ce101a..c714d1ad7 100644 --- a/examples/sky-shell/sky-shell.c +++ b/examples/sky-shell/sky-shell.c @@ -28,7 +28,7 @@ * * This file is part of the Contiki operating system. * - * $Id: sky-shell.c,v 1.13 2010/01/14 15:03:28 joxe Exp $ + * $Id: sky-shell.c,v 1.14 2010/01/14 20:15:34 adamdunkels Exp $ */ /** @@ -172,16 +172,18 @@ PROCESS_THREAD(shell_sky_alldata_process, ev, data) struct neighbor *n; PROCESS_BEGIN(); - + + SENSORS_ACTIVATE(light_sensor); msg.len = sizeof(struct sky_alldata_msg) / sizeof(uint16_t); msg.clock = clock_time(); msg.timesynch_time = timesynch_time(); - msg.light1 = light_sensor.value(0); - msg.light2 = light_sensor.value(1); + msg.light1 = light_sensor.value(LIGHT_SENSOR_PHOTOSYNTHETIC); + msg.light2 = light_sensor.value(LIGHT_SENSOR_TOTAL_SOLAR); msg.temp = sht11_temp(); msg.humidity = sht11_humidity(); msg.rssi = do_rssi(); - + SENSORS_DEACTIVATE(light_sensor); + energest_flush(); cpu = energest_type_time(ENERGEST_TYPE_CPU) - last_cpu; @@ -248,8 +250,6 @@ PROCESS_THREAD(sky_shell_process, ev, data) shell_register_command(&sky_alldata_command); - light_sensor.configure(SENSORS_ACTIVE, (void *) 1); - #if DEBUG_SNIFFERS rime_sniffer_add(&s); #endif /* DEBUG_SNIFFERS */