From c7284070ac4724b7dc94ff1615d254901e0bc896 Mon Sep 17 00:00:00 2001
From: Ben Lye <blye@mathworks.com>
Date: Sat, 10 Oct 2020 19:15:15 +0100
Subject: [PATCH] Remove unnecessary release builds and file name flags

---
 .travis.yml                                   |  3 +-
 buildroot/bin/build_release_orx               |  4 +-
 .../bin/build_release_stm32f1_native_debug    | 17 +---
 buildroot/bin/build_release_stm32f1_no_debug  | 93 ++++---------------
 .../bin/build_release_stm32f1_serial_debug    | 17 +---
 buildroot/bin/build_release_stm32f1_t18int    | 14 +--
 6 files changed, 34 insertions(+), 114 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b2c6f80..6b31e3c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,7 +34,8 @@ before_install:
   - buildPPMOnly() { exitcode=0; printf "\n\e[33;1mBuilding PPM mode only\e[0m\n"; opt_enable ENABLE_PPM; opt_disable ENABLE_SERIAL; buildMulti; if [ $? -ne 0 ]; then exitcode=1; fi; return $exitcode; }
   - export -f buildMulti
 
-  # Function to build the release files - dependent on board type
+  # Function to build the release files - dependent on board type.
+  # Release build scripts are located in buildroot/bin.
   - if [[ "$BOARD" == "multi4in1:avr:multixmega32d4" ]]; then
       buildReleaseFiles(){
         build_release_orx;
diff --git a/buildroot/bin/build_release_orx b/buildroot/bin/build_release_orx
index 25ce7b5..7e23e1d 100644
--- a/buildroot/bin/build_release_orx
+++ b/buildroot/bin/build_release_orx
@@ -15,11 +15,13 @@ buildMulti;
 exitcode=$((exitcode+$?));
 mv build/Multiprotocol.ino.bin ./binaries/multi-orangerx-aetr-blue-inv-v$MULTI_VERSION.bin;
 
-printf "\n\e[33;1mPackaging ancilliary files for v$MULTI_VERSION\e[0m";
+printf "\n\e[33;1mPackaging ancilliary files for v$MULTI_VERSION\e[0m\n";
 cp Multiprotocol/Multi.txt ./binaries/Multi.txt;
 mkdir -p SCRIPTS/TOOLS;
 cp Lua_scripts/*.lua SCRIPTS/TOOLS/;
 cp Lua_scripts/*.txt SCRIPTS/TOOLS/;
 zip -q ./binaries/MultiLuaScripts.zip SCRIPTS/TOOLS/*;
 
+printf "\n";
+
 exit $exitcode;
diff --git a/buildroot/bin/build_release_stm32f1_native_debug b/buildroot/bin/build_release_stm32f1_native_debug
index 7ea3772..31e6e85 100644
--- a/buildroot/bin/build_release_stm32f1_native_debug
+++ b/buildroot/bin/build_release_stm32f1_native_debug
@@ -2,25 +2,12 @@
 
 exitcode=0;
 
-printf "\n\e[33;1mBuilding multi-stm-erskytx-xn297dump-inv-usbdebug-v$MULTI_VERSION.bin\e[0m";
+printf "\n\e[33;1mBuilding multi-stm-xn297dump-usbdebug-v$MULTI_VERSION.bin\e[0m";
 exitcode=0;
-opt_enable CHECK_FOR_BOOTLOADER;
 opt_disable $ALL_PROTOCOLS;
 opt_add XN297DUMP_NRF24L01_INO;
-opt_enable MULTI_STATUS;
-opt_disable MULTI_TELEMETRY;
-opt_enable INVERT_TELEMETRY;
 buildMulti;
 exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/multi-stm-erskytx-xn297dump-inv-usbdebug-v$MULTI_VERSION.bin;
-
-printf "\n\e[33;1mBuilding multi-stm-opentx-xn297dump-inv-usbdebug-v$MULTI_VERSION.bin\e[0m";
-opt_disable $ALL_PROTOCOLS;
-opt_disable MULTI_STATUS;
-opt_enable MULTI_TELEMETRY;
-opt_enable INVERT_TELEMETRY;
-buildMulti;
-exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/multi-stm-opentx-xn297dump-inv-usbdebug-v$MULTI_VERSION.bin;
+mv build/Multiprotocol.ino.bin ./binaries/multi-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 17c35ba..0833fab 100644
--- a/buildroot/bin/build_release_stm32f1_no_debug
+++ b/buildroot/bin/build_release_stm32f1_no_debug
@@ -2,109 +2,52 @@
 
 exitcode=0;
 
-printf "\n\e[33;1mBuilding multi-stm-erskytx-aetr-inv-v$MULTI_VERSION.bin\e[0m";
+printf "\n\e[33;1mBuilding multi-stm-aetr-v$MULTI_VERSION.bin\e[0m";
 opt_enable CHECK_FOR_BOOTLOADER;
 opt_disable ENABLE_PPM;
 opt_enable $ALL_PROTOCOLS;
-opt_enable MULTI_STATUS;
-opt_disable MULTI_TELEMETRY;
-buildMulti;
-exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/multi-stm-erskytx-aetr-inv-v$MULTI_VERSION.bin;
-
-printf "\n\e[33;1mBuilding multi-stm-erskytx-taer-inv-v$MULTI_VERSION.bin\e[0m";
-opt_replace AETR TAER;
-buildMulti;
-exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/multi-stm-erskytx-taer-inv-v$MULTI_VERSION.bin;
-
-printf "\n\e[33;1mBuilding multi-stm-erskytx-reta-inv-v$MULTI_VERSION.bin\e[0m";
-opt_replace TAER RETA;
-buildMulti;
-exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/multi-stm-erskytx-reta-inv-v$MULTI_VERSION.bin;
-
-printf "\n\e[33;1mBuilding multi-stm-erskytx-aetr-noinv-v$MULTI_VERSION.bin\e[0m";
-opt_replace RETA AETR;
-opt_disable INVERT_TELEMETRY;
-buildMulti;
-exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/multi-stm-erskytx-aetr-noinv-v$MULTI_VERSION.bin;
-
-printf "\n\e[33;1mBuilding multi-stm-erskytx-taer-noinv-v$MULTI_VERSION.bin\e[0m";
-opt_replace AETR TAER;
-buildMulti;
-exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/multi-stm-erskytx-taer-noinv-v$MULTI_VERSION.bin;
-
-printf "\n\e[33;1mBuilding multi-stm-erskytx-reta-noinv-v$MULTI_VERSION.bin\e[0m";
-opt_replace TAER RETA;
-buildMulti;
-exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/multi-stm-erskytx-reta-noinv-v$MULTI_VERSION.bin;
-
-printf "\n\e[33;1mBuilding multi-stm-opentx-aetr-inv-v$MULTI_VERSION.bin\e[0m";
-opt_replace RETA AETR;
 opt_disable MULTI_STATUS;
 opt_enable MULTI_TELEMETRY;
 opt_enable INVERT_TELEMETRY;
 buildMulti;
 exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/multi-stm-opentx-aetr-inv-v$MULTI_VERSION.bin;
+mv build/Multiprotocol.ino.bin ./binaries/multi-stm-aetr-v$MULTI_VERSION.bin;
 
-printf "\n\e[33;1mBuilding multi-stm-opentx-taer-inv-v$MULTI_VERSION.bin\e[0m";
+printf "\n\e[33;1mBuilding multi-stm-taer-v$MULTI_VERSION.bin\e[0m";
 opt_replace AETR TAER;
 buildMulti;
 exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/multi-stm-opentx-taer-inv-v$MULTI_VERSION.bin;
+mv build/Multiprotocol.ino.bin ./binaries/multi-stm-taer-v$MULTI_VERSION.bin;
 
-printf "\n\e[33;1mBuilding multi-stm-opentx-reta-inv-v$MULTI_VERSION.bin\e[0m";
+printf "\n\e[33;1mBuilding multi-stm-reta-v$MULTI_VERSION.bin\e[0m";
 opt_replace TAER RETA;
 buildMulti;
 exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/multi-stm-opentx-reta-inv-v$MULTI_VERSION.bin;
+mv build/Multiprotocol.ino.bin ./binaries/multi-stm-reta-v$MULTI_VERSION.bin;
 
-printf "\n\e[33;1mBuilding multi-stm-opentx-aetr-noinv-v$MULTI_VERSION.bin\e[0m";
-opt_replace RETA AETR;
-opt_disable INVERT_TELEMETRY;
-buildMulti;
-exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/multi-stm-opentx-aetr-noinv-v$MULTI_VERSION.bin;
 
-printf "\n\e[33;1mBuilding multi-stm-opentx-taer-noinv-v$MULTI_VERSION.bin\e[0m";
-opt_replace AETR TAER;
-buildMulti;
-exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/multi-stm-opentx-taer-noinv-v$MULTI_VERSION.bin;
-
-printf "\n\e[33;1mBuilding multi-stm-opentx-reta-noinv-v$MULTI_VERSION.bin\e[0m";
-opt_replace TAER RETA;
-buildMulti;
-exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/multi-stm-opentx-reta-noinv-v$MULTI_VERSION.bin;
-
-printf "\n\e[33;1mBuilding multi-cc2500-opentx-aetr-noinv-v$MULTI_VERSION.bin\e[0m";
+printf "\n\e[33;1mBuilding multi-cc2500-aetr-v$MULTI_VERSION.bin\e[0m";
 opt_replace RETA AETR;
 opt_disable A7105_INSTALLED;
 opt_disable CYRF6936_INSTALLED;
 opt_disable NRF24L01_INSTALLED;
 buildMulti;
 exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/multi-cc2500-opentx-aetr-noinv-v$MULTI_VERSION.bin;
+mv build/Multiprotocol.ino.bin ./binaries/multi-cc2500-aetr-v$MULTI_VERSION.bin;
 
-printf "\n\e[33;1mBuilding multi-cc2500-opentx-taer-noinv-v$MULTI_VERSION.bin\e[0m";
+printf "\n\e[33;1mBuilding multi-cc2500-taer-v$MULTI_VERSION.bin\e[0m";
 opt_replace AETR TAER;
 buildMulti;
 exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/multi-cc2500-opentx-taer-noinv-v$MULTI_VERSION.bin;
+mv build/Multiprotocol.ino.bin ./binaries/multi-cc2500-taer-v$MULTI_VERSION.bin;
 
-printf "\n\e[33;1mBuilding multi-cc2500-opentx-reta-noinv-v$MULTI_VERSION.bin\e[0m";
+printf "\n\e[33;1mBuilding multi-cc2500-reta-v$MULTI_VERSION.bin\e[0m";
 opt_replace TAER RETA;
 buildMulti;
 exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/multi-cc2500-opentx-reta-noinv-v$MULTI_VERSION.bin;
+mv build/Multiprotocol.ino.bin ./binaries/multi-cc2500-reta-v$MULTI_VERSION.bin;
 
-printf "\n\e[33;1mBuilding multi-stm-ppm-aetr-noinv-v$MULTI_VERSION.bin\e[0m";
+printf "\n\e[33;1mBuilding multi-stm-ppm-aetr-v$MULTI_VERSION.bin\e[0m";
 opt_enable A7105_INSTALLED;
 opt_enable CYRF6936_INSTALLED;
 opt_enable NRF24L01_INSTALLED;
@@ -116,18 +59,18 @@ opt_disable MULTI_TELEMETRY;
 opt_set NBR_BANKS 5;
 buildMulti;
 exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/multi-stm-ppm-aetr-noinv-v$MULTI_VERSION.bin;
+mv build/Multiprotocol.ino.bin ./binaries/multi-stm-ppm-aetr-v$MULTI_VERSION.bin;
 
-printf "\n\e[33;1mBuilding multi-stm-ppm-taer-noinv-v$MULTI_VERSION.bin\e[0m";
+printf "\n\e[33;1mBuilding multi-stm-ppm-taer-v$MULTI_VERSION.bin\e[0m";
 opt_replace AETR TAER;
 buildMulti;
 exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/multi-stm-ppm-taer-noinv-v$MULTI_VERSION.bin;
+mv build/Multiprotocol.ino.bin ./binaries/multi-stm-ppm-taer-v$MULTI_VERSION.bin;
 
-printf "\n\e[33;1mBuilding multi-stm-ppm-reta-noinv-v$MULTI_VERSION.bin\e[0m";
+printf "\n\e[33;1mBuilding multi-stm-ppm-reta-v$MULTI_VERSION.bin\e[0m";
 opt_replace TAER RETA;
 buildMulti;
 exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/multi-stm-ppm-reta-noinv-v$MULTI_VERSION.bin; 
+mv build/Multiprotocol.ino.bin ./binaries/multi-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 2942d75..e90c1d2 100644
--- a/buildroot/bin/build_release_stm32f1_serial_debug
+++ b/buildroot/bin/build_release_stm32f1_serial_debug
@@ -2,25 +2,12 @@
 
 exitcode=0;
 
-printf "\n\e[33;1mBuilding multi-stm-erskytx-xn297dump-inv-ftdidebug-v$MULTI_VERSION.bin\e[0m";
+printf "\n\e[33;1mBuilding multi-stm-xn297dump-ftdidebug-v$MULTI_VERSION.bin\e[0m";
 exitcode=0;
-opt_enable CHECK_FOR_BOOTLOADER;
 opt_disable $ALL_PROTOCOLS;
 opt_add XN297DUMP_NRF24L01_INO;
-opt_enable MULTI_STATUS;
-opt_disable MULTI_TELEMETRY;
-opt_enable INVERT_TELEMETRY;
 buildMulti;
 exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/multi-stm-erskytx-xn297dump-inv-ftdidebug-v$MULTI_VERSION.bin;
-
-printf "\n\e[33;1mBuilding multi-stm-opentx-xn297dump-inv-ftdidebug-v$MULTI_VERSION.bin\e[0m";
-opt_disable $ALL_PROTOCOLS;
-opt_disable MULTI_STATUS;
-opt_enable MULTI_TELEMETRY;
-opt_enable INVERT_TELEMETRY;
-buildMulti;
-exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/multi-stm-opentx-xn297dump-inv-ftdidebug-v$MULTI_VERSION.bin;
+mv build/Multiprotocol.ino.bin ./binaries/multi-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 24c3498..a22ebc5 100644
--- a/buildroot/bin/build_release_stm32f1_t18int
+++ b/buildroot/bin/build_release_stm32f1_t18int
@@ -2,26 +2,26 @@
 
 exitcode=0;
 
-printf "\n\e[33;1mBuilding multi-t18int-opentx-aetr-noinv-v$MULTI_VERSION.bin\e[0m";
+printf "\n\e[33;1mBuilding multi-t18int-aetr-v$MULTI_VERSION.bin\e[0m";
 opt_disable ENABLE_PPM;
 opt_disable INVERT_TELEMETRY;
 exitcode=0;
 buildMulti;
 exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/multi-t18int-opentx-aetr-noinv-v$MULTI_VERSION.bin;
+mv build/Multiprotocol.ino.bin ./binaries/multi-t18int-aetr-v$MULTI_VERSION.bin;
 
-printf "\n\e[33;1mBuilding multi-t18int-opentx-taer-noinv-v$MULTI_VERSION.bin\e[0m";
+printf "\n\e[33;1mBuilding multi-t18int-taer-v$MULTI_VERSION.bin\e[0m";
 opt_replace AETR TAER;
 exitcode=0;
 buildMulti;
 exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/multi-t18int-opentx-taer-noinv-v$MULTI_VERSION.bin;
+mv build/Multiprotocol.ino.bin ./binaries/multi-t18int-taer-v$MULTI_VERSION.bin;
 
-printf "\n\e[33;1mBuilding multi-t18int-opentx-reta-noinv-v$MULTI_VERSION.bin\e[0m";
+printf "\n\e[33;1mBuilding multi-t18int-reta-v$MULTI_VERSION.bin\e[0m";
 opt_replace TAER RETA;
 exitcode=0;
 buildMulti;
 exitcode=$((exitcode+$?));
-mv build/Multiprotocol.ino.bin ./binaries/multi-t18int-opentx-reta-noinv-v$MULTI_VERSION.bin;
-return $exitcode; 
+mv build/Multiprotocol.ino.bin ./binaries/multi-t18int-reta-v$MULTI_VERSION.bin;
+
 exit $exitcode;