Merge branch '2.3' into 2.4

CREDITS.txt

@@ -2225,3 +2225,15 @@ Radomir Sterba
 Ignacio Barrio
 Bradley Murchie
 Emmanuel Balintec
+Rowell Torres
+Christopher Kokis
+Ken Bryan
+Eric Yoder
+Olav Roth
+Rowell Torres
+Christopher Kokis
+Ken Bryan
+Glenn Noonan
+Michael Jakob
+Dean Berg
+David Hankins

radio/src/io/frsky_firmware_update.cpp

@@ -485,8 +485,10 @@ const char * FrskyDeviceFirmwareUpdate::flashFirmware(const char * filename, Pro
   INTERNAL_MODULE_OFF();
 #endif
 
+#if defined(HARDWARE_EXTERNAL_MODULE)
   uint8_t extPwr = IS_EXTERNAL_MODULE_ON();
   EXTERNAL_MODULE_OFF();
+#endif
 
 #if defined(SPORT_UPDATE_PWR_GPIO)
   uint8_t spuPwr = IS_SPORT_UPDATE_POWER_ON();
@@ -529,10 +531,12 @@ const char * FrskyDeviceFirmwareUpdate::flashFirmware(const char * filename, Pro
   }
 #endif
 
+#if defined(HARDWARE_EXTERNAL_MODULE)
   if (extPwr) {
     EXTERNAL_MODULE_ON();
     setupPulsesExternalModule();
   }
+#endif
 
 #if defined(SPORT_UPDATE_PWR_GPIO)
   if (spuPwr) {
@@ -797,10 +801,12 @@ const char * FrskyChipFirmwareUpdate::flashFirmware(const char * filename, Progr
   }
 #endif
 
+#if defined(HARDWARE_EXTERNAL_MODULE)
   if (extPwr) {
     EXTERNAL_MODULE_ON();
     setupPulsesExternalModule();
   }
+#endif
 
 #if defined(SPORT_UPDATE_PWR_GPIO)
   if (spuPwr) {

radio/src/io/multi_firmware_update.cpp

@@ -128,7 +128,9 @@ class MultiExternalUpdateDriver: public MultiFirmwareUpdateDriver
 
     void sendByte(uint8_t byte) const override
     {
+#if defined(HARDWARE_EXTERNAL_MODULE)
       extmoduleSendInvertedByte(byte);
+#endif
     }
 
     void clear() const override
@@ -595,8 +597,10 @@ bool MultiDeviceFirmwareUpdate::flashFirmware(const char * filename, ProgressHan
   INTERNAL_MODULE_OFF();
 #endif
 
+#if defined(HARDWARE_EXTERNAL_MODULE)
   uint8_t extPwr = IS_EXTERNAL_MODULE_ON();
   EXTERNAL_MODULE_OFF();
+#endif
 
 #if defined(SPORT_UPDATE_PWR_GPIO)
   uint8_t spuPwr = IS_SPORT_UPDATE_POWER_ON();
@@ -642,10 +646,12 @@ bool MultiDeviceFirmwareUpdate::flashFirmware(const char * filename, ProgressHan
   }
 #endif
 
+#if defined(HARDWARE_EXTERNAL_MODULE)
   if (extPwr) {
     EXTERNAL_MODULE_ON();
     setupPulsesExternalModule();
   }
+#endif
 
 #if defined(SPORT_UPDATE_PWR_GPIO)
   if (spuPwr) {

radio/src/pulses/pulses.cpp

@@ -218,6 +218,7 @@ uint8_t getRequiredProtocol(uint8_t module)
   return protocol;
 }
 
+#if defined(HARDWARE_EXTERNAL_MODULE)
 void enablePulsesExternalModule(uint8_t protocol)
 {
   // start new protocol hardware here
@@ -444,6 +445,7 @@ bool setupPulsesExternalModule(uint8_t protocol)
       return false;
   }
 }
+#endif
 
 #if defined(HARDWARE_INTERNAL_MODULE)
 static void enablePulsesInternalModule(uint8_t protocol)
@@ -601,6 +603,7 @@ bool setupPulsesInternalModule()
 }
 #endif
 
+#if defined(HARDWARE_EXTERNAL_MODULE)
 void stopPulsesExternalModule()
 {
   if (moduleState[EXTERNAL_MODULE].protocol != PROTOCOL_CHANNELS_UNINITIALIZED) {
@@ -625,6 +628,7 @@ bool setupPulsesExternalModule()
     return setupPulsesExternalModule(protocol);
   }
 }
+#endif
 
 void setCustomFailsafe(uint8_t moduleIndex)
 {

radio/src/targets/common/arm/stm32/intmodule_serial_driver.cpp

@@ -169,7 +169,7 @@ void intmoduleSendBuffer(const uint8_t * data, uint8_t size)
 
 void intmoduleSendNextFrame()
 {
-  switch(moduleState[INTERNAL_MODULE].protocol) {
+  switch (moduleState[INTERNAL_MODULE].protocol) {
 #if defined(PXX2)
     case PROTOCOL_CHANNELS_PXX2_HIGHSPEED:
       intmoduleSendBuffer(intmodulePulsesData.pxx2.getData(), intmodulePulsesData.pxx2.getSize());

radio/src/targets/taranis/CMakeLists.txt

@@ -463,7 +463,6 @@ set(TARGET_SRC
   ${TARGET_SRC}
   ${LED_DRIVER}
   backlight_driver.cpp
-  extmodule_driver.cpp
   trainer_driver.cpp
   ../common/arm/stm32/timers_driver.cpp
   ../common/arm/stm32/audio_dac_driver.cpp
@@ -523,6 +522,10 @@ if(INTERNAL_MODULE_PPM)
 endif()
 
 if(EXTERNAL_MODULE)
+  set(TARGET_SRC
+    ${TARGET_SRC}
+    extmodule_driver.cpp
+    )
   add_definitions(-DHARDWARE_EXTERNAL_MODULE)
 endif()
 

radio/src/tasks.cpp

@@ -102,10 +102,12 @@ void sendSynchronousPulses(uint8_t runMask)
   }
 #endif
 
+#if defined(HARDWARE_EXTERNAL_MODULE)
   if ((runMask & (1 << EXTERNAL_MODULE)) && isModuleSynchronous(EXTERNAL_MODULE)) {
     if (setupPulsesExternalModule())
       extmoduleSendNextFrame();
   }
+#endif
 }
 
 uint32_t nextMixerTime[NUM_MODULES];

tools/commit-tests.sh

@@ -160,7 +160,7 @@ fi
 if [[ " T8 X7 ALL " =~ \ ${FLAVOR}\  ]] ; then
   # OpenTX on T8
   rm -rf ./*
-  cmake "${COMMON_OPTIONS}" -DPCB=X7 -DPCBREV=TX12 -DHELI=YES -DGVARS=YES "${SRCDIR}"
+  cmake "${COMMON_OPTIONS}" -DPCB=X7 -DPCBREV=T8 -DHELI=YES -DGVARS=YES "${SRCDIR}"
   make -j"${CORES}" ${FIRMARE_TARGET}
   make -j"${CORES}" libsimulator
   make -j"${CORES}" tests-radio