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

Optimized configuration to fit into sky again.

Browse source
This commit is contained in:
Matthias Kovatsch 2012-05-13 16:23:28 +02:00
parent 6df9ffb731
commit 222a858254
3 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
examples/er-rest-example/Makefile
View file

@ -1,4 +1,5 @@
all: rest-server-example coap-client-example plugtest-server all: rest-server-example coap-client-example
# Use this target explicitly if requried: plugtest-server
CONTIKI=../.. CONTIKI=../..
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\" CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
@ -6,9 +7,11 @@ CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
# for static routing, if enabled # for static routing, if enabled
ifneq ($(TARGET), minimal-net) ifneq ($(TARGET), minimal-net)
ifneq ($(TARGET), native) ifneq ($(TARGET), native)
ifneq ($(findstring avr,$(TARGET)), avr)
PROJECT_SOURCEFILES += static-routing.c PROJECT_SOURCEFILES += static-routing.c
endif endif
endif endif
endif
# variable for root Makefile.include # variable for root Makefile.include
WITH_UIP6=1 WITH_UIP6=1
@ -16,7 +19,7 @@ WITH_UIP6=1
UIP_CONF_IPV6=1 UIP_CONF_IPV6=1
# variable for this Makefile # variable for this Makefile
# configure CoAP implementation (3|7) # configure CoAP implementation (3|7) (er-coap-07 also supports CoAP draft 08)
WITH_COAP=7 WITH_COAP=7
# new variable since slip-radio # new variable since slip-radio
@ -36,14 +39,16 @@ SMALL=1
# REST framework, requires WITH_COAP # REST framework, requires WITH_COAP
ifeq ($(WITH_COAP), 7) ifeq ($(WITH_COAP), 7)
${info INFO: compiling with CoAP-07} ${info INFO: compiling with CoAP-08}
CFLAGS += -DWITH_COAP=7 CFLAGS += -DWITH_COAP=7
CFLAGS += -DREST=coap_rest_implementation CFLAGS += -DREST=coap_rest_implementation
CFLAGS += -DUIP_CONF_TCP=0
APPS += er-coap-07 APPS += er-coap-07
else ifeq ($(WITH_COAP), 3) else ifeq ($(WITH_COAP), 3)
${info INFO: compiling with CoAP-03} ${info INFO: compiling with CoAP-03}
CFLAGS += -DWITH_COAP=3 CFLAGS += -DWITH_COAP=3
CFLAGS += -DREST=coap_rest_implementation CFLAGS += -DREST=coap_rest_implementation
CFLAGS += -DUIP_CONF_TCP=0
APPS += er-coap-03 APPS += er-coap-03
else else
${info INFO: compiling with HTTP} ${info INFO: compiling with HTTP}
@ -55,12 +60,13 @@ endif
APPS += erbium APPS += erbium
# optional rules to get assembly
#CUSTOM_RULE_C_TO_OBJECTDIR_O = 1 #CUSTOM_RULE_C_TO_OBJECTDIR_O = 1
#CUSTOM_RULE_S_TO_OBJECTDIR_O = 1 #CUSTOM_RULE_S_TO_OBJECTDIR_O = 1
include $(CONTIKI)/Makefile.include include $(CONTIKI)/Makefile.include
# optional rules to get assembly
#$(OBJECTDIR)/%.o: asmdir/%.S #$(OBJECTDIR)/%.o: asmdir/%.S
# $(CC) $(CFLAGS) -MMD -c $< -o $@ # $(CC) $(CFLAGS) -MMD -c $< -o $@
# @$(FINALIZE_DEPENDENCY) # @$(FINALIZE_DEPENDENCY)
@ -68,10 +74,7 @@ include $(CONTIKI)/Makefile.include
#asmdir/%.S: %.c #asmdir/%.S: %.c
# $(CC) $(CFLAGS) -MMD -S $< -o $@ # $(CC) $(CFLAGS) -MMD -S $< -o $@
# border router rules
$(CONTIKI)/tools/tunslip6: $(CONTIKI)/tools/tunslip6.c $(CONTIKI)/tools/tunslip6: $(CONTIKI)/tools/tunslip6.c
(cd $(CONTIKI)/tools && $(MAKE) tunslip6) (cd $(CONTIKI)/tools && $(MAKE) tunslip6)

15
examples/er-rest-example/project-conf.h
View file

@ -52,7 +52,7 @@
/* Multiplies with chunk size, be aware of memory constraints. */ /* Multiplies with chunk size, be aware of memory constraints. */
#ifndef COAP_MAX_OPEN_TRANSACTIONS #ifndef COAP_MAX_OPEN_TRANSACTIONS
#define COAP_MAX_OPEN_TRANSACTIONS 4 #define COAP_MAX_OPEN_TRANSACTIONS 2
#endif #endif
/* Must be <= open transaction number. */ /* Must be <= open transaction number. */
@ -60,15 +60,8 @@
#define COAP_MAX_OBSERVERS COAP_MAX_OPEN_TRANSACTIONS-1 #define COAP_MAX_OBSERVERS COAP_MAX_OPEN_TRANSACTIONS-1
#endif #endif
/* Reduce 802.15.4 frame queue to save RAM. */
#ifndef UIP_CONF_RECEIVE_WINDOW #undef QUEUEBUF_CONF_NUM
#define UIP_CONF_RECEIVE_WINDOW 60 #define QUEUEBUF_CONF_NUM 4
#endif
#ifndef WEBSERVER_CONF_CFS_CONNS
#define WEBSERVER_CONF_CFS_CONNS 2
#endif
#endif /* __PROJECT_RPL_WEB_CONF_H__ */ #endif /* __PROJECT_RPL_WEB_CONF_H__ */

2
examples/er-rest-example/rest-server-example.c
View file

@ -53,7 +53,7 @@
#define REST_RES_LEDS 1 #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 1 #define REST_RES_BATTERY 0