From 4c74386ce12edca660bcf6c8e8467eac9f39e28f Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Tue, 7 Apr 2026 08:46:43 +0200 Subject: [PATCH] fix(radio): fix X9D+ crash with Master/SBUS trainer mode (#7272) Co-authored-by: raphaelcoeffic <1050031+raphaelcoeffic@users.noreply.github.com> --- radio/src/boards/generic_stm32/module_ports.cpp | 4 ++-- radio/src/targets/taranis/hal.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/radio/src/boards/generic_stm32/module_ports.cpp b/radio/src/boards/generic_stm32/module_ports.cpp index 309a4c68b..19127f928 100644 --- a/radio/src/boards/generic_stm32/module_ports.cpp +++ b/radio/src/boards/generic_stm32/module_ports.cpp @@ -193,8 +193,8 @@ static void _extmod_init_inverter() static const stm32_usart_t sbus_trainer_USART = { .USARTx = TRAINER_MODULE_SBUS_USART, .rxGPIO = TRAINER_MODULE_SBUS_GPIO, - .IRQn = (IRQn_Type)-1, - .IRQ_Prio = 0, + .IRQn = TRAINER_MODULE_SBUS_USART_IRQn, + .IRQ_Prio = 6, .txDMA = nullptr, .txDMA_Stream = 0, .txDMA_Channel = 0, diff --git a/radio/src/targets/taranis/hal.h b/radio/src/targets/taranis/hal.h index 0109894b3..764ea8999 100644 --- a/radio/src/targets/taranis/hal.h +++ b/radio/src/targets/taranis/hal.h @@ -879,6 +879,7 @@ #define TRAINER_MODULE_CPPM_GPIO_AF GPIO_AF2 // Trainer SBUS input on heartbeat pin #define TRAINER_MODULE_SBUS_USART USART6 + #define TRAINER_MODULE_SBUS_USART_IRQn USART6_IRQn #define TRAINER_MODULE_SBUS_GPIO INTMODULE_HEARTBEAT_GPIO #define TRAINER_MODULE_SBUS_DMA DMA2 #define TRAINER_MODULE_SBUS_DMA_STREAM DMA2_Stream1