From deea693f827aa3df821faeccaa95fd418568a726 Mon Sep 17 00:00:00 2001 From: Harald Pichler Date: Tue, 30 Jul 2013 18:45:44 +0200 Subject: [PATCH] bugfix led button battery --- .../er-example-server.c | 17 +++++++++-------- .../er-rest-example-merkurboard/project-conf.h | 9 +++++++-- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/examples/osd/er-rest-example-merkurboard/er-example-server.c b/examples/osd/er-rest-example-merkurboard/er-example-server.c index 36fbb5635..fe5240ea0 100644 --- a/examples/osd/er-rest-example-merkurboard/er-example-server.c +++ b/examples/osd/er-rest-example-merkurboard/er-example-server.c @@ -44,19 +44,20 @@ /* Define which resources to include to meet memory constraints. */ +#define REST_RES_INFO 1 +#define REST_RES_DS1820 0 #define REST_RES_HELLO 0 -#define REST_RES_CHUNKS 1 -#define REST_RES_SEPARATE 1 -#define REST_RES_PUSHING 1 +#define REST_RES_MIRROR 0 /* causes largest code size */ +#define REST_RES_CHUNKS 0 +#define REST_RES_SEPARATE 0 +#define REST_RES_PUSHING 0 #define REST_RES_EVENT 1 -#define REST_RES_SUB 1 -#define REST_RES_LEDS 0 +#define REST_RES_SUB 0 +#define REST_RES_LEDS 1 #define REST_RES_TOGGLE 1 #define REST_RES_LIGHT 0 -#define REST_RES_BATTERY 0 +#define REST_RES_BATTERY 1 #define REST_RES_RADIO 0 -#define REST_RES_MIRROR 0 /* causes largest code size */ - #include "erbium.h" diff --git a/examples/osd/er-rest-example-merkurboard/project-conf.h b/examples/osd/er-rest-example-merkurboard/project-conf.h index 9ba0f0000..2271a3e6c 100644 --- a/examples/osd/er-rest-example-merkurboard/project-conf.h +++ b/examples/osd/er-rest-example-merkurboard/project-conf.h @@ -32,13 +32,18 @@ #ifndef __PROJECT_ERBIUM_CONF_H__ #define __PROJECT_ERBIUM_CONF_H__ +#define PLATFORM_HAS_LEDS 1 +#define PLATFORM_HAS_BUTTON 1 +#define PLATFORM_HAS_TEMPERATURE 1 +#define PLATFORM_HAS_BATTERY 1 + /* Some platforms have weird includes. */ #undef IEEE802154_CONF_PANID /* Disabling RDC for demo purposes. Core updates often require more memory. */ /* For projects, optimize memory and enable RDC again. */ -#undef NETSTACK_CONF_RDC -#define NETSTACK_CONF_RDC nullrdc_driver +// #undef NETSTACK_CONF_RDC +//#define NETSTACK_CONF_RDC nullrdc_driver /* Increase rpl-border-router IP-buffer when using more than 64. */ #undef REST_MAX_CHUNK_SIZE