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

Change the way we switch between cc2530 models

Browse source 
The switch is now performed through a configuration define,
which has also been renamed to better match Contiki's naming
conventions
This commit is contained in:
George Oikonomou 2013-04-03 15:59:05 +01:00 • committed by George Oikonomou
parent 1b0470687b
commit f30d92b101
12 changed files with 29 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
platform/cc2530dk/dev/leds-arch.c
View file

@ -44,7 +44,7 @@
void
leds_arch_init(void)
{
#if MODEL_CC2531
#if MODELS_CONF_CC2531_USB_STICK
P1SEL &= ~LED1_MASK;
P1DIR |= LED1_MASK;
P0SEL &= ~LED2_MASK;
@ -58,7 +58,7 @@ leds_arch_init(void)
unsigned char
leds_arch_get(void)
{
#if MODEL_CC2531
#if MODELS_CONF_CC2531_USB_STICK
return (unsigned char)(LED1_PIN | ((LED2_PIN ^ 0x01) << 1));
#else
return (unsigned char)(LED1_PIN | (LED2_PIN << 1) | (LED3_PIN << 2));
@ -69,7 +69,7 @@ void
leds_arch_set(unsigned char leds)
{
LED1_PIN = leds & 0x01;
#if MODEL_CC2531
#if MODELS_CONF_CC2531_USB_STICK
LED2_PIN = ((leds & 0x02) >> 1) ^ 0x01;
#else
LED2_PIN = (leds & 0x02) >> 1;