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

simplify project-conf.h

Browse source
This commit is contained in:
Harald Pichler 2014-04-14 17:18:30 +02:00
parent 26b1e874d6
commit 8905f35d72
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
examples/osd/light-shutter-control/er-example-server.c
View file

@ -44,6 +44,22 @@
#include "contiki-net.h" #include "contiki-net.h"
#ifdef OSDPLUG
//#define PLATFORM_HAS_LEDS 1
//#define PLATFORM_HAS_BUTTON 1
#define PLATFORM_HAS_OPTRIAC 1
#define PLATFORM_HAS_TEMPERATURE 1
#define PLATFORM_HAS_BATTERY 1
#endif
#if (defined (OSDLIGHT) || defined (OSDSHUTTER))
#define PLATFORM_HAS_LEDS 1
#define PLATFORM_HAS_BUTTON 1
#define PLATFORM_HAS_OPTRIAC 1
#define PLATFORM_HAS_TEMPERATURE 1
#define PLATFORM_HAS_BATTERY 1
#endif
/* Define which resources to include to meet memory constraints. */ /* Define which resources to include to meet memory constraints. */
#define REST_RES_INFO 1 #define REST_RES_INFO 1
#define REST_RES_OPTRIAC 1 #define REST_RES_OPTRIAC 1

6
examples/osd/light-shutter-control/project-conf.h
View file

@ -37,12 +37,6 @@
//#define OSDSHUTTER //#define OSDSHUTTER
//#define PLATFORM_HAS_LEDS 1
//#define PLATFORM_HAS_BUTTON 1
#define PLATFORM_HAS_OPTRIAC 1
#define PLATFORM_HAS_TEMPERATURE 1
#define PLATFORM_HAS_BATTERY 1
#define SICSLOWPAN_CONF_FRAG 1 #define SICSLOWPAN_CONF_FRAG 1
/* For Debug: Dont allow MCU sleeping between channel checks */ /* For Debug: Dont allow MCU sleeping between channel checks */