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

Cleaned up z1-websense.c file

Browse source
This commit is contained in:
Enric M. Calvo 2011-03-08 12:18:26 +01:00
parent b83a440c19
commit 07f59a5142
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
examples/ipv6/z1-websense/z1-websense.c
View file

@ -41,11 +41,9 @@
#include "contiki.h" #include "contiki.h"
#include "httpd-simple.h" #include "httpd-simple.h"
#include "webserver-nogui.h" #include "webserver-nogui.h"
//#include "dev/sht11-sensor.h" #include "dev/temperature-sensor.h"
//#include "dev/light-sensor.h" #include "dev/battery-sensor.h"
#include "dev/temperature-sensor.h" #include "dev/cc2420.h"
#include "dev/battery-sensor.h"
#include "dev/cc2420.h"
#include "dev/leds.h" #include "dev/leds.h"
#include <stdio.h> #include <stdio.h>
@ -68,19 +66,15 @@ static int sensors_pos;
static int static int
get_battery(void) get_battery(void)
{ {
//return 10 * light_sensor.value(LIGHT_SENSOR_PHOTOSYNTHETIC) / 7;
return battery_sensor.value(0); return battery_sensor.value(0);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static int static int
get_temp(void) get_temp(void)
{ {
//return ((sht11_sensor.value(SHT11_SENSOR_TEMP) / 10) - 396) / 10;
return temperature_sensor.value(0); return temperature_sensor.value(0);
} }
//float mytempv = (get_temp()*2.500)/4096;
//float mytemp = (mytempv-0.986)*282;
static float get_mybatt(void){ return (float) ((get_battery()*2.500*2)/4096);} static float get_mybatt(void){ return (float) ((get_battery()*2.500*2)/4096);}
static float get_mytemp(void){ return (float) (((get_temp()*2.500)/4096)-0.986)*282;} static float get_mytemp(void){ return (float) (((get_temp()*2.500)/4096)-0.986)*282;}