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

Fix Makefiles, remove/fix flash targets 

The target "flash" and related stuff is now in the platform makefiles.
master
Ralf Schlatterbeck 2017-08-22 22:29:03 +02:00
parent 12ee7b7e39
commit 7ea0e3b933
51 changed files with 35 additions and 658 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
examples/osd/arduino-bh1750/Makefile
View File

@ -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

7
examples/osd/arduino-bme280/Makefile
View File

@ -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

7
examples/osd/arduino-bmp085/Makefile
View File

@ -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

7
examples/osd/arduino-bmp280/Makefile
View File

@ -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

7
examples/osd/arduino-climate3/Makefile
View File

@ -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

7
examples/osd/arduino-dallaseprom/Makefile
View File

@ -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

7
examples/osd/arduino-dallastemp/Makefile
View File

@ -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

7
examples/osd/arduino-distance/Makefile
View File

@ -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

7
examples/osd/arduino-dooralert/Makefile
View File

@ -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

7
examples/osd/arduino-htu21/Makefile
View File

@ -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

7
examples/osd/arduino-i2c-scanner/Makefile
View File

@ -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

7
examples/osd/arduino-ledstrip/Makefile
View File

@ -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

7
examples/osd/arduino-merkurboard/Makefile
View File

@ -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

7
examples/osd/arduino-plantobserving/Makefile
View File

@ -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

7
examples/osd/arduino-relaybox/Makefile
View File

@ -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

7
examples/osd/arduino-rfid-rc522/Makefile
View File

@ -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

26
examples/osd/arduino-roller/Makefile
View File

@ -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

7
examples/osd/arduino-roomalert/Makefile
View File

@ -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

7
examples/osd/arduino-sketch/Makefile
View File

@ -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

7
examples/osd/arduino-soil-moisture/Makefile
View File

@ -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

7
examples/osd/arduino-valve/Makefile
View File

@ -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

7
examples/osd/arduino-wateralert/Makefile
View File

@ -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

7
examples/osd/arduino-weather/Makefile
View File

@ -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

7
examples/osd/arduino-windsonic/Makefile
View File

@ -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

7
examples/osd/climate/Makefile
View File

@ -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

7
examples/osd/climate2/Makefile
View File

@ -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

77
examples/osd/dual-rgbw-actor/Makefile
View File

@ -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

14
examples/osd/dual-rgbw-actor/er-example-server.c
View File

@ -43,23 +43,9 @@
#include <string.h>
#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__)

7
examples/osd/embedd-vm-merkurboard/Makefile
View File

@ -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

16
examples/osd/er-rest-example-merkurboard/Makefile
View File

@ -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

7
examples/osd/lgb-train/Makefile
View File

@ -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

7
examples/osd/light-actor/Makefile
View File

@ -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

62
examples/osd/light-shutter-control/Makefile
View File

@ -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

1
examples/osd/light-shutter-control/er-example-server.c
View File

@ -72,7 +72,6 @@
#define REST_RES_LED 1
#define REST_RES_BATTERY 1
#include "erbium.h"
#include "pcintkey.h"
#include "statusled.h"

7
examples/osd/maclayertest/Makefile
View File

@ -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

16
examples/osd/merkurboard/Makefile
View File

@ -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

8
examples/osd/native-border-router/Makefile
View File

@ -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

7
examples/osd/opentrigger-board/Makefile
View File

@ -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

7
examples/osd/openvoting-box/Makefile
View File

@ -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

7
examples/osd/pingtheplug/Makefile
View File

@ -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

77
examples/osd/pir-sensor/Makefile
View File

@ -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

21
examples/osd/pir-sensor/er-example-server.c
View File

@ -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__)

19
examples/osd/powerbox/Makefile
View File

@ -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

19
examples/osd/pwm-example/Makefile
View File

@ -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

7
examples/osd/rpl-border-router/Makefile
View File

@ -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

33
examples/osd/servo-sensor/Makefile
View File

@ -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

7
examples/osd/slip-radio/Makefile
View File

@ -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

8
examples/osd/wallclock-time/Makefile
View File

@ -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

19
examples/osd/week-clock/Makefile
View File

@ -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

17
examples/osd/wirelessplug/Makefile
View File

@ -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

22
examples/osd/wirelessplug/er-example-server.c
View File

@ -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__)