diff --git a/examples/osd/arduino-climate3/run.sh b/examples/osd/arduino-climate3/run.sh index 295a9ab1d..0fceb01ce 100755 --- a/examples/osd/arduino-climate3/run.sh +++ b/examples/osd/arduino-climate3/run.sh @@ -1,5 +1,5 @@ #!/bin/bash -# For the new bootloader (using a jump-table) you want to use -# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default) +# 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 BOOTLOADER_GET_MAC=0x0001f3a0 +make TARGET=osd-merkur diff --git a/examples/osd/arduino-dallastemp/run.sh b/examples/osd/arduino-dallastemp/run.sh index 295a9ab1d..0fceb01ce 100755 --- a/examples/osd/arduino-dallastemp/run.sh +++ b/examples/osd/arduino-dallastemp/run.sh @@ -1,5 +1,5 @@ #!/bin/bash -# For the new bootloader (using a jump-table) you want to use -# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default) +# 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 BOOTLOADER_GET_MAC=0x0001f3a0 +make TARGET=osd-merkur diff --git a/examples/osd/arduino-dooralert/run.sh b/examples/osd/arduino-dooralert/run.sh index 295a9ab1d..0fceb01ce 100755 --- a/examples/osd/arduino-dooralert/run.sh +++ b/examples/osd/arduino-dooralert/run.sh @@ -1,5 +1,5 @@ #!/bin/bash -# For the new bootloader (using a jump-table) you want to use -# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default) +# 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 BOOTLOADER_GET_MAC=0x0001f3a0 +make TARGET=osd-merkur diff --git a/examples/osd/arduino-htu21/run.sh b/examples/osd/arduino-htu21/run.sh index 295a9ab1d..0fceb01ce 100755 --- a/examples/osd/arduino-htu21/run.sh +++ b/examples/osd/arduino-htu21/run.sh @@ -1,5 +1,5 @@ #!/bin/bash -# For the new bootloader (using a jump-table) you want to use -# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default) +# 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 BOOTLOADER_GET_MAC=0x0001f3a0 +make TARGET=osd-merkur diff --git a/examples/osd/arduino-ledstrip/run.sh b/examples/osd/arduino-ledstrip/run.sh index 295a9ab1d..0fceb01ce 100755 --- a/examples/osd/arduino-ledstrip/run.sh +++ b/examples/osd/arduino-ledstrip/run.sh @@ -1,5 +1,5 @@ #!/bin/bash -# For the new bootloader (using a jump-table) you want to use -# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default) +# 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 BOOTLOADER_GET_MAC=0x0001f3a0 +make TARGET=osd-merkur diff --git a/examples/osd/arduino-merkurboard/run.sh b/examples/osd/arduino-merkurboard/run.sh index 295a9ab1d..0fceb01ce 100755 --- a/examples/osd/arduino-merkurboard/run.sh +++ b/examples/osd/arduino-merkurboard/run.sh @@ -1,5 +1,5 @@ #!/bin/bash -# For the new bootloader (using a jump-table) you want to use -# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default) +# 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 BOOTLOADER_GET_MAC=0x0001f3a0 +make TARGET=osd-merkur diff --git a/examples/osd/arduino-plantobserving/run.sh b/examples/osd/arduino-plantobserving/run.sh index 295a9ab1d..0fceb01ce 100755 --- a/examples/osd/arduino-plantobserving/run.sh +++ b/examples/osd/arduino-plantobserving/run.sh @@ -1,5 +1,5 @@ #!/bin/bash -# For the new bootloader (using a jump-table) you want to use -# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default) +# 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 BOOTLOADER_GET_MAC=0x0001f3a0 +make TARGET=osd-merkur diff --git a/examples/osd/arduino-roller/run.sh b/examples/osd/arduino-roller/run.sh index 295a9ab1d..0fceb01ce 100755 --- a/examples/osd/arduino-roller/run.sh +++ b/examples/osd/arduino-roller/run.sh @@ -1,5 +1,5 @@ #!/bin/bash -# For the new bootloader (using a jump-table) you want to use -# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default) +# 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 BOOTLOADER_GET_MAC=0x0001f3a0 +make TARGET=osd-merkur diff --git a/examples/osd/arduino-roomalert/run.sh b/examples/osd/arduino-roomalert/run.sh index 295a9ab1d..0fceb01ce 100755 --- a/examples/osd/arduino-roomalert/run.sh +++ b/examples/osd/arduino-roomalert/run.sh @@ -1,5 +1,5 @@ #!/bin/bash -# For the new bootloader (using a jump-table) you want to use -# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default) +# 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 BOOTLOADER_GET_MAC=0x0001f3a0 +make TARGET=osd-merkur diff --git a/examples/osd/arduino-sketch/run.sh b/examples/osd/arduino-sketch/run.sh index 295a9ab1d..0fceb01ce 100755 --- a/examples/osd/arduino-sketch/run.sh +++ b/examples/osd/arduino-sketch/run.sh @@ -1,5 +1,5 @@ #!/bin/bash -# For the new bootloader (using a jump-table) you want to use -# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default) +# 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 BOOTLOADER_GET_MAC=0x0001f3a0 +make TARGET=osd-merkur diff --git a/examples/osd/arduino-wateralert/run.sh b/examples/osd/arduino-wateralert/run.sh index 295a9ab1d..0fceb01ce 100755 --- a/examples/osd/arduino-wateralert/run.sh +++ b/examples/osd/arduino-wateralert/run.sh @@ -1,5 +1,5 @@ #!/bin/bash -# For the new bootloader (using a jump-table) you want to use -# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default) +# 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 BOOTLOADER_GET_MAC=0x0001f3a0 +make TARGET=osd-merkur diff --git a/examples/osd/climate/run.sh b/examples/osd/climate/run.sh index 295a9ab1d..0fceb01ce 100755 --- a/examples/osd/climate/run.sh +++ b/examples/osd/climate/run.sh @@ -1,5 +1,5 @@ #!/bin/bash -# For the new bootloader (using a jump-table) you want to use -# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default) +# 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 BOOTLOADER_GET_MAC=0x0001f3a0 +make TARGET=osd-merkur diff --git a/examples/osd/climate2/run.sh b/examples/osd/climate2/run.sh index 295a9ab1d..0fceb01ce 100755 --- a/examples/osd/climate2/run.sh +++ b/examples/osd/climate2/run.sh @@ -1,5 +1,5 @@ #!/bin/bash -# For the new bootloader (using a jump-table) you want to use -# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default) +# 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 BOOTLOADER_GET_MAC=0x0001f3a0 +make TARGET=osd-merkur diff --git a/examples/osd/dual-rgbw-actor/run.sh b/examples/osd/dual-rgbw-actor/run.sh index c65c87c3a..19451da3a 100755 --- a/examples/osd/dual-rgbw-actor/run.sh +++ b/examples/osd/dual-rgbw-actor/run.sh @@ -1,8 +1,8 @@ #!/bin/bash -# For the new bootloader (using a jump-table) you want to use -# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default) +# 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 -j TARGET=osd-merkur BOOTLOADER_GET_MAC=0x0001f3a0 +make -j 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 diff --git a/examples/osd/embedd-vm-merkurboard/run.sh b/examples/osd/embedd-vm-merkurboard/run.sh index a634126e4..cd9abaee7 100755 --- a/examples/osd/embedd-vm-merkurboard/run.sh +++ b/examples/osd/embedd-vm-merkurboard/run.sh @@ -1,8 +1,8 @@ #!/bin/bash -# For the new bootloader (using a jump-table) you want to use -# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default) +# 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 BOOTLOADER_GET_MAC=0x0001f3a0 +make TARGET=osd-merkur avr-size -C --mcu=MCU=atmega128rfa1 embedd-vm-server.osd-merkur avr-objcopy -j .text -j .data -O ihex embedd-vm-server.osd-merkur embedd-vm-server.osd-merkur.hex avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex embedd-vm-server.osd-merkur embedd-vm-server.osd-merkur.eep diff --git a/examples/osd/er-rest-example-merkurboard/run.sh b/examples/osd/er-rest-example-merkurboard/run.sh index 295a9ab1d..0fceb01ce 100755 --- a/examples/osd/er-rest-example-merkurboard/run.sh +++ b/examples/osd/er-rest-example-merkurboard/run.sh @@ -1,5 +1,5 @@ #!/bin/bash -# For the new bootloader (using a jump-table) you want to use -# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default) +# 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 BOOTLOADER_GET_MAC=0x0001f3a0 +make TARGET=osd-merkur diff --git a/examples/osd/er-rest-example-merkurboard/runclient.sh b/examples/osd/er-rest-example-merkurboard/runclient.sh index 295a9ab1d..0fceb01ce 100755 --- a/examples/osd/er-rest-example-merkurboard/runclient.sh +++ b/examples/osd/er-rest-example-merkurboard/runclient.sh @@ -1,5 +1,5 @@ #!/bin/bash -# For the new bootloader (using a jump-table) you want to use -# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default) +# 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 BOOTLOADER_GET_MAC=0x0001f3a0 +make TARGET=osd-merkur diff --git a/examples/osd/led-strip/run.sh b/examples/osd/led-strip/run.sh index 295a9ab1d..0fceb01ce 100755 --- a/examples/osd/led-strip/run.sh +++ b/examples/osd/led-strip/run.sh @@ -1,5 +1,5 @@ #!/bin/bash -# For the new bootloader (using a jump-table) you want to use -# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default) +# 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 BOOTLOADER_GET_MAC=0x0001f3a0 +make TARGET=osd-merkur diff --git a/examples/osd/light-actor/run.sh b/examples/osd/light-actor/run.sh index 2efd2cf48..4b11e9d2a 100755 --- a/examples/osd/light-actor/run.sh +++ b/examples/osd/light-actor/run.sh @@ -1,8 +1,8 @@ #!/bin/bash -# For the new bootloader (using a jump-table) you want to use -# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default) +# 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 BOOTLOADER_GET_MAC=0x0001f3a0 +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 diff --git a/examples/osd/light-shutter-control/run.sh b/examples/osd/light-shutter-control/run.sh index 2efd2cf48..4b11e9d2a 100755 --- a/examples/osd/light-shutter-control/run.sh +++ b/examples/osd/light-shutter-control/run.sh @@ -1,8 +1,8 @@ #!/bin/bash -# For the new bootloader (using a jump-table) you want to use -# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default) +# 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 BOOTLOADER_GET_MAC=0x0001f3a0 +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 diff --git a/examples/osd/merkurboard/run.sh b/examples/osd/merkurboard/run.sh index 295a9ab1d..0fceb01ce 100755 --- a/examples/osd/merkurboard/run.sh +++ b/examples/osd/merkurboard/run.sh @@ -1,5 +1,5 @@ #!/bin/bash -# For the new bootloader (using a jump-table) you want to use -# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default) +# 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 BOOTLOADER_GET_MAC=0x0001f3a0 +make TARGET=osd-merkur diff --git a/examples/osd/merkurboard/runclient.sh b/examples/osd/merkurboard/runclient.sh index 295a9ab1d..0fceb01ce 100755 --- a/examples/osd/merkurboard/runclient.sh +++ b/examples/osd/merkurboard/runclient.sh @@ -1,5 +1,5 @@ #!/bin/bash -# For the new bootloader (using a jump-table) you want to use -# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default) +# 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 BOOTLOADER_GET_MAC=0x0001f3a0 +make TARGET=osd-merkur diff --git a/examples/osd/pingtheplug/run.sh b/examples/osd/pingtheplug/run.sh index 2efd2cf48..4b11e9d2a 100755 --- a/examples/osd/pingtheplug/run.sh +++ b/examples/osd/pingtheplug/run.sh @@ -1,8 +1,8 @@ #!/bin/bash -# For the new bootloader (using a jump-table) you want to use -# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default) +# 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 BOOTLOADER_GET_MAC=0x0001f3a0 +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 diff --git a/examples/osd/pir-sensor/run.sh b/examples/osd/pir-sensor/run.sh index 2efd2cf48..4b11e9d2a 100755 --- a/examples/osd/pir-sensor/run.sh +++ b/examples/osd/pir-sensor/run.sh @@ -1,8 +1,8 @@ #!/bin/bash -# For the new bootloader (using a jump-table) you want to use -# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default) +# 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 BOOTLOADER_GET_MAC=0x0001f3a0 +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 diff --git a/examples/osd/poti/run.sh b/examples/osd/poti/run.sh index 295a9ab1d..0fceb01ce 100755 --- a/examples/osd/poti/run.sh +++ b/examples/osd/poti/run.sh @@ -1,5 +1,5 @@ #!/bin/bash -# For the new bootloader (using a jump-table) you want to use -# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default) +# 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 BOOTLOADER_GET_MAC=0x0001f3a0 +make TARGET=osd-merkur diff --git a/examples/osd/powerbox/run.sh b/examples/osd/powerbox/run.sh index 2efd2cf48..4b11e9d2a 100755 --- a/examples/osd/powerbox/run.sh +++ b/examples/osd/powerbox/run.sh @@ -1,8 +1,8 @@ #!/bin/bash -# For the new bootloader (using a jump-table) you want to use -# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default) +# 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 BOOTLOADER_GET_MAC=0x0001f3a0 +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 diff --git a/examples/osd/pwm-example/run.sh b/examples/osd/pwm-example/run.sh index 295a9ab1d..0fceb01ce 100755 --- a/examples/osd/pwm-example/run.sh +++ b/examples/osd/pwm-example/run.sh @@ -1,5 +1,5 @@ #!/bin/bash -# For the new bootloader (using a jump-table) you want to use -# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default) +# 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 BOOTLOADER_GET_MAC=0x0001f3a0 +make TARGET=osd-merkur diff --git a/examples/osd/rpl-border-router/run.sh b/examples/osd/rpl-border-router/run.sh index 2bcaa03ef..9833eba6b 100755 --- a/examples/osd/rpl-border-router/run.sh +++ b/examples/osd/rpl-border-router/run.sh @@ -1,8 +1,8 @@ #!/bin/bash -# For the new bootloader (using a jump-table) you want to use -# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default) +# 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 BOOTLOADER_GET_MAC=0x0001f3a0 +make TARGET=osd-merkur avr-size -C --mcu=MCU=atmega128rfa1 border-router.osd-merkur avr-objcopy -j .text -j .data -O ihex border-router.osd-merkur border-router.osd-merkur.hex avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex border-router.osd-merkur border-router.osd-merkur.eep diff --git a/examples/osd/servo-sensor/run.sh b/examples/osd/servo-sensor/run.sh index 2efd2cf48..4b11e9d2a 100755 --- a/examples/osd/servo-sensor/run.sh +++ b/examples/osd/servo-sensor/run.sh @@ -1,8 +1,8 @@ #!/bin/bash -# For the new bootloader (using a jump-table) you want to use -# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default) +# 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 BOOTLOADER_GET_MAC=0x0001f3a0 +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 diff --git a/examples/osd/slip-radio/run.sh b/examples/osd/slip-radio/run.sh index 94e36daac..eebc9a53a 100755 --- a/examples/osd/slip-radio/run.sh +++ b/examples/osd/slip-radio/run.sh @@ -1,8 +1,8 @@ #!/bin/bash -# For the new bootloader (using a jump-table) you want to use -# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default) +# 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 BOOTLOADER_GET_MAC=0x0001f3a0 +make TARGET=osd-merkur avr-size slip-radio.osd-merkur avr-objcopy -j .text -j .data -O ihex slip-radio.osd-merkur slip-radio.osd-merkur.hex avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex slip-radio.osd-merkur slip-radio.osd-merkur.eep diff --git a/examples/osd/wallclock-time/run.sh b/examples/osd/wallclock-time/run.sh index 295a9ab1d..0fceb01ce 100755 --- a/examples/osd/wallclock-time/run.sh +++ b/examples/osd/wallclock-time/run.sh @@ -1,5 +1,5 @@ #!/bin/bash -# For the new bootloader (using a jump-table) you want to use -# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default) +# 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 BOOTLOADER_GET_MAC=0x0001f3a0 +make TARGET=osd-merkur diff --git a/examples/osd/wirelessplug/run.sh b/examples/osd/wirelessplug/run.sh index 2efd2cf48..4b11e9d2a 100755 --- a/examples/osd/wirelessplug/run.sh +++ b/examples/osd/wirelessplug/run.sh @@ -1,8 +1,8 @@ #!/bin/bash -# For the new bootloader (using a jump-table) you want to use -# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default) +# 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 BOOTLOADER_GET_MAC=0x0001f3a0 +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 diff --git a/platform/osd-merkur/params.h b/platform/osd-merkur/params.h index a8fa7637e..3bb6153e8 100644 --- a/platform/osd-merkur/params.h +++ b/platform/osd-merkur/params.h @@ -19,7 +19,7 @@ #define CONTIKI_CONF_RANDOM_MAC 0 //adds 78 bytes #define CONTIKI_CONF_SETTINGS_MANAGER 0 //adds 1696 bytes -#define BOOTLOADER_GET_MAC 1 // get mac form boolaoder, need bootlaoder bonsai, PARAMETER_STORAGE 0 +#define BOOTLOADER_GET_MAC 0x0001ff80 // get mac from bootloader, need bootloader bonsai, PARAMETER_STORAGE 0 #if CONTIKI_CONF_SETTINGS_MANAGER //#define PARAMETER_STORAGE 2