diff --git a/platform/z1/contiki-z1-main.c b/platform/z1/contiki-z1-main.c index 1afa8cdc2..61bc5d0af 100644 --- a/platform/z1/contiki-z1-main.c +++ b/platform/z1/contiki-z1-main.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)$Id: contiki-z1-main.c,v 1.2 2010/08/26 09:16:39 joxe Exp $ + * @(#)$Id: contiki-z1-main.c,v 1.3 2010/08/26 16:01:20 joxe Exp $ */ #include @@ -48,6 +48,7 @@ #include "lib/random.h" #include "net/netstack.h" #include "net/mac/frame802154.h" +#include "dev/button-sensor.h" #if WITH_UIP6 #include "net/uip-ds6.h" @@ -250,8 +251,7 @@ main(int argc, char **argv) process_init(); process_start(&etimer_process, NULL); - //process_start(&sensors_process, NULL); - PRINTF("process_sensors() skipped \n"); + process_start(&sensors_process, NULL); ctimer_init(); diff --git a/platform/z1/dev/button-sensor.c b/platform/z1/dev/button-sensor.c index 4aefb9841..f6f90adc1 100644 --- a/platform/z1/dev/button-sensor.c +++ b/platform/z1/dev/button-sensor.c @@ -28,7 +28,7 @@ * * This file is part of the Contiki operating system. * - * @(#)$Id: button-sensor.c,v 1.1 2010/08/24 16:26:38 joxe Exp $ + * @(#)$Id: button-sensor.c,v 1.2 2010/08/26 16:01:20 joxe Exp $ */ #include "lib/sensors.h" #include "dev/hwconf.h" @@ -40,8 +40,8 @@ const struct sensors_sensor button_sensor; static struct timer debouncetimer; static int status(int type); -HWCONF_PIN(BUTTON, 2, 7); -HWCONF_IRQ(BUTTON, 2, 7); +HWCONF_PIN(BUTTON, 2, 5); +HWCONF_IRQ(BUTTON, 2, 5); /*---------------------------------------------------------------------------*/ interrupt(PORT2_VECTOR)