From a779cb4d0db98ccfed163fab00afa2501de884a1 Mon Sep 17 00:00:00 2001 From: "Enric M. Calvo" Date: Sun, 27 Feb 2011 18:02:12 +0100 Subject: [PATCH] XXX Interrupts by cc2420 & adxl345 compatible now Still remains to be seen why i2cmaster.c and adxl345.c need to be added in the Makefile.common at the very beginnig with the env. var. PROJECT_SOURCEFILES += i2cmaster.c adxl345.c --- platform/z1/Makefile.common | 2 +- platform/z1/dev/adxl345.c | 2 +- platform/z1/dev/cc2420-arch.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/z1/Makefile.common b/platform/z1/Makefile.common index e60f13836..47c81a460 100644 --- a/platform/z1/Makefile.common +++ b/platform/z1/Makefile.common @@ -1,6 +1,6 @@ # $Id: Makefile.z1,v 1.5 2011/02/26 enricmcalvo Exp $ -#PROJECT_SOURCEFILES += i2cmaster.c adxl345.c +PROJECT_SOURCEFILES += i2cmaster.c adxl345.c CFLAGS+=-Os -g CLEAN += symbols.c symbols.h #CFLAGS += -ffunction-sections diff --git a/platform/z1/dev/adxl345.c b/platform/z1/dev/adxl345.c index 1c186b1bb..52d0b5f7d 100644 --- a/platform/z1/dev/adxl345.c +++ b/platform/z1/dev/adxl345.c @@ -371,7 +371,7 @@ PROCESS_THREAD(accmeter_process, ev, data) { /* XXX This interrupt vector is shared with the interrupts from CC2420, so that was moved here but should find a better home. XXX */ -#if 0 +#if 1 static struct timer suppressTimer1, suppressTimer2; interrupt(PORT1_VECTOR) port1_isr (void) { diff --git a/platform/z1/dev/cc2420-arch.c b/platform/z1/dev/cc2420-arch.c index ca72686b8..1588131a1 100644 --- a/platform/z1/dev/cc2420-arch.c +++ b/platform/z1/dev/cc2420-arch.c @@ -47,7 +47,7 @@ #endif /*---------------------------------------------------------------------------*/ -#if 1 +#if 0 // this is now handled in the ADXL345 accelerometer code as it uses irq on port1 too. interrupt(CC2420_IRQ_VECTOR) cc24240_port1_interrupt(void)