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

Sky-websense compiles for Z1 (testing)

Browse source
This commit is contained in:
Enric M. Calvo 2011-02-27 20:10:09 +01:00
parent 02d097674c
commit 414d926966
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
examples/ipv6/sky-websense/sky-websense.c
View file

@ -42,7 +42,7 @@
#include "httpd-simple.h" #include "httpd-simple.h"
#include "webserver-nogui.h" #include "webserver-nogui.h"
#include "dev/sht11-sensor.h" #include "dev/sht11-sensor.h"
#include "dev/light-sensor.h" //#include "dev/light-sensor.h"
#include "dev/leds.h" #include "dev/leds.h"
#include <stdio.h> #include <stdio.h>
@ -59,7 +59,8 @@ static int sensors_pos;
static int static int
get_light(void) get_light(void)
{ {
return 10 * light_sensor.value(LIGHT_SENSOR_PHOTOSYNTHETIC) / 7; //return 10 * light_sensor.value(LIGHT_SENSOR_PHOTOSYNTHETIC) / 7;
return 0;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static int static int
@ -151,7 +152,7 @@ PROCESS_THREAD(web_sense_process, ev, data)
process_start(&webserver_nogui_process, NULL); process_start(&webserver_nogui_process, NULL);
etimer_set(&timer, CLOCK_SECOND * 2); etimer_set(&timer, CLOCK_SECOND * 2);
SENSORS_ACTIVATE(light_sensor); //SENSORS_ACTIVATE(light_sensor);
SENSORS_ACTIVATE(sht11_sensor); SENSORS_ACTIVATE(sht11_sensor);
while(1) { while(1) {

2
platform/z1/Makefile.common
View file

@ -11,7 +11,7 @@ ARCH=msp430.c leds.c watchdog.c xmem.c \
spix.c cc2420.c cc2420-aes.c cc2420-arch.c cc2420-arch-sfd.c\ spix.c cc2420.c cc2420-aes.c cc2420-arch.c cc2420-arch-sfd.c\
node-id.c sensors.c button-sensor.c cfs-coffee.c \ node-id.c sensors.c button-sensor.c cfs-coffee.c \
radio-sensor.c uart0x.c uart0-putchar.c uip-ipchksum.c \ radio-sensor.c uart0x.c uart0-putchar.c uip-ipchksum.c \
checkpoint-arch.c slip.c slip_uart0.c z1-phidgets.c checkpoint-arch.c slip.c slip_uart0.c z1-phidgets.c sht11.c sht11-sensor.c
CONTIKI_TARGET_DIRS = . dev apps net CONTIKI_TARGET_DIRS = . dev apps net
ifndef CONTIKI_TARGET_MAIN ifndef CONTIKI_TARGET_MAIN