From 7f228ffec10800fb25160fff23e249454aaaa071 Mon Sep 17 00:00:00 2001 From: 3djc <5167938+3djc@users.noreply.github.com> Date: Fri, 10 Jul 2026 05:34:58 +0200 Subject: [PATCH] fix(t22): use PB15 and PJ12 for red LED due to USART1_RX DFU overlap (#7542) --- radio/src/boards/generic_stm32/led_driver.cpp | 10 ++++++++++ radio/src/targets/t22/hal.h | 1 + 2 files changed, 11 insertions(+) diff --git a/radio/src/boards/generic_stm32/led_driver.cpp b/radio/src/boards/generic_stm32/led_driver.cpp index dd927792d..d2596efe4 100644 --- a/radio/src/boards/generic_stm32/led_driver.cpp +++ b/radio/src/boards/generic_stm32/led_driver.cpp @@ -52,6 +52,10 @@ __weak void ledInit() gpio_init(LED_RED_GPIO, GPIO_OUT, GPIO_PIN_SPEED_LOW); #endif +#if defined(LED_RED2_GPIO) + gpio_init(LED_RED2_GPIO, GPIO_OUT, GPIO_PIN_SPEED_LOW); +#endif + #if defined(LED_BLUE_GPIO) gpio_init(LED_BLUE_GPIO, GPIO_OUT, GPIO_PIN_SPEED_LOW); #endif @@ -100,6 +104,9 @@ __weak void ledOff() #if defined(LED_RED_GPIO) GPIO_LED_GPIO_OFF(LED_RED_GPIO); #endif +#if defined(LED_RED2_GPIO) + GPIO_LED_GPIO_OFF(LED_RED2_GPIO); +#endif #if defined(LED_BLUE_GPIO) GPIO_LED_GPIO_OFF(LED_BLUE_GPIO); #endif @@ -114,6 +121,9 @@ __weak void ledRed() #if defined(LED_RED_GPIO) GPIO_LED_GPIO_ON(LED_RED_GPIO); #endif +#if defined(LED_RED2_GPIO) + GPIO_LED_GPIO_ON(LED_RED2_GPIO); +#endif } __weak void ledGreen() diff --git a/radio/src/targets/t22/hal.h b/radio/src/targets/t22/hal.h index ea6058519..d08c36c85 100644 --- a/radio/src/targets/t22/hal.h +++ b/radio/src/targets/t22/hal.h @@ -220,6 +220,7 @@ TIM17: ROTARY_ENCODER_TIMER #define GPIO_LED_GPIO_ON gpio_set #define GPIO_LED_GPIO_OFF gpio_clear #define LED_RED_GPIO GPIO_PIN(GPIOB, 15) +#define LED_RED2_GPIO GPIO_PIN(GPIOJ, 12) #define LED_GREEN_GPIO GPIO_PIN(GPIOB, 13) #define LED_BLUE_GPIO GPIO_PIN(GPIOB, 12)