fixed so that accelerometer is initialized and the isr vector is included

This commit is contained in:
joakime 2011-03-16 13:56:29 +01:00
parent 6554e87c00
commit 7984ec38ce
3 changed files with 6 additions and 2 deletions

View file

@ -7,7 +7,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 adxl345.c i2cmaster.c
CONTIKI_TARGET_DIRS = . dev apps net
ifndef CONTIKI_TARGET_MAIN

View file

@ -69,6 +69,7 @@
SENSORS(&button_sensor);
#if DCOSYNCH_CONF_ENABLED
static struct timer mgt_timer;
#endif
@ -258,6 +259,8 @@ main(int argc, char **argv)
set_rime_addr();
cc2420_init();
accm_init();
{
uint8_t longaddr[8];
uint16_t shortaddr;

View file

@ -43,7 +43,7 @@
#include <signal.h>
#include "contiki.h"
#include "adxl345.h"
#include "cc2420-arch.c"
#include "cc2420.h"
#include "i2cmaster.h"
/* Callback pointers when interrupt occurs */
@ -400,6 +400,7 @@ interrupt(PORT1_VECTOR) port1_isr (void) {
}
ENERGEST_OFF(ENERGEST_TYPE_IRQ);
}
/*---------------------------------------------------------------------------*/