Fixed rebase problems due to changes in PR #3870.

EdgeTX · Nov 2, 2023 · 07c2797 · 07c2797
1 parent 41ccbbf
commit 07c2797
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/radio/src/storage/yaml/yaml_datastructs_pl18.cpp b/radio/src/storage/yaml/yaml_datastructs_pl18.cpp
@@ -297,7 +297,7 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "ppmunit", 2 ),
   YAML_CUSTOM("semver",nullptr,w_semver),
   YAML_CUSTOM("board",nullptr,w_board),
-  YAML_ARRAY("calib", 48, 22, struct_CalibData, NULL),
+  YAML_ARRAY("calib", 48, 20, struct_CalibData, NULL),
   YAML_PADDING( 16 ),
   YAML_SIGNED( "currModel", 8 ),
   YAML_UNSIGNED( "contrast", 8 ),
@@ -368,6 +368,7 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_ARRAY("slidersConfig", 0, MAX_POTS, struct_sliderConfig, nullptr),
   YAML_ARRAY("potsConfig", 4, 16, struct_potConfig, nullptr),
   YAML_ARRAY("switchConfig", 2, 32, struct_switchConfig, nullptr),
+  YAML_ARRAY("flexSwitches", 0, MAX_FLEX_SWITCHES, struct_flexSwitch, flex_sw_valid),
   YAML_STRING("currModelFilename", 17),
   YAML_UNSIGNED( "modelQuickSelect", 1 ),
   YAML_UNSIGNED( "blOffBright", 7 ),

diff --git a/radio/util/hw_defs/pot_config.py b/radio/util/hw_defs/pot_config.py
@@ -14,6 +14,20 @@
         "P1": {"default": "POT_CENTER"},
         "P2": {"default": "POT_CENTER"}
     },
+    "pl18": {
+        "P1": {"default": "POT_CENTER"},
+        "P2": {"default": "POT_CENTER"},
+        "P3": {"default": "POT_CENTER"},
+        "SL1": {"default": "SLIDER"},
+        "SL2": {"default": "SLIDER"}
+    },
+    "pl18ev": {
+        "P1": {"default": "POT_CENTER"},
+        "P2": {"default": "POT_CENTER"},
+        "P3": {"default": "POT_CENTER"},
+        "SL1": {"default": "SLIDER"},
+        "SL2": {"default": "SLIDER"}
+    },
     "tpro": {
         "P1": {"default": "POT_CENTER"},
         "P2": {"default": "POT_CENTER"}