From 414d926966852cfb64806659541b33a4907d6a09 Mon Sep 17 00:00:00 2001 From: "Enric M. Calvo" Date: Sun, 27 Feb 2011 20:10:09 +0100 Subject: [PATCH] Sky-websense compiles for Z1 (testing) --- examples/ipv6/sky-websense/sky-websense.c | 7 ++++--- platform/z1/Makefile.common | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/examples/ipv6/sky-websense/sky-websense.c b/examples/ipv6/sky-websense/sky-websense.c index 33c06c129..8f26ca2dc 100644 --- a/examples/ipv6/sky-websense/sky-websense.c +++ b/examples/ipv6/sky-websense/sky-websense.c @@ -42,7 +42,7 @@ #include "httpd-simple.h" #include "webserver-nogui.h" #include "dev/sht11-sensor.h" -#include "dev/light-sensor.h" +//#include "dev/light-sensor.h" #include "dev/leds.h" #include @@ -59,7 +59,8 @@ static int sensors_pos; static int 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 @@ -151,7 +152,7 @@ PROCESS_THREAD(web_sense_process, ev, data) process_start(&webserver_nogui_process, NULL); etimer_set(&timer, CLOCK_SECOND * 2); - SENSORS_ACTIVATE(light_sensor); + //SENSORS_ACTIVATE(light_sensor); SENSORS_ACTIVATE(sht11_sensor); while(1) { diff --git a/platform/z1/Makefile.common b/platform/z1/Makefile.common index 47c81a460..5a137b500 100644 --- a/platform/z1/Makefile.common +++ b/platform/z1/Makefile.common @@ -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\ node-id.c sensors.c button-sensor.c cfs-coffee.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 ifndef CONTIKI_TARGET_MAIN