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

code cleanup

Browse source
This commit is contained in:
harald42 2013-11-29 15:22:33 +01:00 committed by harald
parent 184dee491e
commit 116ce888c4
3 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/osd/powerbox/Makefile
View file

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

8
examples/osd/powerbox/er-example-server.c
View file

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

10
examples/osd/powerbox/project-conf.h
View file

@ -29,8 +29,8 @@
* *
*/ */
#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_LEDS 1
#define PLATFORM_HAS_RELAY 1 #define PLATFORM_HAS_RELAY 1
@ -77,9 +77,9 @@
*/ */
/* Save some memory for the sky platform. */ /* 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 #undef UIP_CONF_MAX_ROUTES
#define UIP_CONF_MAX_ROUTES 10 #define UIP_CONF_MAX_ROUTES 10
@ -94,4 +94,4 @@
#undef SICSLOWPAN_CONF_FRAG #undef SICSLOWPAN_CONF_FRAG
#define SICSLOWPAN_CONF_FRAG 1 #define SICSLOWPAN_CONF_FRAG 1
*/ */
#endif /* __PROJECT_ERBIUM_CONF_H__ */ #endif /* PROJECT_ERBIUM_CONF_H_ */