From 324419241f73a24ce3b13c79896238ceb412cafa Mon Sep 17 00:00:00 2001 From: Ben Lye Date: Mon, 16 Aug 2021 16:59:07 +0100 Subject: [PATCH] Prefix release binaries with mm instead of multi (#596) Better for radios with 128x64 LCDs. --- buildroot/bin/build_release_avr_noboot | 12 ++-- buildroot/bin/build_release_avr_optiboot | 12 ++-- buildroot/bin/build_release_orx | 8 +-- .../bin/build_release_stm32f1_native_debug | 4 +- buildroot/bin/build_release_stm32f1_no_debug | 60 +++++++++---------- .../bin/build_release_stm32f1_serial_debug | 4 +- buildroot/bin/build_release_stm32f1_t18int | 12 ++-- 7 files changed, 56 insertions(+), 56 deletions(-) diff --git a/buildroot/bin/build_release_avr_noboot b/buildroot/bin/build_release_avr_noboot index eb778ab..201db3d 100644 --- a/buildroot/bin/build_release_avr_noboot +++ b/buildroot/bin/build_release_avr_noboot @@ -3,27 +3,27 @@ source ./buildroot/bin/buildFunctions; exitcode=0; -printf "\e[33;1mBuilding multi-avr-usbasp-aetr-A7105-inv-v$MULTI_VERSION.bin\e[0m\n"; +printf "\e[33;1mBuilding mm-avr-usbasp-aetr-A7105-inv-v$MULTI_VERSION.bin\e[0m\n"; opt_disable CHECK_FOR_BOOTLOADER; opt_disable $ALL_PROTOCOLS; opt_enable $A7105_PROTOCOLS; buildMulti; exitcode=$((exitcode+$?)); -mv build/Multiprotocol.ino.bin ./binaries/multi-avr-usbasp-aetr-A7105-inv-v$MULTI_VERSION.bin; +mv build/Multiprotocol.ino.bin ./binaries/mm-avr-usbasp-aetr-A7105-inv-v$MULTI_VERSION.bin; -printf "\e[33;1mBuilding multi-avr-usbasp-aetr-CC2500-inv-v$MULTI_VERSION.bin\e[0m\n"; +printf "\e[33;1mBuilding mm-avr-usbasp-aetr-CC2500-inv-v$MULTI_VERSION.bin\e[0m\n"; opt_disable $ALL_PROTOCOLS; opt_enable $CC2500_PROTOCOLS; opt_disable HITEC_CC2500_INO REDPINE_CC2500_INO OMP_CC2500_INO SKYARTEC_CC2500_INO SCANNER_CC2500_INO FRSKYL_CC2500_INO; buildMulti; exitcode=$((exitcode+$?)); -mv build/Multiprotocol.ino.bin ./binaries/multi-avr-usbasp-aetr-CC2500-inv-v$MULTI_VERSION.bin; +mv build/Multiprotocol.ino.bin ./binaries/mm-avr-usbasp-aetr-CC2500-inv-v$MULTI_VERSION.bin; -printf "\e[33;1mBuilding multi-avr-usbasp-aetr-CYRF6936-inv-v$MULTI_VERSION.bin\e[0m\n"; +printf "\e[33;1mBuilding mm-avr-usbasp-aetr-CYRF6936-inv-v$MULTI_VERSION.bin\e[0m\n"; opt_disable $ALL_PROTOCOLS; opt_enable $CYRF6936_PROTOCOLS; buildMulti; exitcode=$((exitcode+$?)); -mv build/Multiprotocol.ino.bin ./binaries/multi-avr-usbasp-aetr-CYRF6936-inv-v$MULTI_VERSION.bin; +mv build/Multiprotocol.ino.bin ./binaries/mm-avr-usbasp-aetr-CYRF6936-inv-v$MULTI_VERSION.bin; exit $exitcode; diff --git a/buildroot/bin/build_release_avr_optiboot b/buildroot/bin/build_release_avr_optiboot index 93f02f3..039478b 100644 --- a/buildroot/bin/build_release_avr_optiboot +++ b/buildroot/bin/build_release_avr_optiboot @@ -3,27 +3,27 @@ source ./buildroot/bin/buildFunctions; exitcode=0; -printf "\e[33;1mBuilding multi-avr-txflash-aetr-A7105-inv-v$MULTI_VERSION.bin\e[0m\n"; +printf "\e[33;1mBuilding mm-avr-txflash-aetr-A7105-inv-v$MULTI_VERSION.bin\e[0m\n"; opt_enable CHECK_FOR_BOOTLOADER; opt_disable $ALL_PROTOCOLS; opt_enable $A7105_PROTOCOLS; buildMulti; exitcode=$((exitcode+$?)); -mv build/Multiprotocol.ino.bin ./binaries/multi-avr-txflash-aetr-A7105-inv-v$MULTI_VERSION.bin; +mv build/Multiprotocol.ino.bin ./binaries/mm-avr-txflash-aetr-A7105-inv-v$MULTI_VERSION.bin; -printf "\e[33;1mBuilding multi-avr-txflash-aetr-CC2500-inv-v$MULTI_VERSION.bin\e[0m\n"; +printf "\e[33;1mBuilding mm-avr-txflash-aetr-CC2500-inv-v$MULTI_VERSION.bin\e[0m\n"; opt_disable $ALL_PROTOCOLS; opt_enable $CC2500_PROTOCOLS; opt_disable HITEC_CC2500_INO REDPINE_CC2500_INO OMP_CC2500_INO SKYARTEC_CC2500_INO SCANNER_CC2500_INO FRSKYL_CC2500_INO; buildMulti; exitcode=$((exitcode+$?)); -mv build/Multiprotocol.ino.bin ./binaries/multi-avr-txflash-aetr-CC2500-inv-v$MULTI_VERSION.bin; +mv build/Multiprotocol.ino.bin ./binaries/mm-avr-txflash-aetr-CC2500-inv-v$MULTI_VERSION.bin; -printf "\e[33;1mBuilding multi-avr-txflash-aetr-CYRF6936-inv-v$MULTI_VERSION.bin\e[0m\n"; +printf "\e[33;1mBuilding mm-avr-txflash-aetr-CYRF6936-inv-v$MULTI_VERSION.bin\e[0m\n"; opt_disable $ALL_PROTOCOLS; opt_enable $CYRF6936_PROTOCOLS; buildMulti; exitcode=$((exitcode+$?)); -mv build/Multiprotocol.ino.bin ./binaries/multi-avr-txflash-aetr-CYRF6936-inv-v$MULTI_VERSION.bin; +mv build/Multiprotocol.ino.bin ./binaries/mm-avr-txflash-aetr-CYRF6936-inv-v$MULTI_VERSION.bin; exit $exitcode; diff --git a/buildroot/bin/build_release_orx b/buildroot/bin/build_release_orx index ba70d65..f2d05c4 100644 --- a/buildroot/bin/build_release_orx +++ b/buildroot/bin/build_release_orx @@ -3,18 +3,18 @@ source ./buildroot/bin/buildFunctions; exitcode=0; -printf "\e[33;1mBuilding multi-orangerx-aetr-green-inv-v$MULTI_VERSION.bin\e[0m\n"; +printf "\e[33;1mBuilding mm-orangerx-aetr-green-inv-v$MULTI_VERSION.bin\e[0m\n"; opt_enable $ALL_PROTOCOLS; opt_disable ORANGE_TX_BLUE; buildMulti; exitcode=$((exitcode+$?)); -mv build/Multiprotocol.ino.bin ./binaries/multi-orangerx-aetr-green-inv-v$MULTI_VERSION.bin; +mv build/Multiprotocol.ino.bin ./binaries/mm-orangerx-aetr-green-inv-v$MULTI_VERSION.bin; -printf "\e[33;1mBuilding multi-orangerx-aetr-blue-inv-v$MULTI_VERSION.bin\e[0m\n"; +printf "\e[33;1mBuilding mm-orangerx-aetr-blue-inv-v$MULTI_VERSION.bin\e[0m\n"; opt_enable ORANGE_TX_BLUE; buildMulti; exitcode=$((exitcode+$?)); -mv build/Multiprotocol.ino.bin ./binaries/multi-orangerx-aetr-blue-inv-v$MULTI_VERSION.bin; +mv build/Multiprotocol.ino.bin ./binaries/mm-orangerx-aetr-blue-inv-v$MULTI_VERSION.bin; printf "\e[33;1mPackaging ancilliary files for v$MULTI_VERSION\e[0m\n"; cp Multiprotocol/Multi.txt ./binaries/Multi.txt; diff --git a/buildroot/bin/build_release_stm32f1_native_debug b/buildroot/bin/build_release_stm32f1_native_debug index e1f8b6e..c4ad459 100644 --- a/buildroot/bin/build_release_stm32f1_native_debug +++ b/buildroot/bin/build_release_stm32f1_native_debug @@ -3,11 +3,11 @@ source ./buildroot/bin/buildFunctions; exitcode=0; -printf "\e[33;1mBuilding multi-stm-xn297dump-usbdebug-v$MULTI_VERSION.bin\e[0m\n"; +printf "\e[33;1mBuilding mm-stm-xn297dump-usbdebug-v$MULTI_VERSION.bin\e[0m\n"; opt_disable $ALL_PROTOCOLS; opt_add XN297DUMP_NRF24L01_INO; buildMulti; exitcode=$((exitcode+$?)); -mv build/Multiprotocol.ino.bin ./binaries/multi-stm-xn297dump-usbdebug-v$MULTI_VERSION.bin; +mv build/Multiprotocol.ino.bin ./binaries/mm-stm-xn297dump-usbdebug-v$MULTI_VERSION.bin; exit $exitcode; diff --git a/buildroot/bin/build_release_stm32f1_no_debug b/buildroot/bin/build_release_stm32f1_no_debug index 46bbd40..a506b7a 100644 --- a/buildroot/bin/build_release_stm32f1_no_debug +++ b/buildroot/bin/build_release_stm32f1_no_debug @@ -4,68 +4,68 @@ source ./buildroot/bin/buildFunctions; exitcode=0; # Generic 4-in-1 builds -printf "\e[33;1mBuilding multi-stm-serial-aetr-v$MULTI_VERSION.bin\e[0m\n"; +printf "\e[33;1mBuilding mm-stm-serial-aetr-v$MULTI_VERSION.bin\e[0m\n"; opt_disable ENABLE_PPM; buildMulti; exitcode=$((exitcode+$?)); -mv build/Multiprotocol.ino.bin ./binaries/multi-stm-serial-aetr-v$MULTI_VERSION.bin; +mv build/Multiprotocol.ino.bin ./binaries/mm-stm-serial-aetr-v$MULTI_VERSION.bin; -printf "\e[33;1mBuilding multi-stm-serial-taer-v$MULTI_VERSION.bin\e[0m\n"; +printf "\e[33;1mBuilding mm-stm-serial-taer-v$MULTI_VERSION.bin\e[0m\n"; opt_replace AETR TAER; buildMulti; exitcode=$((exitcode+$?)); -mv build/Multiprotocol.ino.bin ./binaries/multi-stm-serial-taer-v$MULTI_VERSION.bin; +mv build/Multiprotocol.ino.bin ./binaries/mm-stm-serial-taer-v$MULTI_VERSION.bin; -printf "\e[33;1mBuilding multi-stm-serial-reta-v$MULTI_VERSION.bin\e[0m\n"; +printf "\e[33;1mBuilding mm-stm-serial-reta-v$MULTI_VERSION.bin\e[0m\n"; opt_replace TAER RETA; buildMulti; exitcode=$((exitcode+$?)); -mv build/Multiprotocol.ino.bin ./binaries/multi-stm-serial-reta-v$MULTI_VERSION.bin; +mv build/Multiprotocol.ino.bin ./binaries/mm-stm-serial-reta-v$MULTI_VERSION.bin; # DIY 5-in-1 builds -printf "\e[33;1mBuilding multi-stm-5in1-aetr-v$MULTI_VERSION.bin\e[0m\n"; +printf "\e[33;1mBuilding mm-stm-5in1-aetr-v$MULTI_VERSION.bin\e[0m\n"; opt_replace RETA AETR; opt_enable SX1276_INSTALLED; buildMulti; exitcode=$((exitcode+$?)); -mv build/Multiprotocol.ino.bin ./binaries/multi-stm-5in1-aetr-v$MULTI_VERSION.bin; +mv build/Multiprotocol.ino.bin ./binaries/mm-stm-5in1-aetr-v$MULTI_VERSION.bin; -printf "\e[33;1mBuilding multi-stm-5in1-taer-v$MULTI_VERSION.bin\e[0m\n"; +printf "\e[33;1mBuilding mm-stm-5in1-taer-v$MULTI_VERSION.bin\e[0m\n"; opt_replace AETR TAER; buildMulti; exitcode=$((exitcode+$?)); -mv build/Multiprotocol.ino.bin ./binaries/multi-stm-5in1-taer-v$MULTI_VERSION.bin; +mv build/Multiprotocol.ino.bin ./binaries/mm-stm-5in1-taer-v$MULTI_VERSION.bin; -printf "\e[33;1mBuilding multi-stm-5in1-reta-v$MULTI_VERSION.bin\e[0m\n"; +printf "\e[33;1mBuilding mm-stm-5in1-reta-v$MULTI_VERSION.bin\e[0m\n"; opt_replace TAER RETA; buildMulti; exitcode=$((exitcode+$?)); -mv build/Multiprotocol.ino.bin ./binaries/multi-stm-5in1-reta-v$MULTI_VERSION.bin; +mv build/Multiprotocol.ino.bin ./binaries/mm-stm-5in1-reta-v$MULTI_VERSION.bin; # T-Lite 5-in-1 builds -printf "\e[33;1mBuilding multi-tlite5in1-aetr-v$MULTI_VERSION.bin\e[0m\n"; +printf "\e[33;1mBuilding mm-tlite5in1-aetr-v$MULTI_VERSION.bin\e[0m\n"; opt_replace RETA AETR; opt_disable INVERT_TELEMETRY; opt_disable SX1276_INSTALLED; opt_enable "MULTI_5IN1_INTERNAL JP_TLite" buildMulti; exitcode=$((exitcode+$?)); -mv build/Multiprotocol.ino.bin ./binaries/multi-tlite5in1-aetr-v$MULTI_VERSION.bin; +mv build/Multiprotocol.ino.bin ./binaries/mm-tlite5in1-aetr-v$MULTI_VERSION.bin; -printf "\e[33;1mBuilding multi-tlite5in1-taer-v$MULTI_VERSION.bin\e[0m\n"; +printf "\e[33;1mBuilding mm-tlite5in1-taer-v$MULTI_VERSION.bin\e[0m\n"; opt_replace AETR TAER; buildMulti; exitcode=$((exitcode+$?)); -mv build/Multiprotocol.ino.bin ./binaries/multi-tlite5in1-taer-v$MULTI_VERSION.bin; +mv build/Multiprotocol.ino.bin ./binaries/mm-tlite5in1-taer-v$MULTI_VERSION.bin; -printf "\e[33;1mBuilding multi-tlite5in1-reta-v$MULTI_VERSION.bin\e[0m\n"; +printf "\e[33;1mBuilding mm-tlite5in1-reta-v$MULTI_VERSION.bin\e[0m\n"; opt_replace TAER RETA; buildMulti; exitcode=$((exitcode+$?)); -mv build/Multiprotocol.ino.bin ./binaries/multi-tlite5in1-reta-v$MULTI_VERSION.bin; +mv build/Multiprotocol.ino.bin ./binaries/mm-tlite5in1-reta-v$MULTI_VERSION.bin; # CC2500-only builds -printf "\e[33;1mBuilding multi-stm-cc2500-aetr-v$MULTI_VERSION.bin\e[0m\n"; +printf "\e[33;1mBuilding mm-stm-cc2500-aetr-v$MULTI_VERSION.bin\e[0m\n"; opt_replace RETA AETR; opt_disable "MULTI_5IN1_INTERNAL JP_TLite" opt_disable A7105_INSTALLED; @@ -74,22 +74,22 @@ opt_disable NRF24L01_INSTALLED; opt_disable INVERT_TELEMETRY; buildMulti; exitcode=$((exitcode+$?)); -mv build/Multiprotocol.ino.bin ./binaries/multi-stm-cc2500-aetr-v$MULTI_VERSION.bin; +mv build/Multiprotocol.ino.bin ./binaries/mm-stm-cc2500-aetr-v$MULTI_VERSION.bin; -printf "\e[33;1mBuilding multi-stm-cc2500-taer-v$MULTI_VERSION.bin\e[0m\n"; +printf "\e[33;1mBuilding mm-stm-cc2500-taer-v$MULTI_VERSION.bin\e[0m\n"; opt_replace AETR TAER; buildMulti; exitcode=$((exitcode+$?)); -mv build/Multiprotocol.ino.bin ./binaries/multi-stm-cc2500-taer-v$MULTI_VERSION.bin; +mv build/Multiprotocol.ino.bin ./binaries/mm-stm-cc2500-taer-v$MULTI_VERSION.bin; -printf "\e[33;1mBuilding multi-stm-cc2500-reta-v$MULTI_VERSION.bin\e[0m\n"; +printf "\e[33;1mBuilding mm-stm-cc2500-reta-v$MULTI_VERSION.bin\e[0m\n"; opt_replace TAER RETA; buildMulti; exitcode=$((exitcode+$?)); -mv build/Multiprotocol.ino.bin ./binaries/multi-stm-cc2500-reta-v$MULTI_VERSION.bin; +mv build/Multiprotocol.ino.bin ./binaries/mm-stm-cc2500-reta-v$MULTI_VERSION.bin; # 4-in-1 PPM builds -printf "\e[33;1mBuilding multi-stm-ppm-aetr-v$MULTI_VERSION.bin\e[0m\n"; +printf "\e[33;1mBuilding mm-stm-ppm-aetr-v$MULTI_VERSION.bin\e[0m\n"; opt_enable A7105_INSTALLED; opt_enable CYRF6936_INSTALLED; opt_enable NRF24L01_INSTALLED; @@ -101,18 +101,18 @@ opt_disable MULTI_TELEMETRY; opt_set NBR_BANKS 5; buildMulti; exitcode=$((exitcode+$?)); -mv build/Multiprotocol.ino.bin ./binaries/multi-stm-ppm-aetr-v$MULTI_VERSION.bin; +mv build/Multiprotocol.ino.bin ./binaries/mm-stm-ppm-aetr-v$MULTI_VERSION.bin; -printf "\e[33;1mBuilding multi-stm-ppm-taer-v$MULTI_VERSION.bin\e[0m\n"; +printf "\e[33;1mBuilding mm-stm-ppm-taer-v$MULTI_VERSION.bin\e[0m\n"; opt_replace AETR TAER; buildMulti; exitcode=$((exitcode+$?)); -mv build/Multiprotocol.ino.bin ./binaries/multi-stm-ppm-taer-v$MULTI_VERSION.bin; +mv build/Multiprotocol.ino.bin ./binaries/mm-stm-ppm-taer-v$MULTI_VERSION.bin; -printf "\e[33;1mBuilding multi-stm-ppm-reta-v$MULTI_VERSION.bin\e[0m\n"; +printf "\e[33;1mBuilding mm-stm-ppm-reta-v$MULTI_VERSION.bin\e[0m\n"; opt_replace TAER RETA; buildMulti; exitcode=$((exitcode+$?)); -mv build/Multiprotocol.ino.bin ./binaries/multi-stm-ppm-reta-v$MULTI_VERSION.bin; +mv build/Multiprotocol.ino.bin ./binaries/mm-stm-ppm-reta-v$MULTI_VERSION.bin; exit $exitcode; diff --git a/buildroot/bin/build_release_stm32f1_serial_debug b/buildroot/bin/build_release_stm32f1_serial_debug index 89e4055..0001ffe 100644 --- a/buildroot/bin/build_release_stm32f1_serial_debug +++ b/buildroot/bin/build_release_stm32f1_serial_debug @@ -3,11 +3,11 @@ source ./buildroot/bin/buildFunctions; exitcode=0; -printf "\e[33;1mBuilding multi-stm-xn297dump-ftdidebug-v$MULTI_VERSION.bin\e[0m\n"; +printf "\e[33;1mBuilding mm-stm-xn297dump-ftdidebug-v$MULTI_VERSION.bin\e[0m\n"; opt_disable $ALL_PROTOCOLS; opt_add XN297DUMP_NRF24L01_INO; buildMulti; exitcode=$((exitcode+$?)); -mv build/Multiprotocol.ino.bin ./binaries/multi-stm-xn297dump-ftdidebug-v$MULTI_VERSION.bin; +mv build/Multiprotocol.ino.bin ./binaries/mm-stm-xn297dump-ftdidebug-v$MULTI_VERSION.bin; exit $exitcode; diff --git a/buildroot/bin/build_release_stm32f1_t18int b/buildroot/bin/build_release_stm32f1_t18int index c665b26..196f5f8 100644 --- a/buildroot/bin/build_release_stm32f1_t18int +++ b/buildroot/bin/build_release_stm32f1_t18int @@ -3,23 +3,23 @@ source ./buildroot/bin/buildFunctions; exitcode=0; -printf "\e[33;1mBuilding multi-t18int-aetr-v$MULTI_VERSION.bin\e[0m\n"; +printf "\e[33;1mBuilding mm-t18int-aetr-v$MULTI_VERSION.bin\e[0m\n"; opt_disable ENABLE_PPM; opt_disable INVERT_TELEMETRY; buildMulti; exitcode=$((exitcode+$?)); -mv build/Multiprotocol.ino.bin ./binaries/multi-t18int-aetr-v$MULTI_VERSION.bin; +mv build/Multiprotocol.ino.bin ./binaries/mm-t18int-aetr-v$MULTI_VERSION.bin; -printf "\e[33;1mBuilding multi-t18int-taer-v$MULTI_VERSION.bin\e[0m\n"; +printf "\e[33;1mBuilding mm-t18int-taer-v$MULTI_VERSION.bin\e[0m\n"; opt_replace AETR TAER; buildMulti; exitcode=$((exitcode+$?)); -mv build/Multiprotocol.ino.bin ./binaries/multi-t18int-taer-v$MULTI_VERSION.bin; +mv build/Multiprotocol.ino.bin ./binaries/mm-t18int-taer-v$MULTI_VERSION.bin; -printf "\e[33;1mBuilding multi-t18int-reta-v$MULTI_VERSION.bin\e[0m\n"; +printf "\e[33;1mBuilding mm-t18int-reta-v$MULTI_VERSION.bin\e[0m\n"; opt_replace TAER RETA; buildMulti; exitcode=$((exitcode+$?)); -mv build/Multiprotocol.ino.bin ./binaries/multi-t18int-reta-v$MULTI_VERSION.bin; +mv build/Multiprotocol.ino.bin ./binaries/mm-t18int-reta-v$MULTI_VERSION.bin; exit $exitcode;