EdgeTX · richardclli · Mar 27, 2024 · Mar 29, 2024 · Apr 2, 2024 · Apr 2, 2024
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -71,6 +71,7 @@ jobs:
           - xlites
           - mt12
           - gx12
+          - nb4p
     container:
       image: ghcr.io/edgetx/edgetx-dev:latest
       volumes:
@@ -116,6 +117,7 @@ jobs:
           - x9lite;x9lites
           - xlite;xlites
           - mt12;gx12
+          - nb4p
     container:
       image: ghcr.io/edgetx/edgetx-dev:latest
       volumes:

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -35,7 +35,7 @@ jobs:
           - x9lite;x9lites
           - xlite;xlites
           - mt12
-          - gx12
+          - nb4p
     container:
       image: ghcr.io/edgetx/edgetx-dev:latest
       volumes:

diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt
@@ -352,7 +352,7 @@ elseif(PCB STREQUAL X10 AND PCBREV STREQUAL T16)
   set(FLAVOUR t16)
 elseif(PCB STREQUAL X10 AND PCBREV STREQUAL T18)
   set(FLAVOUR t18)
-elseif(PCB STREQUAL NV14 AND PCBREV STREQUAL EL18)
+elseif(PCB STREQUAL PL18 AND PCBREV STREQUAL EL18)
   set(FLAVOUR el18)
 elseif(PCB STREQUAL PL18)
   set(FLAVOUR pl18)

diff --git a/fw.json b/fw.json
@@ -6,6 +6,7 @@
         ["Flysky NV14", "nv14-"],
         ["Flysky PL18", "pl18-"],
         ["Flysky PL18EV", "pl18ev-"],
+        ["Flysky NB4+", "nb4p-"],
         ["FrSky Horus X10", "x10-"],
         ["FrSky Horus X10 Express", "x10express-"],
         ["FrSky Horus X12s", "x12s-"],

diff --git a/radio/src/audio.h b/radio/src/audio.h
@@ -109,7 +109,7 @@ enum AudioBufferState
   #define AUDIO_DATA_MIN               0
   #define AUDIO_DATA_MAX               0xffff
   #define AUDIO_BITS_PER_SAMPLE        16
-#elif defined(PCBX12S) || defined(PCBNV14)
+#elif defined(AUDIO_SPI)
   typedef int16_t audio_data_t;
   #define AUDIO_DATA_SILENCE           0
   #define AUDIO_DATA_MIN               INT16_MIN

diff --git a/radio/src/boards/generic_stm32/switches.cpp b/radio/src/boards/generic_stm32/switches.cpp
@@ -41,7 +41,7 @@ __weak SwitchHwPos boardSwitchGetPosition(uint8_t cat, uint8_t idx)
   return stm32_switch_get_position(&_switch_offsets[cat][idx]);
 }
 
-const char* boardSwitchGetName(uint8_t cat, uint8_t idx)
+__weak const char* boardSwitchGetName(uint8_t cat, uint8_t idx)
 {
   return _switch_offsets[cat][idx].name;
 }

diff --git a/radio/src/datastructs.h b/radio/src/datastructs.h
@@ -73,7 +73,7 @@ static inline void check_struct()
   CHKSIZE(TimerData, 17);
   CHKSIZE(ModelHeader, 131);
   CHKSIZE(CustomScreenData, 1892);
-  #if defined(PCBNV14)
+  #if defined(PCBNV14) || defined(RADIO_NB4P) || defined(RADIO_NV14_FAMILY)
     CHKTYPE(TopBarPersistentData, 704);
   #else
     CHKTYPE(TopBarPersistentData, 1048);
@@ -104,10 +104,14 @@ static inline void check_struct()
   CHKSIZE(ModelData, 6770);
 #elif defined(PCBX7) || defined(PCBXLITE) || defined(PCBX9LITE)
   CHKSIZE(ModelData, 6329);
-#elif defined(PCBNV14)
-  CHKSIZE(ModelData, 26463);
 #elif defined(PCBPL18)
-  CHKSIZE(ModelData, 26845);
+  #if defined(RADIO_NB4P) || defined(RADIO_NV14_FAMILY)
+    CHKSIZE(ModelData, 26499);
+  #else
+    CHKSIZE(ModelData, 26845);
+  #endif
+#elif defined(PCBNV14)
+  CHKSIZE(ModelData, 21899);
 #elif defined(RADIO_T15)
   CHKSIZE(ModelData, 26834);
 #elif defined(PCBHORUS)

diff --git a/radio/src/gui/colorlcd/radio/radio_diagkeys.cpp b/radio/src/gui/colorlcd/radio/radio_diagkeys.cpp
@@ -25,7 +25,10 @@
 #include "libopenui.h"
 #include "edgetx.h"
 
-#if defined(PCBPL18)
+#if defined(RADIO_NB4P)
+static const uint8_t _trimMap[MAX_TRIMS * 2] = {0, 1, 2,  3,  4,  5,  6,  7,
+                                                8, 9, 10, 11, 12, 13, 14, 15};
+#elif defined(PCBPL18)
 static const uint8_t _trimMap[MAX_TRIMS * 2] = {8, 9, 10, 11, 12, 13, 14, 15,
                                                 2, 3, 4,  5,  0,  1,  6,  7};
 #else

diff --git a/radio/src/gui/colorlcd/radio/radio_version.cpp b/radio/src/gui/colorlcd/radio/radio_version.cpp
@@ -340,6 +340,7 @@ RadioVersionPage::RadioVersionPage() :
 
 #if defined(PCBNV14) || defined(PCBPL18)
 extern const char* boardLcdType;
+extern const char* boardTouchType;
 #endif
 
 void RadioVersionPage::build(Window* window)
@@ -370,6 +371,9 @@ void RadioVersionPage::build(Window* window)
   version += nl;
   version += "LCD: ";
   version += boardLcdType;
+  version += nl;
+  version += "Touch: ";
+  version += boardTouchType;
 #endif
 
   auto txt = new StaticText(window, rect_t{}, version);

diff --git a/radio/src/storage/yaml/CMakeLists.txt b/radio/src/storage/yaml/CMakeLists.txt
@@ -25,7 +25,13 @@ if((PCB STREQUAL X10) OR (PCB STREQUAL X12S))
 elseif(PCB STREQUAL NV14)
   set(YAML_GEN_OUTPUT storage/yaml/yaml_datastructs_nv14.cpp)
 elseif(PCB STREQUAL PL18)
-  set(YAML_GEN_OUTPUT storage/yaml/yaml_datastructs_pl18.cpp)
+  if(PCBREV STREQUAL NB4P)
+    set(YAML_GEN_OUTPUT storage/yaml/yaml_datastructs_nb4p.cpp)
+  elseif(PCBREV STREQUAL NV14)
+    set(YAML_GEN_OUTPUT storage/yaml/yaml_datastructs_nv14_family.cpp)
+  else()
+    set(YAML_GEN_OUTPUT storage/yaml/yaml_datastructs_pl18.cpp)
+  endif()
 elseif(PCB STREQUAL X7)
   if(PCBREV STREQUAL TPRO)
     set(YAML_GEN_OUTPUT storage/yaml/yaml_datastructs_tpro.cpp)

diff --git a/radio/src/storage/yaml/yaml_datastructs.cpp b/radio/src/storage/yaml/yaml_datastructs.cpp
@@ -36,10 +36,16 @@
  #else
   #include "yaml_datastructs_x10.cpp"
  #endif
+#elif defined(PCBPL18)
+ #if defined(RADIO_NB4P)
+  #include "yaml_datastructs_nb4p.cpp"
+ #elif defined(RADIO_NV14_FAMILY)  
+  #include "yaml_datastructs_nv14_family.cpp"
+ #else
+  #include "yaml_datastructs_pl18.cpp"
+ #endif
 #elif defined(PCBNV14)
  #include "yaml_datastructs_nv14.cpp"
-#elif defined(PCBPL18)
- #include "yaml_datastructs_pl18.cpp"
 #elif defined(PCBX7)
  #if defined(RADIO_TPRO) || defined(RADIO_TPROV2) || defined(RADIO_BUMBLEBEE)
   #include "yaml_datastructs_tpro.cpp"