test: 2.12.5 release candidate (backport-2.12.5 + #7415)

.github/workflows/linux_cpn.yml

@@ -28,3 +28,7 @@ jobs:
         uses: ./.github/actions/build_companion
         with:
           os: 'linux'
+
+      - name: Run companion unit tests
+        shell: bash
+        run: cmake --build build/native --target tests-companion --parallel

CMakeLists.txt

@@ -4,7 +4,7 @@ project(EdgeTX)
 
 set(VERSION_MAJOR "2")
 set(VERSION_MINOR "12")
-set(VERSION_REVISION "4")
+set(VERSION_REVISION "5")
 set(CODENAME "Queen Anne's Revenge")
 string(TIMESTAMP BUILD_YEAR "%Y")
 

companion/src/firmwares/boardjson.cpp

@@ -137,7 +137,10 @@ void BoardJson::afterLoadFixups(Board::Type board, InputsTable * inputs, Switche
   }
 
   //  Flex switches are not listed in json file for these radios
-  int count = IS_RADIOMASTER_TX16S(board) || IS_RADIOMASTER_MT12(board) ? 2 : 0;
+  //  Must match the targets that set FLEXSW (MAX_FLEX_SWITCHES) in the firmware
+  int count = IS_RADIOMASTER_TX16S(board) || IS_RADIOMASTER_TX16SMK3(board) ||
+              IS_FATFISH_F16(board) || IS_HELLORADIOSKY_V16(board) ||
+              IS_RADIOMASTER_MT12(board) ? 2 : 0;
 
   for (int i = 1; i <= count; i++) {
     QString tag = QString("FL%1").arg(i);

companion/src/firmwares/eeprominterface.cpp

@@ -58,7 +58,7 @@ Firmware::Firmware(Firmware * base, const QString & id, const QString & name, Bo
   simulatorId(simulatorId),
   hwdefnId(hwdefnId)
 {
-  gBoardFactories->registerBoard(board, hwdefnId);
+  gBoardFactories->registerBoard(board, this->hwdefnId.isEmpty() ? getFlavour() : this->hwdefnId);
 }
 
 // static

companion/src/firmwares/moduledata.cpp

@@ -127,7 +127,6 @@ bool ModuleData::isAvailable(PulsesProtocol proto, int port)
           case PULSES_SBUS:
           case PULSES_MULTIMODULE:
           case PULSES_CROSSFIRE:
-          case PULSES_FLYSKY_AFHDS2A:
           case PULSES_FLYSKY_AFHDS3:
           case PULSES_GHOST:
             return true;
@@ -543,7 +542,6 @@ bool ModuleData::isProtocolAvailable(int moduleidx, unsigned int protocol, Gener
               case MODULE_TYPE_CROSSFIRE:
               case MODULE_TYPE_MULTIMODULE:
               case MODULE_TYPE_GHOST:
-              case MODULE_TYPE_FLYSKY_AFHDS2A:
               case MODULE_TYPE_FLYSKY_AFHDS3:
               case MODULE_TYPE_LEMON_DSMP:
               case MODULE_TYPE_R9M_LITE_PXX1:
@@ -566,7 +564,6 @@ bool ModuleData::isProtocolAvailable(int moduleidx, unsigned int protocol, Gener
               case MODULE_TYPE_CROSSFIRE:
               case MODULE_TYPE_MULTIMODULE:
               case MODULE_TYPE_GHOST:
-              case MODULE_TYPE_FLYSKY_AFHDS2A:
               case MODULE_TYPE_FLYSKY_AFHDS3:
               case MODULE_TYPE_LEMON_DSMP:
               case MODULE_TYPE_PPM: