From 2d608bac32322fef91be1634a8666a9339474cb6 Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Fri, 23 Sep 2022 13:00:01 +1000 Subject: [PATCH] fix: TX-12MK2 status led sequence, Zorro BLUE/GREEN swap (#2346) * fix: Zorro LED_GREEN and LED_BLUE GPIO swapped * fix: TX12-MK2 Blue=>Green led sequence also Also add Zorro since it's GPIO has been changed. --- radio/src/opentx.h | 7 ++++--- radio/src/targets/taranis/board.cpp | 4 +++- radio/src/targets/taranis/hal.h | 8 ++++---- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/radio/src/opentx.h b/radio/src/opentx.h index a5acf2375..b90a131dc 100644 --- a/radio/src/opentx.h +++ b/radio/src/opentx.h @@ -890,9 +890,10 @@ constexpr uint8_t OPENTX_START_NO_CHECKS = 0x04; #define LED_ERROR_BEGIN() ledRed() // Green is preferred "ready to use" color for these radios #if defined(RADIO_T8) || defined(RADIO_COMMANDO8) || defined(RADIO_TLITE) || \ - defined(RADIO_TPRO) || defined(RADIO_TX12) - #define LED_ERROR_END() ledGreen() - #define LED_BIND() ledBlue() + defined(RADIO_TPRO) || defined(RADIO_TX12) || defined(RADIO_TX12MK2) || \ + defined(RADIO_ZORRO) +#define LED_ERROR_END() ledGreen() +#define LED_BIND() ledBlue() #else // Either green is not an option, or blue is preferred "ready to use" color #define LED_ERROR_END() ledBlue() diff --git a/radio/src/targets/taranis/board.cpp b/radio/src/targets/taranis/board.cpp index d87e92722..6e92eb3a4 100644 --- a/radio/src/targets/taranis/board.cpp +++ b/radio/src/targets/taranis/board.cpp @@ -171,7 +171,9 @@ void boardInit() #if defined(STATUS_LEDS) ledInit(); -#if defined(RADIO_TLITE) || defined(RADIO_TPRO) || defined(RADIO_TX12) +#if defined(RADIO_T8) || defined(RADIO_COMMANDO8) || defined(RADIO_TLITE) || \ + defined(RADIO_TPRO) || defined(RADIO_TX12) || defined(RADIO_TX12MK2) || \ + defined(RADIO_ZORRO) ledBlue(); #else ledGreen(); diff --git a/radio/src/targets/taranis/hal.h b/radio/src/targets/taranis/hal.h index 42afc6468..b7c8b5fa9 100644 --- a/radio/src/targets/taranis/hal.h +++ b/radio/src/targets/taranis/hal.h @@ -1455,12 +1455,12 @@ #define STATUS_LEDS #define GPIO_LED_GPIO_ON GPIO_SetBits #define GPIO_LED_GPIO_OFF GPIO_ResetBits - #define LED_GREEN_GPIO GPIOA - #define LED_GREEN_GPIO_PIN GPIO_Pin_7 // PA.07 + #define LED_GREEN_GPIO GPIOE + #define LED_GREEN_GPIO_PIN GPIO_Pin_2 // PE.02 #define LED_RED_GPIO GPIOE #define LED_RED_GPIO_PIN GPIO_Pin_13 // PE.13 - #define LED_BLUE_GPIO GPIOE - #define LED_BLUE_GPIO_PIN GPIO_Pin_2 // PE.02 + #define LED_BLUE_GPIO GPIOA + #define LED_BLUE_GPIO_PIN GPIO_Pin_7 // PA.07 #elif defined(RADIO_TLITE) || defined(RADIO_TPRO) || defined(RADIO_TX12) #define STATUS_LEDS #define GPIO_LED_GPIO_ON GPIO_SetBits