From 5ac228878230c47772be26d87892446cec698459 Mon Sep 17 00:00:00 2001 From: 3djc Date: Fri, 29 Jul 2016 14:40:04 +0200 Subject: [PATCH] 3djc/move (#3670) * build-companion is now in /tools update build-firmware for new targets * remove PCBREV --- radio/util/build-companion.sh | 46 ----------------------------------- radio/util/build-firmware.py | 10 +++----- 2 files changed, 4 insertions(+), 52 deletions(-) delete mode 100755 radio/util/build-companion.sh diff --git a/radio/util/build-companion.sh b/radio/util/build-companion.sh deleted file mode 100755 index a71d82051..000000000 --- a/radio/util/build-companion.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -# Stops on first error, echo on -set -e -set -x - -SRCDIR=$1 -OUTDIR=$2 - -COMMON_OPTIONS="-DALLOW_NIGHTLY_BUILDS=YES -DVERSION_SUFFIX=$3 -DGVARS=YES -DHELI=YES" -STM32_OPTIONS="${COMMON_OPTIONS} -DLUA=YES" - -rm -rf build -mkdir build -cd build - -cmake ${COMMON_OPTIONS} -DPCB=9X ${SRCDIR} -make -j2 libsimulator - -cmake ${COMMON_OPTIONS} -DPCB=GRUVIN9X ${SRCDIR} -make -j2 libsimulator - -cmake ${COMMON_OPTIONS} -DPCB=MEGA2560 ${SRCDIR} -make -j2 libsimulator - -cmake ${COMMON_OPTIONS} -DPCB=SKY9X ${SRCDIR} -make -j2 libsimulator - -cmake ${COMMON_OPTIONS} -DPCB=9XRPRO ${SRCDIR} -make -j2 libsimulator - -cmake ${STM32_OPTIONS} -DPCB=TARANIS ${SRCDIR} -make -j2 libsimulator - -cmake ${STM32_OPTIONS} -DPCB=TARANIS -DPCBREV=REVPLUS ${SRCDIR} -make -j2 libsimulator - -cmake ${STM32_OPTIONS} -DPCB=TARANIS -DPCBREV=REV9E ${SRCDIR} -make -j2 libsimulator - -cmake ${STM32_OPTIONS} -DPCB=HORUS ${SRCDIR} -make -j2 libsimulator - -make -j2 package - -cp *.deb ${OUTDIR} diff --git a/radio/util/build-firmware.py b/radio/util/build-firmware.py index a0969e4fa..637bf01b3 100755 --- a/radio/util/build-firmware.py +++ b/radio/util/build-firmware.py @@ -99,21 +99,19 @@ elif options[optcount] == "ar9x": board = BOARD_SKY9X board_family = BOARD_FAMILY_ARM elif options[optcount] == "taranis": - command_options["PCB"] = "TARANIS" + command_options["PCB"] = "X9D" firmware_options = options_taranis maxsize = 65536 * 8 board = BOARD_TARANIS board_family = BOARD_FAMILY_ARM elif options[optcount] == "taranisplus": - command_options["PCB"] = "TARANIS" - command_options["PCBREV"] = "REVPLUS" + command_options["PCB"] = "X9D+" firmware_options = options_taranisplus maxsize = 65536 * 8 board = BOARD_TARANIS board_family = BOARD_FAMILY_ARM elif options[optcount] == "taranisx9e": - command_options["PCB"] = "TARANIS" - command_options["PCBREV"] = "REV9E" + command_options["PCB"] = "X9E" firmware_options = options_taranisx9e maxsize = 65536 * 8 board = BOARD_TARANIS @@ -220,4 +218,4 @@ if not os.path.isfile(path): shutil.copyfile(target, path) print filename -exit(0) \ No newline at end of file +exit(0)