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

Multi-platform support, osd-merkur-{128,256}

Browse source 
Rename guhRF platform to osd-merkur-256, previous osd-merkur platform is
now osd-merkur-128. Also check that everything is consistent.
Add both platforms to the regression tests.
Move redundant files in platform dev directory of both platforms to
cpu/avr/dev. Note that this probably needs some rework. Already
discovered some inconsistency in io definitions of both devices in the
avr/io.h includes. Added a workaround in the obvious cases.
The platform makefiles now set correct parameters for bootloader and for
reading mac-address from flash memory.
Factor the flash programming into cpu/avr and platform/osd-merkur* and
rework *all* osd example makefiles to use the new settings. Also update
all the flash.sh and run.sh to use the new settings.
The suli ledstrip modules (and osd example) have also been removed.
This commit is contained in:
Ralf Schlatterbeck 2016-04-22 17:51:59 +02:00
parent 53dd2e5d16
commit 04bbba6c12
237 changed files with 679 additions and 7835 deletions
Download patch file Download diff file Expand all files Collapse all files

11
examples/osd/pir-sensor/Makefile
View file

@ -1,6 +1,6 @@
all: er-example-server
# use this target explicitly if requried: er-plugtest-server
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)
@ -92,3 +92,10 @@ 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

2
examples/osd/pir-sensor/flash.sh
View file

@ -1,2 +1,2 @@
#!/bin/bash
sudo avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U flash:w:er-example-server.osd-merkur.hex:a -U eeprom:w:er-example-server.osd-merkur.eep:a
make TARGET=osd-merkur-128 flash

7
examples/osd/pir-sensor/run.sh
View file

@ -1,8 +1,5 @@
#!/bin/bash
# For the ages-old bootloader (before 2014) you want to use
# BOOTLOADER_GET_MAC=0x0001f3a0 as parameter to make below.
make clean TARGET=osd-merkur
make TARGET=osd-merkur
avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex
avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.eep
make clean TARGET=osd-merkur-128
make TARGET=osd-merkur-128