From d57df1de60a5932ec926ab2126b89d96661a573d Mon Sep 17 00:00:00 2001 From: 3djc <3djc@gh.com> Date: Wed, 18 Mar 2026 15:08:52 +0100 Subject: [PATCH 01/15] feat: GX15 --- .github/ISSUE_TEMPLATE/bug-report.yml | 1 + .github/workflows/release-drafter.yml | 2 +- companion/src/firmwares/boardjson.cpp | 4 +- companion/src/firmwares/boards.cpp | 11 +- companion/src/firmwares/boards.h | 7 + companion/src/firmwares/generalsettings.cpp | 2 + .../src/firmwares/opentx/opentxinterface.cpp | 9 +- radio/src/CMakeLists.txt | 4 +- radio/src/boards/hw_defs/gx15.json | 456 +++++++ radio/src/datastructs.h | 4 +- radio/src/edgetx.cpp | 2 +- radio/src/storage/yaml/CMakeLists.txt | 2 + radio/src/storage/yaml/yaml_datastructs.cpp | 2 + .../storage/yaml/yaml_datastructs_gx15.cpp | 1049 +++++++++++++++++ radio/src/targets/gx15/CMakeLists.txt | 198 ++++ radio/src/targets/gx15/bsp_io.h | 54 + radio/src/targets/gx15/hal.h | 617 ++++++++++ radio/src/targets/gx15/key_driver.cpp | 94 ++ radio/src/targets/gx15/usb_descriptor.h | 29 + radio/src/thirdparty/stb | 2 +- tools/build-common.sh | 3 + tools/generate-hw-defs.sh | 2 +- tools/generate-yaml.sh | 2 +- 23 files changed, 2543 insertions(+), 13 deletions(-) create mode 100644 radio/src/boards/hw_defs/gx15.json create mode 100644 radio/src/storage/yaml/yaml_datastructs_gx15.cpp create mode 100644 radio/src/targets/gx15/CMakeLists.txt create mode 100644 radio/src/targets/gx15/bsp_io.h create mode 100644 radio/src/targets/gx15/hal.h create mode 100644 radio/src/targets/gx15/key_driver.cpp create mode 100644 radio/src/targets/gx15/usb_descriptor.h diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index f6cce928bd7..50bf545d8ae 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -134,6 +134,7 @@ body: - RadioMaster T8 - RadioMaster TX12 / TX12MK2 - RadioMaster TX15 + - RadioMaster GX15 - RadioMaster TX16S / TX16SMK2 - RadioMaster TX16S MK3 - RadioMaster Zorro diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 96459961faf..7b939fe273f 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -177,7 +177,7 @@ jobs: > If you are using a STM32 F2 based radio, *stop right now*, this release is not for you! EdgeTX v2.11 is the last release series to support these radios. Check [this list](https://hackmd.io/@edgetx/B12oQyQKye) if you are unsure if this affects you. Because of this, EdgeTX v2.11 will continue to be supported alongside 2.12, 3.0, etc., with a focus on bug fixes. > [!WARNING] - > Radios based on STM32H7 MCUs update differently to older radios. Do **not** use the "Flash via USB" option in EdgeTX Buddy with them (yet). To update radios such as the Flysky PA01 & ST16, Jumper T15 Pro, RM TX15 and RM TX16S MK3, please follow the instructions in the [EdgeTX Manual](https://manual.edgetx.org/installing-and-updating-edgetx/updating-your-stm32h7-radio). + > Radios based on STM32H7 MCUs update differently to older radios. Do **not** use the "Flash via USB" option in EdgeTX Buddy with them (yet). To update radios such as the Flysky PA01 & ST16, Jumper T15 Pro, RM TX15, RM GX15 and RM TX16S MK3, please follow the instructions in the [EdgeTX Manual](https://manual.edgetx.org/installing-and-updating-edgetx/updating-your-stm32h7-radio). > [!NOTE] > For MacOS users, Companion is now only compiled for MacOS 12 and above. Stay with v2.10.5 or earlier if you need support for an older version of MacOS. diff --git a/companion/src/firmwares/boardjson.cpp b/companion/src/firmwares/boardjson.cpp index 67cc5c076c8..12771c714db 100644 --- a/companion/src/firmwares/boardjson.cpp +++ b/companion/src/firmwares/boardjson.cpp @@ -93,8 +93,8 @@ void BoardJson::afterLoadFixups(Board::Type board, InputsTable * inputs, Switche // TODO json files do not contain gyro defs // Radio cmake directive IMU is currently used if (IS_TARANIS_XLITES(board) || IS_FAMILY_HORUS_OR_T16(board) || - IS_RADIOMASTER_TX15(board) || IS_RADIOMASTER_TX16SMK3(board) || - IS_FLYSKY_PA01(board)) { + IS_RADIOMASTER_TX15(board) || IS_RADIOMASTER_GX15(board) || + IS_RADIOMASTER_TX16SMK3(board) || IS_FLYSKY_PA01(board)) { if (getInputIndex(inputs, "TILT_X", Board::LVT_TAG) < 0) { InputDefn defn; defn.type = AIT_FLEX; diff --git a/companion/src/firmwares/boards.cpp b/companion/src/firmwares/boards.cpp index 114b6d4b129..28d79f01289 100644 --- a/companion/src/firmwares/boards.cpp +++ b/companion/src/firmwares/boards.cpp @@ -137,6 +137,8 @@ uint32_t Boards::getFourCC(Type board) return 0x3878746F; case BOARD_RADIOMASTER_TX15: return 0x4978746F; + case BOARD_RADIOMASTER_GX15: + return 0x4978746F; case BOARD_RADIOMASTER_TX16SMK3: return 0x4978746F; case BOARD_RADIOMASTER_TX12: @@ -293,6 +295,7 @@ int Boards::getFlashSize(Type board) case BOARD_RADIOMASTER_TX16S: case BOARD_RADIOMASTER_TX16SMK3: case BOARD_RADIOMASTER_TX15: + case BOARD_RADIOMASTER_GX15: case BOARD_FLYSKY_NV14: case BOARD_FLYSKY_EL18: case BOARD_FLYSKY_PA01: // 8MB SDRAM @@ -355,7 +358,7 @@ int Boards::getCapability(Board::Type board, Board::Capability capability) case HasIMU: return (IS_FAMILY_HORUS_OR_T16(board) || IS_TARANIS(board) || - IS_RADIOMASTER_TX15(board)); + IS_RADIOMASTER_TX15(board) || IS_RADIOMASTER_GX15(board) || IS_RADIOMASTER_TX16SMK3(board)); case HasInternalGPS: return ((IS_FAMILY_HORUS_OR_T16(board) && getCapability(board, HasAuxSerialMode)) || @@ -422,7 +425,7 @@ int Boards::getCapability(Board::Type board, Board::Capability capability) IS_RADIOMASTER_ZORRO(board) || IS_RADIOMASTER_TX15(board) || IS_JUMPER_T15PRO(board) || IS_FLYSKY_PA01(board) || IS_FLYSKY_ST16(board) || IS_RADIOMASTER_TX16SMK3(board) || - IS_IFLIGHT_C14(board)); + IS_IFLIGHT_C14(board) || IS_RADIOMASTER_GX15(board)); default: return getBoardJson(board)->getCapability(capability); @@ -660,6 +663,8 @@ QString Boards::getBoardName(Board::Type board) return "Radiomaster TX16 SMK3"; case BOARD_RADIOMASTER_TX15: return "Radiomaster TX15"; + case BOARD_RADIOMASTER_GX15: + return "Radiomaster GX15"; case BOARD_RADIOMASTER_ZORRO: return "Radiomaster Zorro"; case BOARD_RADIOMASTER_GX12: @@ -806,6 +811,7 @@ int Boards::getDefaultInternalModules(Board::Type board) case BOARD_HELLORADIOSKY_V14LCD: case BOARD_HELLORADIOSKY_V16: case BOARD_RADIOMASTER_TX15: + case BOARD_RADIOMASTER_GX15: case BOARD_RADIOMASTER_TX16SMK3: case BOARD_IFLIGHT_COMMANDO8: case BOARD_IFLIGHT_COMMANDO14: @@ -881,6 +887,7 @@ void Boards::getBattRange(Board::Type board, int& vmin, int& vmax, unsigned int& case BOARD_RADIOMASTER_TX16S: case BOARD_RADIOMASTER_TX16SMK3: case BOARD_RADIOMASTER_TX15: + case BOARD_RADIOMASTER_GX15: case BOARD_JUMPER_T16: case BOARD_JUMPER_T18: case BOARD_JUMPER_T20: diff --git a/companion/src/firmwares/boards.h b/companion/src/firmwares/boards.h index c157d8d072b..1b2444515a1 100644 --- a/companion/src/firmwares/boards.h +++ b/companion/src/firmwares/boards.h @@ -68,6 +68,7 @@ namespace Board { BOARD_RADIOMASTER_TX16S, BOARD_RADIOMASTER_TX16SMK3, BOARD_RADIOMASTER_TX15, + BOARD_RADIOMASTER_GX15, BOARD_JUMPER_T18, BOARD_JUMPER_T20, BOARD_RADIOMASTER_TX12, @@ -614,6 +615,11 @@ inline bool IS_RADIOMASTER_TX15(Board::Type board) return board == Board::BOARD_RADIOMASTER_TX15; } +inline bool IS_RADIOMASTER_GX15(Board::Type board) +{ + return board == Board::BOARD_RADIOMASTER_GX15; +} + inline bool IS_RADIOMASTER_TX12(Board::Type board) { return board == Board::BOARD_RADIOMASTER_TX12; @@ -689,6 +695,7 @@ inline bool IS_FAMILY_T16(Board::Type board) board == Board::BOARD_JUMPER_T16 || board == Board::BOARD_JUMPER_T18 || board == Board::BOARD_RADIOMASTER_TX15 || + board == Board::BOARD_RADIOMASTER_GX15 || board == Board::BOARD_RADIOMASTER_TX16S || board == Board::BOARD_RADIOMASTER_TX16SMK3; } diff --git a/companion/src/firmwares/generalsettings.cpp b/companion/src/firmwares/generalsettings.cpp index 543943f080d..1861118131a 100644 --- a/companion/src/firmwares/generalsettings.cpp +++ b/companion/src/firmwares/generalsettings.cpp @@ -215,6 +215,8 @@ void GeneralSettings::init() strcpy(bluetoothName, "st16"); else if (IS_RADIOMASTER_TX15(board)) strcpy(bluetoothName, "tx15"); + else if (IS_RADIOMASTER_GX15(board)) + strcpy(bluetoothName, "gx15"); else if (IS_RADIOMASTER_TX16SMK3(board)) strcpy(bluetoothName, "tx16smk3"); else if (IS_FAMILY_HORUS_OR_T16(board)) diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp index e0f74522941..b051f65df4c 100644 --- a/companion/src/firmwares/opentx/opentxinterface.cpp +++ b/companion/src/firmwares/opentx/opentxinterface.cpp @@ -93,7 +93,7 @@ int OpenTxFirmware::getCapability(::Capability capability) return id.contains("internalelrs") || IS_RADIOMASTER_TX12_MK2(board) || IS_IFLIGHT_COMMANDO8(board) || IS_RADIOMASTER_BOXER(board) || IS_RADIOMASTER_POCKET(board) || IS_JUMPER_T20(board) || - IS_RADIOMASTER_MT12(board) || IS_RADIOMASTER_TX15(board) || IS_JUMPER_T15PRO(board) || IS_JUMPER_T22(board); + IS_RADIOMASTER_MT12(board) || IS_RADIOMASTER_TX15(board) || IS_RADIOMASTER_GX15(board) || IS_JUMPER_T15PRO(board) || IS_JUMPER_T22(board); case HasIntModuleFlySky: return id.contains("afhds2a") || id.contains("afhds3") || IS_FLYSKY_NV14(board) || IS_FLYSKY_EL18(board) || IS_FAMILY_PL18(board); @@ -735,6 +735,13 @@ void registerOpenTxFirmwares() firmware->addOptionsGroup({opt_bt, opt_internal_gps}); registerOpenTxFirmware(firmware); + /* Radiomaster GX15 board */ + firmware = new OpenTxFirmware(FIRMWAREID("gx15"), Firmware::tr("Radiomaster GX15"), BOARD_RADIOMASTER_GX15); + addOpenTxFrskyOptions(firmware); + addOpenTxRfOptions(firmware, FLEX); + firmware->addOptionsGroup({opt_bt, opt_internal_gps}); + registerOpenTxFirmware(firmware); + /* Radiomaster TX16S board */ firmware = new OpenTxFirmware(FIRMWAREID("tx16s"), Firmware::tr("Radiomaster TX16S / SE / Hall / Masterfire"), BOARD_RADIOMASTER_TX16S); addOpenTxFrskyOptions(firmware); diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt index 94c1c5ea139..c8b8b062e2d 100644 --- a/radio/src/CMakeLists.txt +++ b/radio/src/CMakeLists.txt @@ -1,7 +1,7 @@ include(CMakeForceCompiler) include(Bitmaps) -set(PCB_TYPES X9LITE X9LITES X7 XLITE XLITES X9D X9D+ X9E X10 X12S PL18 T15PRO ST16 PA01 TX15 TX16SMK3 T22 V12) +set(PCB_TYPES X9LITE X9LITES X7 XLITE XLITES X9D X9D+ X9E X10 X12S PL18 T15PRO ST16 PA01 TX15 GX15 TX16SMK3 T22 V12) set(RADIO_LANGUAGES CN CZ DA DE EN ES FI FR HE HU IT JP KO NL PL PT RU SE SK TW UA) set(TTS_LANGUAGES CN CZ DA DE EN ES FI FR HE HU IT JP KO NL PL PT RU SE SK TW UA) @@ -103,6 +103,8 @@ elseif(PCB STREQUAL V12) include(targets/v12/CMakeLists.txt) elseif(PCB STREQUAL TX15) include(targets/tx15/CMakeLists.txt) +elseif(PCB STREQUAL GX15) + include(targets/gx15/CMakeLists.txt) elseif(PCB STREQUAL TX16SMK3) include(targets/tx16smk3/CMakeLists.txt) elseif(PCB STREQUAL T22) diff --git a/radio/src/boards/hw_defs/gx15.json b/radio/src/boards/hw_defs/gx15.json new file mode 100644 index 00000000000..6ce434bc847 --- /dev/null +++ b/radio/src/boards/hw_defs/gx15.json @@ -0,0 +1,456 @@ +{ + "adc_inputs": { + "adcs": [ + { + "name": "MAIN", + "adc": "ADC1", + "dma": "DMA2", + "dma_channel": "LL_DMAMUX1_REQ_ADC1", + "dma_stream": "LL_DMA_STREAM_4", + "dma_stream_irq": "DMA2_Stream4_IRQn", + "dma_stream_irq_handler": "DMA2_Stream4_IRQHandler", + "sample_time": "LL_ADC_SAMPLINGTIME_8CYCLES_5" + }, + { + "name": "EXT", + "adc": "ADC3", + "dma": "DMA2", + "dma_channel": "LL_DMAMUX1_REQ_ADC3", + "dma_stream": "LL_DMA_STREAM_0", + "dma_stream_irq": "DMA2_Stream0_IRQn", + "dma_stream_irq_handler": "DMA2_Stream0_IRQHandler", + "sample_time": "LL_ADC_SAMPLINGTIME_8CYCLES_5" + } + ], + "inputs": [ + { + "name": "LH", + "type": "STICK", + "adc": "MAIN", + "gpio": "GPIOA", + "pin": "LL_GPIO_PIN_6", + "channel": "LL_ADC_CHANNEL_3" + }, + { + "name": "LV", + "type": "STICK", + "adc": "MAIN", + "gpio": "GPIOC", + "pin": "LL_GPIO_PIN_3", + "channel": "LL_ADC_CHANNEL_13", + "inverted": true + }, + { + "name": "RV", + "type": "STICK", + "adc": "MAIN", + "gpio": "GPIOC", + "pin": "LL_GPIO_PIN_4", + "channel": "LL_ADC_CHANNEL_4" + }, + { + "name": "RH", + "type": "STICK", + "adc": "MAIN", + "gpio": "GPIOC", + "pin": "LL_GPIO_PIN_5", + "channel": "LL_ADC_CHANNEL_8", + "inverted": true + }, + { + "name": "P1", + "type": "FLEX", + "adc": "MAIN", + "gpio": "GPIOC", + "pin": "LL_GPIO_PIN_1", + "channel": "LL_ADC_CHANNEL_11", + "inverted": true, + "label": "S1", + "short_label": "1", + "default": "POT" + }, + { + "name": "P2", + "type": "FLEX", + "adc": "MAIN", + "gpio": "GPIOB", + "pin": "LL_GPIO_PIN_1", + "channel": "LL_ADC_CHANNEL_5", + "inverted": true, + "label": "S2", + "short_label": "2", + "default": "POT" + }, + { + "name": "SL1", + "type": "FLEX", + "adc": "EXT", + "gpio": "GPIOH", + "pin": "LL_GPIO_PIN_2", + "channel": "LL_ADC_CHANNEL_13", + "label": "LS", + "short_label": "L", + "default": "SLIDER" + }, + { + "name": "SL2", + "type": "FLEX", + "adc": "MAIN", + "gpio": "GPIOA", + "pin": "LL_GPIO_PIN_7", + "channel": "LL_ADC_CHANNEL_7", + "inverted": true, + "label": "RS", + "short_label": "R", + "default": "SLIDER" + }, + { + "name": "EXT1", + "type": "FLEX", + "adc": "MAIN", + "gpio": "GPIOA", + "pin": "LL_GPIO_PIN_5", + "channel": "LL_ADC_CHANNEL_19", + "label": "EXT1", + "short_label": "E1", + "default": "NONE" + }, + { + "name": "EXT2", + "type": "FLEX", + "adc": "EXT", + "gpio": "GPIOH", + "pin": "LL_GPIO_PIN_5", + "channel": "LL_ADC_CHANNEL_16", + "label": "EXT2", + "short_label": "E2", + "default": "NONE" + }, + { + "name": "VBAT", + "type": "VBAT", + "adc": "EXT", + "gpio": "GPIOH", + "pin": "LL_GPIO_PIN_3", + "channel": "LL_ADC_CHANNEL_14" + }, + { + "name": "RTC_BAT", + "type": "RTC_BAT", + "adc": "EXT", + "gpio": null, + "pin": null, + "channel": "LL_ADC_CHANNEL_VBAT" + } + ] + }, + "switches": [ + { + "name": "SA", + "type": "3POS", + "flags": 0, + "inverted": false, + "default": "3POS", + "display": null, + "gpio_high": null, + "pin_high": "PCA95XX_P15", + "gpio_low": null, + "pin_low": "PCA95XX_P14", + "is_cfs": false + }, + { + "name": "SB", + "type": "3POS", + "flags": 0, + "inverted": false, + "default": "3POS", + "display": null, + "gpio_high": null, + "pin_high": "PCA95XX_P13", + "gpio_low": null, + "pin_low": "PCA95XX_P12", + "is_cfs": false + }, + { + "name": "SC", + "type": "3POS", + "flags": 0, + "inverted": false, + "default": "3POS", + "display": null, + "gpio_high": null, + "pin_high": "PCA95XX_P11", + "gpio_low": null, + "pin_low": "PCA95XX_P10", + "is_cfs": false + }, + { + "name": "SD", + "type": "3POS", + "flags": 0, + "inverted": false, + "default": "3POS", + "display": null, + "gpio_high": null, + "pin_high": "PCA95XX_P7", + "gpio_low": null, + "pin_low": "PCA95XX_P6", + "is_cfs": false + }, + { + "name": "SE", + "type": "3POS", + "flags": 0, + "inverted": false, + "default": "3POS", + "display": null, + "gpio_high": null, + "pin_high": "PCA95XX_P16", + "gpio_low": null, + "pin_low": "PCA95XX_P17", + "is_cfs": false + }, + { + "name": "SF", + "type": "2POS", + "flags": 0, + "inverted": false, + "default": "2POS", + "display": null, + "gpio": null, + "pin": "PCA95XX_P1", + "is_cfs": false + }, + { + "name": "SG", + "type": "3POS", + "flags": 0, + "inverted": false, + "default": "3POS", + "display": null, + "gpio_high": null, + "pin_high": "PCA95XX_P4", + "gpio_low": null, + "pin_low": "PCA95XX_P5", + "is_cfs": false + }, + { + "name": "SH", + "type": "2POS", + "flags": 0, + "inverted": false, + "default": "2POS", + "display": null, + "gpio": null, + "pin": "PCA95XX_P0", + "is_cfs": false + }, + { + "name": "SI", + "type": "2POS", + "flags": 0, + "inverted": false, + "default": "2POS", + "display": null, + "gpio": null, + "pin": "PCA95XX_P2", + "is_cfs": false + }, + { + "name": "SJ", + "type": "2POS", + "flags": 0, + "inverted": false, + "default": "2POS", + "display": null, + "gpio": null, + "pin": "PCA95XX_P3", + "is_cfs": false + }, + { + "name": "SW1", + "type": "2POS", + "flags": 0, + "inverted": false, + "default": "2POS", + "display": null, + "gpio": null, + "pin": "PCA95XX_P0", + "is_cfs": true, + "cfs_idx": 0 + }, + { + "name": "SW2", + "type": "2POS", + "flags": 0, + "inverted": false, + "default": "2POS", + "display": null, + "gpio": null, + "pin": "PCA95XX_P1", + "is_cfs": true, + "cfs_idx": 1 + }, + { + "name": "SW3", + "type": "2POS", + "flags": 0, + "inverted": false, + "default": "2POS", + "display": null, + "gpio": null, + "pin": "PCA95XX_P2", + "is_cfs": true, + "cfs_idx": 2 + }, + { + "name": "SW4", + "type": "2POS", + "flags": 0, + "inverted": false, + "default": "2POS", + "display": null, + "gpio": null, + "pin": "PCA95XX_P3", + "is_cfs": true, + "cfs_idx": 3 + }, + { + "name": "SW5", + "type": "2POS", + "flags": 0, + "inverted": false, + "default": "2POS", + "display": null, + "gpio": null, + "pin": "PCA95XX_P4", + "is_cfs": true, + "cfs_idx": 4 + }, + { + "name": "SW6", + "type": "2POS", + "flags": 0, + "inverted": false, + "default": "2POS", + "display": null, + "gpio": null, + "pin": "PCA95XX_P5", + "is_cfs": true, + "cfs_idx": 5 + } + ], + "keys": [ + { + "gpio": "GPIOG", + "pin": "LL_GPIO_PIN_3", + "active_low": true, + "key": "KEY_EXIT", + "name": "EXIT", + "label": "EXIT" + }, + { + "gpio": "GPIOG", + "pin": "LL_GPIO_PIN_12", + "active_low": true, + "key": "KEY_ENTER", + "name": "ENTER", + "label": "Enter" + }, + { + "gpio": "GPIOG", + "pin": "LL_GPIO_PIN_7", + "active_low": true, + "key": "KEY_PAGEUP", + "name": "PAGEUP", + "label": "PAGE<" + }, + { + "gpio": "GPIOA", + "pin": "LL_GPIO_PIN_8", + "active_low": true, + "key": "KEY_PAGEDN", + "name": "PAGEDN", + "label": "PAGE>" + }, + { + "gpio": "GPIOE", + "pin": "LL_GPIO_PIN_3", + "active_low": true, + "key": "KEY_MODEL", + "name": "MDL", + "label": "MDL" + }, + { + "gpio": "GPIOG", + "pin": "LL_GPIO_PIN_2", + "active_low": true, + "key": "KEY_TELE", + "name": "TELE", + "label": "TELE" + }, + { + "gpio": "GPIOB", + "pin": "LL_GPIO_PIN_2", + "active_low": true, + "key": "KEY_SYS", + "name": "SYS", + "label": "SYS" + } + ], + "trims": [ + { + "name": "T1" + }, + { + "name": "T2" + }, + { + "name": "T3" + }, + { + "name": "T4" + }, + { + "name": "T5", + "dec": { + "gpio": "GPIOH", + "pin": "LL_GPIO_PIN_15", + "active_low": true + }, + "inc": { + "gpio": "GPIOH", + "pin": "LL_GPIO_PIN_13", + "active_low": true + }, + "active_low": true + }, + { + "name": "T6" + } + ], + "display": { + "w": 480, + "h": 320, + "phys_w": 320, + "phys_h": 480, + "depth": 16, + "color": 1, + "oled": 0, + "backlight_color": 0 + }, + "custom_switches": { + "rgb_led": 1, + "groups": 3 + }, + "hardware": { + "has_audio_mute": 0, + "has_bling_leds": 20, + "has_ext_module_support": 1, + "has_int_module_support": 1, + "sport_max_baudrate": 400000, + "surface": 0, + "cpu": "STM32H750xB", + "cpu_type": "STM32H7" + } +} diff --git a/radio/src/datastructs.h b/radio/src/datastructs.h index 8cc17697283..1ebe84bb82c 100644 --- a/radio/src/datastructs.h +++ b/radio/src/datastructs.h @@ -78,7 +78,7 @@ static inline void check_struct() #if defined(PCBXLITES) CHKSIZE(RadioData, 951); -#elif defined(RADIO_ST16) || defined(PCBPA01) || defined(RADIO_TX15) || defined(RADIO_T15PRO) || defined(RADIO_TX16SMK3) || defined(RADIO_T22) +#elif defined(RADIO_ST16) || defined(PCBPA01) || defined(RADIO_TX15) || defined(RADIO_GX15) || defined(RADIO_T15PRO) || defined(RADIO_TX16SMK3) || defined(RADIO_T22) CHKSIZE(RadioData, 1183); #elif defined(RADIO_V12) CHKSIZE(RadioData, 1180); @@ -112,7 +112,7 @@ static inline void check_struct() #else CHKSIZE(ModelData, 6877); #endif -#elif defined(PCBST16) || defined(RADIO_T15PRO) || defined(RADIO_TX15) +#elif defined(PCBST16) || defined(RADIO_T15PRO) || defined(RADIO_TX15) || defined(RADIO_GX15) CHKSIZE(ModelData, 7641); #elif defined(RADIO_V12) CHKSIZE(ModelData, 7640); diff --git a/radio/src/edgetx.cpp b/radio/src/edgetx.cpp index 0b1428425fe..2f57b0f7b4a 100644 --- a/radio/src/edgetx.cpp +++ b/radio/src/edgetx.cpp @@ -422,7 +422,7 @@ void generalDefault() #if defined(MANUFACTURER_RADIOMASTER) g_eeGeneral.audioMuteEnable = 1; -#if defined(RADIO_TX15) +#if defined(RADIO_TX15) || defined(RADIO_GX15) g_eeGeneral.backlightBright = 50; // Screen looks off if not set high enough #endif #endif diff --git a/radio/src/storage/yaml/CMakeLists.txt b/radio/src/storage/yaml/CMakeLists.txt index aaa01d575e9..7149e6d41d2 100644 --- a/radio/src/storage/yaml/CMakeLists.txt +++ b/radio/src/storage/yaml/CMakeLists.txt @@ -46,6 +46,8 @@ elseif(PCB STREQUAL PA01) set(YAML_GEN_OUTPUT storage/yaml/yaml_datastructs_pa01.cpp) elseif(PCB STREQUAL TX15) set(YAML_GEN_OUTPUT storage/yaml/yaml_datastructs_tx15.cpp) + elseif(PCB STREQUAL GX15) + set(YAML_GEN_OUTPUT storage/yaml/yaml_datastructs_gx15.cpp) elseif(PCB STREQUAL TX16SMK3) set(YAML_GEN_OUTPUT storage/yaml/yaml_datastructs_tx16smk3.cpp) elseif(PCB STREQUAL X7) diff --git a/radio/src/storage/yaml/yaml_datastructs.cpp b/radio/src/storage/yaml/yaml_datastructs.cpp index c8afc78d58a..97d2b935c56 100644 --- a/radio/src/storage/yaml/yaml_datastructs.cpp +++ b/radio/src/storage/yaml/yaml_datastructs.cpp @@ -38,6 +38,8 @@ #endif #elif defined(PCBTX15) #include "yaml_datastructs_tx15.cpp" +#elif defined(PCBGX15) + #include "yaml_datastructs_gx15.cpp" #elif defined(PCBT15) #include "yaml_datastructs_t15pro.cpp" #elif defined(PCBTX16SMK3) diff --git a/radio/src/storage/yaml/yaml_datastructs_gx15.cpp b/radio/src/storage/yaml/yaml_datastructs_gx15.cpp new file mode 100644 index 00000000000..3bbbf742618 --- /dev/null +++ b/radio/src/storage/yaml/yaml_datastructs_gx15.cpp @@ -0,0 +1,1049 @@ +// generated by generate_yaml.py + +// +// Enums first +// + +const struct YamlIdStr enum_BacklightMode[] = { + { e_backlight_mode_off, "backlight_mode_off" }, + { e_backlight_mode_keys, "backlight_mode_keys" }, + { e_backlight_mode_sticks, "backlight_mode_sticks" }, + { e_backlight_mode_all, "backlight_mode_all" }, + { e_backlight_mode_on, "backlight_mode_on" }, + { 0, NULL } +}; +const struct YamlIdStr enum_AntennaModes[] = { + { ANTENNA_MODE_INTERNAL, "MODE_INTERNAL" }, + { ANTENNA_MODE_ASK, "MODE_ASK" }, + { ANTENNA_MODE_PER_MODEL, "MODE_PER_MODEL" }, + { ANTENNA_MODE_EXTERNAL, "MODE_EXTERNAL" }, + { 0, NULL } +}; +const struct YamlIdStr enum_ModuleType[] = { + { MODULE_TYPE_NONE, "TYPE_NONE" }, + { MODULE_TYPE_PPM, "TYPE_PPM" }, + { MODULE_TYPE_XJT_PXX1, "TYPE_XJT_PXX1" }, + { MODULE_TYPE_ISRM_PXX2, "TYPE_ISRM_PXX2" }, + { MODULE_TYPE_DSM2, "TYPE_DSM2" }, + { MODULE_TYPE_CROSSFIRE, "TYPE_CROSSFIRE" }, + { MODULE_TYPE_MULTIMODULE, "TYPE_MULTIMODULE" }, + { MODULE_TYPE_R9M_PXX1, "TYPE_R9M_PXX1" }, + { MODULE_TYPE_R9M_PXX2, "TYPE_R9M_PXX2" }, + { MODULE_TYPE_R9M_LITE_PXX1, "TYPE_R9M_LITE_PXX1" }, + { MODULE_TYPE_R9M_LITE_PXX2, "TYPE_R9M_LITE_PXX2" }, + { MODULE_TYPE_GHOST, "TYPE_GHOST" }, + { MODULE_TYPE_R9M_LITE_PRO_PXX2, "TYPE_R9M_LITE_PRO_PXX2" }, + { MODULE_TYPE_SBUS, "TYPE_SBUS" }, + { MODULE_TYPE_XJT_LITE_PXX2, "TYPE_XJT_LITE_PXX2" }, + { MODULE_TYPE_FLYSKY_AFHDS2A, "TYPE_FLYSKY_AFHDS2A" }, + { MODULE_TYPE_FLYSKY_AFHDS3, "TYPE_FLYSKY_AFHDS3" }, + { MODULE_TYPE_LEMON_DSMP, "TYPE_LEMON_DSMP" }, + { 0, NULL } +}; +const struct YamlIdStr enum_TrainerMultiplex[] = { + { TRAINER_OFF, "OFF" }, + { TRAINER_ADD, "ADD" }, + { TRAINER_REPL, "REPL" }, + { 0, NULL } +}; +const struct YamlIdStr enum_BeeperMode[] = { + { e_mode_quiet, "mode_quiet" }, + { e_mode_alarms, "mode_alarms" }, + { e_mode_nokeys, "mode_nokeys" }, + { e_mode_all, "mode_all" }, + { 0, NULL } +}; +const struct YamlIdStr enum_BluetoothModes[] = { + { BLUETOOTH_OFF, "OFF" }, + { BLUETOOTH_TELEMETRY, "TELEMETRY" }, + { BLUETOOTH_TRAINER, "TRAINER" }, + { 0, NULL } +}; +const struct YamlIdStr enum_Functions[] = { + { FUNC_OVERRIDE_CHANNEL, "OVERRIDE_CHANNEL" }, + { FUNC_TRAINER, "TRAINER" }, + { FUNC_INSTANT_TRIM, "INSTANT_TRIM" }, + { FUNC_RESET, "RESET" }, + { FUNC_SET_TIMER, "SET_TIMER" }, + { FUNC_ADJUST_GVAR, "ADJUST_GVAR" }, + { FUNC_VOLUME, "VOLUME" }, + { FUNC_SET_FAILSAFE, "SET_FAILSAFE" }, + { FUNC_RANGECHECK, "RANGECHECK" }, + { FUNC_BIND, "BIND" }, + { FUNC_PLAY_SOUND, "PLAY_SOUND" }, + { FUNC_PLAY_TRACK, "PLAY_TRACK" }, + { FUNC_PLAY_VALUE, "PLAY_VALUE" }, + { FUNC_PLAY_SCRIPT, "PLAY_SCRIPT" }, + { FUNC_BACKGND_MUSIC, "BACKGND_MUSIC" }, + { FUNC_BACKGND_MUSIC_PAUSE, "BACKGND_MUSIC_PAUSE" }, + { FUNC_VARIO, "VARIO" }, + { FUNC_HAPTIC, "HAPTIC" }, + { FUNC_LOGS, "LOGS" }, + { FUNC_BACKLIGHT, "BACKLIGHT" }, + { FUNC_SCREENSHOT, "SCREENSHOT" }, + { FUNC_RACING_MODE, "RACING_MODE" }, + { FUNC_DISABLE_TOUCH, "DISABLE_TOUCH" }, + { FUNC_SET_SCREEN, "SET_SCREEN" }, + { FUNC_DISABLE_AUDIO_AMP, "DISABLE_AUDIO_AMP" }, + { FUNC_RGB_LED, "RGB_LED" }, + { FUNC_PUSH_CUST_SWITCH, "PUSH_CUST_SWITCH" }, + { FUNC_TEST, "TEST" }, + { 0, NULL } +}; +const struct YamlIdStr enum_SwitchConfig[] = { + { SWITCH_NONE, "NONE" }, + { SWITCH_TOGGLE, "TOGGLE" }, + { SWITCH_2POS, "2POS" }, + { SWITCH_3POS, "3POS" }, + { SWITCH_GLOBAL, "GLOBAL" }, + { SWITCH_none, "none" }, + { SWITCH_toggle, "toggle" }, + { SWITCH_2pos, "2pos" }, + { SWITCH_3pos, "3pos" }, + { 0, NULL } +}; +const struct YamlIdStr enum_fsStartPositionType[] = { + { FS_START_OFF, "START_OFF" }, + { FS_START_ON, "START_ON" }, + { FS_START_PREVIOUS, "START_PREVIOUS" }, + { 0, NULL } +}; +const struct YamlIdStr enum_booleanEnum[] = { + { BOOL_OFF, "OFF" }, + { BOOL_ON, "ON" }, + { 0, NULL } +}; +const struct YamlIdStr enum_QMPage[] = { + { QM_NONE, "NONE" }, + { QM_OPEN_QUICK_MENU, "OPEN_QUICK_MENU" }, + { QM_MANAGE_MODELS, "MANAGE_MODELS" }, + { QM_MODEL_SETUP, "MODEL_SETUP" }, + { QM_MODEL_FLIGHTMODES, "MODEL_FLIGHTMODES" }, + { QM_MODEL_INPUTS, "MODEL_INPUTS" }, + { QM_MODEL_MIXES, "MODEL_MIXES" }, + { QM_MODEL_OUTPUTS, "MODEL_OUTPUTS" }, + { QM_MODEL_CURVES, "MODEL_CURVES" }, + { QM_MODEL_GVARS, "MODEL_GVARS" }, + { QM_MODEL_LS, "MODEL_LS" }, + { QM_MODEL_SF, "MODEL_SF" }, + { QM_MODEL_SCRIPTS, "MODEL_SCRIPTS" }, + { QM_MODEL_TELEMETRY, "MODEL_TELEMETRY" }, + { QM_MODEL_NOTES, "MODEL_NOTES" }, + { QM_RADIO_SETUP, "RADIO_SETUP" }, + { QM_RADIO_GF, "RADIO_GF" }, + { QM_RADIO_TRAINER, "RADIO_TRAINER" }, + { QM_RADIO_HARDWARE, "RADIO_HARDWARE" }, + { QM_RADIO_VERSION, "RADIO_VERSION" }, + { QM_UI_THEMES, "UI_THEMES" }, + { QM_UI_SETUP, "UI_SETUP" }, + { QM_UI_SCREEN1, "UI_SCREEN1" }, + { QM_UI_SCREEN2, "UI_SCREEN2" }, + { QM_UI_SCREEN3, "UI_SCREEN3" }, + { QM_UI_SCREEN4, "UI_SCREEN4" }, + { QM_UI_SCREEN5, "UI_SCREEN5" }, + { QM_UI_SCREEN6, "UI_SCREEN6" }, + { QM_UI_SCREEN7, "UI_SCREEN7" }, + { QM_UI_SCREEN8, "UI_SCREEN8" }, + { QM_UI_SCREEN9, "UI_SCREEN9" }, + { QM_UI_SCREEN10, "UI_SCREEN10" }, + { QM_UI_ADD_PG, "UI_ADD_PG" }, + { QM_TOOLS_APPS, "TOOLS_APPS" }, + { QM_TOOLS_STORAGE, "TOOLS_STORAGE" }, + { QM_TOOLS_RESET, "TOOLS_RESET" }, + { QM_TOOLS_CHAN_MON, "TOOLS_CHAN_MON" }, + { QM_TOOLS_LS_MON, "TOOLS_LS_MON" }, + { QM_TOOLS_STATS, "TOOLS_STATS" }, + { QM_TOOLS_DEBUG, "TOOLS_DEBUG" }, + { QM_APP, "APP" }, + { 0, NULL } +}; +const struct YamlIdStr enum_TimerModes[] = { + { TMRMODE_OFF, "OFF" }, + { TMRMODE_ON, "ON" }, + { TMRMODE_START, "START" }, + { TMRMODE_THR, "THR" }, + { TMRMODE_THR_REL, "THR_REL" }, + { TMRMODE_THR_START, "THR_START" }, + { 0, NULL } +}; +const struct YamlIdStr enum_MixerMultiplex[] = { + { MLTPX_ADD, "ADD" }, + { MLTPX_MUL, "MUL" }, + { MLTPX_REPL, "REPL" }, + { 0, NULL } +}; +const struct YamlIdStr enum_MixSources[] = { + { MIXSRC_NONE, "NONE" }, + { MIXSRC_TILT_X, "TILT_X" }, + { MIXSRC_TILT_Y, "TILT_Y" }, + { MIXSRC_SPACEMOUSE_A, "SPACEMOUSE_A" }, + { MIXSRC_SPACEMOUSE_B, "SPACEMOUSE_B" }, + { MIXSRC_SPACEMOUSE_C, "SPACEMOUSE_C" }, + { MIXSRC_SPACEMOUSE_D, "SPACEMOUSE_D" }, + { MIXSRC_SPACEMOUSE_E, "SPACEMOUSE_E" }, + { MIXSRC_SPACEMOUSE_F, "SPACEMOUSE_F" }, + { MIXSRC_MIN, "MIN" }, + { MIXSRC_MAX, "MAX" }, + { MIXSRC_TX_VOLTAGE, "TX_VOLTAGE" }, + { MIXSRC_TX_TIME, "TX_TIME" }, + { MIXSRC_TX_GPS, "TX_GPS" }, + { 0, NULL } +}; +const struct YamlIdStr enum_LogicalSwitchesFunctions[] = { + { LS_FUNC_NONE, "FUNC_NONE" }, + { LS_FUNC_VEQUAL, "FUNC_VEQUAL" }, + { LS_FUNC_VALMOSTEQUAL, "FUNC_VALMOSTEQUAL" }, + { LS_FUNC_VPOS, "FUNC_VPOS" }, + { LS_FUNC_VNEG, "FUNC_VNEG" }, + { LS_FUNC_APOS, "FUNC_APOS" }, + { LS_FUNC_ANEG, "FUNC_ANEG" }, + { LS_FUNC_AND, "FUNC_AND" }, + { LS_FUNC_OR, "FUNC_OR" }, + { LS_FUNC_XOR, "FUNC_XOR" }, + { LS_FUNC_EDGE, "FUNC_EDGE" }, + { LS_FUNC_EQUAL, "FUNC_EQUAL" }, + { LS_FUNC_GREATER, "FUNC_GREATER" }, + { LS_FUNC_LESS, "FUNC_LESS" }, + { LS_FUNC_DIFFEGREATER, "FUNC_DIFFEGREATER" }, + { LS_FUNC_ADIFFEGREATER, "FUNC_ADIFFEGREATER" }, + { LS_FUNC_TIMER, "FUNC_TIMER" }, + { LS_FUNC_STICKY, "FUNC_STICKY" }, + { 0, NULL } +}; +const struct YamlIdStr enum_SwashType[] = { + { SWASH_TYPE_NONE, "TYPE_NONE" }, + { SWASH_TYPE_120, "TYPE_120" }, + { SWASH_TYPE_120X, "TYPE_120X" }, + { SWASH_TYPE_140, "TYPE_140" }, + { SWASH_TYPE_90, "TYPE_90" }, + { 0, NULL } +}; +const struct YamlIdStr enum_SwitchSources[] = { + { SWSRC_NONE, "NONE" }, + { SWSRC_ON, "ON" }, + { SWSRC_ONE, "ONE" }, + { SWSRC_TELEMETRY_STREAMING, "TELEMETRY_STREAMING" }, + { SWSRC_RADIO_ACTIVITY, "RADIO_ACTIVITY" }, + { SWSRC_TRAINER_CONNECTED, "TRAINER_CONNECTED" }, + { SWSRC_OFF, "OFF" }, + { 0, NULL } +}; +const struct YamlIdStr enum_PotsWarnMode[] = { + { POTS_WARN_OFF, "WARN_OFF" }, + { POTS_WARN_MANUAL, "WARN_MANUAL" }, + { POTS_WARN_AUTO, "WARN_AUTO" }, + { 0, NULL } +}; +const struct YamlIdStr enum_ModelOverridableEnable[] = { + { OVERRIDE_GLOBAL, "GLOBAL" }, + { OVERRIDE_OFF, "OFF" }, + { OVERRIDE_ON, "ON" }, + { 0, NULL } +}; +const struct YamlIdStr enum_FailsafeModes[] = { + { FAILSAFE_NOT_SET, "NOT_SET" }, + { FAILSAFE_HOLD, "HOLD" }, + { FAILSAFE_CUSTOM, "CUSTOM" }, + { FAILSAFE_NOPULSES, "NOPULSES" }, + { FAILSAFE_RECEIVER, "RECEIVER" }, + { 0, NULL } +}; +const struct YamlIdStr enum_TelemetrySensorFormula[] = { + { TELEM_FORMULA_ADD, "FORMULA_ADD" }, + { TELEM_FORMULA_AVERAGE, "FORMULA_AVERAGE" }, + { TELEM_FORMULA_MIN, "FORMULA_MIN" }, + { TELEM_FORMULA_MAX, "FORMULA_MAX" }, + { TELEM_FORMULA_MULTIPLY, "FORMULA_MULTIPLY" }, + { TELEM_FORMULA_TOTALIZE, "FORMULA_TOTALIZE" }, + { TELEM_FORMULA_CELL, "FORMULA_CELL" }, + { TELEM_FORMULA_CONSUMPTION, "FORMULA_CONSUMPTION" }, + { TELEM_FORMULA_DIST, "FORMULA_DIST" }, + { 0, NULL } +}; +const struct YamlIdStr enum_TelemetrySensorType[] = { + { TELEM_TYPE_CUSTOM, "TYPE_CUSTOM" }, + { TELEM_TYPE_CALCULATED, "TYPE_CALCULATED" }, + { 0, NULL } +}; +const struct YamlIdStr enum_USBJoystickIfMode[] = { + { USBJOYS_JOYSTICK, "JOYSTICK" }, + { USBJOYS_GAMEPAD, "GAMEPAD" }, + { USBJOYS_MULTIAXIS, "MULTIAXIS" }, + { 0, NULL } +}; +const struct YamlIdStr enum_USBJoystickCh[] = { + { USBJOYS_CH_NONE, "CH_NONE" }, + { USBJOYS_CH_BUTTON, "CH_BUTTON" }, + { USBJOYS_CH_AXIS, "CH_AXIS" }, + { USBJOYS_CH_SIM, "CH_SIM" }, + { 0, NULL } +}; + +// +// Structs last +// + +static const struct YamlNode struct_CalibData[] = { + YAML_IDX_CUST("calib",r_calib,w_calib), + YAML_SIGNED( "mid", 16 ), + YAML_SIGNED( "spanNeg", 16 ), + YAML_SIGNED( "spanPos", 16 ), + YAML_END +}; +static const struct YamlNode struct_signed_16[] = { + YAML_IDX, + YAML_SIGNED( "val", 16 ), + YAML_END +}; +static const struct YamlNode struct_TrainerMix[] = { + YAML_IDX, + YAML_UNSIGNED( "srcChn", 6 ), + YAML_ENUM("mode", 2, enum_TrainerMultiplex, NULL), + YAML_SIGNED( "studWeight", 8 ), + YAML_END +}; +static const struct YamlNode struct_TrainerData[] = { + YAML_ARRAY("calib", 16, 4, struct_signed_16, NULL), + YAML_ARRAY("mix", 16, 4, struct_TrainerMix, NULL), + YAML_END +}; +static const struct YamlNode struct_anonymous_1[] = { + YAML_STRING("name", 8), + YAML_END +}; +static const struct YamlNode struct_anonymous_2[] = { + YAML_SIGNED( "val", 16 ), + YAML_UNSIGNED( "mode", 8 ), + YAML_UNSIGNED( "param", 8 ), + YAML_SIGNED( "val2", 32 ), + YAML_END +}; +static const struct YamlNode struct_anonymous_3[] = { + YAML_SIGNED( "val1", 32 ), + YAML_SIGNED( "val2", 32 ), + YAML_END +}; +static const struct YamlNode union_anonymous_0_elmts[] = { + YAML_STRUCT("play", 64, struct_anonymous_1, NULL), + YAML_STRUCT("all", 64, struct_anonymous_2, NULL), + YAML_STRUCT("clear", 64, struct_anonymous_3, NULL), + YAML_END +}; +static const struct YamlNode struct_CustomFunctionData[] = { + YAML_IDX, + YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ), + YAML_ENUM("func", 6, enum_Functions, NULL), + YAML_CUSTOM("def",r_customFn,w_customFn), + YAML_PADDING( 64 ), + YAML_PADDING( 1 ), + YAML_PADDING( 7 ), + YAML_END +}; +static const struct YamlNode struct_RGBLedColor[] = { + YAML_UNSIGNED( "r", 8 ), + YAML_UNSIGNED( "g", 8 ), + YAML_UNSIGNED( "b", 8 ), + YAML_END +}; +static const struct YamlNode struct_switchDef[] = { + YAML_IDX_CUST("sw",sw_idx_read,sw_idx_write), + YAML_STRING("name", 3), + YAML_ENUM("type", 3, enum_SwitchConfig, NULL), + YAML_ENUM("start", 2, enum_fsStartPositionType, switch_is_cfs), + YAML_ENUM("onColorLuaOverride", 1, enum_booleanEnum, switch_is_cfs), + YAML_ENUM("offColorLuaOverride", 1, enum_booleanEnum, switch_is_cfs), + YAML_PADDING( 1 ), + YAML_STRUCT("onColor", 24, struct_RGBLedColor, switch_is_cfs), + YAML_STRUCT("offColor", 24, struct_RGBLedColor, switch_is_cfs), + YAML_END +}; +static const struct YamlNode struct_KeyShortcut[] = { + YAML_IDX, + YAML_CUSTOM("shortcut",r_keyShortcut,w_keyShortcut), + YAML_PADDING( 8 ), + YAML_END +}; +static const struct YamlNode struct_QMFavorite[] = { + YAML_IDX, + YAML_CUSTOM("shortcut",r_qmFavorite,w_qmFavorite), + YAML_PADDING( 8 ), + YAML_END +}; +static const struct YamlNode struct_RadioData[] = { + YAML_UNSIGNED( "manuallyEdited", 1 ), + YAML_SIGNED( "timezoneMinutes", 3 ), + YAML_UNSIGNED( "ppmunit", 2 ), + YAML_PADDING( 2 ), + YAML_CUSTOM("semver",nullptr,w_semver), + YAML_CUSTOM("board",nullptr,w_board), + YAML_ARRAY("calib", 48, 20, struct_CalibData, NULL), + YAML_PADDING( 16 ), + YAML_UNSIGNED( "vBatWarn", 8 ), + YAML_SIGNED( "txVoltageCalibration", 8 ), + YAML_ENUM("backlightMode", 3, enum_BacklightMode, NULL), + YAML_ENUM("antennaMode", 2, enum_AntennaModes, NULL), + YAML_UNSIGNED( "disableRtcWarning", 1 ), + YAML_UNSIGNED( "keysBacklight", 1 ), + YAML_UNSIGNED( "dontPlayHello", 1 ), + YAML_ENUM("internalModule", 8, enum_ModuleType, NULL), + YAML_STRUCT("trainer", 128, struct_TrainerData, NULL), + YAML_UNSIGNED( "view", 8 ), + YAML_PADDING( 2 ), + YAML_UNSIGNED( "fai", 1 ), + YAML_SIGNED_CUST( "beepMode", 2, r_beeperMode, w_beeperMode ), + YAML_UNSIGNED( "alarmsFlash", 1 ), + YAML_UNSIGNED( "disableMemoryWarning", 1 ), + YAML_UNSIGNED( "disableAlarmWarning", 1 ), + YAML_UNSIGNED( "stickMode", 2 ), + YAML_SIGNED( "timezone", 5 ), + YAML_UNSIGNED( "adjustRTC", 1 ), + YAML_UNSIGNED( "inactivityTimer", 8 ), + YAML_CUSTOM("telemetryBaudrate",r_telemetryBaudrate,nullptr), + YAML_UNSIGNED( "internalModuleBaudrate", 3 ), + YAML_SIGNED( "splashMode", 3 ), + YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ), + YAML_SIGNED( "switchesDelay", 8 ), + YAML_UNSIGNED( "lightAutoOff", 8 ), + YAML_UNSIGNED( "templateSetup", 8 ), + YAML_SIGNED( "PPM_Multiplier", 8 ), + YAML_SIGNED_CUST( "hapticLength", 8, r_5pos, w_5pos ), + YAML_SIGNED_CUST( "beepLength", 3, r_5pos, w_5pos ), + YAML_SIGNED_CUST( "hapticStrength", 3, r_5pos, w_5pos ), + YAML_UNSIGNED( "gpsFormat", 1 ), + YAML_UNSIGNED( "audioMuteEnable", 1 ), + YAML_UNSIGNED_CUST( "speakerPitch", 8, r_spPitch, w_spPitch ), + YAML_SIGNED_CUST( "speakerVolume", 8, r_vol, w_vol ), + YAML_SIGNED_CUST( "vBatMin", 8, r_vbat_min, w_vbat_min ), + YAML_SIGNED_CUST( "vBatMax", 8, r_vbat_max, w_vbat_max ), + YAML_UNSIGNED( "backlightBright", 8 ), + YAML_UNSIGNED( "globalTimer", 32 ), + YAML_UNSIGNED( "bluetoothBaudrate", 4 ), + YAML_ENUM("bluetoothMode", 4, enum_BluetoothModes, NULL), + YAML_UNSIGNED( "countryCode", 2 ), + YAML_SIGNED( "pwrOnSpeed", 3 ), + YAML_SIGNED( "pwrOffSpeed", 3 ), + YAML_CUSTOM("jitterFilter",r_jitterFilter,nullptr), + YAML_UNSIGNED( "noJitterFilter", 1 ), + YAML_UNSIGNED( "imperial", 1 ), + YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ), + YAML_UNSIGNED( "USBMode", 2 ), + YAML_UNSIGNED( "jackMode", 2 ), + YAML_PADDING( 1 ), + YAML_STRING("ttsLanguage", 2), + YAML_STRING("uiLanguage", 2), + YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ), + YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ), + YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ), + YAML_SIGNED_CUST( "backgroundVolume", 4, r_5pos, w_5pos ), + YAML_SIGNED_CUST( "varioPitch", 8, r_vPitch, w_vPitch ), + YAML_SIGNED_CUST( "varioRange", 8, r_vPitch, w_vPitch ), + YAML_SIGNED( "varioRepeat", 8 ), + YAML_ARRAY("customFn", 88, 64, struct_CustomFunctionData, cfn_is_active), + YAML_CUSTOM("auxSerialMode",r_serialMode,nullptr), + YAML_CUSTOM("aux2SerialMode",r_serialMode,nullptr), + YAML_ARRAY("serialPort", 8, 4, struct_serialConfig, nullptr), + YAML_ARRAY("sticksConfig", 0, MAX_STICKS, struct_stickConfig, stick_name_valid), + YAML_ARRAY("slidersConfig", 0, MAX_POTS, struct_sliderConfig, nullptr), + YAML_PADDING( 8 ), + YAML_ARRAY("potsConfig", 4, 16, struct_potConfig, nullptr), + YAML_ARRAY("switchConfig", 80, 20, struct_switchDef, switchIsActive), + YAML_ARRAY("flexSwitches", 0, MAX_FLEX_SWITCHES, struct_flexSwitch, flex_sw_valid), + YAML_STRING("currModelFilename", 17), + YAML_UNSIGNED( "blOffBright", 8 ), + YAML_STRING("bluetoothName", 10), + YAML_STRING("ownerRegistrationID", 8), + YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr), + YAML_UNSIGNED( "rotEncMode", 3 ), + YAML_PADDING( 2 ), + YAML_PADDING( 3 ), + YAML_SIGNED( "imuMax", 8 ), + YAML_SIGNED( "imuOffset", 8 ), + YAML_STRING("selectedTheme", 26), + YAML_SIGNED_CUST( "backlightSrc", 10, r_mixSrcRawEx, w_mixSrcRawEx ), + YAML_SIGNED( "radioGFDisabled", 1 ), + YAML_SIGNED( "radioTrainerDisabled", 1 ), + YAML_SIGNED( "modelHeliDisabled", 1 ), + YAML_SIGNED( "modelFMDisabled", 1 ), + YAML_SIGNED( "modelCurvesDisabled", 1 ), + YAML_SIGNED( "modelGVDisabled", 1 ), + YAML_SIGNED_CUST( "volumeSrc", 10, r_mixSrcRawEx, w_mixSrcRawEx ), + YAML_SIGNED( "modelLSDisabled", 1 ), + YAML_SIGNED( "modelSFDisabled", 1 ), + YAML_SIGNED( "modelCustomScriptsDisabled", 1 ), + YAML_SIGNED( "modelTelemetryDisabled", 1 ), + YAML_SIGNED( "disableTrainerPoweroffAlarm", 1 ), + YAML_SIGNED( "disablePwrOnOffHaptic", 1 ), + YAML_UNSIGNED( "modelQuickSelect", 1 ), + YAML_UNSIGNED( "labelSingleSelect", 1 ), + YAML_UNSIGNED( "labelMultiMode", 1 ), + YAML_UNSIGNED( "favMultiMode", 1 ), + YAML_UNSIGNED( "modelSelectLayout", 2 ), + YAML_UNSIGNED( "radioThemesDisabled", 1 ), + YAML_PADDING( 1 ), + YAML_UNSIGNED( "pwrOffIfInactive", 8 ), + YAML_ARRAY("keyShortcuts", 8, 6, struct_KeyShortcut, NULL), + YAML_ARRAY("qmFavorites", 8, 12, struct_QMFavorite, NULL), + YAML_END +}; +static const struct YamlNode struct_unsigned_8[] = { + YAML_IDX, + YAML_UNSIGNED( "val", 8 ), + YAML_END +}; +static const struct YamlNode struct_ModelHeader[] = { + YAML_STRING("name", 15), + YAML_ARRAY("modelId", 8, 2, struct_unsigned_8, NULL), + YAML_STRING("bitmap", 14), + YAML_STRING("labels", 100), + YAML_END +}; +static const struct YamlNode struct_TimerData[] = { + YAML_IDX, + YAML_UNSIGNED( "start", 22 ), + YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ), + YAML_SIGNED( "value", 22 ), + YAML_ENUM("mode", 3, enum_TimerModes, NULL), + YAML_UNSIGNED( "countdownBeep", 2 ), + YAML_UNSIGNED( "minuteBeep", 1 ), + YAML_UNSIGNED( "persistent", 2 ), + YAML_SIGNED( "countdownStart", 2 ), + YAML_UNSIGNED( "showElapsed", 1 ), + YAML_UNSIGNED( "extraHaptic", 1 ), + YAML_PADDING( 6 ), + YAML_STRING("name", 8), + YAML_END +}; +static const struct YamlNode struct_CurveRef[] = { + YAML_UNSIGNED( "type", 5 ), + YAML_UNSIGNED_CUST( "value", 11, r_sourceNumVal, w_sourceNumVal ), + YAML_END +}; +static const struct YamlNode struct_MixData[] = { + YAML_UNSIGNED( "destCh", 5 ), + YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ), + YAML_UNSIGNED( "carryTrim", 1 ), + YAML_UNSIGNED( "mixWarn", 2 ), + YAML_ENUM("mltpx", 2, enum_MixerMultiplex, NULL), + YAML_UNSIGNED( "delayPrec", 1 ), + YAML_UNSIGNED( "speedPrec", 1 ), + YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ), + YAML_PADDING( 1 ), + YAML_UNSIGNED_CUST( "weight", 11, r_sourceNumVal, w_sourceNumVal ), + YAML_UNSIGNED_CUST( "offset", 11, r_sourceNumVal, w_sourceNumVal ), + YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ), + YAML_STRUCT("curve", 16, struct_CurveRef, NULL), + YAML_UNSIGNED( "delayUp", 8 ), + YAML_UNSIGNED( "delayDown", 8 ), + YAML_UNSIGNED( "speedUp", 8 ), + YAML_UNSIGNED( "speedDown", 8 ), + YAML_STRING("name", 6), + YAML_END +}; +static const struct YamlNode struct_LimitData[] = { + YAML_IDX, + YAML_SIGNED_CUST( "min", 11, in_read_weight, in_write_weight ), + YAML_SIGNED_CUST( "max", 11, in_read_weight, in_write_weight ), + YAML_SIGNED( "ppmCenter", 10 ), + YAML_SIGNED_CUST( "offset", 11, in_read_weight, in_write_weight ), + YAML_UNSIGNED( "symetrical", 1 ), + YAML_UNSIGNED( "revert", 1 ), + YAML_PADDING( 3 ), + YAML_SIGNED( "curve", 8 ), + YAML_STRING("name", 6), + YAML_END +}; +static const struct YamlNode struct_ExpoData[] = { + YAML_UNSIGNED( "mode", 2 ), + YAML_UNSIGNED( "scale", 14 ), + YAML_CUSTOM("carryTrim",r_carryTrim,nullptr), + YAML_SIGNED( "trimSource", 6 ), + YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ), + YAML_UNSIGNED_CUST( "weight", 11, r_sourceNumVal, w_sourceNumVal ), + YAML_UNSIGNED_CUST( "offset", 11, r_sourceNumVal, w_sourceNumVal ), + YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ), + YAML_STRUCT("curve", 16, struct_CurveRef, NULL), + YAML_UNSIGNED( "chn", 5 ), + YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ), + YAML_PADDING( 2 ), + YAML_STRING("name", 6), + YAML_END +}; +static const struct YamlNode struct_CurveHeader[] = { + YAML_IDX, + YAML_UNSIGNED( "type", 1 ), + YAML_UNSIGNED( "smooth", 1 ), + YAML_SIGNED( "points", 6 ), + YAML_STRING("name", 3), + YAML_END +}; +static const struct YamlNode struct_signed_8[] = { + YAML_IDX, + YAML_SIGNED( "val", 8 ), + YAML_END +}; +static const struct YamlNode struct_LogicalSwitchData[] = { + YAML_IDX, + YAML_ENUM("func", 8, enum_LogicalSwitchesFunctions, NULL), + YAML_CUSTOM("def",r_logicSw,w_logicSw), + YAML_PADDING( 10 ), + YAML_PADDING( 10 ), + YAML_SIGNED_CUST( "andsw", 10, r_swtchSrc, w_swtchSrc ), + YAML_UNSIGNED( "lsPersist", 1 ), + YAML_UNSIGNED( "lsState", 1 ), + YAML_PADDING( 16 ), + YAML_UNSIGNED( "delay", 8 ), + YAML_UNSIGNED( "duration", 8 ), + YAML_END +}; +static const struct YamlNode struct_SwashRingData[] = { + YAML_ENUM("type", 8, enum_SwashType, NULL), + YAML_UNSIGNED( "value", 8 ), + YAML_UNSIGNED_CUST( "collectiveSource", 8, r_mixSrcRaw, w_mixSrcRaw ), + YAML_UNSIGNED_CUST( "aileronSource", 8, r_mixSrcRaw, w_mixSrcRaw ), + YAML_UNSIGNED_CUST( "elevatorSource", 8, r_mixSrcRaw, w_mixSrcRaw ), + YAML_SIGNED( "collectiveWeight", 8 ), + YAML_SIGNED( "aileronWeight", 8 ), + YAML_SIGNED( "elevatorWeight", 8 ), + YAML_END +}; +static const struct YamlNode struct_trim_t[] = { + YAML_IDX, + YAML_SIGNED( "value", 11 ), + YAML_UNSIGNED( "mode", 5 ), + YAML_END +}; +static const struct YamlNode struct_FlightModeData[] = { + YAML_IDX, + YAML_ARRAY("trim", 16, 8, struct_trim_t, NULL), + YAML_STRING("name", 10), + YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ), + YAML_PADDING( 6 ), + YAML_UNSIGNED( "fadeIn", 8 ), + YAML_UNSIGNED( "fadeOut", 8 ), + YAML_ARRAY("gvars", 16, 15, struct_signed_16, gvar_is_active), + YAML_END +}; +static const struct YamlNode struct_GVarData[] = { + YAML_IDX, + YAML_STRING("name", 3), + YAML_UNSIGNED( "min", 12 ), + YAML_UNSIGNED( "max", 12 ), + YAML_UNSIGNED( "popup", 1 ), + YAML_UNSIGNED( "prec", 1 ), + YAML_UNSIGNED( "unit", 2 ), + YAML_PADDING( 4 ), + YAML_END +}; +static const struct YamlNode struct_VarioData[] = { + YAML_UNSIGNED_CUST( "source", 7, r_tele_sensor, w_tele_sensor ), + YAML_UNSIGNED( "centerSilent", 1 ), + YAML_SIGNED( "centerMax", 8 ), + YAML_SIGNED( "centerMin", 8 ), + YAML_SIGNED( "min", 8 ), + YAML_SIGNED( "max", 8 ), + YAML_END +}; +static const struct YamlNode struct_RssiAlarmData[] = { + YAML_CUSTOM("disabled",r_rssiDisabled,nullptr), + YAML_CUSTOM("warning",r_rssiWarning,nullptr), + YAML_CUSTOM("critical",r_rssiCritical,nullptr), + YAML_END +}; +static const struct YamlNode struct_RFAlarmData[] = { + YAML_SIGNED( "warning", 8 ), + YAML_SIGNED( "critical", 8 ), + YAML_END +}; +static const struct YamlNode struct_PpmModule[] = { + YAML_SIGNED( "delay", 6 ), + YAML_UNSIGNED( "pulsePol", 1 ), + YAML_UNSIGNED( "outputType", 1 ), + YAML_SIGNED( "frameLength", 8 ), + YAML_END +}; +static const struct YamlNode struct_anonymous_5[] = { + YAML_PADDING( 8 ), + YAML_UNSIGNED( "disableTelemetry", 1 ), + YAML_UNSIGNED( "disableMapping", 1 ), + YAML_UNSIGNED( "autoBindMode", 1 ), + YAML_UNSIGNED( "lowPowerMode", 1 ), + YAML_UNSIGNED( "receiverTelemetryOff", 1 ), + YAML_UNSIGNED( "receiverHigherChannels", 1 ), + YAML_PADDING( 2 ), + YAML_SIGNED( "optionValue", 8 ), + YAML_END +}; +static const struct YamlNode struct_anonymous_6[] = { + YAML_UNSIGNED( "power", 2 ), + YAML_PADDING( 2 ), + YAML_UNSIGNED( "receiverTelemetryOff", 1 ), + YAML_UNSIGNED( "receiverHigherChannels", 1 ), + YAML_SIGNED( "antennaMode", 2 ), + YAML_PADDING( 8 ), + YAML_END +}; +static const struct YamlNode struct_anonymous_7[] = { + YAML_PADDING( 6 ), + YAML_UNSIGNED( "noninverted", 1 ), + YAML_PADDING( 1 ), + YAML_SIGNED( "refreshRate", 8 ), + YAML_END +}; +static const struct YamlNode struct_string_64[] = { + YAML_IDX, + YAML_STRING("val", 8), + YAML_END +}; +static const struct YamlNode struct_anonymous_8[] = { + YAML_UNSIGNED( "receivers", 7 ), + YAML_UNSIGNED( "racingMode", 1 ), + YAML_ARRAY("receiverName", 64, 3, struct_string_64, NULL), + YAML_END +}; +static const struct YamlNode struct_anonymous_9[] = { + YAML_ARRAY("rx_id", 8, 4, struct_unsigned_8, NULL), + YAML_UNSIGNED( "mode", 3 ), + YAML_UNSIGNED( "rfPower", 1 ), + YAML_UNSIGNED( "reserved", 4 ), + YAML_ARRAY("rx_freq", 8, 2, struct_unsigned_8, NULL), + YAML_END +}; +static const struct YamlNode struct_anonymous_10[] = { + YAML_UNSIGNED( "emi", 2 ), + YAML_UNSIGNED( "telemetry", 1 ), + YAML_UNSIGNED( "phyMode", 3 ), + YAML_UNSIGNED( "reserved", 2 ), + YAML_UNSIGNED( "rfPower", 8 ), + YAML_END +}; +static const struct YamlNode struct_anonymous_11[] = { + YAML_UNSIGNED( "raw12bits", 1 ), + YAML_UNSIGNED( "telemetryBaudrate", 3 ), + YAML_PADDING( 4 ), + YAML_END +}; +static const struct YamlNode struct_anonymous_12[] = { + YAML_UNSIGNED( "telemetryBaudrate", 3 ), + YAML_UNSIGNED( "crsfArmingMode", 1 ), + YAML_PADDING( 4 ), + YAML_SIGNED_CUST( "crsfArmingTrigger", 10, r_swtchSrc, w_swtchSrc ), + YAML_SIGNED( "spare3", 6 ), + YAML_END +}; +static const struct YamlNode struct_anonymous_13[] = { + YAML_UNSIGNED( "flags", 8 ), + YAML_UNSIGNED( "enableAETR", 1 ), + YAML_END +}; +static const struct YamlNode union_anonymous_4_elmts[] = { + YAML_ARRAY("raw", 8, 25, struct_unsigned_8, NULL), + YAML_STRUCT("ppm", 16, struct_PpmModule, NULL), + YAML_STRUCT("multi", 24, struct_anonymous_5, NULL), + YAML_STRUCT("pxx", 16, struct_anonymous_6, NULL), + YAML_STRUCT("sbus", 16, struct_anonymous_7, NULL), + YAML_STRUCT("pxx2", 200, struct_anonymous_8, NULL), + YAML_STRUCT("flysky", 56, struct_anonymous_9, NULL), + YAML_STRUCT("afhds3", 16, struct_anonymous_10, NULL), + YAML_STRUCT("ghost", 8, struct_anonymous_11, NULL), + YAML_STRUCT("crsf", 24, struct_anonymous_12, NULL), + YAML_STRUCT("dsmp", 16, struct_anonymous_13, NULL), + YAML_END +}; +static const struct YamlNode struct_ModuleData[] = { + YAML_IDX, + YAML_UNSIGNED_CUST( "type", 8, r_moduleType, w_moduleType ), + YAML_CUSTOM("subType",r_modSubtype,w_modSubtype), + YAML_UNSIGNED( "channelsStart", 8 ), + YAML_SIGNED_CUST( "channelsCount", 8, r_channelsCount, w_channelsCount ), + YAML_ENUM("failsafeMode", 4, enum_FailsafeModes, NULL), + YAML_PADDING( 4 ), + YAML_UNION("mod", 200, union_anonymous_4_elmts, select_mod_type), + YAML_END +}; +static const struct YamlNode struct_TrainerModuleData[] = { + YAML_UNSIGNED_CUST( "mode", 8, r_trainerMode, w_trainerMode ), + YAML_UNSIGNED( "channelsStart", 8 ), + YAML_SIGNED( "channelsCount", 8 ), + YAML_SIGNED( "frameLength", 8 ), + YAML_SIGNED( "delay", 6 ), + YAML_UNSIGNED( "pulsePol", 1 ), + YAML_PADDING( 1 ), + YAML_END +}; +static const struct YamlNode union_ScriptDataInput_elmts[] = { + YAML_SIGNED( "value", 16 ), + YAML_UNSIGNED_CUST( "source", 16, r_mixSrcRaw, w_mixSrcRaw ), + YAML_END +}; +static const struct YamlNode union_ScriptDataInput[] = { + YAML_IDX, + YAML_UNION("u", 16, union_ScriptDataInput_elmts, select_script_input), + YAML_END +}; +static const struct YamlNode struct_ScriptData[] = { + YAML_IDX, + YAML_STRING("file", 6), + YAML_STRING("name", 6), + YAML_ARRAY("inputs", 16, 6, union_ScriptDataInput, NULL), + YAML_END +}; +static const struct YamlNode struct_string_32[] = { + YAML_IDX, + YAML_STRING("val", 4), + YAML_END +}; +static const struct YamlNode union_anonymous_14_elmts[] = { + YAML_UNSIGNED( "id", 16 ), + YAML_UNSIGNED( "persistentValue", 16 ), + YAML_END +}; +static const struct YamlNode struct_anonymous_16[] = { + YAML_UNSIGNED( "physID", 5 ), + YAML_UNSIGNED( "rxIndex", 3 ), + YAML_END +}; +static const struct YamlNode union_anonymous_15_elmts[] = { + YAML_STRUCT("frskyInstance", 8, struct_anonymous_16, NULL), + YAML_UNSIGNED( "instance", 8 ), + YAML_ENUM("formula", 8, enum_TelemetrySensorFormula, NULL), + YAML_END +}; +static const struct YamlNode struct_anonymous_18[] = { + YAML_UNSIGNED( "ratio", 16 ), + YAML_SIGNED( "offset", 16 ), + YAML_END +}; +static const struct YamlNode struct_anonymous_19[] = { + YAML_UNSIGNED( "source", 8 ), + YAML_UNSIGNED( "index", 8 ), + YAML_PADDING( 16 ), + YAML_END +}; +static const struct YamlNode struct_anonymous_20[] = { + YAML_ARRAY("sources", 8, 4, struct_signed_8, NULL), + YAML_END +}; +static const struct YamlNode struct_anonymous_21[] = { + YAML_UNSIGNED( "source", 8 ), + YAML_PADDING( 24 ), + YAML_END +}; +static const struct YamlNode struct_anonymous_22[] = { + YAML_UNSIGNED( "gps", 8 ), + YAML_UNSIGNED( "alt", 8 ), + YAML_PADDING( 16 ), + YAML_END +}; +static const struct YamlNode union_anonymous_17_elmts[] = { + YAML_STRUCT("custom", 32, struct_anonymous_18, NULL), + YAML_STRUCT("cell", 32, struct_anonymous_19, NULL), + YAML_STRUCT("calc", 32, struct_anonymous_20, NULL), + YAML_STRUCT("consumption", 32, struct_anonymous_21, NULL), + YAML_STRUCT("dist", 32, struct_anonymous_22, NULL), + YAML_UNSIGNED( "param", 32 ), + YAML_END +}; +static const struct YamlNode struct_TelemetrySensor[] = { + YAML_IDX, + YAML_UNION("id1", 16, union_anonymous_14_elmts, select_id1), + YAML_UNION("id2", 8, union_anonymous_15_elmts, select_id2), + YAML_STRING("label", 4), + YAML_UNSIGNED( "subId", 8 ), + YAML_ENUM("type", 1, enum_TelemetrySensorType, NULL), + YAML_PADDING( 1 ), + YAML_UNSIGNED( "unit", 6 ), + YAML_UNSIGNED( "prec", 2 ), + YAML_UNSIGNED( "autoOffset", 1 ), + YAML_UNSIGNED( "filter", 1 ), + YAML_UNSIGNED( "logs", 1 ), + YAML_UNSIGNED( "persistent", 1 ), + YAML_UNSIGNED( "onlyPositive", 1 ), + YAML_PADDING( 1 ), + YAML_UNION("cfg", 32, union_anonymous_17_elmts, select_sensor_cfg), + YAML_END +}; +static const struct YamlNode union_WidgetOptionValue_elmts[] = { + YAML_CUSTOM("unsignedValue",r_wov_unsigned,w_wov_unsigned), + YAML_CUSTOM("signedValue",r_wov_signed,w_wov_signed), + YAML_CUSTOM("boolValue",r_wov_unsigned,w_wov_unsigned), + YAML_CUSTOM("stringValue",r_wov_string,w_wov_string), + YAML_CUSTOM("source",r_wov_source,w_wov_source), + YAML_CUSTOM("color",r_wov_color,w_wov_color), + YAML_END +}; +static const struct YamlNode struct_WidgetOptionValueTyped[] = { + YAML_IDX, + YAML_CUSTOM("type",r_wov_type,w_wov_type), + YAML_UNION("value", 0, union_WidgetOptionValue_elmts, select_wov), + YAML_END +}; +static const struct YamlNode struct_WidgetPersistentData[] = { + YAML_ARRAY("options", 0, 50, struct_WidgetOptionValueTyped, widget_option_is_active), + YAML_END +}; +static const struct YamlNode struct_ZonePersistentData[] = { + YAML_IDX, + YAML_CUSTOM("widgetName",r_widget_name,w_widget_name), + YAML_STRUCT("widgetData", 0, struct_WidgetPersistentData, isAlwaysActive), + YAML_END +}; +static const struct YamlNode union_LayoutOptionValue_elmts[] = { + YAML_CUSTOM("unsignedValue",r_lov_unsigned,w_lov_unsigned), + YAML_CUSTOM("boolValue",r_lov_unsigned,w_lov_unsigned), + YAML_CUSTOM("color",r_lov_color,w_lov_color), + YAML_END +}; +static const struct YamlNode struct_LayoutOptionValueTyped[] = { + YAML_IDX, + YAML_CUSTOM("type",r_lov_type,w_lov_type), + YAML_UNION("value", 0, union_LayoutOptionValue_elmts, select_lov), + YAML_END +}; +static const struct YamlNode struct_LayoutPersistentData[] = { + YAML_ARRAY("zones", 0, 10, struct_ZonePersistentData, widget_is_active), + YAML_ARRAY("options", 0, 10, struct_LayoutOptionValueTyped, layout_option_is_active), + YAML_END +}; +static const struct YamlNode struct_CustomScreenData[] = { + YAML_IDX, + YAML_CUSTOM("LayoutId",r_screen_id,w_screen_id), + YAML_STRUCT("layoutData", 0, struct_LayoutPersistentData, isAlwaysActive), + YAML_END +}; +static const struct YamlNode struct_TopBarPersistentData[] = { + YAML_ARRAY("zones", 0, 6, struct_ZonePersistentData, widget_is_active), + YAML_END +}; +static const struct YamlNode struct_customSwitch[] = { + YAML_IDX_CUST("sw",cfs_idx_read,cfs_idx_write), + YAML_STRING("name", 3), + YAML_ENUM("type", 3, enum_SwitchConfig, NULL), + YAML_UNSIGNED( "group", 2 ), + YAML_ENUM("start", 2, enum_fsStartPositionType, NULL), + YAML_UNSIGNED( "state", 1 ), + YAML_ENUM("onColorLuaOverride", 1, enum_booleanEnum, NULL), + YAML_ENUM("offColorLuaOverride", 1, enum_booleanEnum, NULL), + YAML_PADDING( 6 ), + YAML_STRUCT("onColor", 24, struct_RGBLedColor, isAlwaysActive), + YAML_STRUCT("offColor", 24, struct_RGBLedColor, isAlwaysActive), + YAML_END +}; +static const struct YamlNode struct_USBJoystickChData[] = { + YAML_IDX, + YAML_ENUM("mode", 3, enum_USBJoystickCh, NULL), + YAML_UNSIGNED( "inversion", 1 ), + YAML_UNSIGNED( "param", 4 ), + YAML_UNSIGNED( "btn_num", 5 ), + YAML_UNSIGNED( "switch_npos", 3 ), + YAML_END +}; +static const struct YamlNode struct_ModelData[] = { + YAML_CUSTOM("semver",nullptr,w_semver), + YAML_STRUCT("header", 1048, struct_ModelHeader, NULL), + YAML_ARRAY("timers", 136, 3, struct_TimerData, NULL), + YAML_UNSIGNED( "telemetryProtocol", 3 ), + YAML_UNSIGNED( "thrTrim", 1 ), + YAML_UNSIGNED( "noGlobalFunctions", 1 ), + YAML_UNSIGNED( "displayTrims", 2 ), + YAML_UNSIGNED( "ignoreSensorIds", 1 ), + YAML_SIGNED( "trimInc", 3 ), + YAML_UNSIGNED( "disableThrottleWarning", 1 ), + YAML_UNSIGNED( "displayChecklist", 1 ), + YAML_UNSIGNED( "extendedLimits", 1 ), + YAML_UNSIGNED( "extendedTrims", 1 ), + YAML_UNSIGNED( "throttleReversed", 1 ), + YAML_UNSIGNED( "enableCustomThrottleWarning", 1 ), + YAML_UNSIGNED( "disableTelemetryWarning", 1 ), + YAML_UNSIGNED( "showInstanceIds", 1 ), + YAML_UNSIGNED( "checklistInteractive", 1 ), + YAML_PADDING( 4 ), + YAML_SIGNED( "customThrottleWarningPosition", 8 ), + YAML_UNSIGNED( "beepANACenter", 16 ), + YAML_ARRAY("mixData", 160, 64, struct_MixData, NULL), + YAML_ARRAY("limitData", 104, 32, struct_LimitData, NULL), + YAML_ARRAY("expoData", 144, 64, struct_ExpoData, NULL), + YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL), + YAML_ARRAY("points", 8, 512, struct_signed_8, NULL), + YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL), + YAML_ARRAY("customFn", 88, 64, struct_CustomFunctionData, cfn_is_active), + YAML_STRUCT("swashR", 64, struct_SwashRingData, swash_is_active), + YAML_ARRAY("flightModeData", 480, 9, struct_FlightModeData, fmd_is_active), + YAML_UNSIGNED_CUST( "thrTraceSrc", 8, r_thrSrc, w_thrSrc ), + YAML_CUSTOM("switchWarningState",r_swtchWarn,nullptr), + YAML_ARRAY("switchWarning", 2, 32, struct_swtchWarn, nullptr), + YAML_ARRAY("gvars", 56, 15, struct_GVarData, NULL), + YAML_STRUCT("varioData", 40, struct_VarioData, NULL), + YAML_UNSIGNED_CUST( "rssiSource", 8, r_tele_sensor, w_tele_sensor ), + YAML_STRUCT("rssiAlarms", 0, struct_RssiAlarmData, NULL), + YAML_STRUCT("rfAlarms", 16, struct_RFAlarmData, NULL), + YAML_UNSIGNED( "thrTrimSw", 3 ), + YAML_ENUM("potsWarnMode", 2, enum_PotsWarnMode, NULL), + YAML_ENUM("jitterFilter", 2, enum_ModelOverridableEnable, NULL), + YAML_PADDING( 1 ), + YAML_ARRAY("moduleData", 232, 2, struct_ModuleData, NULL), + YAML_ARRAY("failsafeChannels", 16, 32, struct_signed_16, NULL), + YAML_STRUCT("trainerData", 40, struct_TrainerModuleData, NULL), + YAML_ARRAY("scriptsData", 192, 9, struct_ScriptData, NULL), + YAML_ARRAY("inputNames", 32, 32, struct_string_32, NULL), + YAML_UNSIGNED( "potsWarnEnabled", 16 ), + YAML_ARRAY("potsWarnPosition", 8, 16, struct_signed_8, NULL), + YAML_ARRAY("telemetrySensors", 112, 99, struct_TelemetrySensor, NULL), + YAML_ARRAY("screenData", 0, 10, struct_CustomScreenData, screen_is_active), + YAML_STRUCT("topbarData", 0, struct_TopBarPersistentData, isAlwaysActive), + YAML_ARRAY("topbarWidgetWidth", 8, 6, struct_unsigned_8, NULL), + YAML_UNSIGNED( "view", 8 ), + YAML_STRING("modelRegistrationID", 8), + YAML_CUSTOM("functionSwitchConfig",r_functionSwitchConfig,nullptr), + YAML_CUSTOM("functionSwitchGroup",r_functionSwitchGroup,nullptr), + YAML_CUSTOM("functionSwitchStartConfig",r_functionSwitchStartConfig,nullptr), + YAML_CUSTOM("functionSwitchLogicalState",r_functionSwitchLogicalState,nullptr), + YAML_ARRAY("switchNames", 0, NUM_FUNCTIONS_SWITCHES, struct_cfsNameConfig, nullptr), + YAML_ARRAY("functionSwitchLedONColor", 0, NUM_FUNCTIONS_SWITCHES, struct_cfsOnColorConfig, nullptr), + YAML_ARRAY("functionSwitchLedOFFColor", 0, NUM_FUNCTIONS_SWITCHES, struct_cfsOffColorConfig, nullptr), + YAML_ARRAY("customSwitches", 88, 6, struct_customSwitch, isAlwaysActive), + YAML_ARRAY("cfsGroupOn", 1, 8, struct_cfsGroupOn, cfsGroupIsActive), + YAML_PADDING( 8 ), + YAML_UNSIGNED( "usbJoystickExtMode", 1 ), + YAML_ENUM("usbJoystickIfMode", 3, enum_USBJoystickIfMode, NULL), + YAML_UNSIGNED( "usbJoystickCircularCut", 4 ), + YAML_ARRAY("usbJoystickCh", 16, 26, struct_USBJoystickChData, NULL), + YAML_ENUM("radioThemesDisabled", 2, enum_ModelOverridableEnable, NULL), + YAML_ENUM("radioGFDisabled", 2, enum_ModelOverridableEnable, NULL), + YAML_ENUM("radioTrainerDisabled", 2, enum_ModelOverridableEnable, NULL), + YAML_ENUM("modelHeliDisabled", 2, enum_ModelOverridableEnable, NULL), + YAML_ENUM("modelFMDisabled", 2, enum_ModelOverridableEnable, NULL), + YAML_ENUM("modelCurvesDisabled", 2, enum_ModelOverridableEnable, NULL), + YAML_ENUM("modelGVDisabled", 2, enum_ModelOverridableEnable, NULL), + YAML_ENUM("modelLSDisabled", 2, enum_ModelOverridableEnable, NULL), + YAML_ENUM("modelSFDisabled", 2, enum_ModelOverridableEnable, NULL), + YAML_ENUM("modelCustomScriptsDisabled", 2, enum_ModelOverridableEnable, NULL), + YAML_ENUM("modelTelemetryDisabled", 2, enum_ModelOverridableEnable, NULL), + YAML_END +}; +static const struct YamlNode struct_PartialModel[] = { + YAML_STRUCT("header", 1048, struct_ModelHeader, NULL), + YAML_ARRAY("timers", 136, 3, struct_TimerData, NULL), + YAML_END +}; + +#define MAX_RADIODATA_MODELDATA_PARTIALMODEL_STR_LEN 29 + +static const struct YamlNode __RadioData_root_node = YAML_ROOT( struct_RadioData ); + +const YamlNode* get_radiodata_nodes() +{ + return &__RadioData_root_node; +} +static const struct YamlNode __ModelData_root_node = YAML_ROOT( struct_ModelData ); + +const YamlNode* get_modeldata_nodes() +{ + return &__ModelData_root_node; +} +static const struct YamlNode __PartialModel_root_node = YAML_ROOT( struct_PartialModel ); + +const YamlNode* get_partialmodel_nodes() +{ + return &__PartialModel_root_node; +} + diff --git a/radio/src/targets/gx15/CMakeLists.txt b/radio/src/targets/gx15/CMakeLists.txt new file mode 100644 index 00000000000..471177f595a --- /dev/null +++ b/radio/src/targets/gx15/CMakeLists.txt @@ -0,0 +1,198 @@ +option(UNEXPECTED_SHUTDOWN "Enable the Unexpected Shutdown screen" ON) +option(PXX1 "PXX1 protocol support" ON) +option(PXX2 "PXX2 protocol support" OFF) +option(AFHDS3 "AFHDS3 TX Module" ON) +option(MULTIMODULE "DIY Multiprotocol TX Module (https://github.com/pascallanger/DIY-Multiprotocol-TX-Module)" ON) +option(GHOST "Ghost TX Module" ON) +option(MODULE_SIZE_STD "Standard size TX Module" ON) +option(LUA_MIXER "Enable LUA mixer/model scripts support" ON) +option(DISK_CACHE "Enable SD card disk cache" ON) + +set(FIRMWARE_QSPI YES) +set(FIRMWARE_FORMAT_UF2 YES) +set(PWR_BUTTON "PRESS" CACHE STRING "Pwr button type (PRESS/SWITCH)") +set(CPU_TYPE STM32H7) +set(HSE_VALUE 48000000) +set(SDCARD YES) +set(STORAGE_MODELSLIST YES) +set(HAPTIC YES) +set(GUI_DIR colorlcd) +set(BITMAPS_DIR 480x272) +set(TARGET_DIR gx15) +set(RTC_BACKUP_RAM YES) +set(PPM_LIMITS_SYMETRICAL YES) +set(USB_SERIAL ON CACHE BOOL "Enable USB serial (CDC)") +set(HARDWARE_EXTERNAL_MODULE YES) +set(INTERNAL_MODULE_AFHDS3 NO) +set(ROTARY_ENCODER YES) +set(FUNCTION_SWITCHES_WITH_RGB YES) + +#option(STICKS_DEAD_ZONE "Enable sticks dead zone" YES) + +# IMU support +set(IMU ON) +add_definitions(-DIMU_ICM4207C) + +# for size report script +set(CPU_TYPE_FULL STM32H750xB) +set(TARGET_LINKER_DIR stm32h750_sdram) +set(TARGET_EXTRAM_START 0xD0000000) +set(SIZE_TARGET_MEM_DEFINE "MEM_SIZE_SDRAM1=8192") +set(FIRMWARE_STRIP_BOOTLOADER YES) + +add_definitions(-DPCBGX15 -DPCBHORUS) +add_definitions(-DBATTERY_CHARGE) +add_definitions(-DSTM32_SUPPORT_32BIT_TIMERS) +add_definitions(-DFIRMWARE_QSPI) +add_definitions(-DFIRMWARE_FORMAT_UF2) +add_definitions(-DUSE_CUSTOM_EXTI_IRQ) +add_definitions(-DUSB_CHARGER) + +set(FLAVOUR gx15) +add_definitions(-DRADIO_GX15) +add_definitions(-DMANUFACTURER_RADIOMASTER) + +# defines existing internal modules +set(INTERNAL_MODULES CRSF CACHE STRING "Internal modules") +set(DEFAULT_INTERNAL_MODULE CROSSFIRE CACHE STRING "Default internal module") + +set(BITMAPS_TARGET bm480_bitmaps) +set(FONTS_TARGET x12_fonts) +set(LCD_DRIVER lcd_driver.cpp) +set(HARDWARE_TOUCH YES) +set(RADIO_DEPENDENCIES ${RADIO_DEPENDENCIES} ${BITMAPS_TARGET}) +set(FIRMWARE_DEPENDENCIES datacopy) +set(SOFTWARE_KEYBOARD ON) +set(FUNCTION_SWITCHES ON) +set(USB_CHARGER YES) +set(AUX_SERIAL YES) +set(AUX2_SERIAL YES) + +add_definitions( + -DSTM32H750XBTx -DSTM32H750xx + -DSDRAM -DCCMRAM + -DHARDWARE_TOUCH -DHARDWARE_KEYS -DSOFTWARE_KEYBOARD + -DWS2812_MAX_LEDS=26 +) + +set(SDRAM ON) + +add_definitions(-DRTCLOCK) +add_definitions(-DPWR_BUTTON_${PWR_BUTTON}) +add_definitions(-DGPS_USART_BAUDRATE=${INTERNAL_GPS_BAUDRATE}) + +if(STICKS_DEAD_ZONE) + add_definitions(-DSTICK_DEAD_ZONE) +endif() + +if(NOT UNEXPECTED_SHUTDOWN) + add_definitions(-DNO_UNEXPECTED_SHUTDOWN) +endif() + +if(DISK_CACHE) + set(SRC ${SRC} disk_cache.cpp) + add_definitions(-DDISK_CACHE) +endif() + +if(FUNCTION_SWITCHES_WITH_RGB) + set(FUNCTION_SWITCHES YES) + add_definitions(-DFUNCTION_SWITCHES) + add_definitions(-DFUNCTION_SWITCHES_RGB_LEDS) +endif() + +if(FUNCTION_SWITCHES) +add_definitions(-DFUNCTION_SWITCHES) +endif() + +set(AFHDS3 ON) + +# VCP CLI +set(ENABLE_SERIAL_PASSTHROUGH ON CACHE BOOL "Enable serial passthrough") +set(CLI ON CACHE BOOL "Enable CLI") + +set(BOARD rm-h750) + +include_directories(boards/${BOARD}) + +set(TARGET_SRC_DIR targets/${TARGET_DIR}) +set(BOARD_SRC_DIR boards/${BOARD}) + +set(BOARD_COMMON_SRC + ${BOARD_SRC_DIR}/board.cpp + ${BOARD_SRC_DIR}/bsp_io.cpp + ${BOARD_SRC_DIR}/lcd_driver_480.cpp + ${BOARD_SRC_DIR}/backlight_driver.cpp + ${BOARD_SRC_DIR}/haptic_driver.cpp + ${BOARD_SRC_DIR}/extflash_driver.cpp + ${BOARD_SRC_DIR}/usb_charger_driver.cpp + ${TARGET_SRC_DIR}/key_driver.cpp + targets/common/arm/stm32/abnormal_reboot.cpp + targets/common/arm/stm32/delays_driver.cpp + targets/common/arm/stm32/dma2d.cpp + targets/common/arm/stm32/flash_driver.cpp + targets/common/arm/stm32/pwr_driver.cpp + targets/common/arm/stm32/rotary_encoder_driver.cpp + targets/common/arm/stm32/rtc_driver.cpp + targets/common/arm/stm32/watchdog_driver.cpp + drivers/pca95xx.cpp +) + +# Bootloader board library +add_library(board_bl OBJECT EXCLUDE_FROM_ALL + ${BOARD_COMMON_SRC} + ${BOARD_SRC_DIR}/sdram_driver.cpp + ${RADIO_SRC_DIR}/gui/colorlcd/boot_menu.cpp + targets/common/arm/stm32/stm32_qspi.cpp + targets/common/arm/stm32/stm32_pulse_driver.cpp +) +add_dependencies(board_bl minimal_board_lib) +set(BOOTLOADER_SRC ${BOOTLOADER_SRC} $) + +set(CMSIS_SRC ${BOARD_SRC_DIR}/system_clock.c) + +# Firmware board library +add_library(board OBJECT EXCLUDE_FROM_ALL + ${BOARD_COMMON_SRC} + ${BOARD_SRC_DIR}/tp_gt911.cpp + ${BOARD_SRC_DIR}/audio_driver.cpp + drivers/icm42607C.cpp + drivers/imu_filter.cpp + drivers/tas2505.cpp + targets/common/arm/stm32/heartbeat_driver.cpp + targets/common/arm/stm32/mixer_scheduler_driver.cpp + targets/common/arm/stm32/module_timer_driver.cpp + targets/common/arm/stm32/stm32_pulse_driver.cpp + targets/common/arm/stm32/stm32_softserial_driver.cpp + targets/common/arm/stm32/stm32_qspi.cpp + targets/common/arm/stm32/stm32_i2s.cpp + targets/common/arm/stm32/stm32_switch_driver.cpp + targets/common/arm/stm32/stm32_ws2812.cpp + targets/common/arm/stm32/trainer_driver.cpp +) +add_dependencies(board board_lib) +set(FIRMWARE_SRC ${FIRMWARE_SRC} $) + +include_directories(${RADIO_SRC_DIR}/fonts/colorlcd gui/${GUI_DIR} gui/${GUI_DIR}/layouts) + +if(BOOTLOADER) + set(FIRMWARE_TARGET_SRC + ${FIRMWARE_TARGET_SRC} + ../../bootloader/loadboot.cpp + ) +endif() + +set(SRC + ${SRC} + io/frsky_firmware_update.cpp + io/multi_firmware_update.cpp + ) + +if (MULTIMODULE) + add_definitions(-DMULTI_PROTOLIST) + set(SRC ${SRC} + io/multi_protolist.cpp + ) +endif() + +# Make malloc() thread-safe +add_definitions(-DTHREADSAFE_MALLOC) diff --git a/radio/src/targets/gx15/bsp_io.h b/radio/src/targets/gx15/bsp_io.h new file mode 100644 index 00000000000..fca1361533f --- /dev/null +++ b/radio/src/targets/gx15/bsp_io.h @@ -0,0 +1,54 @@ +/* + * 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. + */ + +#pragma once + +#include "drivers/pca95xx.h" +#include "hal/switch_driver.h" + +#define IO_EXPANDER_I2C_BUS I2C_Bus_2 +#define IO_EXPANDER1_I2C_ADDR 0x74 +#define IO_EXPANDER2_I2C_ADDR 0x75 + +// Port expander 2 +#define BSP_TR6U PCA95XX_PIN_7 +#define BSP_TR6D PCA95XX_PIN_6 +#define BSP_TR4R PCA95XX_PIN_8 +#define BSP_TR4L PCA95XX_PIN_9 +#define BSP_TR2D PCA95XX_PIN_10 +#define BSP_TR2U PCA95XX_PIN_11 +#define BSP_TR1D PCA95XX_PIN_12 +#define BSP_TR1U PCA95XX_PIN_13 +#define BSP_TR3R PCA95XX_PIN_14 +#define BSP_TR3L PCA95XX_PIN_15 + +extern uint8_t isSwitch3Pos(uint8_t idx); + +int bsp_io_init(); +uint32_t bsp_io_read_switches(); +uint32_t bsp_io_read_fs_switches(); +uint32_t bsp_get_fs_switches(); + +uint16_t bsp_input_get(); +struct stm32_switch_t; + +constexpr uint32_t IO_EXPANDER1_MASK = 0xFFFF; +constexpr uint32_t IO_EXPANDER2_MASK = 0xFFFF; \ No newline at end of file diff --git a/radio/src/targets/gx15/hal.h b/radio/src/targets/gx15/hal.h new file mode 100644 index 00000000000..325130fd988 --- /dev/null +++ b/radio/src/targets/gx15/hal.h @@ -0,0 +1,617 @@ +/* + * 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. + */ + + +/* + +STM32H750 + +SDMMC uses own DMA controler + +DMA1 +Stream0: LED_STRIP_TIMER_DMA_STREAM +Stream1: INTMODULE_DMA_STREAM +Stream2: FLYSKY_HALL_DMA_Stream_RX +Stream3: TELEMETRY_DMA_Stream_RX +Stream4: I2S_DMA_Stream +Stream5: INTMODULE_RX_DMA_STREAM +Stream6: AUX2_SERIAL_DMA_RX_STREAM +Stream7: TELEMETRY_DMA_Stream_TX + +DMA2 +Stream0: ADC_EXT_DMA_STREAM (do not move) +Stream1: AUX_SERIAL_DMA_TX_STREAM +Stream2: AUX_SERIAL_DMA_RX_STREAM +Stream3: EXTMODULE_TIMER_DMA_STREAM +Stream4: ADC_DMA_STREAM (do not move) +Stream5: EXTMODULE_USART_RX_DMA_STREAM +Stream6: EXTMODULE_USART_TX_DMA_STREAM +Stream7: AUX2_SERIAL_DMA_TX_STREAM + +TIM1: BACKLIGHT_TIMER +TIM2: LED_STRIP_TIMER +TIM3: HAPTIC_GPIO_TIMER +TIM4: +TIM5: EXTMODULE_TIMER +TIM7: +TIM8: TRAINER_TIMER +TIM12: MIXER_SCHEDULER_TIMER +TIM14: MS_TIMER +TIM15: PDM +TIM16: +TIM17: ROTARY_ENCODER_TIMER + */ + +#ifndef _HAL_H_ +#define _HAL_H_ + +#define CPU_FREQ 480000000 + +#define PERI1_FREQUENCY 120000000 +#define PERI2_FREQUENCY 120000000 +#define TIMER_MULT_APB1 2 +#define TIMER_MULT_APB2 2 + +// Keys +#define KEYS_GPIO_REG_PAGEDN GPIOA +#define KEYS_GPIO_PIN_PAGEDN LL_GPIO_PIN_8 // PA.08 +#define KEYS_GPIO_REG_PAGEUP GPIOG +#define KEYS_GPIO_PIN_PAGEUP LL_GPIO_PIN_7 // PG.07 +#define KEYS_GPIO_REG_SYS GPIOB +#define KEYS_GPIO_PIN_SYS LL_GPIO_PIN_2 // PB.02 +#define KEYS_GPIO_REG_ENTER GPIOG +#define KEYS_GPIO_PIN_ENTER LL_GPIO_PIN_12 // PG.12 +#define KEYS_GPIO_REG_MDL GPIOE +#define KEYS_GPIO_PIN_MDL LL_GPIO_PIN_3 // PE.03 +#define KEYS_GPIO_REG_EXIT GPIOG +#define KEYS_GPIO_PIN_EXIT LL_GPIO_PIN_3 // PG.03 +#define KEYS_GPIO_REG_TELE GPIOG +#define KEYS_GPIO_PIN_TELE LL_GPIO_PIN_2 // PG.02 + +// Trims +#define TRIMS_GPIO_REG_LHL +#define TRIMS_GPIO_PIN_LHL + +#define TRIMS_GPIO_REG_LHR +#define TRIMS_GPIO_PIN_LHR + +#define TRIMS_GPIO_REG_LVD +#define TRIMS_GPIO_PIN_LVD + +#define TRIMS_GPIO_REG_LVU +#define TRIMS_GPIO_PIN_LVU + +#define TRIMS_GPIO_REG_RHL +#define TRIMS_GPIO_PIN_RHL + +#define TRIMS_GPIO_REG_RHR +#define TRIMS_GPIO_PIN_RHR + +#define TRIMS_GPIO_REG_RVD +#define TRIMS_GPIO_PIN_RVD + +#define TRIMS_GPIO_REG_RVU +#define TRIMS_GPIO_PIN_RVU + +#define TRIMS_GPIO_REG_RSD +#define TRIMS_GPIO_PIN_RSD + +#define TRIMS_GPIO_REG_RSU +#define TRIMS_GPIO_PIN_RSU + +#define TRIMS_GPIO_REG_LSD GPIOH +#define TRIMS_GPIO_PIN_LSD LL_GPIO_PIN_15 + +#define TRIMS_GPIO_REG_LSU GPIOH +#define TRIMS_GPIO_PIN_LSU LL_GPIO_PIN_13 + +// function switches +//SW1 +#define SWITCHES_GPIO_REG_K +#define SWITCHES_GPIO_PIN_K PCA95XX_P0 +#define SWITCHES_K_CFS_IDX 0 +#define FUNCTION_SWITCH_1 SK +//SW2 +#define SWITCHES_GPIO_REG_L +#define SWITCHES_GPIO_PIN_L PCA95XX_P1 +#define SWITCHES_L_CFS_IDX 1 +#define FUNCTION_SWITCH_2 SL +//SW3 +#define SWITCHES_GPIO_REG_M +#define SWITCHES_GPIO_PIN_M PCA95XX_P2 +#define SWITCHES_M_CFS_IDX 2 +#define FUNCTION_SWITCH_3 SM +//SW4 +#define SWITCHES_GPIO_REG_N +#define SWITCHES_GPIO_PIN_N PCA95XX_P3 +#define SWITCHES_N_CFS_IDX 3 +#define FUNCTION_SWITCH_4 SN +//SW5 +#define SWITCHES_GPIO_REG_O +#define SWITCHES_GPIO_PIN_O PCA95XX_P4 +#define SWITCHES_O_CFS_IDX 4 +#define FUNCTION_SWITCH_5 SO +//SW6 +#define SWITCHES_GPIO_REG_P +#define SWITCHES_GPIO_PIN_P PCA95XX_P5 +#define SWITCHES_P_CFS_IDX 5 +#define FUNCTION_SWITCH_6 SP + +// Extender Switches +#define SWITCHES_A_3POS +#define SWITCHES_GPIO_REG_A_H +#define SWITCHES_GPIO_PIN_A_H PCA95XX_P15 +#define SWITCHES_GPIO_REG_A_L +#define SWITCHES_GPIO_PIN_A_L PCA95XX_P14 +#define SWITCHES_B_3POS +#define SWITCHES_GPIO_REG_B_H +#define SWITCHES_GPIO_PIN_B_H PCA95XX_P13 +#define SWITCHES_GPIO_REG_B_L +#define SWITCHES_GPIO_PIN_B_L PCA95XX_P12 +#define SWITCHES_C_3POS +#define SWITCHES_GPIO_REG_C_H +#define SWITCHES_GPIO_PIN_C_H PCA95XX_P11 +#define SWITCHES_GPIO_REG_C_L +#define SWITCHES_GPIO_PIN_C_L PCA95XX_P10 +#define SWITCHES_D_3POS +#define SWITCHES_GPIO_REG_D_H +#define SWITCHES_GPIO_PIN_D_H PCA95XX_P7 +#define SWITCHES_GPIO_REG_D_L +#define SWITCHES_GPIO_PIN_D_L PCA95XX_P6 +#define SWITCHES_E_3POS +#define SWITCHES_GPIO_REG_E_H +#define SWITCHES_GPIO_PIN_E_H PCA95XX_P16 +#define SWITCHES_GPIO_REG_E_L +#define SWITCHES_GPIO_PIN_E_L PCA95XX_P17 +#define SWITCHES_F_2POS +#define SWITCHES_GPIO_REG_F +#define SWITCHES_GPIO_PIN_F PCA95XX_P1 +#define SWITCHES_G_3POS +#define SWITCHES_GPIO_REG_G_H +#define SWITCHES_GPIO_PIN_G_H PCA95XX_P4 +#define SWITCHES_GPIO_REG_G_L +#define SWITCHES_GPIO_PIN_G_L PCA95XX_P5 +#define SWITCHES_H_2POS +#define SWITCHES_GPIO_REG_H +#define SWITCHES_GPIO_PIN_H PCA95XX_P0 +#define SWITCHES_I_2POS +#define SWITCHES_GPIO_REG_I +#define SWITCHES_GPIO_PIN_I PCA95XX_P2 +#define SWITCHES_J_2POS +#define SWITCHES_GPIO_REG_J +#define SWITCHES_GPIO_PIN_J PCA95XX_P3 + +// Expanders +#define IO_INT_GPIO GPIO_PIN(GPIOD, 3) +#define IO_RESET_GPIO GPIO_PIN(GPIOG, 10) +#if !defined(USE_EXTI3_IRQ) +#define USE_EXTI3_IRQ +#define EXTI3_IRQ_Priority 9 +#endif + +// ADC +#define ADC_GPIO_PIN_STICK_LH LL_GPIO_PIN_6 // PA.06 +#define ADC_GPIO_PIN_STICK_LV LL_GPIO_PIN_3 // PC.03 +#define ADC_GPIO_PIN_STICK_RV LL_GPIO_PIN_4 // PC.04 +#define ADC_GPIO_PIN_STICK_RH LL_GPIO_PIN_5 // PC.05 + +#define ADC_GPIO_PIN_POT1 LL_GPIO_PIN_1 // PC.01 POT1 +#define ADC_GPIO_PIN_POT2 LL_GPIO_PIN_1 // PB.01 POT2 +#define ADC_GPIO_PIN_BATT LL_GPIO_PIN_3 // PH.03 +#define ADC_GPIO_PIN_SLIDER1 LL_GPIO_PIN_2 // PH.02 VRC/LS +#define ADC_GPIO_PIN_SLIDER2 LL_GPIO_PIN_7 // PA.07 VRD/RS + +#define ADC_GPIO_PIN_EXT1 LL_GPIO_PIN_5 // PA.05,ADC1_CH19 +#define ADC_GPIO_PIN_EXT2 LL_GPIO_PIN_5 // PH.05,ADC3_CH16 + +#define ADC_GPIOA_PINS (ADC_GPIO_PIN_STICK_LH | ADC_GPIO_PIN_SLIDER2|ADC_GPIO_PIN_EXT1) +#define ADC_GPIOB_PINS (ADC_GPIO_PIN_POT2) +#define ADC_GPIOC_PINS (ADC_GPIO_PIN_STICK_RV | ADC_GPIO_PIN_STICK_LV | ADC_GPIO_PIN_STICK_RH | ADC_GPIO_PIN_POT1) +#define ADC_GPIOH_PINS (ADC_GPIO_PIN_BATT | ADC_GPIO_PIN_SLIDER1|ADC_GPIO_PIN_EXT2) + + +#define ADC_CHANNEL_STICK_LH LL_ADC_CHANNEL_3 // ADC12_INP3 +#define ADC_CHANNEL_STICK_LV LL_ADC_CHANNEL_13 // ADC12_INP13 +#define ADC_CHANNEL_STICK_RV LL_ADC_CHANNEL_4 // ADC12_INP4 +#define ADC_CHANNEL_STICK_RH LL_ADC_CHANNEL_8 // ADC12_INP8 + +// Each ADC cannot map more than 8 channels, otherwise it will cause problems +#define ADC_CHANNEL_POT1 LL_ADC_CHANNEL_11 // ADC12_INP11 +#define ADC_CHANNEL_POT2 LL_ADC_CHANNEL_5 // ADC12_INP5 +#define ADC_CHANNEL_BATT LL_ADC_CHANNEL_14 // ADC3_INP14 +#define ADC_CHANNEL_RTC_BAT LL_ADC_CHANNEL_VBAT // ADC3_INP17 +#define ADC_CHANNEL_SLIDER1 LL_ADC_CHANNEL_13 // ADC3_INP13 +#define ADC_CHANNEL_SLIDER2 LL_ADC_CHANNEL_7 // ADC12_INP7 + +#define ADC_CHANNEL_EXT1 LL_ADC_CHANNEL_19 // ADC1_IN19 +#define ADC_CHANNEL_EXT2 LL_ADC_CHANNEL_16 // ADC3_IN16 + +#define ADC_MAIN ADC1 +#define ADC_DMA DMA2 +#define ADC_DMA_CHANNEL LL_DMAMUX1_REQ_ADC1 +#define ADC_DMA_STREAM LL_DMA_STREAM_4 +#define ADC_DMA_STREAM_IRQ DMA2_Stream4_IRQn +#define ADC_DMA_STREAM_IRQHandler DMA2_Stream4_IRQHandler +#define ADC_SAMPTIME LL_ADC_SAMPLINGTIME_8CYCLES_5 + +#define ADC_EXT ADC3 +#define ADC_EXT_CHANNELS { ADC_CHANNEL_SLIDER1, ADC_CHANNEL_BATT , ADC_CHANNEL_RTC_BAT,ADC_CHANNEL_EXT2 } +#define ADC_EXT_DMA DMA2 +#define ADC_EXT_DMA_CHANNEL LL_DMAMUX1_REQ_ADC3 +#define ADC_EXT_DMA_STREAM LL_DMA_STREAM_0 +#define ADC_EXT_DMA_STREAM_IRQ DMA2_Stream0_IRQn +#define ADC_EXT_DMA_STREAM_IRQHandler DMA2_Stream0_IRQHandler +#define ADC_EXT_SAMPTIME LL_ADC_SAMPLINGTIME_8CYCLES_5 +#define ADC_VREF_PREC2 330 + +#define ADC_DIRECTION { \ + 0,-1,0,-1, /* gimbals */ \ + -1,-1, /* pots */ \ + 0,-1, /* sliders */ \ + 0, /* vbat */ \ + 0, /* rtc_bat */ \ + 0, /* SWA */ \ + 0, /* SWB */ \ + 0, /* SWC */ \ + 0, /* SWD */ \ + 0, /* SWE */ \ + 0 /* SWF */ \ + } + +#define USE_EXTI9_5_IRQ // used for I2C port extender interrupt +#define EXTI9_5_IRQ_Priority 5 + +// Power +#define PWR_SWITCH_GPIO GPIO_PIN(GPIOA, 4) +#define PWR_ON_GPIO GPIO_PIN(GPIOH, 12) + +// Chargers (USB and wireless) +#define UCHARGER_GPIO GPIO_PIN(GPIOD, 11) +#define UCHARGER_EN_GPIO GPIO_PIN(GPIOB, 12) + +// S.Port update connector +#define HAS_SPORT_UPDATE_CONNECTOR() (false) + +// Telemetry + #define TELEMETRY_SET_INPUT 0 + #define TELEMETRY_TX_GPIO GPIO_PIN(GPIOA, 9) + #define TELEMETRY_RX_GPIO GPIO_UNDEF + #define TELEMETRY_USART USART1 + #define TELEMETRY_USART_IRQn USART1_IRQn + #define TELEMETRY_DMA DMA1 + #define TELEMETRY_DMA_Stream_TX LL_DMA_STREAM_7 + #define TELEMETRY_DMA_Channel_TX LL_DMAMUX1_REQ_USART1_TX + #define TELEMETRY_DMA_TX_Stream_IRQ DMA1_Stream7_IRQn + #define TELEMETRY_DMA_TX_IRQHandler DMA1_Stream7_IRQHandler + #define TELEMETRY_DMA_Stream_RX LL_DMA_STREAM_3 + #define TELEMETRY_DMA_Channel_RX LL_DMAMUX1_REQ_USART1_RX + #define TELEMETRY_USART_IRQHandler USART1_IRQHandler + +// Software IRQ (Prio 5 -> FreeRTOS compatible) +#define TELEMETRY_USE_CUSTOM_EXTI +#define CUSTOM_EXTI_IRQ_NAME ETH_WKUP_IRQ +#define ETH_WKUP_IRQ_Priority 5 +#define CUSTOM_EXTI_IRQ_LINE 86 +#define TELEMETRY_RX_FRAME_EXTI_LINE CUSTOM_EXTI_IRQ_LINE + +// USB +#define USB_GPIO GPIOA +#define USB_GPIO_VBUS GPIO_PIN(GPIOH, 11) +#define USB_GPIO_DM GPIO_PIN(GPIOA, 11) +#define USB_GPIO_DP GPIO_PIN(GPIOA, 12) +#define USB_GPIO_AF GPIO_AF10 + +// LCD +#define LCD_SPI_CS_GPIO GPIOD +#define LCD_SPI_CS_GPIO_PIN LL_GPIO_PIN_5 +#define LCD_SPI_SCK_GPIO GPIOB +#define LCD_SPI_SCK_GPIO_PIN LL_GPIO_PIN_0 +#define LCD_SPI_MOSI_GPIO GPIOI +#define LCD_SPI_MOSI_GPIO_PIN LL_GPIO_PIN_9 + +#define LTDC_IRQ_PRIO 4 +#define DMA_SCREEN_IRQ_PRIO 6 + +#define LCD_RESET_GPIO GPIOJ +#define LCD_RESET_GPIO_PIN LL_GPIO_PIN_12 + +#define LCD_TE_GPIO GPIOI +#define LCD_TE_GPIO_PIN LL_GPIO_PIN_4 + +// Backlight +#define BACKLIGHT_GPIO GPIO_PIN(GPIOA, 10) // TIM1_CH3 +#define BACKLIGHT_TIMER TIM1 +#define BACKLIGHT_TIMER_CHANNEL LL_TIM_CHANNEL_CH3 +#define BACKLIGHT_GPIO_AF GPIO_AF1 +#define BACKLIGHT_TIMER_FREQ (PERI1_FREQUENCY * TIMER_MULT_APB1) + +// QSPI Flash +#define QSPI_CLK_GPIO GPIO_PIN(GPIOF, 10) +#define QSPI_CLK_GPIO_AF GPIO_AF9 +#define QSPI_CS_GPIO GPIO_PIN(GPIOG, 6) +#define QSPI_CS_GPIO_AF GPIO_AF10 +#define QSPI_MISO_GPIO GPIO_PIN(GPIOF, 9) +#define QSPI_MISO_GPIO_AF GPIO_AF10 +#define QSPI_MOSI_GPIO GPIO_PIN(GPIOF, 8) +#define QSPI_MOSI_GPIO_AF GPIO_AF10 +#define QSPI_WP_GPIO GPIO_PIN(GPIOF, 7) +#define QSPI_WP_GPIO_AF GPIO_AF9 +#define QSPI_HOLD_GPIO GPIO_PIN(GPIOF, 6) +#define QSPI_HOLD_GPIO_AF GPIO_AF9 +#define QSPI_FLASH_SIZE 0x1000000 + + +// SD +#define SD_SDIO SDMMC1 +#define SD_SDIO_CLK_DIV(fq) (HAL_RCCEx_GetPeriphCLKFreq(RCC_PERIPHCLK_SDMMC) / (2 * fq)) +#define SD_SDIO_TRANSFER_CLK_DIV SD_SDIO_CLK_DIV(24000000) // Hz + +#define SD2_PRESENT_GPIO GPIO_PIN(GPIOH, 8) // PH.08 +#define SD2_SDIO SDMMC2 +#define SD2_SDIO_PIN_D0 GPIO_PIN(GPIOB, 14) +#define SD2_SDIO_AF_D0 GPIO_AF9 +#define SD2_SDIO_PIN_D1 GPIO_PIN(GPIOB, 15) +#define SD2_SDIO_AF_D1 GPIO_AF9 +#define SD2_SDIO_PIN_D2 GPIO_PIN(GPIOG, 11) +#define SD2_SDIO_AF_D2 GPIO_AF10 +#define SD2_SDIO_PIN_D3 GPIO_PIN(GPIOB, 4) +#define SD2_SDIO_AF_D3 GPIO_AF9 +#define SD2_SDIO_PIN_CLK GPIO_PIN(GPIOD, 6) +#define SD2_SDIO_AF_CLK GPIO_AF11 +#define SD2_SDIO_PIN_CMD GPIO_PIN(GPIOD, 7) +#define SD2_SDIO_AF_CMD GPIO_AF11 +#define SD2_SDIO_TRANSFER_CLK_DIV SD_SDIO_CLK_DIV(24000000) // Hz + +#define STORAGE_USE_SDIO + +// AUDIO +#define AUDIO_I2C I2C_Bus_1 +#define AUDIO_SPI SPI2 +#define AUDIO_RESET_PIN GPIO_PIN(GPIOH, 10) +#define AUDIO_HP_DETECT_PIN GPIO_PIN(GPIOH, 14) +#define I2S_DMA DMA1 +#define I2S_DMA_Stream LL_DMA_STREAM_4 +#define I2S_DMA_Stream_Request LL_DMAMUX1_REQ_SPI2_TX +#define I2S_DMA_Stream_IRQn DMA1_Stream4_IRQn +#define I2S_DMA_Stream_IRQHandler DMA1_Stream4_IRQHandler + +// I2C Bus +#define I2C_B1 I2C4 +#define I2C_B1_SDA_GPIO GPIO_PIN(GPIOD, 13) // PD.13 +#define I2C_B1_SCL_GPIO GPIO_PIN(GPIOD, 12) // PD.12 +#define I2C_B1_GPIO_AF LL_GPIO_AF_4 +#define I2C_B1_CLK_RATE 400000 + +#define I2C_B2 I2C1 +#define I2C_B2_SDA_GPIO GPIO_PIN(GPIOB, 9) // PB.09 +#define I2C_B2_SCL_GPIO GPIO_PIN(GPIOB, 8) // PB.08 +#define I2C_B2_GPIO_AF LL_GPIO_AF_4 +#define I2C_B2_CLK_RATE 400000 + +// Haptic: TIM3_CH2 +#define HAPTIC_PWM +#define HAPTIC_GPIO GPIO_PIN(GPIOC, 7) +#define HAPTIC_GPIO_TIMER TIM3 +#define HAPTIC_GPIO_AF GPIO_AF2 +#define HAPTIC_TIMER_OUTPUT_ENABLE TIM_CCER_CC2E | TIM_CCER_CC2NE; +#define HAPTIC_TIMER_MODE TIM_CCMR1_OC2M_1 | TIM_CCMR1_OC2M_2 | TIM_CCMR1_OC2PE +#define HAPTIC_TIMER_COMPARE_VALUE HAPTIC_GPIO_TIMER->CCR2 + +// LED Strip +#define LED_STRIP_LENGTH 26 // 6POS + 2 rings of 10 +#define BLING_LED_STRIP_START 6 +#define BLING_LED_STRIP_LENGTH 20 +#define CFS_LED_STRIP_START 0 +#define CFS_LED_STRIP_LENGTH 6 +#define CFS_LEDS_PER_SWITCH 1 +#define LED_STRIP_GPIO GPIO_PIN(GPIOA, 0) // PA.00 / TIM2_CH1 +#define LED_STRIP_GPIO_AF LL_GPIO_AF_1 // TIM1/2/16/17 +#define LED_STRIP_TIMER TIM2 +#define LED_STRIP_TIMER_FREQ (PERI1_FREQUENCY * TIMER_MULT_APB1) +#define LED_STRIP_TIMER_CHANNEL LL_TIM_CHANNEL_CH1 +#define LED_STRIP_TIMER_DMA DMA1 +#define LED_STRIP_TIMER_DMA_CHANNEL LL_DMAMUX1_REQ_TIM2_UP +#define LED_STRIP_TIMER_DMA_STREAM LL_DMA_STREAM_0 +#define LED_STRIP_TIMER_DMA_IRQn DMA1_Stream0_IRQn +#define LED_STRIP_TIMER_DMA_IRQHandler DMA1_Stream0_IRQHandler +#define LED_STRIP_REFRESH_PERIOD 50 //ms + +#define STATUS_LEDS +#define GPIO_LED_GPIO_ON gpio_set +#define GPIO_LED_GPIO_OFF gpio_clear +#define LED_RED_GPIO GPIO_PIN(GPIOI, 8) // PI.08 +#define LED_GREEN_GPIO GPIO_PIN(GPIOI, 11) // PI.11 +#define LED_BLUE_GPIO GPIO_PIN(GPIOI, 10) // PI.10 + +// Internal Module +#define INTMODULE_PWR_GPIO GPIO_PIN(GPIOB, 13) // PB.13 +#define INTMODULE_BOOTCMD_GPIO GPIO_PIN(GPIOH, 9) // PH.09 +#define INTMODULE_BOOTCMD_DEFAULT 0 +#define INTMODULE_TX_GPIO GPIO_PIN(GPIOG, 14) +#define INTMODULE_RX_GPIO GPIO_PIN(GPIOG, 9) +#define INTMODULE_USART USART6 +#define INTMODULE_GPIO_AF LL_GPIO_AF_7 +#define INTMODULE_USART_IRQn USART6_IRQn +#define INTMODULE_USART_IRQHandler USART6_IRQHandler +#define INTMODULE_DMA DMA1 +#define INTMODULE_DMA_STREAM LL_DMA_STREAM_1 +#define INTMODULE_DMA_STREAM_IRQ DMA1_Stream1_IRQn +#define INTMODULE_DMA_FLAG_TC DMA_FLAG_TCIF1 +#define INTMODULE_DMA_CHANNEL LL_DMAMUX1_REQ_USART6_TX +#define INTMODULE_RX_DMA DMA1 +#define INTMODULE_RX_DMA_STREAM LL_DMA_STREAM_5 +#define INTMODULE_RX_DMA_CHANNEL LL_DMAMUX1_REQ_USART6_RX +#define INTMODULE_RX_DMA_Stream_IRQn DMA1_Stream5_IRQn +#define INTMODULE_RX_DMA_Stream_IRQHandler DMA1_Stream5_IRQHandler + +// External Module +#define EXTMODULE +#define EXTMODULE_PULSES +#define EXTMODULE_PWR_GPIO GPIO_PIN(GPIOD, 4) // PD.04 +#define EXTMODULE_TX_GPIO GPIO_PIN(GPIOA, 2) // TIM2_CH3, TIM5_CH3,TIM15_CH1, +#define EXTMODULE_RX_GPIO GPIO_PIN(GPIOA, 3) +#define EXTMODULE_TX_GPIO_AF LL_GPIO_AF_3 // TIM5_CH3 +#define EXTMODULE_TIMER TIM5 +#define EXTMODULE_TIMER_32BITS +#define EXTMODULE_TIMER_Channel LL_TIM_CHANNEL_CH3 +#define EXTMODULE_TIMER_IRQn TIM5_IRQn +#define EXTMODULE_TIMER_IRQHandler TIM5_IRQHandler +#define EXTMODULE_TIMER_FREQ (PERI2_FREQUENCY * TIMER_MULT_APB2) +#define EXTMODULE_TIMER_TX_GPIO_AF LL_GPIO_AF_2 + + +//USART +#define EXTMODULE_USART USART2 +#define EXTMODULE_USART_TX_DMA DMA2 +#define EXTMODULE_USART_TX_DMA_CHANNEL LL_DMAMUX1_REQ_USART2_TX +#define EXTMODULE_USART_TX_DMA_STREAM LL_DMA_STREAM_6 +#define EXTMODULE_USART_RX_DMA_CHANNEL LL_DMAMUX1_REQ_USART2_RX +#define EXTMODULE_USART_RX_DMA_STREAM LL_DMA_STREAM_5 +#define EXTMODULE_USART_IRQHandler USART2_IRQHandler +#define EXTMODULE_USART_IRQn USART2_IRQn + +//TIMER +#define EXTMODULE_TIMER_DMA_CHANNEL LL_DMAMUX1_REQ_TIM5_UP +#define EXTMODULE_TIMER_DMA DMA2 +#define EXTMODULE_TIMER_DMA_STREAM LL_DMA_STREAM_6 +#define EXTMODULE_TIMER_DMA_STREAM_IRQn DMA2_Stream6_IRQn +#define EXTMODULE_TIMER_DMA_IRQHandler DMA2_Stream6_IRQHandler + +// Trainer Port +#define TRAINER_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA) + +#define TRAINER_IN_GPIO GPIO_PIN(GPIOI, 6) +#define TRAINER_IN_TIMER_Channel LL_TIM_CHANNEL_CH2 + +#define TRAINER_OUT_GPIO GPIO_PIN(GPIOI, 5) +#define TRAINER_OUT_TIMER_Channel LL_TIM_CHANNEL_CH1 + +#define TRAINER_TIMER TIM8 +#define TRAINER_TIMER_IRQn TIM8_CC_IRQn +#define TRAINER_TIMER_IRQHandler TIM8_CC_IRQHandler +#define TRAINER_GPIO_AF LL_GPIO_AF_3 +#define TRAINER_TIMER_FREQ (PERI2_FREQUENCY * TIMER_MULT_APB2) + +#define TRAINER_DETECT_GPIO GPIO_PIN(GPIOH, 4) + +// AUX ports +#define AUX_SERIAL_TX_GPIO GPIO_PIN(GPIOB, 6) // PB.06 +#define AUX_SERIAL_RX_GPIO GPIO_PIN(GPIOB, 5) // PB.05 +#define AUX_SERIAL_USART UART5 +#define AUX_SERIAL_USART_IRQHandler UART5_IRQHandler +#define AUX_SERIAL_USART_IRQn UART5_IRQn +#define AUX_SERIAL_DMA_TX DMA2 +#define AUX_SERIAL_DMA_TX_STREAM LL_DMA_STREAM_1 +#define AUX_SERIAL_DMA_TX_CHANNEL LL_DMAMUX1_REQ_UART5_TX +#define AUX_SERIAL_DMA_RX DMA2 +#define AUX_SERIAL_DMA_RX_STREAM LL_DMA_STREAM_2 +#define AUX_SERIAL_DMA_RX_CHANNEL LL_DMAMUX1_REQ_UART5_RX +#define AUX_SERIAL_PWR_GPIO GPIO_PIN(GPIOB, 7) // PB.07 + +#define AUX2_SERIAL_TX_GPIO GPIO_PIN(GPIOB, 10) // PB.10 +#define AUX2_SERIAL_RX_GPIO GPIO_PIN(GPIOB, 11) // PB.11 +#define AUX2_SERIAL_USART USART3 +#define AUX2_SERIAL_USART_IRQHandler USART3_IRQHandler +#define AUX2_SERIAL_USART_IRQn USART3_IRQn +#define AUX2_SERIAL_DMA_TX DMA2 +#define AUX2_SERIAL_DMA_TX_STREAM LL_DMA_STREAM_7 +#define AUX2_SERIAL_DMA_TX_CHANNEL LL_DMAMUX1_REQ_USART3_TX +#define AUX2_SERIAL_DMA_RX DMA1 +#define AUX2_SERIAL_DMA_RX_STREAM LL_DMA_STREAM_6 +#define AUX2_SERIAL_DMA_RX_CHANNEL LL_DMAMUX1_REQ_USART3_RX +#define AUX2_SERIAL_PWR_GPIO GPIO_PIN(GPIOC, 13) // PC.13 + +// Touch +#define TOUCH_I2C_BUS I2C_Bus_2 +#define TOUCH_INT_GPIO GPIO_PIN(GPIOE, 2) // PE.02 +#define TOUCH_RST_GPIO GPIO_PIN(GPIOJ, 13) // PJ.13 + +// TOUCH_INT_EXTI IRQ +#if !defined(USE_EXTI2_IRQ) +#define USE_EXTI2_IRQ +#define EXTI2_IRQ_Priority 9 +#endif + +// IMU +#define IMU_I2C_BUS I2C_Bus_1 +#define IMU_I2C_ADDRESS 0x6A +#define IMU_INT_GPIO GPIO_PIN(GPIOG, 13) // PG.13 +// IMU_INT_EXTI IRQ +#if !defined(USE_EXTI15_10_IRQ) + #define USE_EXTI15_10_IRQ + #define EXTI15_10_IRQ_Priority 6 +#endif + + +//ROTARY emulation for trims as buttons +#define ROTARY_ENCODER_NAVIGATION +// Rotary Encoder +#define ROTARY_ENCODER_GPIO_A GPIOI +#define ROTARY_ENCODER_GPIO_PIN_A LL_GPIO_PIN_7 +#define ROTARY_ENCODER_GPIO_B GPIOJ +#define ROTARY_ENCODER_GPIO_PIN_B LL_GPIO_PIN_8 +#define ROTARY_ENCODER_POSITION() (((ROTARY_ENCODER_GPIO_A->IDR >> 7) & 0x01)|((ROTARY_ENCODER_GPIO_B->IDR >> 7) & 0x02)) +#define ROTARY_ENCODER_EXTI_LINE1 LL_EXTI_LINE_7 +#define ROTARY_ENCODER_EXTI_LINE2 LL_EXTI_LINE_8 +#if !defined(USE_EXTI7_IRQ) + #define USE_EXTI7_IRQ + #define EXTI7_IRQ_Priority 5 +#endif +#if !defined(USE_EXTI8_IRQ) + #define USE_EXTI8_IRQ + #define EXTI8_IRQ_Priority 5 +#endif +#define ROTARY_ENCODER_EXTI_PORT_A LL_SYSCFG_EXTI_PORTI +#define ROTARY_ENCODER_EXTI_PORT_B LL_SYSCFG_EXTI_PORTJ +#define ROTARY_ENCODER_EXTI_SYS_LINE1 LL_SYSCFG_EXTI_LINE7 +#define ROTARY_ENCODER_EXTI_SYS_LINE2 LL_SYSCFG_EXTI_LINE8 +#define ROTARY_ENCODER_TIMER TIM17 +#define ROTARY_ENCODER_TIMER_IRQn TIM17_IRQn +#define ROTARY_ENCODER_TIMER_IRQHandler TIM17_IRQHandler + +// Millisecond timer +#define MS_TIMER TIM14 +#define MS_TIMER_IRQn TIM8_TRG_COM_TIM14_IRQn +#define MS_TIMER_IRQHandler TIM8_TRG_COM_TIM14_IRQHandler + +// Mixer scheduler timer +#define MIXER_SCHEDULER_TIMER TIM12 +#define MIXER_SCHEDULER_TIMER_FREQ (PERI1_FREQUENCY * TIMER_MULT_APB1) +#define MIXER_SCHEDULER_TIMER_IRQn TIM8_BRK_TIM12_IRQn +#define MIXER_SCHEDULER_TIMER_IRQHandler TIM8_BRK_TIM12_IRQHandler + +#define LANDSCAPE_LCD true +#define PORTRAIT_LCD false +#define LANDSCAPE_LCD_SML false +#define LANDSCAPE_LCD_STD true +#define LANDSCAPE_LCD_LRG false + +#define LCD_W 480 +#define LCD_H 320 + +#define LCD_PHYS_W LCD_H +#define LCD_PHYS_H LCD_W + +#define LCD_DEPTH 16 + +#define LSE_DRIVE_STRENGTH RCC_LSEDRIVE_HIGH + +#endif // _HAL_H_ diff --git a/radio/src/targets/gx15/key_driver.cpp b/radio/src/targets/gx15/key_driver.cpp new file mode 100644 index 00000000000..07d99eb5e4d --- /dev/null +++ b/radio/src/targets/gx15/key_driver.cpp @@ -0,0 +1,94 @@ +/* + * 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 "hal/key_driver.h" + +#include "bsp_io.h" +#include "stm32_hal_ll.h" +#include "stm32_gpio_driver.h" +#include "stm32_i2c_driver.h" + +#include "hal.h" +#include "delays_driver.h" +#include "keys.h" + +#include "stm32_keys.inc" +#include "debug.h" + +void keysInit() { + _init_keys(); + _init_trims(); +} + + +uint32_t readKeys() { return _read_keys(); } + +/* The output bit-order has to be: + 0 LHL TR3L (Left equals down) + 1 LHR TR3R + 2 LVD TR1D + 3 LVU TR1U + 4 RVD TR2D + 5 RVU TR2U + 6 RHL TR4L + 7 RHR TR4R +*/ + +enum PhysicalTrims { + TR3L = 0, + TR3R, + TR1D = 2, + TR1U, + TR2D = 4, + TR2U, + TR4L = 6, + TR4R, + TR5U = 8, + TR5D, + TR6U = 10, + TR6D +}; + +uint32_t readTrims() +{ + uint32_t result = 0; + uint32_t keys = bsp_get_fs_switches(); + +#define _TRIM(t) \ + if ((keys & BSP_##t) == 0) result |= 1 << t; + + _TRIM(TR1U); + _TRIM(TR1D); + _TRIM(TR3L); + _TRIM(TR3R); + _TRIM(TR2U); + _TRIM(TR2D); + _TRIM(TR4L); + _TRIM(TR4R); + if (!LL_GPIO_IsInputPinSet(GPIOH, LL_GPIO_PIN_15)) result |= (1 << TR5U); + if (!LL_GPIO_IsInputPinSet(GPIOH, LL_GPIO_PIN_13)) result |= (1 << TR5D); + _TRIM(TR6U); + _TRIM(TR6D); + +#undef _TRIM + + return result; +} diff --git a/radio/src/targets/gx15/usb_descriptor.h b/radio/src/targets/gx15/usb_descriptor.h new file mode 100644 index 00000000000..d42433256de --- /dev/null +++ b/radio/src/targets/gx15/usb_descriptor.h @@ -0,0 +1,29 @@ +/* + * 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. + */ + +#ifndef _USB_DESCRIPTOR_H_ +#define _USB_DESCRIPTOR_H_ + +#define USB_NAME "Radiomaster GX15" +#define USB_MANUFACTURER 'R', 'M', ' ', ' ', ' ', ' ', ' ', ' ' /* 8 bytes */ +#define USB_PRODUCT 'G', 'X', '1', '5', ' ', ' ', ' ', ' ' /* 8 Bytes */ + +#endif // _USB_DESCRIPTOR_H_ diff --git a/radio/src/thirdparty/stb b/radio/src/thirdparty/stb index 31c1ad37456..5c205738c19 160000 --- a/radio/src/thirdparty/stb +++ b/radio/src/thirdparty/stb @@ -1 +1 @@ -Subproject commit 31c1ad37456438565541f4919958214b6e762fb4 +Subproject commit 5c205738c191bcb0abc65c4febfa9bd25ff35234 diff --git a/tools/build-common.sh b/tools/build-common.sh index 871ce024d38..f32c68f9f9a 100644 --- a/tools/build-common.sh +++ b/tools/build-common.sh @@ -122,6 +122,9 @@ get_target_build_options() { tx15) BUILD_OPTIONS+="-DPCB=TX15" ;; + gx15) + BUILD_OPTIONS+="-DPCB=GX15" + ;; tx16s) BUILD_OPTIONS+="-DPCB=X10 -DPCBREV=TX16S" ;; diff --git a/tools/generate-hw-defs.sh b/tools/generate-hw-defs.sh index f20535d2f4f..a4d5bb46bed 100755 --- a/tools/generate-hw-defs.sh +++ b/tools/generate-hw-defs.sh @@ -9,7 +9,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" : "${SRCDIR:=$(dirname "$(pwd)/$0")/..}" -: ${FLAVOR:="nv14;el18;pl18;pl18ev;pl18u;nb4p;st16;c14;pa01;t12;t12max;t15;t15pro;t22;t16;t18;t8;zorro;pocket;commando8;tlite;tpro;tprov2;tpros;bumblebee;t20;t20v2;t14;lr3pro;mt12;gx12;tx12;tx12mk2;boxer;tx16s;tx16smk3;x10;x10express;x12s;x7;x7access;x9d;x9dp;x9dp2019;x9e;x9lite;x9lites;xlite;xlites;f16;v16;v14;v14lcd;v12;tx15"} +: ${FLAVOR:="nv14;el18;pl18;pl18ev;pl18u;nb4p;st16;c14;pa01;t12;t12max;t15;t15pro;t22;t16;t18;t8;zorro;pocket;commando8;tlite;tpro;tprov2;tpros;bumblebee;t20;t20v2;t14;lr3pro;mt12;gx12;tx12;tx12mk2;boxer;tx16s;tx16smk3;x10;x10express;x12s;x7;x7access;x9d;x9dp;x9dp2019;x9e;x9lite;x9lites;xlite;xlites;f16;v16;v14;v14lcd;v12;tx15;gx15"} : ${COMMON_OPTIONS:="-DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_RULE_MESSAGES=OFF -Wno-dev -DCMAKE_MESSAGE_LOG_LEVEL=WARNING"} # wipe build directory clean diff --git a/tools/generate-yaml.sh b/tools/generate-yaml.sh index 530a9dfdfe2..17662621698 100755 --- a/tools/generate-yaml.sh +++ b/tools/generate-yaml.sh @@ -11,7 +11,7 @@ if [[ -n ${GCC_ARM} ]] ; then export PATH=${GCC_ARM}:$PATH fi -: ${FLAVOR:="x10;t15;pl18;nv14;pl18u;nb4p;x9d;x9dp2019;x9e;xlite;xlites;x7;tpro;t20;f16;gx12;st16;c14;pa01;tx15;t15pro;tx16smk3;t22;v12"} +: ${FLAVOR:="x10;t15;pl18;nv14;pl18u;nb4p;x9d;x9dp2019;x9e;xlite;xlites;x7;tpro;t20;f16;gx12;st16;c14;pa01;tx15;gx15;t15pro;tx16smk3;t22;v12"} : ${SRCDIR:="$(dirname "$SCRIPT_DIR")"} : ${COMMON_OPTIONS:="-DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_RULE_MESSAGES=OFF -Wno-dev -DDISABLE_COMPANION=YES -DCMAKE_MESSAGE_LOG_LEVEL=WARNING"} From f1f0bcc943395311843e559eee9944ed6589fb83 Mon Sep 17 00:00:00 2001 From: 3djc <3djc@gh.com> Date: Wed, 18 Mar 2026 16:08:25 +0100 Subject: [PATCH 02/15] fix: compilation (legacy was missing) --- radio/src/boards/hw_defs/gx15.json | 8 ++-- radio/src/targets/gx15/hal.h | 20 ++++----- radio/util/hw_defs/legacy_names.py | 67 ++++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+), 17 deletions(-) diff --git a/radio/src/boards/hw_defs/gx15.json b/radio/src/boards/hw_defs/gx15.json index 6ce434bc847..47bb980fe6d 100644 --- a/radio/src/boards/hw_defs/gx15.json +++ b/radio/src/boards/hw_defs/gx15.json @@ -112,8 +112,7 @@ "pin": "LL_GPIO_PIN_5", "channel": "LL_ADC_CHANNEL_19", "label": "EXT1", - "short_label": "E1", - "default": "NONE" + "short_label": "E1" }, { "name": "EXT2", @@ -123,8 +122,7 @@ "pin": "LL_GPIO_PIN_5", "channel": "LL_ADC_CHANNEL_16", "label": "EXT2", - "short_label": "E2", - "default": "NONE" + "short_label": "E2" }, { "name": "VBAT", @@ -347,7 +345,7 @@ "active_low": true, "key": "KEY_EXIT", "name": "EXIT", - "label": "EXIT" + "label": "RTN" }, { "gpio": "GPIOG", diff --git a/radio/src/targets/gx15/hal.h b/radio/src/targets/gx15/hal.h index 325130fd988..085efb2db88 100644 --- a/radio/src/targets/gx15/hal.h +++ b/radio/src/targets/gx15/hal.h @@ -263,18 +263,14 @@ TIM17: ROTARY_ENCODER_TIMER #define ADC_VREF_PREC2 330 #define ADC_DIRECTION { \ - 0,-1,0,-1, /* gimbals */ \ - -1,-1, /* pots */ \ - 0,-1, /* sliders */ \ - 0, /* vbat */ \ - 0, /* rtc_bat */ \ - 0, /* SWA */ \ - 0, /* SWB */ \ - 0, /* SWC */ \ - 0, /* SWD */ \ - 0, /* SWE */ \ - 0 /* SWF */ \ - } + 0,-1,0,-1, /* gimbals */ \ + -1,-1, /* pots */ \ + 0,-1, /* sliders */ \ + 0,0, /* ext */ \ + 0, /* vbat */ \ + 0, /* rtc_bat */ \ + 0 /* lux sensor */ \ +} #define USE_EXTI9_5_IRQ // used for I2C port extender interrupt #define EXTI9_5_IRQ_Priority 5 diff --git a/radio/util/hw_defs/legacy_names.py b/radio/util/hw_defs/legacy_names.py index c9089dc4ada..4bdd67c7496 100644 --- a/radio/util/hw_defs/legacy_names.py +++ b/radio/util/hw_defs/legacy_names.py @@ -195,6 +195,73 @@ } } }, + { + "targets": {"gx15"}, + "inputs": { + "LH": { + "yaml": "Rud", + "lua": "rud", + "description": "Rudder" + }, + "LV": { + "yaml": "Ele", + "lua": "ele", + "description": "Elevator" + }, + "RV": { + "yaml": "Thr", + "lua": "thr", + "description": "Throttle" + }, + "RH": { + "yaml": "Ail", + "lua": "ail", + "description": "Aileron" + }, + "P1": { + "yaml": "S1", + "lua": "s1", + "label": "S1", + "short_label": "1", + "description": "Potentiometer S1" + }, + "P2": { + "yaml": "S2", + "lua": "s2", + "label": "S2", + "short_label": "2", + "description": "Potentiometer S2" + }, + "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" + }, + "EXT1": { + "yaml": "EXT1", + "lua": "ext1", + "label": "EXT1", + "short_label": "E1", + "description": "Ext 1" + }, + "EXT2": { + "yaml": "EXT2", + "lua": "ext2", + "label": "EXT2", + "short_label": "E2", + "description": "Ext 2" + } + } + }, { "targets": {"x12s"}, "inputs": { From e2867f54f9fe56e7db04e7cb38cccd9c473d3a21 Mon Sep 17 00:00:00 2001 From: 3djc <3djc@gh.com> Date: Thu, 2 Apr 2026 11:01:24 +0200 Subject: [PATCH 03/15] fix: rebase and switch definitions --- radio/src/boards/hw_defs/gx15.json | 6 +++--- radio/src/targets/gx15/CMakeLists.txt | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/radio/src/boards/hw_defs/gx15.json b/radio/src/boards/hw_defs/gx15.json index 47bb980fe6d..6fee4e27077 100644 --- a/radio/src/boards/hw_defs/gx15.json +++ b/radio/src/boards/hw_defs/gx15.json @@ -237,7 +237,7 @@ "type": "2POS", "flags": 0, "inverted": false, - "default": "2POS", + "default": "TOGGLE", "display": null, "gpio": null, "pin": "PCA95XX_P0", @@ -248,7 +248,7 @@ "type": "2POS", "flags": 0, "inverted": false, - "default": "2POS", + "default": "NONE", "display": null, "gpio": null, "pin": "PCA95XX_P2", @@ -259,7 +259,7 @@ "type": "2POS", "flags": 0, "inverted": false, - "default": "2POS", + "default": "NONE", "display": null, "gpio": null, "pin": "PCA95XX_P3", diff --git a/radio/src/targets/gx15/CMakeLists.txt b/radio/src/targets/gx15/CMakeLists.txt index 471177f595a..73aed57034c 100644 --- a/radio/src/targets/gx15/CMakeLists.txt +++ b/radio/src/targets/gx15/CMakeLists.txt @@ -156,7 +156,6 @@ add_library(board OBJECT EXCLUDE_FROM_ALL ${BOARD_SRC_DIR}/tp_gt911.cpp ${BOARD_SRC_DIR}/audio_driver.cpp drivers/icm42607C.cpp - drivers/imu_filter.cpp drivers/tas2505.cpp targets/common/arm/stm32/heartbeat_driver.cpp targets/common/arm/stm32/mixer_scheduler_driver.cpp From cf34488d8e317d833089a3281a15ef6360a80127 Mon Sep 17 00:00:00 2001 From: 3djc <3djc@gh.com> Date: Thu, 23 Apr 2026 09:52:35 +0200 Subject: [PATCH 04/15] feat: support both IMU on GX15 --- radio/src/targets/gx15/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/radio/src/targets/gx15/CMakeLists.txt b/radio/src/targets/gx15/CMakeLists.txt index 73aed57034c..baf6df5d486 100644 --- a/radio/src/targets/gx15/CMakeLists.txt +++ b/radio/src/targets/gx15/CMakeLists.txt @@ -32,6 +32,7 @@ set(FUNCTION_SWITCHES_WITH_RGB YES) # IMU support set(IMU ON) add_definitions(-DIMU_ICM4207C) +add_definitions(-DIMU_SC7U22) # for size report script set(CPU_TYPE_FULL STM32H750xB) @@ -156,6 +157,7 @@ add_library(board OBJECT EXCLUDE_FROM_ALL ${BOARD_SRC_DIR}/tp_gt911.cpp ${BOARD_SRC_DIR}/audio_driver.cpp drivers/icm42607C.cpp + drivers/sc7u22.cpp drivers/tas2505.cpp targets/common/arm/stm32/heartbeat_driver.cpp targets/common/arm/stm32/mixer_scheduler_driver.cpp From 2432bb484640ec412eb79342d86189deaa498afc Mon Sep 17 00:00:00 2001 From: 3djc <3djc@gh.com> Date: Thu, 9 Apr 2026 12:23:09 +0200 Subject: [PATCH 05/15] feat: V1.5 support --- radio/src/targets/gx15/hal.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/radio/src/targets/gx15/hal.h b/radio/src/targets/gx15/hal.h index 085efb2db88..b76f78f7fbc 100644 --- a/radio/src/targets/gx15/hal.h +++ b/radio/src/targets/gx15/hal.h @@ -199,9 +199,13 @@ TIM17: ROTARY_ENCODER_TIMER #define SWITCHES_GPIO_REG_J #define SWITCHES_GPIO_PIN_J PCA95XX_P3 +//MEMS +#define PDM_DATA GPIO_PIN(GPIOD,4) +#define PDM_CLK GPIO_PIN(GPIOD, 13) + // Expanders -#define IO_INT_GPIO GPIO_PIN(GPIOD, 3) -#define IO_RESET_GPIO GPIO_PIN(GPIOG, 10) +#define IO_INT_GPIO GPIO_PIN(GPIOB, 3) +#define IO_RESET_GPIO GPIO_PIN(GPIOG, 10) #if !defined(USE_EXTI3_IRQ) #define USE_EXTI3_IRQ #define EXTI3_IRQ_Priority 9 @@ -217,7 +221,7 @@ TIM17: ROTARY_ENCODER_TIMER #define ADC_GPIO_PIN_POT2 LL_GPIO_PIN_1 // PB.01 POT2 #define ADC_GPIO_PIN_BATT LL_GPIO_PIN_3 // PH.03 #define ADC_GPIO_PIN_SLIDER1 LL_GPIO_PIN_2 // PH.02 VRC/LS -#define ADC_GPIO_PIN_SLIDER2 LL_GPIO_PIN_7 // PA.07 VRD/RS +#define ADC_GPIO_PIN_SLIDER2 LL_GPIO_PIN_5 // PA.05 VRD/RS #define ADC_GPIO_PIN_EXT1 LL_GPIO_PIN_5 // PA.05,ADC1_CH19 #define ADC_GPIO_PIN_EXT2 LL_GPIO_PIN_5 // PH.05,ADC3_CH16 @@ -239,7 +243,7 @@ TIM17: ROTARY_ENCODER_TIMER #define ADC_CHANNEL_BATT LL_ADC_CHANNEL_14 // ADC3_INP14 #define ADC_CHANNEL_RTC_BAT LL_ADC_CHANNEL_VBAT // ADC3_INP17 #define ADC_CHANNEL_SLIDER1 LL_ADC_CHANNEL_13 // ADC3_INP13 -#define ADC_CHANNEL_SLIDER2 LL_ADC_CHANNEL_7 // ADC12_INP7 +#define ADC_CHANNEL_SLIDER2 LL_ADC_CHANNEL_19 // ADC12_INP19 #define ADC_CHANNEL_EXT1 LL_ADC_CHANNEL_19 // ADC1_IN19 #define ADC_CHANNEL_EXT2 LL_ADC_CHANNEL_16 // ADC3_IN16 From 9b3ca452bb49a02dd7a8c376b5ce638a1a949271 Mon Sep 17 00:00:00 2001 From: 3djc <3djc@gh.com> Date: Sat, 9 May 2026 10:42:55 +0200 Subject: [PATCH 06/15] chore: prep for #7347 --- radio/src/targets/gx15/hal.h | 1 + 1 file changed, 1 insertion(+) diff --git a/radio/src/targets/gx15/hal.h b/radio/src/targets/gx15/hal.h index b76f78f7fbc..35eb1b9e352 100644 --- a/radio/src/targets/gx15/hal.h +++ b/radio/src/targets/gx15/hal.h @@ -387,6 +387,7 @@ TIM17: ROTARY_ENCODER_TIMER #define AUDIO_SPI SPI2 #define AUDIO_RESET_PIN GPIO_PIN(GPIOH, 10) #define AUDIO_HP_DETECT_PIN GPIO_PIN(GPIOH, 14) +#define VOLUME_LEVEL_MAX 20 #define I2S_DMA DMA1 #define I2S_DMA_Stream LL_DMA_STREAM_4 #define I2S_DMA_Stream_Request LL_DMAMUX1_REQ_SPI2_TX From 294408d3f6c64f2368b54e93f6f9d90ac280615e Mon Sep 17 00:00:00 2001 From: 3djc <3djc@gh.com> Date: Sun, 14 Jun 2026 09:16:01 +0200 Subject: [PATCH 07/15] chore: fix warning --- radio/src/targets/gx15/hal.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/radio/src/targets/gx15/hal.h b/radio/src/targets/gx15/hal.h index 35eb1b9e352..f736688f263 100644 --- a/radio/src/targets/gx15/hal.h +++ b/radio/src/targets/gx15/hal.h @@ -387,7 +387,8 @@ TIM17: ROTARY_ENCODER_TIMER #define AUDIO_SPI SPI2 #define AUDIO_RESET_PIN GPIO_PIN(GPIOH, 10) #define AUDIO_HP_DETECT_PIN GPIO_PIN(GPIOH, 14) -#define VOLUME_LEVEL_MAX 20 +#undef VOLUME_LEVEL_MAX +#define VOLUME_LEVEL_MAX 20 #define I2S_DMA DMA1 #define I2S_DMA_Stream LL_DMA_STREAM_4 #define I2S_DMA_Stream_Request LL_DMAMUX1_REQ_SPI2_TX From 0677779a2d74fa68f1ea77006546a3ba0d389538 Mon Sep 17 00:00:00 2001 From: 3djc <3djc@gh.com> Date: Tue, 23 Jun 2026 09:06:19 +0200 Subject: [PATCH 08/15] fix: invert charger detection for GX15 --- radio/src/boards/rm-h750/usb_charger_driver.cpp | 4 ++++ radio/src/targets/gx15/hal.h | 1 + 2 files changed, 5 insertions(+) diff --git a/radio/src/boards/rm-h750/usb_charger_driver.cpp b/radio/src/boards/rm-h750/usb_charger_driver.cpp index 5e01d872316..d733bb290fa 100644 --- a/radio/src/boards/rm-h750/usb_charger_driver.cpp +++ b/radio/src/boards/rm-h750/usb_charger_driver.cpp @@ -36,5 +36,9 @@ void usbChargerInit() bool usbChargerLed() { +#if defined UCHARGER_INVERTED + return (!gpio_read(UCHARGER_GPIO) && usbPlugged()); +#else return (gpio_read(UCHARGER_GPIO) && usbPlugged()); +#endif } diff --git a/radio/src/targets/gx15/hal.h b/radio/src/targets/gx15/hal.h index f736688f263..62bf1b159cd 100644 --- a/radio/src/targets/gx15/hal.h +++ b/radio/src/targets/gx15/hal.h @@ -286,6 +286,7 @@ TIM17: ROTARY_ENCODER_TIMER // Chargers (USB and wireless) #define UCHARGER_GPIO GPIO_PIN(GPIOD, 11) #define UCHARGER_EN_GPIO GPIO_PIN(GPIOB, 12) +#define UCHARGER_INVERTED (true) // S.Port update connector #define HAS_SPORT_UPDATE_CONNECTOR() (false) From e946cb5daef7492617b8b9dfc8a0e431c19b99dc Mon Sep 17 00:00:00 2001 From: 3djc <3djc@gh.com> Date: Tue, 23 Jun 2026 09:12:48 +0200 Subject: [PATCH 09/15] fix: rebase --- radio/src/targets/gx15/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/radio/src/targets/gx15/CMakeLists.txt b/radio/src/targets/gx15/CMakeLists.txt index baf6df5d486..f5ed35b4399 100644 --- a/radio/src/targets/gx15/CMakeLists.txt +++ b/radio/src/targets/gx15/CMakeLists.txt @@ -167,7 +167,7 @@ add_library(board OBJECT EXCLUDE_FROM_ALL targets/common/arm/stm32/stm32_qspi.cpp targets/common/arm/stm32/stm32_i2s.cpp targets/common/arm/stm32/stm32_switch_driver.cpp - targets/common/arm/stm32/stm32_ws2812.cpp + targets/common/arm/stm32/stm32_rgbleds.cpp targets/common/arm/stm32/trainer_driver.cpp ) add_dependencies(board board_lib) From 90c081144dd1a8358cabff47ebe63a06926411f2 Mon Sep 17 00:00:00 2001 From: 3djc <3djc@gh.com> Date: Wed, 12 Aug 2026 10:39:13 +0200 Subject: [PATCH 10/15] fix: rebase Migrate GX15 to the JSON hw_defs schema (#7411): move display, timers, leds and rotenc from hal.h into gx15.json and include hal_settings.h. Replaces the dropped custom_switches block with leds, and regenerates the stale YAML map. Co-Authored-By: Claude Opus 5 --- radio/src/boards/hw_defs/gx15.json | 93 +++++++++++++++---- .../storage/yaml/yaml_datastructs_gx15.cpp | 7 +- radio/src/targets/gx15/hal.h | 78 +--------------- 3 files changed, 83 insertions(+), 95 deletions(-) diff --git a/radio/src/boards/hw_defs/gx15.json b/radio/src/boards/hw_defs/gx15.json index 6fee4e27077..6476100a834 100644 --- a/radio/src/boards/hw_defs/gx15.json +++ b/radio/src/boards/hw_defs/gx15.json @@ -428,26 +428,87 @@ } ], "display": { - "w": 480, - "h": 320, - "phys_w": 320, - "phys_h": 480, - "depth": 16, - "color": 1, - "oled": 0, - "backlight_color": 0 + "lcd_w": 480, + "lcd_h": 320, + "lcd_phys_w": 320, + "lcd_phys_h": 480, + "lcd_depth": 16, + "ltdc_irq_prio": 4, + "dma_screen_irq_prio": 6 }, - "custom_switches": { - "rgb_led": 1, - "groups": 3 + "timers": { + "cpu_freq": 480000000, + "peri1_frequency": 120000000, + "peri2_frequency": 120000000, + "timer_mult_apb1": 2, + "timer_mult_apb2": 2, + "ms_timer": "TIM14", + "ms_timer_irqn": "TIM8_TRG_COM_TIM14_IRQn", + "ms_timer_irqhandler": "TIM8_TRG_COM_TIM14_IRQHandler", + "mixer_scheduler_timer": "TIM12", + "mixer_scheduler_timer_freq": "(PERI1_FREQUENCY * TIMER_MULT_APB1)", + "mixer_scheduler_timer_irqn": "TIM8_BRK_TIM12_IRQn", + "mixer_scheduler_timer_irqhandler": "TIM8_BRK_TIM12_IRQHandler" + }, + "leds": { + "led_strip_length": 26, + "bling_led_strip_start": 6, + "bling_led_strip_length": 20, + "cfs_led_strip_start": 0, + "cfs_led_strip_length": 6, + "cfs_leds_per_switch": 1, + "led_strip_gpio": "GPIO_PIN(GPIOA, 0)", + "led_strip_gpio_af": "LL_GPIO_AF_1", + "led_strip_timer": "TIM2", + "led_strip_timer_freq": "(PERI1_FREQUENCY * TIMER_MULT_APB1)", + "led_strip_timer_channel": "LL_TIM_CHANNEL_CH1", + "led_strip_timer_dma": "DMA1", + "led_strip_timer_dma_channel": "LL_DMAMUX1_REQ_TIM2_UP", + "led_strip_timer_dma_stream": "LL_DMA_STREAM_0", + "led_strip_timer_dma_irqn": "DMA1_Stream0_IRQn", + "led_strip_timer_dma_irqhandler": "DMA1_Stream0_IRQHandler", + "led_strip_refresh_period": 50, + "status_leds": true, + "led_red_gpio": "GPIO_PIN(GPIOI, 8)", + "led_green_gpio": "GPIO_PIN(GPIOI, 11)", + "led_blue_gpio": "GPIO_PIN(GPIOI, 10)" + }, + "key_lock_combo": [ + "KEY_SYS", + "KEY_MODEL" + ], + "rotenc": { + "rotary_encoder_gpio_a": "GPIOI", + "rotary_encoder_gpio_pin_a": "LL_GPIO_PIN_7", + "rotary_encoder_gpio_b": "GPIOJ", + "rotary_encoder_gpio_pin_b": "LL_GPIO_PIN_8", + "rotary_encoder_position": "(((ROTARY_ENCODER_GPIO_A->IDR >> 7) & 0x01)|((ROTARY_ENCODER_GPIO_B->IDR >> 7) & 0x02))", + "rotary_encoder_exti_line1": "LL_EXTI_LINE_7", + "rotary_encoder_exti_line2": "LL_EXTI_LINE_8", + "exti": [ + { + "irq": "EXTI7_IRQ", + "priority": 5 + }, + { + "irq": "EXTI8_IRQ", + "priority": 5 + } + ], + "rotary_encoder_exti_port_a": "LL_SYSCFG_EXTI_PORTI", + "rotary_encoder_exti_port_b": "LL_SYSCFG_EXTI_PORTJ", + "rotary_encoder_exti_sys_line1": "LL_SYSCFG_EXTI_LINE7", + "rotary_encoder_exti_sys_line2": "LL_SYSCFG_EXTI_LINE8", + "rotary_encoder_timer": "TIM17", + "rotary_encoder_timer_irqn": "TIM17_IRQn", + "rotary_encoder_timer_irqhandler": "TIM17_IRQHandler" }, "hardware": { - "has_audio_mute": 0, - "has_bling_leds": 20, - "has_ext_module_support": 1, - "has_int_module_support": 1, + "has_audio_mute": false, + "has_ext_module_support": true, + "has_int_module_support": true, "sport_max_baudrate": 400000, - "surface": 0, + "surface": false, "cpu": "STM32H750xB", "cpu_type": "STM32H7" } diff --git a/radio/src/storage/yaml/yaml_datastructs_gx15.cpp b/radio/src/storage/yaml/yaml_datastructs_gx15.cpp index 3bbbf742618..6a5ce05d9a1 100644 --- a/radio/src/storage/yaml/yaml_datastructs_gx15.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_gx15.cpp @@ -458,6 +458,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_PADDING( 3 ), YAML_SIGNED( "imuMax", 8 ), YAML_SIGNED( "imuOffset", 8 ), + YAML_UNSIGNED( "imuInvert", 8 ), YAML_STRING("selectedTheme", 26), YAML_SIGNED_CUST( "backlightSrc", 10, r_mixSrcRawEx, w_mixSrcRawEx ), YAML_SIGNED( "radioGFDisabled", 1 ), @@ -474,12 +475,14 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED( "disableTrainerPoweroffAlarm", 1 ), YAML_SIGNED( "disablePwrOnOffHaptic", 1 ), YAML_UNSIGNED( "modelQuickSelect", 1 ), + YAML_UNSIGNED( "oneLogPerDay", 1 ), + YAML_UNSIGNED( "keyLockEnabled", 1 ), YAML_UNSIGNED( "labelSingleSelect", 1 ), YAML_UNSIGNED( "labelMultiMode", 1 ), YAML_UNSIGNED( "favMultiMode", 1 ), YAML_UNSIGNED( "modelSelectLayout", 2 ), YAML_UNSIGNED( "radioThemesDisabled", 1 ), - YAML_PADDING( 1 ), + YAML_PADDING( 7 ), YAML_UNSIGNED( "pwrOffIfInactive", 8 ), YAML_ARRAY("keyShortcuts", 8, 6, struct_KeyShortcut, NULL), YAML_ARRAY("qmFavorites", 8, 12, struct_QMFavorite, NULL), @@ -678,7 +681,7 @@ static const struct YamlNode struct_anonymous_6[] = { YAML_PADDING( 2 ), YAML_UNSIGNED( "receiverTelemetryOff", 1 ), YAML_UNSIGNED( "receiverHigherChannels", 1 ), - YAML_SIGNED( "antennaMode", 2 ), + YAML_PADDING( 2 ), YAML_PADDING( 8 ), YAML_END }; diff --git a/radio/src/targets/gx15/hal.h b/radio/src/targets/gx15/hal.h index 62bf1b159cd..f3ade83463c 100644 --- a/radio/src/targets/gx15/hal.h +++ b/radio/src/targets/gx15/hal.h @@ -63,12 +63,7 @@ TIM17: ROTARY_ENCODER_TIMER #ifndef _HAL_H_ #define _HAL_H_ -#define CPU_FREQ 480000000 - -#define PERI1_FREQUENCY 120000000 -#define PERI2_FREQUENCY 120000000 -#define TIMER_MULT_APB1 2 -#define TIMER_MULT_APB2 2 +#include "hal_settings.h" // Keys #define KEYS_GPIO_REG_PAGEDN GPIOA @@ -328,9 +323,6 @@ TIM17: ROTARY_ENCODER_TIMER #define LCD_SPI_MOSI_GPIO GPIOI #define LCD_SPI_MOSI_GPIO_PIN LL_GPIO_PIN_9 -#define LTDC_IRQ_PRIO 4 -#define DMA_SCREEN_IRQ_PRIO 6 - #define LCD_RESET_GPIO GPIOJ #define LCD_RESET_GPIO_PIN LL_GPIO_PIN_12 @@ -418,31 +410,8 @@ TIM17: ROTARY_ENCODER_TIMER #define HAPTIC_TIMER_MODE TIM_CCMR1_OC2M_1 | TIM_CCMR1_OC2M_2 | TIM_CCMR1_OC2PE #define HAPTIC_TIMER_COMPARE_VALUE HAPTIC_GPIO_TIMER->CCR2 -// LED Strip -#define LED_STRIP_LENGTH 26 // 6POS + 2 rings of 10 -#define BLING_LED_STRIP_START 6 -#define BLING_LED_STRIP_LENGTH 20 -#define CFS_LED_STRIP_START 0 -#define CFS_LED_STRIP_LENGTH 6 -#define CFS_LEDS_PER_SWITCH 1 -#define LED_STRIP_GPIO GPIO_PIN(GPIOA, 0) // PA.00 / TIM2_CH1 -#define LED_STRIP_GPIO_AF LL_GPIO_AF_1 // TIM1/2/16/17 -#define LED_STRIP_TIMER TIM2 -#define LED_STRIP_TIMER_FREQ (PERI1_FREQUENCY * TIMER_MULT_APB1) -#define LED_STRIP_TIMER_CHANNEL LL_TIM_CHANNEL_CH1 -#define LED_STRIP_TIMER_DMA DMA1 -#define LED_STRIP_TIMER_DMA_CHANNEL LL_DMAMUX1_REQ_TIM2_UP -#define LED_STRIP_TIMER_DMA_STREAM LL_DMA_STREAM_0 -#define LED_STRIP_TIMER_DMA_IRQn DMA1_Stream0_IRQn -#define LED_STRIP_TIMER_DMA_IRQHandler DMA1_Stream0_IRQHandler -#define LED_STRIP_REFRESH_PERIOD 50 //ms - -#define STATUS_LEDS #define GPIO_LED_GPIO_ON gpio_set #define GPIO_LED_GPIO_OFF gpio_clear -#define LED_RED_GPIO GPIO_PIN(GPIOI, 8) // PI.08 -#define LED_GREEN_GPIO GPIO_PIN(GPIOI, 11) // PI.11 -#define LED_BLUE_GPIO GPIO_PIN(GPIOI, 10) // PI.10 // Internal Module #define INTMODULE_PWR_GPIO GPIO_PIN(GPIOB, 13) // PB.13 @@ -564,57 +533,12 @@ TIM17: ROTARY_ENCODER_TIMER #endif -//ROTARY emulation for trims as buttons -#define ROTARY_ENCODER_NAVIGATION -// Rotary Encoder -#define ROTARY_ENCODER_GPIO_A GPIOI -#define ROTARY_ENCODER_GPIO_PIN_A LL_GPIO_PIN_7 -#define ROTARY_ENCODER_GPIO_B GPIOJ -#define ROTARY_ENCODER_GPIO_PIN_B LL_GPIO_PIN_8 -#define ROTARY_ENCODER_POSITION() (((ROTARY_ENCODER_GPIO_A->IDR >> 7) & 0x01)|((ROTARY_ENCODER_GPIO_B->IDR >> 7) & 0x02)) -#define ROTARY_ENCODER_EXTI_LINE1 LL_EXTI_LINE_7 -#define ROTARY_ENCODER_EXTI_LINE2 LL_EXTI_LINE_8 -#if !defined(USE_EXTI7_IRQ) - #define USE_EXTI7_IRQ - #define EXTI7_IRQ_Priority 5 -#endif -#if !defined(USE_EXTI8_IRQ) - #define USE_EXTI8_IRQ - #define EXTI8_IRQ_Priority 5 -#endif -#define ROTARY_ENCODER_EXTI_PORT_A LL_SYSCFG_EXTI_PORTI -#define ROTARY_ENCODER_EXTI_PORT_B LL_SYSCFG_EXTI_PORTJ -#define ROTARY_ENCODER_EXTI_SYS_LINE1 LL_SYSCFG_EXTI_LINE7 -#define ROTARY_ENCODER_EXTI_SYS_LINE2 LL_SYSCFG_EXTI_LINE8 -#define ROTARY_ENCODER_TIMER TIM17 -#define ROTARY_ENCODER_TIMER_IRQn TIM17_IRQn -#define ROTARY_ENCODER_TIMER_IRQHandler TIM17_IRQHandler - -// Millisecond timer -#define MS_TIMER TIM14 -#define MS_TIMER_IRQn TIM8_TRG_COM_TIM14_IRQn -#define MS_TIMER_IRQHandler TIM8_TRG_COM_TIM14_IRQHandler - -// Mixer scheduler timer -#define MIXER_SCHEDULER_TIMER TIM12 -#define MIXER_SCHEDULER_TIMER_FREQ (PERI1_FREQUENCY * TIMER_MULT_APB1) -#define MIXER_SCHEDULER_TIMER_IRQn TIM8_BRK_TIM12_IRQn -#define MIXER_SCHEDULER_TIMER_IRQHandler TIM8_BRK_TIM12_IRQHandler - #define LANDSCAPE_LCD true #define PORTRAIT_LCD false #define LANDSCAPE_LCD_SML false #define LANDSCAPE_LCD_STD true #define LANDSCAPE_LCD_LRG false -#define LCD_W 480 -#define LCD_H 320 - -#define LCD_PHYS_W LCD_H -#define LCD_PHYS_H LCD_W - -#define LCD_DEPTH 16 - #define LSE_DRIVE_STRENGTH RCC_LSEDRIVE_HIGH #endif // _HAL_H_ From 39b034f51cfb22ae6df8e1e9f77bf3a603f24cb6 Mon Sep 17 00:00:00 2001 From: philmoz Date: Wed, 12 Aug 2026 20:47:33 +1000 Subject: [PATCH 11/15] Restore STB library version. --- radio/src/thirdparty/stb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/radio/src/thirdparty/stb b/radio/src/thirdparty/stb index 5c205738c19..31c1ad37456 160000 --- a/radio/src/thirdparty/stb +++ b/radio/src/thirdparty/stb @@ -1 +1 @@ -Subproject commit 5c205738c191bcb0abc65c4febfa9bd25ff35234 +Subproject commit 31c1ad37456438565541f4919958214b6e762fb4 From 3f475aa4d26f26b5eb598d67ccba65b555e3778a Mon Sep 17 00:00:00 2001 From: philmoz Date: Wed, 12 Aug 2026 21:37:06 +1000 Subject: [PATCH 12/15] Fix IMU inversion. Move settings to JSON file. --- radio/src/boards/hw_defs/gx15.json | 79 ++++++++++++++++++++---------- radio/src/targets/gx15/hal.h | 33 ------------- 2 files changed, 53 insertions(+), 59 deletions(-) diff --git a/radio/src/boards/hw_defs/gx15.json b/radio/src/boards/hw_defs/gx15.json index 6476100a834..2cdfe578300 100644 --- a/radio/src/boards/hw_defs/gx15.json +++ b/radio/src/boards/hw_defs/gx15.json @@ -436,19 +436,12 @@ "ltdc_irq_prio": 4, "dma_screen_irq_prio": 6 }, - "timers": { - "cpu_freq": 480000000, - "peri1_frequency": 120000000, - "peri2_frequency": 120000000, - "timer_mult_apb1": 2, - "timer_mult_apb2": 2, - "ms_timer": "TIM14", - "ms_timer_irqn": "TIM8_TRG_COM_TIM14_IRQn", - "ms_timer_irqhandler": "TIM8_TRG_COM_TIM14_IRQHandler", - "mixer_scheduler_timer": "TIM12", - "mixer_scheduler_timer_freq": "(PERI1_FREQUENCY * TIMER_MULT_APB1)", - "mixer_scheduler_timer_irqn": "TIM8_BRK_TIM12_IRQn", - "mixer_scheduler_timer_irqhandler": "TIM8_BRK_TIM12_IRQHandler" + "backlight": { + "backlight_gpio": "GPIO_PIN(GPIOA, 10)", + "backlight_timer": "TIM1", + "backlight_timer_channel": "LL_TIM_CHANNEL_CH3", + "backlight_gpio_af": "GPIO_AF1", + "backlight_timer_freq": "(PERI1_FREQUENCY * TIMER_MULT_APB1)" }, "leds": { "led_strip_length": 26, @@ -473,10 +466,40 @@ "led_green_gpio": "GPIO_PIN(GPIOI, 11)", "led_blue_gpio": "GPIO_PIN(GPIOI, 10)" }, - "key_lock_combo": [ - "KEY_SYS", - "KEY_MODEL" - ], + "hardware": { + "has_ext_module_support": true, + "has_int_module_support": true, + "sport_max_baudrate": 400000, + "cpu": "STM32H750xB", + "cpu_type": "STM32H7" + }, + "timers": { + "cpu_freq": 480000000, + "peri1_frequency": 120000000, + "peri2_frequency": 120000000, + "timer_mult_apb1": 2, + "timer_mult_apb2": 2, + "ms_timer": "TIM14", + "ms_timer_irqn": "TIM8_TRG_COM_TIM14_IRQn", + "ms_timer_irqhandler": "TIM8_TRG_COM_TIM14_IRQHandler", + "mixer_scheduler_timer": "TIM12", + "mixer_scheduler_timer_freq": "(PERI1_FREQUENCY * TIMER_MULT_APB1)", + "mixer_scheduler_timer_irqn": "TIM8_BRK_TIM12_IRQn", + "mixer_scheduler_timer_irqhandler": "TIM8_BRK_TIM12_IRQHandler" + }, + "imu": { + "imu_i2c_bus": "I2C_Bus_1", + "imu_i2c_address": "0x6A", + "imu_int_gpio": "GPIO_PIN(GPIOG, 13)", + "imu_invert_x": true, + "imu_invert_y": true, + "exti": [ + { + "irq": "EXTI15_10_IRQ", + "priority": 6 + } + ] + }, "rotenc": { "rotary_encoder_gpio_a": "GPIOI", "rotary_encoder_gpio_pin_a": "LL_GPIO_PIN_7", @@ -503,13 +526,17 @@ "rotary_encoder_timer_irqn": "TIM17_IRQn", "rotary_encoder_timer_irqhandler": "TIM17_IRQHandler" }, - "hardware": { - "has_audio_mute": false, - "has_ext_module_support": true, - "has_int_module_support": true, - "sport_max_baudrate": 400000, - "surface": false, - "cpu": "STM32H750xB", - "cpu_type": "STM32H7" - } + "haptic": { + "haptic_pwm": true, + "haptic_gpio": "GPIO_PIN(GPIOC, 7)", + "haptic_gpio_timer": "TIM3", + "haptic_gpio_af": "GPIO_AF2", + "haptic_timer_output_enable": "TIM_CCER_CC2E | TIM_CCER_CC2NE", + "haptic_timer_mode": "TIM_CCMR1_OC2M_1 | TIM_CCMR1_OC2M_2 | TIM_CCMR1_OC2PE", + "haptic_timer_compare_value": "HAPTIC_GPIO_TIMER->CCR2" + }, + "key_lock_combo": [ + "KEY_SYS", + "KEY_MODEL" + ] } diff --git a/radio/src/targets/gx15/hal.h b/radio/src/targets/gx15/hal.h index f3ade83463c..68f4d36e3d6 100644 --- a/radio/src/targets/gx15/hal.h +++ b/radio/src/targets/gx15/hal.h @@ -329,13 +329,6 @@ TIM17: ROTARY_ENCODER_TIMER #define LCD_TE_GPIO GPIOI #define LCD_TE_GPIO_PIN LL_GPIO_PIN_4 -// Backlight -#define BACKLIGHT_GPIO GPIO_PIN(GPIOA, 10) // TIM1_CH3 -#define BACKLIGHT_TIMER TIM1 -#define BACKLIGHT_TIMER_CHANNEL LL_TIM_CHANNEL_CH3 -#define BACKLIGHT_GPIO_AF GPIO_AF1 -#define BACKLIGHT_TIMER_FREQ (PERI1_FREQUENCY * TIMER_MULT_APB1) - // QSPI Flash #define QSPI_CLK_GPIO GPIO_PIN(GPIOF, 10) #define QSPI_CLK_GPIO_AF GPIO_AF9 @@ -401,15 +394,6 @@ TIM17: ROTARY_ENCODER_TIMER #define I2C_B2_GPIO_AF LL_GPIO_AF_4 #define I2C_B2_CLK_RATE 400000 -// Haptic: TIM3_CH2 -#define HAPTIC_PWM -#define HAPTIC_GPIO GPIO_PIN(GPIOC, 7) -#define HAPTIC_GPIO_TIMER TIM3 -#define HAPTIC_GPIO_AF GPIO_AF2 -#define HAPTIC_TIMER_OUTPUT_ENABLE TIM_CCER_CC2E | TIM_CCER_CC2NE; -#define HAPTIC_TIMER_MODE TIM_CCMR1_OC2M_1 | TIM_CCMR1_OC2M_2 | TIM_CCMR1_OC2PE -#define HAPTIC_TIMER_COMPARE_VALUE HAPTIC_GPIO_TIMER->CCR2 - #define GPIO_LED_GPIO_ON gpio_set #define GPIO_LED_GPIO_OFF gpio_clear @@ -522,23 +506,6 @@ TIM17: ROTARY_ENCODER_TIMER #define EXTI2_IRQ_Priority 9 #endif -// IMU -#define IMU_I2C_BUS I2C_Bus_1 -#define IMU_I2C_ADDRESS 0x6A -#define IMU_INT_GPIO GPIO_PIN(GPIOG, 13) // PG.13 -// IMU_INT_EXTI IRQ -#if !defined(USE_EXTI15_10_IRQ) - #define USE_EXTI15_10_IRQ - #define EXTI15_10_IRQ_Priority 6 -#endif - - -#define LANDSCAPE_LCD true -#define PORTRAIT_LCD false -#define LANDSCAPE_LCD_SML false -#define LANDSCAPE_LCD_STD true -#define LANDSCAPE_LCD_LRG false - #define LSE_DRIVE_STRENGTH RCC_LSEDRIVE_HIGH #endif // _HAL_H_ From 0f2502906e90c7361aff2fec8cd205f67c122ba6 Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Tue, 18 Aug 2026 10:56:30 +1000 Subject: [PATCH 13/15] fix(ci): missing build bits, pots have detent --- .github/workflows/build_fw.yml | 3 ++- .github/workflows/nightly.yml | 2 +- fw.json | 1 + radio/src/boards/hw_defs/gx15.json | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_fw.yml b/.github/workflows/build_fw.yml index 425bf9df9bb..49137ff7309 100644 --- a/.github/workflows/build_fw.yml +++ b/.github/workflows/build_fw.yml @@ -87,7 +87,8 @@ jobs: - tprov2;tpros;bumblebee - mt12;gx12;t20;t20v2 - t12max;tx12mk2;boxer - - tx15;tx16s + - tx16s + - tx15;gx15 - x12s;f16 - v14;v14lcd;v16 - x10;x10express diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 06a78f0932c..5d2d1d425f5 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -38,7 +38,7 @@ jobs: - nb4p - st16 - c14 - - tx15 + - tx15;gx15 - t15pro - v12 container: diff --git a/fw.json b/fw.json index 41124d8db46..e6a49af6648 100644 --- a/fw.json +++ b/fw.json @@ -36,6 +36,7 @@ ["Jumper T-Pro V2", "tprov2-"], ["RadioMaster Boxer", "boxer-"], ["RadioMaster GX12", "gx12-"], + ["RadioMaster GX15", "gx15-"], ["RadioMaster MT12","mt12-"], ["RadioMaster Pocket", "pocket-"], ["RadioMaster TX12MK2", "tx12mk2-"], diff --git a/radio/src/boards/hw_defs/gx15.json b/radio/src/boards/hw_defs/gx15.json index 2cdfe578300..8b54347b86c 100644 --- a/radio/src/boards/hw_defs/gx15.json +++ b/radio/src/boards/hw_defs/gx15.json @@ -67,7 +67,7 @@ "inverted": true, "label": "S1", "short_label": "1", - "default": "POT" + "default": "POT_CENTER" }, { "name": "P2", @@ -79,7 +79,7 @@ "inverted": true, "label": "S2", "short_label": "2", - "default": "POT" + "default": "POT_CENTER" }, { "name": "SL1", From a8d679323e961676dd2d4e7c1a2b3bb3c70c6946 Mon Sep 17 00:00:00 2001 From: Peter Feerick <5500713+pfeerick@users.noreply.github.com> Date: Tue, 18 Aug 2026 13:50:44 +1000 Subject: [PATCH 14/15] chore(ci): missing simulator --- .github/workflows/companion.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/companion.yml b/.github/workflows/companion.yml index 3ff17544498..72d312fe2c2 100644 --- a/.github/workflows/companion.yml +++ b/.github/workflows/companion.yml @@ -59,7 +59,7 @@ jobs: - id: color-4 target: [nb4p, st16, pa01, c14] - id: color-5 - target: [t15pro, tx16smk3] + target: [t15pro, tx16smk3, gx15] steps: - name: Check out the repo From 7b5ed699e1e560d356d722fcb1f53443949aeb8e Mon Sep 17 00:00:00 2001 From: philmoz Date: Wed, 19 Aug 2026 08:58:13 +1000 Subject: [PATCH 15/15] Remove 'sport_max_baudrate'. --- radio/src/boards/hw_defs/gx15.json | 1 - 1 file changed, 1 deletion(-) diff --git a/radio/src/boards/hw_defs/gx15.json b/radio/src/boards/hw_defs/gx15.json index 8b54347b86c..e9deaa095f0 100644 --- a/radio/src/boards/hw_defs/gx15.json +++ b/radio/src/boards/hw_defs/gx15.json @@ -469,7 +469,6 @@ "hardware": { "has_ext_module_support": true, "has_int_module_support": true, - "sport_max_baudrate": 400000, "cpu": "STM32H750xB", "cpu_type": "STM32H7" },