Fixed PL18EV build problem.

EdgeTX · Dec 4, 2023 · bb7e8f6 · bb7e8f6
1 parent 6ffbebe
commit bb7e8f6
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 1 deletion.
diff --git a/fw.json b/fw.json
@@ -4,6 +4,7 @@
         ["Flysky EL18", "el18-"],
         ["Flysky NV14", "nv14-"],
         ["Flysky PL18", "pl18-"],
+        ["Flysky PL18EV", "pl18ev-"],
         ["FrSky Horus X10", "x10-"],
         ["FrSky Horus X10 Access", "x10-access-"],
         ["FrSky Horus X12s", "x12s-"],

diff --git a/radio/src/boards/generic_stm32/module_ports.cpp b/radio/src/boards/generic_stm32/module_ports.cpp
@@ -28,6 +28,7 @@
 #include "board.h"
 #include "dataconstants.h"
 
+#if defined (HARDWARE_INTERNAL_MODULE)
 #if defined(INTMODULE_USART)
 
 #define INTMODULE_USART_IRQ_PRIORITY 5
@@ -110,7 +111,8 @@ extern "C" void INTMODULE_TIMER_IRQHandler()
 
 DEFINE_STM32_SOFTSERIAL_PORT(InternalModule, intmoduleTimer);
 
-#endif
+#endif // INTMODULE_USART
+#endif // HARDWARE_INTERNAL_MODULE
 
 #include "module_timer_driver.h"
 

diff --git a/radio/util/hw_defs/legacy_names.py b/radio/util/hw_defs/legacy_names.py
@@ -342,6 +342,60 @@
         "targets": {
             "pl18"
         },
+        "inputs": {
+            "LH": {
+                "yaml": "Rud"
+            },
+            "LV": {
+                "yaml": "Ele"
+            },
+            "RV": {
+                "yaml": "Thr"
+            },
+            "RH": {
+                "yaml": "Ail"
+            },
+            "P1": {
+                "yaml": "POT1",
+                "lua": "s1",
+                "label": "S1",
+                "short_label": "1",
+                "description": "Potentiometer 1"
+            },
+            "P2": {
+                "yaml": "POT2",
+                "lua": "s2",
+                "label": "S2",
+                "short_label": "2",
+                "description": "Potentiometer 2"
+            },
+            "P3": {
+                "yaml": "POT3",
+                "lua": "s3",
+                "label": "S3",
+                "short_label": "3",
+                "description": "Potentiometer 3"
+            },
+            "SL1": {
+                "yaml": "LS",
+                "lua": "ls",
+                "label": "LS",
+                "short_label": "L",
+                "description": "Left slider"
+            },
+            "SL2": {
+                "yaml": "RS",
+                "lua": "rs",
+                "label": "RS",
+                "short_label": "R",
+                "description": "Right slider"
+            },
+        }
+    },
+    {
+        "targets": {
+            "pl18ev"
+        },
         "inputs": {
             "LH": {
                 "yaml": "Rud"