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

bugfix led button battery

Browse source
This commit is contained in:
Harald Pichler 2013-07-30 18:45:44 +02:00
parent ba2e08aebf
commit deea693f82
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
examples/osd/er-rest-example-merkurboard/er-example-server.c
View file

@ -44,19 +44,20 @@
/* 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_DS1820 0
#define REST_RES_HELLO 0 #define REST_RES_HELLO 0
#define REST_RES_CHUNKS 1 #define REST_RES_MIRROR 0 /* causes largest code size */
#define REST_RES_SEPARATE 1 #define REST_RES_CHUNKS 0
#define REST_RES_PUSHING 1 #define REST_RES_SEPARATE 0
#define REST_RES_PUSHING 0
#define REST_RES_EVENT 1 #define REST_RES_EVENT 1
#define REST_RES_SUB 1 #define REST_RES_SUB 0
#define REST_RES_LEDS 0 #define REST_RES_LEDS 1
#define REST_RES_TOGGLE 1 #define REST_RES_TOGGLE 1
#define REST_RES_LIGHT 0 #define REST_RES_LIGHT 0
#define REST_RES_BATTERY 0 #define REST_RES_BATTERY 1
#define REST_RES_RADIO 0 #define REST_RES_RADIO 0
#define REST_RES_MIRROR 0 /* causes largest code size */
#include "erbium.h" #include "erbium.h"

9
examples/osd/er-rest-example-merkurboard/project-conf.h
View file

@ -32,13 +32,18 @@
#ifndef __PROJECT_ERBIUM_CONF_H__ #ifndef __PROJECT_ERBIUM_CONF_H__
#define __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. */ /* Some platforms have weird includes. */
#undef IEEE802154_CONF_PANID #undef IEEE802154_CONF_PANID
/* Disabling RDC for demo purposes. Core updates often require more memory. */ /* Disabling RDC for demo purposes. Core updates often require more memory. */
/* For projects, optimize memory and enable RDC again. */ /* For projects, optimize memory and enable RDC again. */
#undef NETSTACK_CONF_RDC // #undef NETSTACK_CONF_RDC
#define NETSTACK_CONF_RDC nullrdc_driver //#define NETSTACK_CONF_RDC nullrdc_driver
/* Increase rpl-border-router IP-buffer when using more than 64. */ /* Increase rpl-border-router IP-buffer when using more than 64. */
#undef REST_MAX_CHUNK_SIZE #undef REST_MAX_CHUNK_SIZE