.github/workflows/actions.yml

@@ -101,7 +101,7 @@ jobs:
           - t12;t12max
           - t15;t16;t18
           - t8;zorro;pocket;mt12;commando8
-          - tlite;tpro;tprov2;tpros;lr3pro
+          - tlite;tpro;tprov2;tpros;bumblebee;lr3pro
           - t20;t20v2;t14
           - tx12;tx12mk2;boxer
           - tx16s

.github/workflows/macosx_cpn.yml

@@ -32,13 +32,13 @@ jobs:
     # well on Windows or Mac.  You can convert this to a matrix build if you need
     # cross-platform coverage.
     # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
-    runs-on: macos-12
+    runs-on: macos-13
 
     steps:
       - name: Select XCode version
         uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: '13.2.1'
+          xcode-version: '14.1.0'
 
       - name: Check out the repo
         uses: actions/checkout@v4

.github/workflows/nightly.yml

@@ -21,7 +21,7 @@ jobs:
           - t12;t12max
           - t15,t16;t18
           - t8;zorro;pocket;mt12;commando8
-          - tlite;tpro;tprov2;tpros;lr3pro
+          - tlite;tpro;tprov2;tpros;bumblebee;lr3pro
           - t20;t20v2;t14
           - tx12;tx12mk2;boxer
           - tx16s

.gitpod.yml

@@ -1,4 +1,4 @@
-image: ghcr.io/edgetx/gitpod-workspace:latest
+image: ghcr.io/edgetx/gitpod-workspace:2.10
 
 tasks:
   - name: Prep build folder

CMakeLists.txt

@@ -4,7 +4,7 @@ project(EdgeTX)
 
 set(VERSION_MAJOR "2")
 set(VERSION_MINOR "10")
-set(VERSION_REVISION "3")
+set(VERSION_REVISION "6")
 set(CODENAME "Centurion")
 string(TIMESTAMP BUILD_YEAR "%Y")
 

README.md

@@ -2,7 +2,7 @@
 [![GitHub all releases](https://img.shields.io/github/downloads/EdgeTX/edgetx/total)](https://github.com/EdgeTX/edgetx/releases)
 [![GitHub license](https://img.shields.io/github/license/Edgetx/edgetx)](https://github.com/EdgeTX/edgetx/blob/main/LICENSE)
 [![Commit Tests](https://github.com/EdgeTX/edgetx/actions/workflows/actions.yml/badge.svg)](https://github.com/EdgeTX/edgetx/actions/workflows/actions.yml)
-[![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/edgetx/edgetx/tree/main)
+[![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/edgetx/edgetx/tree/2.10)
 [![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-%23FE5196?logo=conventionalcommits&logoColor=white)](https://conventionalcommits.org)
 [![Discord](https://img.shields.io/discord/839849772864503828.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/wF9wUKnZ6H)
 [![Support us on OpenCollective](https://img.shields.io/opencollective/all/edgetx)](https://opencollective.com/edgetx)

companion/src/CMakeLists.txt

@@ -306,6 +306,8 @@ elseif(PCB STREQUAL X7 AND PCBREV STREQUAL TPRO)
   set(FLAVOUR tpro)
 elseif(PCB STREQUAL X7 AND PCBREV STREQUAL TPROV2)
   set(FLAVOUR tprov2)
+elseif(PCB STREQUAL X7 AND PCBREV STREQUAL BUMBLEBEE)
+  set(FLAVOUR bumblebee)
 elseif(PCB STREQUAL X7 AND PCBREV STREQUAL T20)
   set(FLAVOUR t20)
 elseif(PCB STREQUAL X7 AND PCBREV STREQUAL T20V2)

companion/src/companion.qrc

@@ -220,6 +220,14 @@
     <file>images/simulator/JumperTPROS/exit.png</file>
     <file>images/simulator/JumperTPROS/menu.png</file>
     <file>images/simulator/JumperTPROS/page.png</file>
+    <file>images/simulator/JumperBumblebee/top.png</file>
+    <file>images/simulator/JumperBumblebee/bottom.png</file>
+    <file>images/simulator/JumperBumblebee/enter.png</file>
+    <file>images/simulator/JumperBumblebee/exit.png</file>
+    <file>images/simulator/JumperBumblebee/left.png</file>
+    <file>images/simulator/JumperBumblebee/menu.png</file>
+    <file>images/simulator/JumperBumblebee/page.png</file>
+    <file>images/simulator/JumperBumblebee/right.png</file>
     <file>images/simulator/TX12/left.png</file>
     <file>images/simulator/TX12/left-pageup.png</file>
     <file>images/simulator/TX12/left-pagedn.png</file>

companion/src/firmwares/boards.cpp

@@ -192,6 +192,7 @@ int Boards::getEEpromSize(Board::Type board)
     case BOARD_JUMPER_TLITE_F4:
     case BOARD_JUMPER_TPRO:
     case BOARD_JUMPER_TPROV2:
+    case BOARD_JUMPER_BUMBLEBEE:
     case BOARD_JUMPER_TPROS:
     case BOARD_RADIOMASTER_TX12:
     case BOARD_RADIOMASTER_TX12_MK2:
@@ -249,6 +250,7 @@ int Boards::getFlashSize(Type board)
     case BOARD_JUMPER_TPRO:
     case BOARD_JUMPER_TPROV2:
     case BOARD_JUMPER_TPROS:
+    case BOARD_JUMPER_BUMBLEBEE:
     case BOARD_RADIOMASTER_TX12:
     case BOARD_RADIOMASTER_TX12_MK2:
     case BOARD_RADIOMASTER_ZORRO:
@@ -292,7 +294,7 @@ int Boards::getCapability(Board::Type board, Board::Capability capability)
         return 8;
       else if (IS_JUMPER_TPROV2(board))
         return 6;
-      else if (IS_JUMPER_TLITE(board) || IS_JUMPER_TPROV1(board) || IS_BETAFPV_LR3PRO(board) || IS_IFLIGHT_COMMANDO8(board))
+      else if (IS_JUMPER_TLITE(board) || IS_JUMPER_TPROV1(board) || IS_BETAFPV_LR3PRO(board) || IS_IFLIGHT_COMMANDO8(board) || IS_JUMPER_BUMBLEBEE(board))
         return 4;
       else if(IS_RADIOMASTER_ZORRO(board))
         return 8;
@@ -336,6 +338,7 @@ int Boards::getCapability(Board::Type board, Board::Capability capability)
       return ((IS_TARANIS_X9LITE(board) || (IS_TARANIS_XLITE(board) && !IS_TARANIS_X9LITES(board)) ||
               IS_TARANIS_X9DP_2019(board) || IS_TARANIS_X7_ACCESS(board) || IS_RADIOMASTER_ZORRO(board) ||
               IS_RADIOMASTER_TX12_MK2(board) || IS_RADIOMASTER_BOXER(board) || IS_RADIOMASTER_POCKET(board)) ||
+              IS_FAMILY_T16(board) || IS_FAMILY_HORUS(board) || 
               (getCapability(board, HasExternalModuleSupport) && (IS_TARANIS(board) && !IS_FAMILY_T12(board))));
 
     case MaxAnalogs:
@@ -543,6 +546,8 @@ QString Boards::getBoardName(Board::Type board)
       return "Jumper T-Pro S";
     case BOARD_JUMPER_T12MAX:
       return "Jumper T12 MAX";
+    case BOARD_JUMPER_BUMBLEBEE:
+      return "Jumper Bumblebee";
     case BOARD_JUMPER_T14:
       return "Jumper T14";
     case BOARD_JUMPER_T15:
@@ -693,6 +698,7 @@ int Boards::getDefaultInternalModules(Board::Type board)
   case BOARD_JUMPER_T20V2:
   case BOARD_JUMPER_TPROS:
   case BOARD_JUMPER_T15:
+  case BOARD_JUMPER_BUMBLEBEE:
   case BOARD_FATFISH_F16:
     return (int)MODULE_TYPE_CROSSFIRE;
 

companion/src/firmwares/boards.h

@@ -85,6 +85,7 @@ namespace Board {
     BOARD_JUMPER_TPROS,
     BOARD_RADIOMASTER_POCKET,
     BOARD_JUMPER_T20V2,
+    BOARD_JUMPER_BUMBLEBEE,
     BOARD_FATFISH_F16,
     BOARD_TYPE_COUNT,
     BOARD_TYPE_MAX = BOARD_TYPE_COUNT - 1
@@ -439,6 +440,11 @@ inline bool IS_JUMPER_TPROV2(Board::Type board)
   return board == Board::BOARD_JUMPER_TPROV2;
 }
 
+inline bool IS_JUMPER_BUMBLEBEE(Board::Type board)
+{
+  return board == Board::BOARD_JUMPER_BUMBLEBEE;
+}
+
 inline bool IS_JUMPER_TPROS(Board::Type board)
 {
   return board == Board::BOARD_JUMPER_TPROS;
@@ -532,6 +538,7 @@ inline bool IS_FAMILY_T12(Board::Type board)
          board == Board::BOARD_JUMPER_TPRO ||
          board == Board::BOARD_JUMPER_TPROV2 ||
          board == Board::BOARD_JUMPER_TPROS ||
+         board == Board::BOARD_JUMPER_BUMBLEBEE ||
          board == Board::BOARD_RADIOMASTER_TX12 ||
          board == Board::BOARD_RADIOMASTER_TX12_MK2 ||
          board == Board::BOARD_RADIOMASTER_ZORRO ||

companion/src/firmwares/edgetx/yaml_modeldata.cpp

@@ -107,7 +107,8 @@ static const YamlLookupTable trainerModeLut = {
   {  TRAINER_MODE_SLAVE_JACK, "SLAVE"  },
   {  TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE, "MASTER_SBUS_EXT"  },
   {  TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE, "MASTER_CPPM_EXT"  },
-  {  TRAINER_MODE_MASTER_SERIAL, "MASTER_BATT_COMP"  },
+  {  TRAINER_MODE_MASTER_SERIAL, "MASTER_SERIAL"  },
+  {  TRAINER_MODE_MASTER_SERIAL, "MASTER_BATT_COMP"  }, // depreciated, kept for conversion from older settings
   {  TRAINER_MODE_MASTER_BLUETOOTH, "MASTER_BT"  },
   {  TRAINER_MODE_SLAVE_BLUETOOTH, "SLAVE_BT"  },
   {  TRAINER_MODE_MULTI, "MASTER_MULTI"  },

companion/src/firmwares/generalsettings.cpp

@@ -413,8 +413,8 @@ void GeneralSettings::convert(RadioDataConversionState & cstate)
 
   //  Try to intelligently copy any custom controls
   //  step 1 clear current config
-  memset(&inputConfig[0], '0', sizeof(InputConfig) * CPN_MAX_INPUTS);
-  memset(&switchConfig[0], '0', sizeof(SwitchConfig) * CPN_MAX_SWITCHES);
+  memset(&inputConfig[0], 0, sizeof(InputConfig) * CPN_MAX_INPUTS);
+  memset(&switchConfig[0], 0, sizeof(SwitchConfig) * CPN_MAX_SWITCHES);
   //  step 2 load default config
   setDefaultControlTypes(cstate.toType);
   //  step 3 copy matching config based on tags

companion/src/firmwares/modeldata.cpp

@@ -1651,6 +1651,16 @@ bool ModelData::isTrainerModeAvailable(const GeneralSettings & generalSettings,
       generalSettings.bluetoothMode)
     return false;
 
+  if (value == TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE &&
+      !Boards::getCapability(board, Board::HasTrainerModuleSBUS))
+    return false;
+
+  if ((value == TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE || value == TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE) &&
+      (Boards::getCapability(board, Board::HasTrainerModuleCPPM) ||
+       Boards::getCapability(board, Board::HasTrainerModuleSBUS)) &&
+      moduleData[1].protocol != PULSES_OFF)
+    return false;
+
   if (value == TRAINER_MODE_MASTER_SERIAL &&
       (generalSettings.serialPort[GeneralSettings::SP_AUX1] != GeneralSettings::AUX_SERIAL_SBUS_TRAINER &&
        generalSettings.serialPort[GeneralSettings::SP_AUX2] != GeneralSettings::AUX_SERIAL_SBUS_TRAINER))
@@ -1669,16 +1679,6 @@ bool ModelData::isTrainerModeAvailable(const GeneralSettings & generalSettings,
       !Boards::getCapability(board, Board::HasTrainerModuleCPPM))
     return false;
 
-  if (value == TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE &&
-      !Boards::getCapability(board, Board::HasTrainerModuleSBUS))
-    return false;
-
-  if ((value == TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE || value == TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE) &&
-      (Boards::getCapability(board, Board::HasTrainerModuleCPPM) ||
-       Boards::getCapability(board, Board::HasTrainerModuleSBUS)) &&
-      moduleData[1].protocol != PULSES_OFF)
-    return false;
-
   if (value == TRAINER_MODE_MULTI &&
       ((!Boards::getCapability(board, Board::HasInternalModuleSupport) &&
         !Boards::getCapability(board, Board::HasExternalModuleSupport)) ||

companion/src/firmwares/opentx/opentxeeprom.cpp

@@ -43,11 +43,11 @@ inline int MAX_SWITCHES(Board::Type board, int version)
   if (IS_TARANIS_X9D(board))
     return 9;
 
-  if (IS_JUMPER_TPROV2(board))
-    return 12;
-
   if (IS_JUMPER_TPROV1(board))
-     return 10;
+    return 10;
+
+  if (IS_JUMPER_TPROV2(board) || IS_JUMPER_BUMBLEBEE(board))
+    return 14;
 
   if (IS_FAMILY_T12(board))
     return 8;
@@ -1774,8 +1774,11 @@ class ArmCustomFunctionField: public TransformedField {
     {
       fn.func = (AssignFunc)_func;
 
-      if (hasRepeatParam(fn))
+      if (hasRepeatParam(fn)) {
         fn.repeatParam = _active;
+        // PR #3601 added enabled field to all sf/gfs functions with repeat parameter assumed always enabled so now set explicitly
+        fn.enabled = 1;
+      }
       else
         fn.enabled = (_active & 0x01);
 

companion/src/firmwares/opentx/opentxinterface.cpp

@@ -70,6 +70,8 @@ const char * OpenTxEepromInterface::getName()
       return "EdgeTX for Jumper T-Pro V2";
     case BOARD_JUMPER_TPROS:
       return "EdgeTX for Jumper T-Pro S";
+    case BOARD_JUMPER_BUMBLEBEE:
+      return "EdgeTX for Jumper Bumblebee";
     case BOARD_JUMPER_T12MAX:
       return "EdgeTX for Jumper T12 MAX";
     case BOARD_JUMPER_T14:
@@ -1451,6 +1453,16 @@ void registerOpenTxFirmwares()
   registerOpenTxFirmware(firmware);
   addOpenTxRfOptions(firmware, FLEX);
 
+  /* Jumper Bumblebee board */
+  firmware = new OpenTxFirmware(FIRMWAREID("bumblebee"), QCoreApplication::translate("Firmware", "Jumper Bumblebee"), BOARD_JUMPER_BUMBLEBEE);
+  addOpenTxCommonOptions(firmware);
+  firmware->addOption("noheli", Firmware::tr("Disable HELI menu and cyclic mix support"));
+  firmware->addOption("nogvars", Firmware::tr("Disable Global variables"));
+  firmware->addOption("lua", Firmware::tr("Enable Lua custom scripts screen"));
+  addOpenTxFontOptions(firmware);
+  registerOpenTxFirmware(firmware);
+  addOpenTxRfOptions(firmware, FLEX);
+
   /* Jumper T12 board */
   firmware = new OpenTxFirmware(FIRMWAREID("t12"), QCoreApplication::translate("Firmware", "Jumper T12 / T12 Pro"), BOARD_JUMPER_T12);
   addOpenTxCommonOptions(firmware);

companion/src/mainwindow.cpp

@@ -349,13 +349,9 @@ void MainWindow::openDocURL()
   QDesktopServices::openUrl(QUrl(link));
 }
 
-void MainWindow::openFile(const QString & fileName, bool updateLastUsedDir)
+void MainWindow::openFile(const QString & fileName)
 {
   if (!fileName.isEmpty()) {
-    if (updateLastUsedDir) {
-      g.eepromDir(QFileInfo(fileName).dir().absolutePath());
-    }
-
     QMdiSubWindow *existing = findMdiChild(fileName);
     if (existing) {
       mdiArea->setActiveSubWindow(existing);
@@ -413,7 +409,7 @@ void MainWindow::openRecentFile()
   QAction *action = qobject_cast<QAction *>(sender());
   if (action) {
     QString fileName = action->data().toString();
-    openFile(fileName, false);
+    openFile(fileName);
   }
 }
 

companion/src/mainwindow.h

@@ -115,7 +115,7 @@ class MainWindow : public QMainWindow
     void downloads();
     void doUpdates(bool check, bool interactive = true);
 
-    void openFile(const QString & fileName, bool updateLastUsedDir = false);
+    void openFile(const QString & fileName);
 
   private:
     QAction * addAct(const QString & icon, const char * slot = NULL, const QKeySequence & shortcut = 0, QObject * slotObj = NULL, const char * signal = NULL);

companion/src/mdichild.cpp

@@ -1325,8 +1325,6 @@ bool MdiChild::saveAs(bool isNew)
   }
   while (QFileInfo(fileName).suffix().toLower() != "etx");
 
-  g.eepromDir(QFileInfo(fileName).dir().absolutePath());
-
   return saveFile(fileName, true);
 }
 
@@ -1339,6 +1337,8 @@ bool MdiChild::saveFile(const QString & filename, bool setCurrent)
     return false;
   }
 
+  g.eepromDir(QFileInfo(filename).dir().absolutePath());
+
   for (int i = 0; i < (int)radioData.models.size(); i++) {
     if (!radioData.models[i].isEmpty())
       radioData.models[i].modelUpdated = false;

companion/src/modeledit/customfunctions.cpp

@@ -353,10 +353,8 @@ void CustomFunctionsPanel::functionEdited()
     functions[index].swtch = swtch;
     functions[index].func = (AssignFunc)fswtchFunc[index]->currentData().toInt();
     functions[index].enabled = true;
-    if (functions[index].func == FuncPlayScript || functions[index].func == FuncRGBLed)
-      fswtchRepeat[index]->setModel(tabModelFactory->getItemModel(repeatLuaId));
-    else
-      fswtchRepeat[index]->setModel(tabModelFactory->getItemModel(repeatId));
+    if (functions[index].func == FuncLogs)
+      functions[index].param = 10;  // 1 sec
     refreshCustomFunction(index);
     emit modified();
     lock = false;
@@ -399,7 +397,7 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
     }
     else if (func == FuncLogs) {
       fswtchParam[i]->setDecimals(1);
-      fswtchParam[i]->setMinimum(0);
+      fswtchParam[i]->setMinimum(0.1);
       fswtchParam[i]->setMaximum(25.5);
       fswtchParam[i]->setSingleStep(0.1);
       if (modified)
@@ -464,6 +462,7 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
         if (modified)
           cfn.repeatParam = fswtchRepeat[i]->currentData().toInt();
         widgetsMask |= CUSTOM_FUNCTION_REPEAT;
+        fswtchRepeat[i]->setModel(tabModelFactory->getItemModel(repeatId));
         fswtchRepeat[i]->setCurrentIndex(fswtchRepeat[i]->findData(cfn.repeatParam));
       }
       if (func == FuncPlayValue) {
@@ -560,6 +559,7 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
         cfn.repeatParam = fswtchRepeat[i]->currentData().toInt();
       }
       Helpers::populateFileComboBox(fswtchParamArmT[i], scriptsSet, cfn.paramarm);
+      fswtchRepeat[i]->setModel(tabModelFactory->getItemModel(repeatLuaId));
       fswtchRepeat[i]->setCurrentIndex(fswtchRepeat[i]->findData(cfn.repeatParam));
     }
     else {

companion/src/shared/namevalidator.h

@@ -25,7 +25,7 @@
 #include "textvalidator.h"
 
 // characters supportd by B&W radio firmware gui editor
-constexpr char NAME_VALID_PATTERN_BW[]    {"[ A-Za-z0-9\\-]*"};
+constexpr char NAME_VALID_PATTERN_BW[]    {"[ A-Za-z0-9\\_\\-\\,\\.]*"};
 // characters supported by color radio firmware keyboard widget
 constexpr char NAME_VALID_PATTERN_COLOR[] {"[ A-Za-z0-9\\-\\_\\,\\.\"\\+\\/\\*\\=\\%\\!\\?\\#\\<\\>\\@\\$\\(\\)\\{\\}\\[\\]\\;\\:\\']*"};
 

companion/src/simulation/CMakeLists.txt

@@ -44,6 +44,7 @@ set(${PROJECT_NAME}_SRCS
   simulateduiwidgetJumperTLITE.cpp
   simulateduiwidgetJumperTPRO.cpp
   simulateduiwidgetJumperTPROS.cpp
+  simulateduiwidgetJumperBumblebee.cpp
   simulateduiwidgetLR3PRO.cpp
   simulateduiwidgetNV14.cpp
   simulateduiwidgetPL18.cpp