EdgeTX · raphaelcoeffic · Jul 28, 2025 · Jul 28, 2025 · Jul 12, 2025 · Jul 28, 2025
diff --git a/.github/workflows/macosx_cpn.yml b/.github/workflows/macosx_cpn.yml
@@ -67,7 +67,7 @@ jobs:
           cache-key-prefix: 'install-qt-action-macOS'
 
       - name: Install dependencies
-        run: python3 -m pip install --upgrade pip Pillow lz4 clang jinja2
+        run: python3 -m pip install --upgrade pip Pillow lz4 clang jinja2 pydantic
 
       - name: Install libusb
         run:  brew install libusb

diff --git a/.github/workflows/win_cpn-64.yml b/.github/workflows/win_cpn-64.yml
@@ -69,7 +69,7 @@ jobs:
       - name: Install Python Dependencies
         run: |
           echo $PATH
-          $Python3_ROOT_DIR/python3.exe -m pip install clang jinja2 lz4 pillow
+          $Python3_ROOT_DIR/python3.exe -m pip install clang jinja2 lz4 pillow pydantic
 
       - name: Setup dfu-util and libusb
         run: |

diff --git a/cmake/Macros.cmake b/cmake/Macros.cmake
@@ -96,18 +96,18 @@ function(AddHardwareDefTarget output)
   endforeach()
 
   set(GEN_HW_DEFS ${CMAKE_CXX_COMPILER} ${HW_DEF_ARGS} -x c++-header -E -dM ${HW_DEF_SRC})
-  set(GEN_JSON ${PYTHON_EXECUTABLE} ${RADIO_DIRECTORY}/util/hw_defs/generate_hw_def.py)
-  set(GEN_JSON ${GEN_JSON} -i defines -T ${FLAVOUR} -)
+  # set(GEN_JSON ${PYTHON_EXECUTABLE} ${RADIO_DIRECTORY}/util/hw_defs/generate_hw_def.py)
+  # set(GEN_JSON ${GEN_JSON} -i defines -T ${FLAVOUR} -)
 
-  add_custom_command(OUTPUT ${output}
-    COMMAND ${GEN_HW_DEFS} | ${GEN_JSON} > ${output}
-    DEPENDS ${HW_DEF_SRC} ${RADIO_DIRECTORY}/util/hw_defs/generate_hw_def.py
-    )
+  # add_custom_command(OUTPUT ${output}
+  #   COMMAND ${GEN_HW_DEFS} | ${GEN_JSON} > ${output}
+  #   DEPENDS ${HW_DEF_SRC} ${RADIO_DIRECTORY}/util/hw_defs/generate_hw_def.py
+  # )
 
   add_custom_command(OUTPUT ${output}.h
     COMMAND ${GEN_HW_DEFS} > ${output}.h
     DEPENDS ${HW_DEF_SRC} ${RADIO_DIRECTORY}/util/hw_defs/generate_hw_def.py
-    )
+  )
 endfunction()
 
 function(AddHWGenTarget input template output)
@@ -116,7 +116,7 @@ function(AddHWGenTarget input template output)
   set(GEN_JSON ${PYTHON_EXECUTABLE} ${RADIO_DIRECTORY}/util/hw_defs/generate_hw_def.py)
 
   # Inputs
-  set(INPUT_JSON ${CMAKE_CURRENT_BINARY_DIR}/${input})
+  set(INPUT_JSON ${RADIO_SRC_DIR}/boards/hw_defs/${input})
   set(TEMPLATE ${RADIO_DIRECTORY}/util/hw_defs/${template}.jinja)
   set(GEN_PY_DEPS
     ${RADIO_DIRECTORY}/util/hw_defs/generator.py

diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt
@@ -130,7 +130,8 @@ else()
 endif()
 
 ############# Import radio hardware definitions ###############
-set(HWDEFS_DIR "${CMAKE_CURRENT_BINARY_DIR}/../../radio/src")
+
+set(HWDEFS_DIR "${CMAKE_SOURCE_DIR}/radio/src/boards/hw_defs")
 set(HWDEFS_TMPL "${COMPANION_SRC_DIRECTORY}/hwdefs.qrc.in")
 set(HWDEFS_PHDR "HWDEF_JSON_LIST")
 set(HWDEFS_QRC "${CMAKE_CURRENT_BINARY_DIR}/hwdefs.qrc")
@@ -300,22 +301,6 @@ add_subdirectory(tests)
 
 ############# Install ####################
 
-# the current flavour is not automatically added if build in the current cmake iteration, so always
-# add its library name to be sure
-string(TOLOWER ${PCB} FLAVOUR)
-
-if(PCBREV)
-  if(PCB STREQUAL X7 AND PCBREV STREQUAL ACCESS)
-    set(FLAVOUR x7access)
-  elseif(PCB STREQUAL X9D+ AND PCBREV STREQUAL 2019)
-    set(FLAVOUR x9d+2019)
-  elseif(PCB STREQUAL X10 AND PCBREV STREQUAL EXPRESS)
-    set(FLAVOUR x10express)
-  else()
-    string(TOLOWER ${PCBREV} FLAVOUR)
-  endif()
-endif(PCBREV)
-
 set(COMPANION_TARGETS_DIR_ROOT "${COMPANION_SRC_DIRECTORY}/../targets")
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
@@ -680,4 +665,3 @@ else()
 endif()
 
 include(CPack)
-
diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt
@@ -100,11 +100,18 @@ else()
   message(FATAL_ERROR "Unknown PCB '${PCB}'")
 endif()
 
+# Add RADIO_xxx definition
+string(TOUPPER ${FLAVOUR} RADIO_NAME)
+string(REPLACE "+" "P" RADIO_NAME ${RADIO_NAME})
+string(CONCAT RADIO_NAME "RADIO_" ${RADIO_NAME})
+add_definitions(-D${RADIO_NAME})
+set(${RADIO_NAME} YES)
+
 set(HW_DESC_JSON ${FLAVOUR}.json)
 AddHardwareDefTarget(${HW_DESC_JSON})
 
 # enable generating JSON definition separately for debugging
-add_custom_target(hardware_defs DEPENDS ${HW_DESC_JSON} ${HW_DESC_JSON}.h)
+add_custom_target(hardware_defs DEPENDS ${HW_DESC_JSON}.h)
 
 include(hal/CMakeLists.txt)
 
@@ -719,5 +726,3 @@ if(CPU_FAMILY STREQUAL STM32)
 endif()
 
 PrintTargetReport("firmware")
-
-AddHardwareDefTarget(hardware_defs ${RADIO_DIRECTORY}/src/targets/hw_defs/${FLAVOUR}.json)
diff --git a/radio/src/boards/generic_stm32/CMakeLists.txt b/radio/src/boards/generic_stm32/CMakeLists.txt
@@ -8,7 +8,7 @@ AddHWGenTarget(${HW_DESC_JSON} hal_adc_inputs hal_adc_inputs.inc)
 
 # Dependencies common to bootloader and firmware
 set(MINIMAL_BOARD_LIB_SRC
-  ${CMAKE_CURRENT_BINARY_DIR}/${HW_DESC_JSON}
+  ${RADIO_SRC_DIR}/boards/hw_defs/${HW_DESC_JSON}
   ${CMAKE_CURRENT_BINARY_DIR}/stm32_keys.inc
 
   boards/generic_stm32/inputs.cpp

diff --git a/radio/src/boards/generic_stm32/analog_inputs.cpp b/radio/src/boards/generic_stm32/analog_inputs.cpp
@@ -27,7 +27,7 @@
 
 #include "hal.h"
 
-#if defined(ADC_SPI)
+#if defined(USE_ADS79XX)
   #include "ads79xx.h"
 #endif
 
@@ -40,8 +40,9 @@
 
 // generated files
 #include "stm32_adc_inputs.inc"
-#include "stm32_pwm_inputs.inc"
+#if !defined(BOOT)
 #include "hal_adc_inputs.inc"
+#endif
 
 constexpr uint8_t n_ADC = DIM(_ADC_adc);
 constexpr uint8_t n_ADC_spi = DIM(_ADC_spi);
@@ -54,16 +55,21 @@ static_assert(n_inputs <= MAX_ANALOG_INPUTS, "Too many analog inputs");
 static bool adc_init()
 {
   bool success = stm32_hal_adc_init(_ADC_adc, n_ADC, _ADC_inputs, _ADC_GPIOs, n_GPIO);
-#if defined(ADC_SPI)
+#if defined(USE_ADS79XX)
   if (n_ADC_spi > 0) ads79xx_init(&_ADC_spi[0]);
 #endif
   return success;
 }
 
+static void adc_deinit()
+{
+  stm32_hal_adc_deinit(_ADC_adc, n_ADC);
+}
+
 static bool adc_start_read()
 {
   bool success = stm32_hal_adc_start_read(_ADC_adc, n_ADC, _ADC_inputs, n_inputs);
-#if defined(ADC_SPI)
+#if defined(USE_ADS79XX)
   if (n_ADC_spi > 0) {
     success = success && ads79xx_adc_start_read(&_ADC_spi[0], _ADC_inputs);
   }
@@ -73,7 +79,7 @@ static bool adc_start_read()
 
 static void adc_wait_completion()
 {
-#if defined(ADC_SPI)
+#if defined(USE_ADS79XX)
   // ADS79xx does all the work in the completion function
   // so it's probably better to poll it first
   if (n_ADC_spi > 0) ads79xx_adc_wait_completion(&_ADC_spi[0], _ADC_inputs);
@@ -82,17 +88,22 @@ static void adc_wait_completion()
 }
 
 const etx_hal_adc_driver_t _adc_driver = {
+#if !defined(BOOT)
   .inputs = _hal_inputs,
   .default_pots_cfg = _pot_default_config,
+#endif
   .init = adc_init,
+  .deinit = adc_deinit,
   .start_conversion = adc_start_read,
   .wait_completion = adc_wait_completion,
   .set_input_mask = stm32_hal_set_inputs_mask,
   .get_input_mask = stm32_hal_get_inputs_mask,
 };
 
+#if !defined(BOOT)
 #if defined(PWM_STICKS)
 #include "stm32_gpio.h"
+#include "stm32_pwm_inputs.inc"
 
 static const stick_pwm_timer_t _sticks_timer = {
   .GPIOx = PWM_GPIO,
@@ -141,3 +152,4 @@ void gimbalsDetect()
     detected = gimbal_drivers[idx++]();
   }
 }
+#endif // !BOOT