Make it a tool

Author: raphaelcoeffic

radio/src/gui/common/stdlcd/menus_common.h

@@ -140,6 +140,7 @@ void menuRadioSpectrumAnalyser(event_t event);
 void menuRadioPowerMeter(event_t event);
 void menuRadioCalibration(event_t event);
 void menuGhostModuleConfig(event_t event);
+void menuServoPwmTool(event_t event);
 
 void menuModelSelect(event_t event);
 void menuModelSetup(event_t event);

radio/src/gui/common/stdlcd/radio_servo_pwm.cpp

@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) EdgeTX
+ *
+ * Based on code named
+ *   opentx - https://github.com/opentx/opentx
+ *   th9x - http://code.google.com/p/th9x
+ *   er9x - http://code.google.com/p/er9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
+ *
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include "edgetx.h"
+#include "os/sleep.h"
+
+#if defined(SERVO_PWM)
+
+#if LCD_W >= 212
+  #define HW_SETTINGS_COLUMN1            12*FW
+  #define HW_SETTINGS_COLUMN2            (20*FW - 3)
+  #define HW_SETTINGS_COLUMN3            HW_SETTINGS_COLUMN2
+#else
+  #define HW_SETTINGS_COLUMN1            30
+  #define HW_SETTINGS_COLUMN2            (HW_SETTINGS_COLUMN1 + 5*FW)
+  #define HW_SETTINGS_COLUMN3            HW_SETTINGS_COLUMN2 + FW
+#endif
+
+#if !defined(SIMU)
+extern void pwmOutputDisable();
+extern void pwmOutputInit();
+extern void pwmOutputEnable(uint16_t pulse_width_us);
+#else
+void pwmOutputDisable() {}
+void pwmOutputInit() {}
+void pwmOutputEnable(uint16_t) {}
+#endif
+
+static uint8_t pwmOutputSource;
+
+enum {
+  ITEM_PWM_SOURCE,
+  ITEM_SERVO_PWM_MAX,
+};
+
+void menuServoPwmTool(event_t event)
+{
+  SUBMENU(STR_PWM_OUTPUT, 0, {0});
+
+  if (menuEvent == EVT_ENTRY_UP) {
+    TRACE("stopping servo pwm...");
+    pwmOutputDisable();
+    return;
+  }
+
+  if (event == EVT_ENTRY) {
+    TRACE("starting servo pwm...");
+    pwmOutputSource = MIXSRC_NONE;
+    pwmOutputInit();
+  }
+
+  if (pwmOutputSource > MIXSRC_NONE) {
+    mixsrc_t chan = pwmOutputSource - MIXSRC_FIRST;
+    pwmOutputEnable(PPM_CH_CENTER(chan) + channelOutputs[chan] / 2);
+  } else {
+    pwmOutputDisable();
+  }
+
+  for (int i = 0; i < ITEM_SERVO_PWM_MAX; i++) {
+    LcdFlags attr = (menuVerticalPosition == i ? (s_editMode > 0 ? INVERS | BLINK : INVERS) : 0);
+    coord_t y = MENU_HEADER_HEIGHT + 12 + i * FH;
+
+    switch (i) {
+      case ITEM_PWM_SOURCE:
+        lcdDrawTextAlignedLeft(y, STR_PWM_OUTPUT);
+        drawSource(HW_SETTINGS_COLUMN2, y, pwmOutputSource, attr);
+        if (attr & BLINK)
+          CHECK_INCDEC_GENVAR(event, pwmOutputSource, 0, MAX_OUTPUT_CHANNELS);
+        break;
+    }
+  }
+}
+
+#endif
+

radio/src/gui/common/stdlcd/radio_tools.cpp

@@ -214,6 +214,10 @@ void menuRadioTools(event_t event)
     addRadioModuleToolHandler(index++, "Ghost Menu", menuGhostModuleConfig, EXTERNAL_MODULE);
 #endif
 
+#if defined(SERVO_PWM)
+  addRadioModuleToolHandler(index++, STR_PWM_OUTPUT, menuServoPwmTool, 0);
+#endif
+
 #endif
 
   if (index == 0) {

radio/src/targets/simu/simpgmspace.cpp

@@ -504,7 +504,3 @@ struct TouchState getInternalTouchState()
   return simTouchState;
 }
 #endif
-
-#if defined(SERVO_PWM)
-void pwmOutputEnable(uint16_t pulse_width_us) {}
-#endif

radio/src/targets/taranis/CMakeLists.txt

@@ -623,12 +623,6 @@ if(BLUETOOTH)
   )
 endif()
 
-if(PCBREV STREQUAL MT12)
-  list(APPEND BOARD_COMMON_SRC
-    ${TARGET_SRC_DIR}/pwm_ch_driver.cpp
-  )
-endif()
-
 # Bootloader board library
 add_library(board_bl OBJECT EXCLUDE_FROM_ALL
   ${BOARD_COMMON_SRC}
@@ -702,6 +696,15 @@ if(FLAVOUR STREQUAL xlites)
   )
 endif()
 
+if(FLAVOUR STREQUAL mt12)
+  target_sources(board PRIVATE
+    ${TARGET_SRC_DIR}/pwm_ch_driver.cpp
+  )
+  set(SRC ${SRC}
+    gui/common/stdlcd/radio_servo_pwm.cpp
+  )
+endif()
+
 set(SRC ${SRC}
   io/frsky_firmware_update.cpp
   io/multi_firmware_update.cpp

radio/src/targets/taranis/pwm_ch_driver.cpp

@@ -19,15 +19,12 @@
  * GNU General Public License for more details.
  */
 
-#include "hal/gpio.h"
-#include "stm32_gpio.h"
-#include "stm32_timer.h"
 #include "stm32_pulse_driver.h"
+#include "stm32_gpio.h"
 
 #include "edgetx_types.h"
 #include "board.h"
 
-
 static const stm32_pulse_timer_t _pwm_timer = {
   .GPIO = (gpio_t)PWM_GPIO,
   .GPIO_Alternate = PWM_GPIO_AF,
@@ -42,12 +39,6 @@ static const stm32_pulse_timer_t _pwm_timer = {
   .DMA_TC_CallbackPtr = nullptr,
 };
 
-void pwmOutputLowInit()
-{
-  gpio_init(PWM_GPIO, GPIO_OUT, GPIO_PIN_SPEED_LOW);
-  gpio_clear(PWM_GPIO);
-}
-
 void pwmOutputDisable()
 {
   stm32_pulse_stop(&_pwm_timer);
@@ -65,4 +56,4 @@ void pwmOutputEnable(uint16_t pulse_width_us)
 {
   stm32_pulse_set_cmp_val(&_pwm_timer, pulse_width_us);
   stm32_pulse_start(&_pwm_timer);
-}
+}