feat: support Jumper T20 V2 (#4701)

Co-authored-by: 3djc <3djc@gh.com> Co-authored-by: Peter Feerick <peter.feerick@gmail.com>
EdgeTX · Mar 14, 2024 · 84a90a7 · 84a90a7
1 parent ab2b773
commit 84a90a7
Show file tree

Hide file tree

Showing 27 changed files with 149 additions and 57 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -55,6 +55,7 @@ jobs:
           - tlite
           - t20
           - t14
+          - t20v2
           - tx12
           - x10
           - x12s
@@ -99,7 +100,7 @@ jobs:
           - t16;t18
           - t8;zorro;pocket;mt12;commando8
           - tlite;tpro;tprov2;lr3pro
-          - t20;t14
+          - t20;t20v2;t14
           - tx12;tx12mk2;boxer
           - tx16s
           - x10;x10-access

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -22,7 +22,7 @@ jobs:
           - t16;t18
           - t8;zorro;pocket;mt12;commando8
           - tlite;tpro;tprov2;lr3pro
-          - t20;t14
+          - t20;t20v2;t14
           - tx12;tx12mk2;boxer
           - tx16s
           - x10;x10-access

diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt
@@ -308,6 +308,8 @@ elseif(PCB STREQUAL X7 AND PCBREV STREQUAL TPROV2)
   set(FLAVOUR tprov2)
 elseif(PCB STREQUAL X7 AND PCBREV STREQUAL T20)
   set(FLAVOUR t20)
+elseif(PCB STREQUAL X7 AND PCBREV STREQUAL T20V2)
+  set(FLAVOUR t20v2)
 elseif(PCB STREQUAL X7 AND PCBREV STREQUAL TX12)
   set(FLAVOUR tx12)
 elseif(PCB STREQUAL X7 AND PCBREV STREQUAL TX12MK2)

diff --git a/companion/src/firmwares/boards.cpp b/companion/src/firmwares/boards.cpp
@@ -185,6 +185,7 @@ int Boards::getEEpromSize(Board::Type board)
     case BOARD_IFLIGHT_COMMANDO8:
     case BOARD_JUMPER_T12:
     case BOARD_JUMPER_T20:
+    case BOARD_JUMPER_T20V2:
     case BOARD_JUMPER_TLITE:
     case BOARD_JUMPER_TLITE_F4:
     case BOARD_JUMPER_TPRO:
@@ -235,6 +236,7 @@ int Boards::getFlashSize(Type board)
     case BOARD_IFLIGHT_COMMANDO8:
     case BOARD_JUMPER_T12:
     case BOARD_JUMPER_T20:
+    case BOARD_JUMPER_T20V2:
     case BOARD_JUMPER_TLITE:
     case BOARD_JUMPER_TLITE_F4:
     case BOARD_JUMPER_TPRO:
@@ -533,6 +535,8 @@ QString Boards::getBoardName(Board::Type board)
       return "Jumper T18";
     case BOARD_JUMPER_T20:
       return "Jumper T20";
+    case BOARD_JUMPER_T20V2:
+      return "Jumper T20 V2";
     case BOARD_RADIOMASTER_TX16S:
       return "Radiomaster TX16S";
     case BOARD_RADIOMASTER_TX12:
@@ -661,6 +665,7 @@ int Boards::getDefaultInternalModules(Board::Type board)
   case BOARD_RADIOMASTER_TX12_MK2:
   case BOARD_IFLIGHT_COMMANDO8:
   case BOARD_JUMPER_T20:
+  case BOARD_JUMPER_T20V2:
     return (int)MODULE_TYPE_CROSSFIRE;
 
   case BOARD_FLYSKY_NV14:

diff --git a/companion/src/firmwares/boards.h b/companion/src/firmwares/boards.h
@@ -80,6 +80,7 @@ namespace Board {
     BOARD_FLYSKY_EL18,
     BOARD_JUMPER_TPROV2,
     BOARD_RADIOMASTER_POCKET,
+    BOARD_JUMPER_T20V2,
     BOARD_TYPE_COUNT,
     BOARD_TYPE_MAX = BOARD_TYPE_COUNT - 1
   };
@@ -444,7 +445,7 @@ inline bool IS_JUMPER_T18(Board::Type board)
 
 inline bool IS_JUMPER_T20(Board::Type board)
 {
-  return board == Board::BOARD_JUMPER_T20;
+  return board == Board::BOARD_JUMPER_T20 || board == Board::BOARD_JUMPER_T20V2;
 }
 
 inline bool IS_RADIOMASTER_TX16S(Board::Type board)
@@ -492,6 +493,7 @@ inline bool IS_FAMILY_T12(Board::Type board)
 {
   return board == Board::BOARD_JUMPER_T12 ||
          board == Board::BOARD_JUMPER_T20 ||
+         board == Board::BOARD_JUMPER_T20V2 ||
          board == Board::BOARD_JUMPER_TLITE ||
          board == Board::BOARD_JUMPER_TLITE_F4 ||
          board == Board::BOARD_JUMPER_TPRO ||

diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp
@@ -74,6 +74,8 @@ const char * OpenTxEepromInterface::getName()
       return "EdgeTX for Jumper T18";
     case BOARD_JUMPER_T20:
       return "EdgeTX for Jumper T20";
+    case BOARD_JUMPER_T20V2:
+      return "EdgeTX for Jumper T20 V2";
     case BOARD_RADIOMASTER_TX16S:
       return "EdgeTX for Radiomaster TX16S";
     case BOARD_RADIOMASTER_TX12:
@@ -1424,6 +1426,13 @@ void registerOpenTxFirmwares()
   addOpenTxRfOptions(firmware, NONE);
   registerOpenTxFirmware(firmware);
 
+  /* Jumper T20 V2 board */
+  firmware = new OpenTxFirmware(FIRMWAREID("t20v2"), Firmware::tr("Jumper T20 V2"), BOARD_JUMPER_T20V2);
+  addOpenTxFrskyOptions(firmware);
+  firmware->addOption("internalelrs", Firmware::tr("Select if internal ELRS module is installed"));
+  addOpenTxRfOptions(firmware, NONE);
+  registerOpenTxFirmware(firmware);
+
   /* Radiomaster Boxer board */
   firmware = new OpenTxFirmware(FIRMWAREID("boxer"), QCoreApplication::translate("Firmware", "Radiomaster Boxer"), Board::BOARD_RADIOMASTER_BOXER);
   addOpenTxCommonOptions(firmware);

diff --git a/fw.json b/fw.json
@@ -28,6 +28,7 @@
         ["Jumper T-Pro V2", "tprov2-"],
         ["Jumper T20", "t20-"],
         ["Jumper T14", "t14-"],
+        ["Jumper T20 V2", "t20v2-"],
         ["RadioMaster Boxer", "boxer-"],
         ["RadioMaster MT12","mt12-"],
         ["RadioMaster Pocket", "pocket-"],

diff --git a/radio/src/datastructs.h b/radio/src/datastructs.h
@@ -133,7 +133,7 @@ static inline void check_struct()
 #elif defined(RADIO_T14)
   CHKSIZE(RadioData, 869);
   CHKSIZE(ModelData, 6265);
-#elif defined(RADIO_T20)
+#elif defined(RADIO_FAMILY_T20)
   CHKSIZE(RadioData, 869);
   CHKSIZE(ModelData, 6326);
 #elif defined(RADIO_BOXER)

diff --git a/radio/src/gui/128x64/startup_shutdown.cpp b/radio/src/gui/128x64/startup_shutdown.cpp
@@ -29,7 +29,7 @@ const unsigned char bmp_sleep[]  = {
 #include "sleep.lbm"
 };
 
-#if defined(RADIO_T20)
+#if defined(RADIO_FAMILY_T20)
 constexpr uint8_t steps = NUM_FUNCTIONS_SWITCHES/2;
 #elif defined(FUNCTION_SWITCHES)
 constexpr uint8_t steps = NUM_FUNCTIONS_SWITCHES;
@@ -53,7 +53,7 @@ void drawStartupAnimation(uint32_t duration, uint32_t totalDuration)
   for (uint8_t j = 0; j < steps; j++) {
     if (index2 > j) {
       fsLedOn(j);
-#if defined(RADIO_T20)
+#if defined(RADIO_FAMILY_T20)
       fsLedOn(j + steps);
 #endif
     }
@@ -89,12 +89,12 @@ void drawShutdownAnimation(uint32_t duration, uint32_t totalDuration,
 
   for (uint8_t j = 0; j < steps; j++) {
     fsLedOff(j);
-#if defined(RADIO_T20)
+#if defined(RADIO_FAMILY_T20)
     fsLedOff(j + steps);
 #endif
     if (steps - index2 > j) {
       fsLedOn(j);
-#if defined(RADIO_T20)
+#if defined(RADIO_FAMILY_T20)
       fsLedOn(j + steps);
 #endif
     }

diff --git a/radio/src/hal/rotary_encoder.h b/radio/src/hal/rotary_encoder.h
@@ -27,7 +27,7 @@
 #define ROTENC_MIDSPEED   5
 #define ROTENC_HIGHSPEED 50
 
-#if defined(RADIO_T20) || defined(RADIO_T14)
+#if defined(RADIO_FAMILY_T20) || defined(RADIO_T14)
 #define ROTARY_ENCODER_GRANULARITY 4
 #else
 #define ROTARY_ENCODER_GRANULARITY 2

diff --git a/radio/src/storage/yaml/CMakeLists.txt b/radio/src/storage/yaml/CMakeLists.txt
@@ -25,7 +25,7 @@ elseif(PCB STREQUAL PL18)
 elseif(PCB STREQUAL X7)
   if(PCBREV STREQUAL TPRO)
     set(YAML_GEN_OUTPUT storage/yaml/yaml_datastructs_tpro.cpp)
-  elseif(PCBREV STREQUAL T20)
+  elseif((PCBREV STREQUAL T20) OR (PCBREV STREQUAL T20V2))
     set(YAML_GEN_OUTPUT storage/yaml/yaml_datastructs_t20.cpp)
   else()
     set(YAML_GEN_OUTPUT storage/yaml/yaml_datastructs_128x64.cpp)

diff --git a/radio/src/storage/yaml/yaml_datastructs.cpp b/radio/src/storage/yaml/yaml_datastructs.cpp
@@ -39,7 +39,7 @@
 #elif defined(PCBX7)
  #if defined(RADIO_TPRO) || defined(RADIO_TPROV2)
   #include "yaml_datastructs_tpro.cpp"
- #elif defined(RADIO_T20)
+ #elif defined(RADIO_FAMILY_T20)
   #include "yaml_datastructs_t20.cpp"
  #else
   #include "yaml_datastructs_128x64.cpp"

diff --git a/radio/src/targets/common/arm/stm32/bootloader/boot.cpp b/radio/src/targets/common/arm/stm32/bootloader/boot.cpp
@@ -49,7 +49,7 @@
   #define BOOTLOADER_KEYS                 0x42
 #endif
 
-#if defined(RADIO_T20)
+#if defined(RADIO_FAMILY_T20)
   #define SECONDARY_BOOTLOADER_KEYS       0x1200
 #endif
 

diff --git a/radio/src/targets/taranis/CMakeLists.txt b/radio/src/targets/taranis/CMakeLists.txt
@@ -169,6 +169,21 @@ elseif(PCB STREQUAL X7)
     set(FLYSKY_GIMBAL ON)
     add_definitions(-DFUNCTION_SWITCHES)
     add_definitions(-DRADIO_T20)
+    add_definitions(-DRADIO_FAMILY_T20)
+    add_definitions(-DMANUFACTURER_JUMPER)
+    set(ENABLE_SERIAL_PASSTHROUGH ON CACHE BOOL "Enable serial passthrough")
+  elseif(PCBREV STREQUAL T20V2)
+    set(DEFAULT_INTERNAL_MODULE MULTIMODULE CACHE STRING "Default internal module")
+    set(INTERNAL_MODULE_SERIAL YES)
+    set(MODULE_SIZE_SML YES)
+    set(FLAVOUR t20v2)
+    set(NAVIGATION_TYPE x7)
+    set(ROTARY_ENCODER YES)
+    set(CPU_TYPE_FULL STM32F407xE)
+    set(FLYSKY_GIMBAL ON)
+    add_definitions(-DFUNCTION_SWITCHES)
+    add_definitions(-DRADIO_T20V2)
+    add_definitions(-DRADIO_FAMILY_T20)
     add_definitions(-DMANUFACTURER_JUMPER)
     set(ENABLE_SERIAL_PASSTHROUGH ON CACHE BOOL "Enable serial passthrough")
   elseif(PCBREV STREQUAL TLITE)

diff --git a/radio/src/targets/taranis/board.h b/radio/src/targets/taranis/board.h
@@ -163,7 +163,7 @@ extern HardwareOptions hardwareOptions;
   #define BATTERY_WARN                  87 // 8.7V
   #define BATTERY_MIN                   85 // 8.5V
   #define BATTERY_MAX                   115 // 11.5V
-#elif defined(PCBXLITE) || defined(RADIO_T20)
+#elif defined(PCBXLITE) || defined(RADIO_FAMILY_T20)
   // 2 x Li-Ion
   #define BATTERY_WARN                  66 // 6.6V
   #define BATTERY_MIN                   67 // 6.7V
@@ -416,13 +416,13 @@ void setTopBatteryValue(uint32_t volts);
 
 #if defined(RADIO_ZORRO) || defined(RADIO_TX12MK2) || defined(RADIO_BOXER) || defined(RADIO_MT12) || defined(RADIO_POCKET)
   #define VOLTAGE_DROP 45
-#elif defined(RADIO_TPROV2) || defined(RADIO_T20)
+#elif defined(RADIO_TPROV2) || defined(RADIO_FAMILY_T20)
   #define VOLTAGE_DROP 60
 #else
   #define VOLTAGE_DROP 20
 #endif
 
-#if defined(RADIO_T20)
+#if defined(RADIO_FAMILY_T20)
 #define NUM_TRIMS                               8
 #else
 #define NUM_TRIMS                               4