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

cc2531 B1 support. B2 to come

Browse source
This commit is contained in:
George Oikonomou 2011-12-16 19:01:33 +00:00 committed by George Oikonomou
parent 26ae56fcaf
commit c95fc4f360
2 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
platform/cc2530dk/dev/button-sensor.c
View file

@ -80,8 +80,13 @@ int configure(int type, int value)
return 0; return 0;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#if MODEL_CC2531
void
port_1_isr(void) __interrupt(P1INT_VECTOR)
#else
void void
port_0_isr(void) __interrupt(P0INT_VECTOR) port_0_isr(void) __interrupt(P0INT_VECTOR)
#endif
{ {
EA = 0; EA = 0;
ENERGEST_ON(ENERGEST_TYPE_IRQ); ENERGEST_ON(ENERGEST_TYPE_IRQ);

21
platform/cc2530dk/dev/button-sensor.h
View file

@ -43,23 +43,38 @@
#include "contiki-conf.h" #include "contiki-conf.h"
#include "lib/sensors.h" #include "lib/sensors.h"
#define BUTTON_PORT 0
#define BUTTON_PIN 1
#define BUTTON_SENSOR "Button" #define BUTTON_SENSOR "Button"
/* /*
* SmartRF Buttons * SmartRF Buttons
* B1: P0_1, B2: Not Connected * B1: P0_1, B2: Not Connected
*
* USB Dongle Buttons
* B1: P1_2
* B2: P1_3
*
*/ */
#if MODEL_CC2531
#define BUTTON_PORT 1
#define BUTTON_PIN 2
#else
#define BUTTON_PORT 0
#define BUTTON_PIN 1
#endif
#ifdef BUTTON_SENSOR_CONF_ON #ifdef BUTTON_SENSOR_CONF_ON
#define BUTTON_SENSOR_ON BUTTON_SENSOR_CONF_ON #define BUTTON_SENSOR_ON BUTTON_SENSOR_CONF_ON
#endif /* BUTTON_SENSOR_CONF_ON */ #endif /* BUTTON_SENSOR_CONF_ON */
#if BUTTON_SENSOR_ON #if BUTTON_SENSOR_ON
extern const struct sensors_sensor button_sensor; extern const struct sensors_sensor button_sensor;
#if MODEL_CC2531
/* Button 1: P1_2 - Port 1 ISR needed */
void port_1_isr(void) __interrupt(P1INT_VECTOR);
#else
/* Button 1: P0_1 - Port 0 ISR needed */ /* Button 1: P0_1 - Port 0 ISR needed */
void port_0_isr(void) __interrupt(P0INT_VECTOR); void port_0_isr(void) __interrupt(P0INT_VECTOR);
#endif
#define BUTTON_SENSOR_ACTIVATE() button_sensor.configure(SENSORS_ACTIVE, 1) #define BUTTON_SENSOR_ACTIVATE() button_sensor.configure(SENSORS_ACTIVE, 1)
#else #else
#define BUTTON_SENSOR_ACTIVATE() #define BUTTON_SENSOR_ACTIVATE()