From b7523d12f0383a004e54ac66eff188161fc023e2 Mon Sep 17 00:00:00 2001
From: 3djc <lesitewebdejc@hotmail.com>
Date: Mon, 3 Feb 2020 07:32:31 +0100
Subject: [PATCH] Fix TX16S compile, and add more radio to Travis

---
 radio/src/targets/horus/board.cpp |  4 ++--
 radio/src/targets/horus/board.h   |  2 +-
 tools/commit-tests.sh             | 18 ++++++++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/radio/src/targets/horus/board.cpp b/radio/src/targets/horus/board.cpp
index 7476db295..abdde2106 100644
--- a/radio/src/targets/horus/board.cpp
+++ b/radio/src/targets/horus/board.cpp
@@ -53,7 +53,7 @@ void auxSerialPowerOff()
 }
 #endif
 
-#if defined(PCBX10) && !defined(RADIO_T16)
+#if HAS_SPORT_UPDATE_CONNECTOR()
 void sportUpdateInit()
 {
   GPIO_InitTypeDef GPIO_InitStructure;
@@ -179,7 +179,7 @@ void boardInit()
 
   ledInit();
 
-#if defined(PCBX10) && !defined(RADIO_T16)
+#if HAS_SPORT_UPDATE_CONNECTOR()
   sportUpdateInit();
 #endif
 
diff --git a/radio/src/targets/horus/board.h b/radio/src/targets/horus/board.h
index d5b7bdac5..09554c063 100644
--- a/radio/src/targets/horus/board.h
+++ b/radio/src/targets/horus/board.h
@@ -596,7 +596,7 @@ extern uint32_t telemetryErrors;
 void telemetryPortInvertedInit(uint32_t baudrate);
 
 // Sport update driver
-#if defined(PCBX10) && !defined(RADIO_T16)
+#if HAS_SPORT_UPDATE_CONNECTOR()
 void sportUpdatePowerOn();
 void sportUpdatePowerOff();
 #define SPORT_UPDATE_POWER_ON()        sportUpdatePowerOn()
diff --git a/tools/commit-tests.sh b/tools/commit-tests.sh
index 9e470343c..b3d193ed1 100755
--- a/tools/commit-tests.sh
+++ b/tools/commit-tests.sh
@@ -184,6 +184,24 @@ if [[ " X10 COLORLCD ALL " =~ \ ${FLAVOR}\  ]] ; then
   make -j"${CORES}" tests-radio
 fi
 
+if [[ " T16 COLORLCD ALL " =~ \ ${FLAVOR}\  ]] ; then
+  # OpenTX on T16 boards
+  rm -rf ./*
+  cmake "${COMMON_OPTIONS}" -DPCB=X10 -PCBREV=T16 -DHELI=YES -DLUA=YES -DGVARS=YES "${SRCDIR}"
+  make -j"${CORES}" ${FIRMARE_TARGET}
+  make -j"${CORES}" libsimulator
+  make -j"${CORES}" tests-radio
+fi
+
+if [[ " TX16S COLORLCD ALL " =~ \ ${FLAVOR}\  ]] ; then
+  # OpenTX on TX16S boards
+  rm -rf ./*
+  cmake "${COMMON_OPTIONS}" -DPCB=X10 -DPCB=TX16S -DHELI=YES -DLUA=YES -DGVARS=YES "${SRCDIR}"
+  make -j"${CORES}" ${FIRMARE_TARGET}
+  make -j"${CORES}" libsimulator
+  make -j"${CORES}" tests-radio
+fi
+
 if [[ " X12S COLORLCD ALL " =~ \ ${FLAVOR}\  ]] ; then
   # OpenTX on X12S
   rm -rf ./*