code cleanup

examples/osd/powerbox/Makefile

@@ -6,14 +6,10 @@ all: er-example-server
 # configure CoAP implementation (3|7|12|13) (er-coap-07 also supports CoAP draft 08)
 WITH_COAP=13
 
-
-# variable for Makefile.include
-WITH_UIP6=1
 # for some platforms
 UIP_CONF_IPV6=1
 # IPv6 make config disappeared completely
 CFLAGS += -DUIP_CONF_IPV6
-CFLAGS += -DUIP_CONF_IPV6_RPL
 
 CONTIKI=../../..
 CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"

examples/osd/powerbox/er-example-server.c

@@ -373,8 +373,6 @@ hw_init()
 #endif
 }
 
-#define MESURE_INTERVAL		(CLOCK_SECOND/2)
-
 PROCESS(rest_server_example, "Erbium Example Server");
 
 AUTOSTART_PROCESSES(&rest_server_example, &sensors_process);
@@ -426,11 +424,7 @@ PROCESS_THREAD(rest_server_example, ev, data)
   /* Define application-specific events here. */
   while(1) {
     PROCESS_WAIT_EVENT();
-#if defined (REST_RES_EVENT)
-    if (ev == sensors_event ) {
-      PRINTF("EVENT\n");
-    }
-#endif /* REST_RES_EVENT */
+
   } /* while (1) */
   PROCESS_END();
 }

examples/osd/powerbox/project-conf.h

@@ -29,8 +29,8 @@
  *
  */
 
-#ifndef __PROJECT_ERBIUM_CONF_H__
-#define __PROJECT_ERBIUM_CONF_H__
+#ifndef PROJECT_ERBIUM_CONF_H_
+#define PROJECT_ERBIUM_CONF_H_
 
 #define PLATFORM_HAS_LEDS    1
 #define PLATFORM_HAS_RELAY  1
@@ -77,9 +77,9 @@
 */
 
 /* Save some memory for the sky platform. */
+#undef NBR_TABLE_CONF_MAX_NEIGHBORS
+#define NBR_TABLE_CONF_MAX_NEIGHBORS     10
 
-#undef UIP_CONF_DS6_NBR_NBU
-#define UIP_CONF_DS6_NBR_NBU     10
 #undef UIP_CONF_MAX_ROUTES
 #define UIP_CONF_MAX_ROUTES   10
 
@@ -94,4 +94,4 @@
 #undef SICSLOWPAN_CONF_FRAG
 #define SICSLOWPAN_CONF_FRAG	1
 */
-#endif /* __PROJECT_ERBIUM_CONF_H__ */
+#endif /* PROJECT_ERBIUM_CONF_H_ */