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

Added resource definition for button, leds, and battery, and removed obsolete compiler setup

Browse source
This commit is contained in:
Niclas Finne 2012-03-09 20:35:49 +01:00
parent 512d757d59
commit cf3827829d
2 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
platform/esb/contiki-conf.h
View file

@ -1,6 +1,10 @@
#ifndef __CONTIKI_CONF_H__ #ifndef __CONTIKI_CONF_H__
#define __CONTIKI_CONF_H__ #define __CONTIKI_CONF_H__
#define PLATFORM_HAS_LEDS 1
#define PLATFORM_HAS_BUTTON 1
#define PLATFORM_HAS_BATTERY 1
/* DCO speed resynchronization for more robust UART, etc. */ /* DCO speed resynchronization for more robust UART, etc. */
#define DCOSYNCH_CONF_ENABLED 1 #define DCOSYNCH_CONF_ENABLED 1
#define DCOSYNCH_CONF_PERIOD 30 #define DCOSYNCH_CONF_PERIOD 30
@ -11,15 +15,6 @@
#define PROFILE_CONF_ON 0 #define PROFILE_CONF_ON 0
#define ENERGEST_CONF_ON 1 #define ENERGEST_CONF_ON 1
#ifdef __IAR_SYSTEMS_ICC__
#define __MSP430F149__ 1
#define __MSP430__ 1
#define CC_CONF_INLINE
#define BV(x) (1 << x)
#else
#define CC_CONF_INLINE inline
#endif
#define HAVE_STDINT_H #define HAVE_STDINT_H
#include "msp430def.h" #include "msp430def.h"

2
platform/esb/contiki-esb-main.c
View file

@ -305,8 +305,6 @@ main(void)
watchdog_start(); watchdog_start();
} }
} }
return 0;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* char *arg_alloc(char size) {return NULL;} */ /* char *arg_alloc(char size) {return NULL;} */