From 4a981f1c474737d37147e3b3cba1f70cc08f0b1c Mon Sep 17 00:00:00 2001 From: harald42 Date: Wed, 21 Aug 2013 08:03:42 +0200 Subject: [PATCH] bugfix wrong define --- examples/osd/pingtheplug/er-example-server.c | 12 +----------- examples/osd/pingtheplug/project-conf.h | 6 +++--- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/examples/osd/pingtheplug/er-example-server.c b/examples/osd/pingtheplug/er-example-server.c index c3a7bac07..0c205ea82 100644 --- a/examples/osd/pingtheplug/er-example-server.c +++ b/examples/osd/pingtheplug/er-example-server.c @@ -88,7 +88,7 @@ #warning "Erbium example without CoAP-specifc functionality" #endif /* CoAP-specific example */ -#define DEBUG 1 +#define DEBUG 0 #if DEBUG #define PRINTF(...) printf(__VA_ARGS__) #define PRINT6ADDR(addr) PRINTF("[%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x]", ((uint8_t *)addr)[0], ((uint8_t *)addr)[1], ((uint8_t *)addr)[2], ((uint8_t *)addr)[3], ((uint8_t *)addr)[4], ((uint8_t *)addr)[5], ((uint8_t *)addr)[6], ((uint8_t *)addr)[7], ((uint8_t *)addr)[8], ((uint8_t *)addr)[9], ((uint8_t *)addr)[10], ((uint8_t *)addr)[11], ((uint8_t *)addr)[12], ((uint8_t *)addr)[13], ((uint8_t *)addr)[14], ((uint8_t *)addr)[15]) @@ -494,10 +494,6 @@ PROCESS_THREAD(rest_server_example, ev, data) static int ext4=0; static int ext5=0; static int ext6=0; -// ext4 = is_button_ext4(); -// ext5 = is_button_ext5(); -// ext6 = is_button_ext6(); - PROCESS_BEGIN(); PRINTF("Starting Erbium Example Server\n"); @@ -514,12 +510,6 @@ PROCESS_THREAD(rest_server_example, ev, data) PRINTF("IP+UDP header: %u\n", UIP_IPUDPH_LEN); PRINTF("REST max chunk: %u\n", REST_MAX_CHUNK_SIZE); -/* if static routes are used rather than RPL */ -#if !UIP_CONF_IPV6_RPL && !defined (CONTIKI_TARGET_MINIMAL_NET) && !defined (CONTIKI_TARGET_NATIVE) - set_global_address(); - configure_routing(); -#endif - /* Initialize the OSD Hardware. */ hw_init(); /* Initialize the REST engine. */ diff --git a/examples/osd/pingtheplug/project-conf.h b/examples/osd/pingtheplug/project-conf.h index a6836b39e..624f9a900 100644 --- a/examples/osd/pingtheplug/project-conf.h +++ b/examples/osd/pingtheplug/project-conf.h @@ -29,8 +29,8 @@ * */ -#ifndef __PROJECT_RPL_WEB_CONF_H__ -#define __PROJECT_RPL_WEB_CONF_H__ +#ifndef __PROJECT_ERBIUM_CONF_H__ +#define __PROJECT_ERBIUM_CONF_H__ //#define PLATFORM_HAS_LEDS 1 //#define PLATFORM_HAS_BUTTON 1 @@ -89,7 +89,7 @@ /* Reduce 802.15.4 frame queue to save RAM. */ #undef QUEUEBUF_CONF_NUM -#define QUEUEBUF_CONF_NUM 8 +#define QUEUEBUF_CONF_NUM 4 /*