From 7ea0e3b9337f20a41abd57323350640bba0939c5 Mon Sep 17 00:00:00 2001 From: Ralf Schlatterbeck Date: Tue, 22 Aug 2017 22:29:03 +0200 Subject: [PATCH] Fix Makefiles, remove/fix flash targets The target "flash" and related stuff is now in the platform makefiles. --- examples/osd/arduino-bh1750/Makefile | 7 -- examples/osd/arduino-bme280/Makefile | 7 -- examples/osd/arduino-bmp085/Makefile | 7 -- examples/osd/arduino-bmp280/Makefile | 7 -- examples/osd/arduino-climate3/Makefile | 7 -- examples/osd/arduino-dallaseprom/Makefile | 7 -- examples/osd/arduino-dallastemp/Makefile | 7 -- examples/osd/arduino-distance/Makefile | 7 -- examples/osd/arduino-dooralert/Makefile | 7 -- examples/osd/arduino-htu21/Makefile | 7 -- examples/osd/arduino-i2c-scanner/Makefile | 7 -- examples/osd/arduino-ledstrip/Makefile | 7 -- examples/osd/arduino-merkurboard/Makefile | 7 -- examples/osd/arduino-plantobserving/Makefile | 7 -- examples/osd/arduino-relaybox/Makefile | 7 -- examples/osd/arduino-rfid-rc522/Makefile | 7 -- examples/osd/arduino-roller/Makefile | 26 +------ examples/osd/arduino-roomalert/Makefile | 7 -- examples/osd/arduino-sketch/Makefile | 7 -- examples/osd/arduino-soil-moisture/Makefile | 7 -- examples/osd/arduino-valve/Makefile | 7 -- examples/osd/arduino-wateralert/Makefile | 7 -- examples/osd/arduino-weather/Makefile | 7 -- examples/osd/arduino-windsonic/Makefile | 7 -- examples/osd/climate/Makefile | 7 -- examples/osd/climate2/Makefile | 7 -- examples/osd/dual-rgbw-actor/Makefile | 77 +------------------ .../osd/dual-rgbw-actor/er-example-server.c | 14 ---- examples/osd/embedd-vm-merkurboard/Makefile | 7 -- .../osd/er-rest-example-merkurboard/Makefile | 16 ++-- examples/osd/lgb-train/Makefile | 7 -- examples/osd/light-actor/Makefile | 7 -- examples/osd/light-shutter-control/Makefile | 62 +-------------- .../light-shutter-control/er-example-server.c | 1 - examples/osd/maclayertest/Makefile | 7 -- examples/osd/merkurboard/Makefile | 16 ++-- examples/osd/native-border-router/Makefile | 8 -- examples/osd/opentrigger-board/Makefile | 7 -- examples/osd/openvoting-box/Makefile | 7 -- examples/osd/pingtheplug/Makefile | 7 -- examples/osd/pir-sensor/Makefile | 77 +------------------ examples/osd/pir-sensor/er-example-server.c | 21 ----- examples/osd/powerbox/Makefile | 19 ----- examples/osd/pwm-example/Makefile | 19 ----- examples/osd/rpl-border-router/Makefile | 7 -- examples/osd/servo-sensor/Makefile | 33 -------- examples/osd/slip-radio/Makefile | 7 -- examples/osd/wallclock-time/Makefile | 8 -- examples/osd/week-clock/Makefile | 19 ----- examples/osd/wirelessplug/Makefile | 17 ++-- examples/osd/wirelessplug/er-example-server.c | 22 ------ 51 files changed, 35 insertions(+), 658 deletions(-) diff --git a/examples/osd/arduino-bh1750/Makefile b/examples/osd/arduino-bh1750/Makefile index 201eeac72..88958f312 100644 --- a/examples/osd/arduino-bh1750/Makefile +++ b/examples/osd/arduino-bh1750/Makefile @@ -62,10 +62,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/arduino-bme280/Makefile b/examples/osd/arduino-bme280/Makefile index f2566e617..f8258bc21 100644 --- a/examples/osd/arduino-bme280/Makefile +++ b/examples/osd/arduino-bme280/Makefile @@ -62,10 +62,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/arduino-bmp085/Makefile b/examples/osd/arduino-bmp085/Makefile index b74569ff2..ad1c9e894 100644 --- a/examples/osd/arduino-bmp085/Makefile +++ b/examples/osd/arduino-bmp085/Makefile @@ -62,10 +62,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/arduino-bmp280/Makefile b/examples/osd/arduino-bmp280/Makefile index f69d0c202..a62bc5c1a 100644 --- a/examples/osd/arduino-bmp280/Makefile +++ b/examples/osd/arduino-bmp280/Makefile @@ -62,10 +62,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/arduino-climate3/Makefile b/examples/osd/arduino-climate3/Makefile index 540913919..68362fb79 100644 --- a/examples/osd/arduino-climate3/Makefile +++ b/examples/osd/arduino-climate3/Makefile @@ -45,10 +45,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/arduino-dallaseprom/Makefile b/examples/osd/arduino-dallaseprom/Makefile index 31ed18ed2..48e0b6f27 100644 --- a/examples/osd/arduino-dallaseprom/Makefile +++ b/examples/osd/arduino-dallaseprom/Makefile @@ -62,10 +62,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/arduino-dallastemp/Makefile b/examples/osd/arduino-dallastemp/Makefile index f1741488c..74c4d7868 100644 --- a/examples/osd/arduino-dallastemp/Makefile +++ b/examples/osd/arduino-dallastemp/Makefile @@ -62,10 +62,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/arduino-distance/Makefile b/examples/osd/arduino-distance/Makefile index 5a017eac0..dc7446112 100644 --- a/examples/osd/arduino-distance/Makefile +++ b/examples/osd/arduino-distance/Makefile @@ -61,10 +61,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/arduino-dooralert/Makefile b/examples/osd/arduino-dooralert/Makefile index 5a017eac0..dc7446112 100644 --- a/examples/osd/arduino-dooralert/Makefile +++ b/examples/osd/arduino-dooralert/Makefile @@ -61,10 +61,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/arduino-htu21/Makefile b/examples/osd/arduino-htu21/Makefile index b44ef11f1..341f83e4e 100644 --- a/examples/osd/arduino-htu21/Makefile +++ b/examples/osd/arduino-htu21/Makefile @@ -62,10 +62,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/arduino-i2c-scanner/Makefile b/examples/osd/arduino-i2c-scanner/Makefile index 5a017eac0..dc7446112 100644 --- a/examples/osd/arduino-i2c-scanner/Makefile +++ b/examples/osd/arduino-i2c-scanner/Makefile @@ -61,10 +61,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/arduino-ledstrip/Makefile b/examples/osd/arduino-ledstrip/Makefile index f03fdfc85..7d16b3998 100644 --- a/examples/osd/arduino-ledstrip/Makefile +++ b/examples/osd/arduino-ledstrip/Makefile @@ -62,10 +62,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/arduino-merkurboard/Makefile b/examples/osd/arduino-merkurboard/Makefile index 5a017eac0..dc7446112 100644 --- a/examples/osd/arduino-merkurboard/Makefile +++ b/examples/osd/arduino-merkurboard/Makefile @@ -61,10 +61,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/arduino-plantobserving/Makefile b/examples/osd/arduino-plantobserving/Makefile index 5a017eac0..dc7446112 100644 --- a/examples/osd/arduino-plantobserving/Makefile +++ b/examples/osd/arduino-plantobserving/Makefile @@ -61,10 +61,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/arduino-relaybox/Makefile b/examples/osd/arduino-relaybox/Makefile index 5a017eac0..dc7446112 100644 --- a/examples/osd/arduino-relaybox/Makefile +++ b/examples/osd/arduino-relaybox/Makefile @@ -61,10 +61,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/arduino-rfid-rc522/Makefile b/examples/osd/arduino-rfid-rc522/Makefile index 296328948..c3e7bf942 100644 --- a/examples/osd/arduino-rfid-rc522/Makefile +++ b/examples/osd/arduino-rfid-rc522/Makefile @@ -61,10 +61,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/arduino-roller/Makefile b/examples/osd/arduino-roller/Makefile index 5ffe58cad..ba0db78b5 100644 --- a/examples/osd/arduino-roller/Makefile +++ b/examples/osd/arduino-roller/Makefile @@ -11,7 +11,7 @@ CONTIKI_WITH_IPV6 = 1 CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\" -PROJECT_SOURCEFILES += ${SKETCH}.cpp kexp.c +PROJECT_SOURCEFILES += ${SKETCH}.cpp # kexp.c # automatically build RESTful resources REST_RESOURCES_DIR = ./resources @@ -24,27 +24,12 @@ REST_RESOURCES_FILES= $(notdir \ PROJECTDIRS += $(REST_RESOURCES_DIR) $(REST_RESOURCES_DIR_COMMON) PROJECT_SOURCEFILES += $(REST_RESOURCES_FILES) -# variable for Makefile.include -ifneq ($(TARGET), minimal-net) -CFLAGS += -DUIP_CONF_IPV6_RPL=1 -else -# minimal-net does not support RPL under Linux and is mostly used to test CoAP only -${info INFO: compiling without RPL} -CFLAGS += -DUIP_CONF_IPV6_RPL=0 -CFLAGS += -DHARD_CODED_ADDRESS=\"fdfd::10\" -${info INFO: compiling with large buffers} -CFLAGS += -DUIP_CONF_BUFFER_SIZE=2048 -CFLAGS += -DREST_MAX_CHUNK_SIZE=1024 -CFLAGS += -DCOAP_MAX_HEADER_SIZE=640 -endif - # linker optimizations SMALL=1 - # REST Engine shall use Erbium CoAP implementation APPS += er-coap -APPS += rest-engine +APPS += rest-engine json APPS += arduino include $(CONTIKI)/Makefile.include @@ -61,10 +46,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/arduino-roomalert/Makefile b/examples/osd/arduino-roomalert/Makefile index fad4a2b73..304f8ee42 100644 --- a/examples/osd/arduino-roomalert/Makefile +++ b/examples/osd/arduino-roomalert/Makefile @@ -62,10 +62,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/arduino-sketch/Makefile b/examples/osd/arduino-sketch/Makefile index d54e087b2..0e6730ee3 100644 --- a/examples/osd/arduino-sketch/Makefile +++ b/examples/osd/arduino-sketch/Makefile @@ -49,10 +49,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/arduino-soil-moisture/Makefile b/examples/osd/arduino-soil-moisture/Makefile index 88859c886..7cdf2c470 100644 --- a/examples/osd/arduino-soil-moisture/Makefile +++ b/examples/osd/arduino-soil-moisture/Makefile @@ -62,10 +62,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/arduino-valve/Makefile b/examples/osd/arduino-valve/Makefile index 848c40424..a8909d2a3 100644 --- a/examples/osd/arduino-valve/Makefile +++ b/examples/osd/arduino-valve/Makefile @@ -49,10 +49,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u # $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/arduino-wateralert/Makefile b/examples/osd/arduino-wateralert/Makefile index 5a017eac0..dc7446112 100644 --- a/examples/osd/arduino-wateralert/Makefile +++ b/examples/osd/arduino-wateralert/Makefile @@ -61,10 +61,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/arduino-weather/Makefile b/examples/osd/arduino-weather/Makefile index 79a367a8c..48458ec09 100644 --- a/examples/osd/arduino-weather/Makefile +++ b/examples/osd/arduino-weather/Makefile @@ -62,10 +62,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/arduino-windsonic/Makefile b/examples/osd/arduino-windsonic/Makefile index 703b27365..5879b69f0 100644 --- a/examples/osd/arduino-windsonic/Makefile +++ b/examples/osd/arduino-windsonic/Makefile @@ -62,10 +62,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/climate/Makefile b/examples/osd/climate/Makefile index 211ea0c1c..b2aec0cff 100644 --- a/examples/osd/climate/Makefile +++ b/examples/osd/climate/Makefile @@ -68,10 +68,3 @@ connect-router-native: $(CONTIKI)/examples/ipv6/native-border-router/border-rout connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/climate2/Makefile b/examples/osd/climate2/Makefile index ee3981b6a..6ee0139d3 100644 --- a/examples/osd/climate2/Makefile +++ b/examples/osd/climate2/Makefile @@ -70,10 +70,3 @@ connect-router-native: $(CONTIKI)/examples/ipv6/native-border-router/border-rout connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/dual-rgbw-actor/Makefile b/examples/osd/dual-rgbw-actor/Makefile index d0e207dcf..b8080d8f2 100644 --- a/examples/osd/dual-rgbw-actor/Makefile +++ b/examples/osd/dual-rgbw-actor/Makefile @@ -2,84 +2,16 @@ EXE=er-example-server all: $(EXE) -# variable for this Makefile -# configure CoAP implementation (3|7|12|13) (er-coap-07 also supports CoAP draft 08) -WITH_COAP=7 - -# for some platforms -UIP_CONF_IPV6=1 -# IPv6 make config disappeared completely -CFLAGS += -DUIP_CONF_IPV6=1 - CONTIKI=../../.. CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\" -# variable for Makefile.include -ifneq ($(TARGET), minimal-net) -CFLAGS += -DUIP_CONF_IPV6_RPL=1 -else -# minimal-net does not support RPL under Linux and is mostly used to test CoAP only -${info INFO: compiling without RPL} -CFLAGS += -DUIP_CONF_IPV6_RPL=0 -CFLAGS += -DHARD_CODED_ADDRESS=\"fdfd::10\" -${info INFO: compiling with large buffers} -CFLAGS += -DUIP_CONF_BUFFER_SIZE=2048 -CFLAGS += -DREST_MAX_CHUNK_SIZE=1024 -CFLAGS += -DCOAP_MAX_HEADER_SIZE=640 -endif - # linker optimizations SMALL=1 -# REST framework, requires WITH_COAP -ifeq ($(WITH_COAP), 13) -${info INFO: compiling with CoAP-13} -CFLAGS += -DWITH_COAP=13 -CFLAGS += -DREST=coap_rest_implementation -CFLAGS += -DUIP_CONF_TCP=0 -APPS += er-coap-13 -else ifeq ($(WITH_COAP), 12) -${info INFO: compiling with CoAP-12} -CFLAGS += -DWITH_COAP=12 -CFLAGS += -DREST=coap_rest_implementation -CFLAGS += -DUIP_CONF_TCP=0 -APPS += er-coap-12 -else ifeq ($(WITH_COAP), 7) -${info INFO: compiling with CoAP-08} -CFLAGS += -DWITH_COAP=7 -CFLAGS += -DREST=coap_rest_implementation -CFLAGS += -DUIP_CONF_TCP=0 -APPS += er-coap-07 -else ifeq ($(WITH_COAP), 3) -${info INFO: compiling with CoAP-03} -CFLAGS += -DWITH_COAP=3 -CFLAGS += -DREST=coap_rest_implementation -CFLAGS += -DUIP_CONF_TCP=0 -APPS += er-coap-03 -else -${info INFO: compiling with HTTP} -CFLAGS += -DWITH_HTTP -CFLAGS += -DREST=http_rest_implementation -CFLAGS += -DUIP_CONF_TCP=1 -APPS += er-http-engine -endif - -APPS += erbium - -# optional rules to get assembly -#CUSTOM_RULE_C_TO_OBJECTDIR_O = 1 -#CUSTOM_RULE_S_TO_OBJECTDIR_O = 1 +APPS += er-coap rest-engine json include $(CONTIKI)/Makefile.include -# optional rules to get assembly -#$(OBJECTDIR)/%.o: asmdir/%.S -# $(CC) $(CFLAGS) -MMD -c $< -o $@ -# @$(FINALIZE_DEPENDENCY) -# -#asmdir/%.S: %.c -# $(CC) $(CFLAGS) -MMD -S $< -o $@ - # border router rules $(CONTIKI)/tools/tunslip6: $(CONTIKI)/tools/tunslip6.c (cd $(CONTIKI)/tools && $(MAKE) tunslip6) @@ -92,10 +24,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/dual-rgbw-actor/er-example-server.c b/examples/osd/dual-rgbw-actor/er-example-server.c index 9fb587974..2d5a1aa56 100644 --- a/examples/osd/dual-rgbw-actor/er-example-server.c +++ b/examples/osd/dual-rgbw-actor/er-example-server.c @@ -43,23 +43,9 @@ #include #include "contiki.h" #include "contiki-net.h" -#include "erbium.h" #include "dev/t4-servo-sensor.h" -/* For CoAP-specific example: not required for normal RESTful Web service. */ -#if WITH_COAP == 3 -#include "er-coap-03.h" -#elif WITH_COAP == 7 -#include "er-coap-07.h" -#elif WITH_COAP == 12 -#include "er-coap-12.h" -#elif WITH_COAP == 13 -#include "er-coap-13.h" -#else -#warning "Erbium example without CoAP-specifc functionality" -#endif /* CoAP-specific example */ - #define DEBUG 1 #if DEBUG #define PRINTF(...) printf(__VA_ARGS__) diff --git a/examples/osd/embedd-vm-merkurboard/Makefile b/examples/osd/embedd-vm-merkurboard/Makefile index 6e69fd76f..ffe6fc374 100644 --- a/examples/osd/embedd-vm-merkurboard/Makefile +++ b/examples/osd/embedd-vm-merkurboard/Makefile @@ -62,10 +62,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/er-rest-example-merkurboard/Makefile b/examples/osd/er-rest-example-merkurboard/Makefile index 21cc867a2..9bea0dd07 100644 --- a/examples/osd/er-rest-example-merkurboard/Makefile +++ b/examples/osd/er-rest-example-merkurboard/Makefile @@ -76,15 +76,19 @@ connect-router-native: $(CONTIKI)/examples/ipv6/native-border-router/border-rout connect-minimal: sudo ip address add fdfd::1/64 dev tap0 -avr-size-server: er-example-server.$(TARGET).sz +avr-size-server: er-example-server.$(TARGET)$(CUSTOM_SUFFIX).sz -avr-size-client: er-example-server.$(TARGET).sz +avr-size-client: er-example-server.$(TARGET)$(CUSTOM_SUFFIX).sz -flash-server: er-example-server.$(TARGET).u er-example-server.$(TARGET).eu +flash-server: er-example-server.$(TARGET)$(CUSTOM_SUFFIX).u \ + er-example-server.$(TARGET)$(CUSTOM_SUFFIX).eu -flash-client: er-example-client.$(TARGET).u er-example-client.$(TARGET).eu +flash-client: er-example-client.$(TARGET)$(CUSTOM_SUFFIX).u \ + er-example-client.$(TARGET)$(CUSTOM_SUFFIX).eu .PHONY: flash-client avr-size-client flash-server avr-size-server -.PRECIOUS: er-example-server.$(TARGET).hex er-example-server.$(TARGET).eep \ - er-example-client.$(TARGET).hex er-example-client.$(TARGET).eep +.PRECIOUS: er-example-server.$(TARGET)$(CUSTOM_SUFFIX).hex \ + er-example-server.$(TARGET)$(CUSTOM_SUFFIX).eep \ + er-example-client.$(TARGET)$(CUSTOM_SUFFIX).hex \ + er-example-client.$(TARGET)$(CUSTOM_SUFFIX).eep diff --git a/examples/osd/lgb-train/Makefile b/examples/osd/lgb-train/Makefile index fef4c390e..f14e914b4 100644 --- a/examples/osd/lgb-train/Makefile +++ b/examples/osd/lgb-train/Makefile @@ -61,10 +61,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/light-actor/Makefile b/examples/osd/light-actor/Makefile index 881d7002c..48494765b 100644 --- a/examples/osd/light-actor/Makefile +++ b/examples/osd/light-actor/Makefile @@ -48,10 +48,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/light-shutter-control/Makefile b/examples/osd/light-shutter-control/Makefile index 340032d58..601078498 100644 --- a/examples/osd/light-shutter-control/Makefile +++ b/examples/osd/light-shutter-control/Makefile @@ -2,15 +2,6 @@ EXE=er-example-server all: $(EXE) -# variable for this Makefile -# configure CoAP implementation (3|7|12|13) (er-coap-07 also supports CoAP draft 08) -WITH_COAP=13 - -# for some platforms -UIP_CONF_IPV6=1 -# IPv6 make config disappeared completely -CFLAGS += -DUIP_CONF_IPV6=1 - CONTIKI=../../.. CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\" @@ -35,55 +26,11 @@ endif # linker optimizations SMALL=1 -# REST framework, requires WITH_COAP -ifeq ($(WITH_COAP), 13) -${info INFO: compiling with CoAP-13} -CFLAGS += -DWITH_COAP=13 -CFLAGS += -DREST=coap_rest_implementation -CFLAGS += -DUIP_CONF_TCP=0 -APPS += er-coap-13 -else ifeq ($(WITH_COAP), 12) -${info INFO: compiling with CoAP-12} -CFLAGS += -DWITH_COAP=12 -CFLAGS += -DREST=coap_rest_implementation -CFLAGS += -DUIP_CONF_TCP=0 -APPS += er-coap-12 -else ifeq ($(WITH_COAP), 7) -${info INFO: compiling with CoAP-08} -CFLAGS += -DWITH_COAP=7 -CFLAGS += -DREST=coap_rest_implementation -CFLAGS += -DUIP_CONF_TCP=0 -APPS += er-coap-07 -else ifeq ($(WITH_COAP), 3) -${info INFO: compiling with CoAP-03} -CFLAGS += -DWITH_COAP=3 -CFLAGS += -DREST=coap_rest_implementation -CFLAGS += -DUIP_CONF_TCP=0 -APPS += er-coap-03 -else -${info INFO: compiling with HTTP} -CFLAGS += -DWITH_HTTP -CFLAGS += -DREST=http_rest_implementation -CFLAGS += -DUIP_CONF_TCP=1 -APPS += er-http-engine -endif - APPS += erbium - -# optional rules to get assembly -#CUSTOM_RULE_C_TO_OBJECTDIR_O = 1 -#CUSTOM_RULE_S_TO_OBJECTDIR_O = 1 +APPS += er-coap rest-engine include $(CONTIKI)/Makefile.include -# optional rules to get assembly -#$(OBJECTDIR)/%.o: asmdir/%.S -# $(CC) $(CFLAGS) -MMD -c $< -o $@ -# @$(FINALIZE_DEPENDENCY) -# -#asmdir/%.S: %.c -# $(CC) $(CFLAGS) -MMD -S $< -o $@ - # border router rules $(CONTIKI)/tools/tunslip6: $(CONTIKI)/tools/tunslip6.c (cd $(CONTIKI)/tools && $(MAKE) tunslip6) @@ -96,10 +43,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/light-shutter-control/er-example-server.c b/examples/osd/light-shutter-control/er-example-server.c index b58c1676b..4c89de5d0 100644 --- a/examples/osd/light-shutter-control/er-example-server.c +++ b/examples/osd/light-shutter-control/er-example-server.c @@ -72,7 +72,6 @@ #define REST_RES_LED 1 #define REST_RES_BATTERY 1 -#include "erbium.h" #include "pcintkey.h" #include "statusled.h" diff --git a/examples/osd/maclayertest/Makefile b/examples/osd/maclayertest/Makefile index ffb8d687e..657277e29 100644 --- a/examples/osd/maclayertest/Makefile +++ b/examples/osd/maclayertest/Makefile @@ -69,10 +69,3 @@ connect-router-native: $(CONTIKI)/examples/ipv6/native-border-router/border-rout connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/merkurboard/Makefile b/examples/osd/merkurboard/Makefile index 9cd7198da..bc41abcbc 100644 --- a/examples/osd/merkurboard/Makefile +++ b/examples/osd/merkurboard/Makefile @@ -65,15 +65,19 @@ connect-router-native: $(CONTIKI)/examples/ipv6/native-border-router/border-rout connect-minimal: sudo ip address add fdfd::1/64 dev tap0 -avr-size-server: er-example-server.$(TARGET).sz +avr-size-server: er-example-server.$(TARGET)$(CUSTOM_SUFFIX).sz -avr-size-client: er-example-server.$(TARGET).sz +avr-size-client: er-example-server.$(TARGET)$(CUSTOM_SUFFIX).sz -flash-server: er-example-server.$(TARGET).u er-example-server.$(TARGET).eu +flash-server: er-example-server.$(TARGET)$(CUSTOM_SUFFIX).u \ + er-example-server.$(TARGET)$(CUSTOM_SUFFIX).eu -flash-client: er-example-client.$(TARGET).u er-example-client.$(TARGET).eu +flash-client: er-example-client.$(TARGET)$(CUSTOM_SUFFIX).u \ + er-example-client.$(TARGET)$(CUSTOM_SUFFIX).eu .PHONY: flash-client avr-size-client flash-server avr-size-server -.PRECIOUS: er-example-server.$(TARGET).hex er-example-server.$(TARGET).eep \ - er-example-client.$(TARGET).hex er-example-client.$(TARGET).eep +.PRECIOUS: er-example-server.$(TARGET)$(CUSTOM_SUFFIX).hex \ + er-example-server.$(TARGET)$(CUSTOM_SUFFIX).eep \ + er-example-client.$(TARGET)$(CUSTOM_SUFFIX).hex \ + er-example-client.$(TARGET)$(CUSTOM_SUFFIX).eep diff --git a/examples/osd/native-border-router/Makefile b/examples/osd/native-border-router/Makefile index 442a39e78..c0dab3cb0 100644 --- a/examples/osd/native-border-router/Makefile +++ b/examples/osd/native-border-router/Makefile @@ -25,11 +25,3 @@ include $(CONTIKI)/Makefile.include connect-router: border-router.native sudo ./border-router.native aaaa::1/64 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep - diff --git a/examples/osd/opentrigger-board/Makefile b/examples/osd/opentrigger-board/Makefile index a7257f3ab..885f416dc 100644 --- a/examples/osd/opentrigger-board/Makefile +++ b/examples/osd/opentrigger-board/Makefile @@ -61,10 +61,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/openvoting-box/Makefile b/examples/osd/openvoting-box/Makefile index 8800ba83a..887c467ae 100644 --- a/examples/osd/openvoting-box/Makefile +++ b/examples/osd/openvoting-box/Makefile @@ -62,10 +62,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/pingtheplug/Makefile b/examples/osd/pingtheplug/Makefile index 881d7002c..48494765b 100644 --- a/examples/osd/pingtheplug/Makefile +++ b/examples/osd/pingtheplug/Makefile @@ -48,10 +48,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/pir-sensor/Makefile b/examples/osd/pir-sensor/Makefile index 0675e5538..b8080d8f2 100644 --- a/examples/osd/pir-sensor/Makefile +++ b/examples/osd/pir-sensor/Makefile @@ -2,84 +2,16 @@ EXE=er-example-server all: $(EXE) -# variable for this Makefile -# configure CoAP implementation (3|7|12|13) (er-coap-07 also supports CoAP draft 08) -WITH_COAP=13 - -# for some platforms -UIP_CONF_IPV6=1 -# IPv6 make config disappeared completely -CFLAGS += -DUIP_CONF_IPV6=1 - CONTIKI=../../.. CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\" -# variable for Makefile.include -ifneq ($(TARGET), minimal-net) -CFLAGS += -DUIP_CONF_IPV6_RPL=1 -else -# minimal-net does not support RPL under Linux and is mostly used to test CoAP only -${info INFO: compiling without RPL} -CFLAGS += -DUIP_CONF_IPV6_RPL=0 -CFLAGS += -DHARD_CODED_ADDRESS=\"fdfd::10\" -${info INFO: compiling with large buffers} -CFLAGS += -DUIP_CONF_BUFFER_SIZE=2048 -CFLAGS += -DREST_MAX_CHUNK_SIZE=1024 -CFLAGS += -DCOAP_MAX_HEADER_SIZE=640 -endif - # linker optimizations SMALL=1 -# REST framework, requires WITH_COAP -ifeq ($(WITH_COAP), 13) -${info INFO: compiling with CoAP-13} -CFLAGS += -DWITH_COAP=13 -CFLAGS += -DREST=coap_rest_implementation -CFLAGS += -DUIP_CONF_TCP=0 -APPS += er-coap-13 -else ifeq ($(WITH_COAP), 12) -${info INFO: compiling with CoAP-12} -CFLAGS += -DWITH_COAP=12 -CFLAGS += -DREST=coap_rest_implementation -CFLAGS += -DUIP_CONF_TCP=0 -APPS += er-coap-12 -else ifeq ($(WITH_COAP), 7) -${info INFO: compiling with CoAP-08} -CFLAGS += -DWITH_COAP=7 -CFLAGS += -DREST=coap_rest_implementation -CFLAGS += -DUIP_CONF_TCP=0 -APPS += er-coap-07 -else ifeq ($(WITH_COAP), 3) -${info INFO: compiling with CoAP-03} -CFLAGS += -DWITH_COAP=3 -CFLAGS += -DREST=coap_rest_implementation -CFLAGS += -DUIP_CONF_TCP=0 -APPS += er-coap-03 -else -${info INFO: compiling with HTTP} -CFLAGS += -DWITH_HTTP -CFLAGS += -DREST=http_rest_implementation -CFLAGS += -DUIP_CONF_TCP=1 -APPS += er-http-engine -endif - -APPS += erbium - -# optional rules to get assembly -#CUSTOM_RULE_C_TO_OBJECTDIR_O = 1 -#CUSTOM_RULE_S_TO_OBJECTDIR_O = 1 +APPS += er-coap rest-engine json include $(CONTIKI)/Makefile.include -# optional rules to get assembly -#$(OBJECTDIR)/%.o: asmdir/%.S -# $(CC) $(CFLAGS) -MMD -c $< -o $@ -# @$(FINALIZE_DEPENDENCY) -# -#asmdir/%.S: %.c -# $(CC) $(CFLAGS) -MMD -S $< -o $@ - # border router rules $(CONTIKI)/tools/tunslip6: $(CONTIKI)/tools/tunslip6.c (cd $(CONTIKI)/tools && $(MAKE) tunslip6) @@ -92,10 +24,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/pir-sensor/er-example-server.c b/examples/osd/pir-sensor/er-example-server.c index 7ae248eef..607e5beeb 100644 --- a/examples/osd/pir-sensor/er-example-server.c +++ b/examples/osd/pir-sensor/er-example-server.c @@ -52,13 +52,6 @@ #define REST_RES_TOGGLE 0 #define REST_RES_BATTERY 1 -#if !UIP_CONF_IPV6_RPL && !defined (CONTIKI_TARGET_MINIMAL_NET) && !defined (CONTIKI_TARGET_NATIVE) -#warning "Compiling with static routing!" -#include "static-routing.h" -#endif - -#include "erbium.h" - #include "dev/led.h" #if defined (PLATFORM_HAS_BUTTON) #include "dev/button-sensor.h" @@ -76,20 +69,6 @@ #include "dev/battery-sensor.h" #endif - -/* For CoAP-specific example: not required for normal RESTful Web service. */ -#if WITH_COAP == 3 -#include "er-coap-03.h" -#elif WITH_COAP == 7 -#include "er-coap-07.h" -#elif WITH_COAP == 12 -#include "er-coap-12.h" -#elif WITH_COAP == 13 -#include "er-coap-13.h" -#else -#warning "Erbium example without CoAP-specifc functionality" -#endif /* CoAP-specific example */ - #define DEBUG 1 #if DEBUG #define PRINTF(...) printf(__VA_ARGS__) diff --git a/examples/osd/powerbox/Makefile b/examples/osd/powerbox/Makefile index 72ffc56e5..a359ed71d 100644 --- a/examples/osd/powerbox/Makefile +++ b/examples/osd/powerbox/Makefile @@ -31,20 +31,8 @@ SMALL=1 APPS += er-coap APPS += rest-engine -# optional rules to get assembly -#CUSTOM_RULE_C_TO_OBJECTDIR_O = 1 -#CUSTOM_RULE_S_TO_OBJECTDIR_O = 1 - include $(CONTIKI)/Makefile.include -# optional rules to get assembly -#$(OBJECTDIR)/%.o: asmdir/%.S -# $(CC) $(CFLAGS) -MMD -c $< -o $@ -# @$(FINALIZE_DEPENDENCY) -# -#asmdir/%.S: %.c -# $(CC) $(CFLAGS) -MMD -S $< -o $@ - # border router rules $(CONTIKI)/tools/tunslip6: $(CONTIKI)/tools/tunslip6.c (cd $(CONTIKI)/tools && $(MAKE) tunslip6) @@ -57,10 +45,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/pwm-example/Makefile b/examples/osd/pwm-example/Makefile index c10f7ff31..348cf7d79 100644 --- a/examples/osd/pwm-example/Makefile +++ b/examples/osd/pwm-example/Makefile @@ -11,19 +11,7 @@ CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\" PROJECT_SOURCEFILES += resource_led_pwm.c -# variable for Makefile.include -ifneq ($(TARGET), minimal-net) CFLAGS += -DUIP_CONF_IPV6_RPL=1 -else -# minimal-net does not support RPL under Linux and is mostly used to test CoAP only -${info INFO: compiling without RPL} -CFLAGS += -DUIP_CONF_IPV6_RPL=0 -CFLAGS += -DHARD_CODED_ADDRESS=\"fdfd::10\" -${info INFO: compiling with large buffers} -CFLAGS += -DUIP_CONF_BUFFER_SIZE=2048 -CFLAGS += -DREST_MAX_CHUNK_SIZE=1024 -CFLAGS += -DCOAP_MAX_HEADER_SIZE=640 -endif # linker optimizations SMALL=1 @@ -46,10 +34,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/rpl-border-router/Makefile b/examples/osd/rpl-border-router/Makefile index e57591e80..ef772c9cc 100644 --- a/examples/osd/rpl-border-router/Makefile +++ b/examples/osd/rpl-border-router/Makefile @@ -47,10 +47,3 @@ connect-router: $(CONTIKI)/tools/tunslip6 connect-router-cooja: $(CONTIKI)/tools/tunslip6 sudo $(CONTIKI)/tools/tunslip6 -a 127.0.0.1 $(PREFIX) - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/servo-sensor/Makefile b/examples/osd/servo-sensor/Makefile index 72ffc56e5..3eeda3c59 100644 --- a/examples/osd/servo-sensor/Makefile +++ b/examples/osd/servo-sensor/Makefile @@ -9,42 +9,16 @@ CFLAGS += -DUIP_CONF_IPV6=1 CONTIKI=../../.. CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\" - -# variable for Makefile.include -ifneq ($(TARGET), minimal-net) CFLAGS += -DUIP_CONF_IPV6_RPL=1 -else -# minimal-net does not support RPL under Linux and is mostly used to test CoAP only -${info INFO: compiling without RPL} -CFLAGS += -DUIP_CONF_IPV6_RPL=0 -CFLAGS += -DHARD_CODED_ADDRESS=\"fdfd::10\" -${info INFO: compiling with large buffers} -CFLAGS += -DUIP_CONF_BUFFER_SIZE=2048 -CFLAGS += -DREST_MAX_CHUNK_SIZE=1024 -CFLAGS += -DCOAP_MAX_HEADER_SIZE=640 -endif # linker optimizations SMALL=1 - APPS += er-coap APPS += rest-engine -# optional rules to get assembly -#CUSTOM_RULE_C_TO_OBJECTDIR_O = 1 -#CUSTOM_RULE_S_TO_OBJECTDIR_O = 1 - include $(CONTIKI)/Makefile.include -# optional rules to get assembly -#$(OBJECTDIR)/%.o: asmdir/%.S -# $(CC) $(CFLAGS) -MMD -c $< -o $@ -# @$(FINALIZE_DEPENDENCY) -# -#asmdir/%.S: %.c -# $(CC) $(CFLAGS) -MMD -S $< -o $@ - # border router rules $(CONTIKI)/tools/tunslip6: $(CONTIKI)/tools/tunslip6.c (cd $(CONTIKI)/tools && $(MAKE) tunslip6) @@ -57,10 +31,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/slip-radio/Makefile b/examples/osd/slip-radio/Makefile index d6bb0802c..3eb30c470 100644 --- a/examples/osd/slip-radio/Makefile +++ b/examples/osd/slip-radio/Makefile @@ -26,10 +26,3 @@ endif CONTIKI_WITH_RPL = 0 CONTIKI_WITH_IPV6 = 1 include $(CONTIKI)/Makefile.include - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/wallclock-time/Makefile b/examples/osd/wallclock-time/Makefile index 46d8e4625..dd25e5226 100644 --- a/examples/osd/wallclock-time/Makefile +++ b/examples/osd/wallclock-time/Makefile @@ -38,11 +38,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -# At some point we may want to include the eeprom file -flash: $(EXE).$(TARGET).u # $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/week-clock/Makefile b/examples/osd/week-clock/Makefile index 5939a88e8..db1abc94f 100644 --- a/examples/osd/week-clock/Makefile +++ b/examples/osd/week-clock/Makefile @@ -24,19 +24,7 @@ REST_RESOURCES_FILES= $(notdir \ PROJECTDIRS += $(REST_RESOURCES_DIR) $(REST_RESOURCES_DIR_COMMON) PROJECT_SOURCEFILES += $(REST_RESOURCES_FILES) -# variable for Makefile.include -ifneq ($(TARGET), minimal-net) CFLAGS += -DUIP_CONF_IPV6_RPL=1 -else -# minimal-net does not support RPL under Linux and is mostly used to test CoAP only -${info INFO: compiling without RPL} -CFLAGS += -DUIP_CONF_IPV6_RPL=0 -CFLAGS += -DHARD_CODED_ADDRESS=\"fdfd::10\" -${info INFO: compiling with large buffers} -CFLAGS += -DUIP_CONF_BUFFER_SIZE=2048 -CFLAGS += -DREST_MAX_CHUNK_SIZE=1024 -CFLAGS += -DCOAP_MAX_HEADER_SIZE=640 -endif # linker optimizations SMALL=1 @@ -62,10 +50,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 - -avr-size: $(EXE).$(TARGET).sz - -flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu - -.PHONY: flash avr-size -.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep diff --git a/examples/osd/wirelessplug/Makefile b/examples/osd/wirelessplug/Makefile index aeaa5e2ad..7924bfc8b 100644 --- a/examples/osd/wirelessplug/Makefile +++ b/examples/osd/wirelessplug/Makefile @@ -91,15 +91,18 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-minimal: sudo ip address add fdfd::1/64 dev tap0 -avr-size-server: er-example-server.$(TARGET).sz +avr-size-server: er-example-server.$(TARGET)$(CUSTOM_SUFFIX).sz -avr-size-client: er-example-server.$(TARGET).sz +avr-size-client: er-example-server.$(TARGET)$(CUSTOM_SUFFIX).sz -flash-server: er-example-server.$(TARGET).u er-example-server.$(TARGET).eu +flash-server: er-example-server.$(TARGET)$(CUSTOM_SUFFIX).u \ + er-example-server.$(TARGET)$(CUSTOM_SUFFIX).eu -flash-client: er-example-client.$(TARGET).u er-example-client.$(TARGET).eu +flash-client: er-example-client.$(TARGET)$(CUSTOM_SUFFIX).u \ + er-example-client.$(TARGET)$(CUSTOM_SUFFIX).eu .PHONY: flash-client avr-size-client flash-server avr-size-server -.PRECIOUS: er-example-server.$(TARGET).hex er-example-server.$(TARGET).eep \ - er-example-client.$(TARGET).hex er-example-client.$(TARGET).eep - +.PRECIOUS: er-example-server.$(TARGET)$(CUSTOM_SUFFIX).hex \ + er-example-server.$(TARGET)$(CUSTOM_SUFFIX).eep \ + er-example-client.$(TARGET)$(CUSTOM_SUFFIX).hex \ + er-example-client.$(TARGET)$(CUSTOM_SUFFIX).eep diff --git a/examples/osd/wirelessplug/er-example-server.c b/examples/osd/wirelessplug/er-example-server.c index 0e2466255..4ab43e06f 100644 --- a/examples/osd/wirelessplug/er-example-server.c +++ b/examples/osd/wirelessplug/er-example-server.c @@ -59,15 +59,6 @@ #define REST_RES_BATTERY 0 #define REST_RES_RADIO 0 - - -#if !UIP_CONF_IPV6_RPL && !defined (CONTIKI_TARGET_MINIMAL_NET) && !defined (CONTIKI_TARGET_NATIVE) -#warning "Compiling with static routing!" -#include "static-routing.h" -#endif - -#include "erbium.h" - // todo OSD-Testboard move to platform/dev #include "dev/led.h" #if REST_RES_DS1820 @@ -95,19 +86,6 @@ #include "relay.h" -/* For CoAP-specific example: not required for normal RESTful Web service. */ -#if WITH_COAP == 3 -#include "er-coap-03.h" -#elif WITH_COAP == 7 -#include "er-coap-07.h" -#elif WITH_COAP == 12 -#include "er-coap-12.h" -#elif WITH_COAP == 13 -#include "er-coap-13.h" -#else -#warning "Erbium example without CoAP-specifc functionality" -#endif /* CoAP-specific example */ - #define DEBUG 0 #if DEBUG #define PRINTF(...) printf(__VA_ARGS__)