piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: TX-12MK2 status led sequence, Zorro BLUE/GREEN swap (#2346)

Browse Source 
* 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.
This commit is contained in:
Peter Feerick
2022-09-23 13:00:01 +10:00
committed by GitHub
parent 40149c487c
commit 2d608bac32
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/opentx.h
+4 -3
View File
@@ -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()
radio/src/targets/taranis/board.cpp
+3 -1
View File
@@ -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();
radio/src/targets/taranis/hal.h
+4 -4
View File
@@ -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