From de93e2795926667841e0a259a578c989179dc73c Mon Sep 17 00:00:00 2001 From: MRC3742 Date: Tue, 22 Apr 2025 22:24:27 -0400 Subject: [PATCH] fix(x10): wrong PCB detected with touch screen mod (#6108) Co-authored-by: Peter Feerick --- radio/src/targets/common/arm/stm32/pwr_driver.cpp | 8 ++------ radio/src/targets/horus/hal.h | 11 ++++++++--- radio/src/targets/taranis/hal.h | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/radio/src/targets/common/arm/stm32/pwr_driver.cpp b/radio/src/targets/common/arm/stm32/pwr_driver.cpp index 44757811b..f294e3eb1 100644 --- a/radio/src/targets/common/arm/stm32/pwr_driver.cpp +++ b/radio/src/targets/common/arm/stm32/pwr_driver.cpp @@ -70,14 +70,10 @@ void pwrInit() hardwareOptions.pcbrev = PCBREV_VALUE(); #elif defined(PCBREV_GPIO_1) && defined(PCBREV_GPIO_2) gpio_init(PCBREV_GPIO_1, GPIO_IN_PU, GPIO_PIN_SPEED_LOW); + gpio_init(PCBREV_GPIO_2, GPIO_IN_PU, GPIO_PIN_SPEED_LOW); #if defined(PCBREV_TOUCH_GPIO) - #if defined(PCBREV_TOUCH_GPIO_PULL_UP) - gpio_init(PCBREV_GPIO_2, GPIO_IN_PU, GPIO_PIN_SPEED_LOW); - #else - gpio_init(PCBREV_TOUCH_GPIO, GPIO_IN_PD, GPIO_PIN_SPEED_LOW); - #endif + gpio_init(PCBREV_TOUCH_GPIO, PCBREV_TOUCH_PULL_TYPE, GPIO_PIN_SPEED_LOW); #endif - hardwareOptions.pcbrev = PCBREV_VALUE(); #endif diff --git a/radio/src/targets/horus/hal.h b/radio/src/targets/horus/hal.h index a226e2972..b7ba222e9 100644 --- a/radio/src/targets/horus/hal.h +++ b/radio/src/targets/horus/hal.h @@ -613,18 +613,23 @@ #define PCBREV_GPIO GPIO_PIN(GPIOH, 8) // PH.08 #define PCBREV_VALUE() (gpio_read(PCBREV_GPIO) >> 8) #elif defined(RADIO_V16) - #define PCBREV_VALUE() {0} + #define PCBREV_VALUE() {0} #elif defined(PCBX10) #define PCBREV_GPIO_1 GPIO_PIN(GPIOH, 7) // PH.07 #define PCBREV_GPIO_2 GPIO_PIN(GPIOH, 8) // PH.08 #define PCBREV_TOUCH_GPIO GPIO_PIN(GPIOA, 6) // PA.06 - #define PCBREV_VALUE() ((gpio_read(PCBREV_GPIO_1) | gpio_read(PCBREV_GPIO_2)) >> 7) - #define PCBREV_TOUCH_GPIO_PULL_UP + #define PCBREV_TOUCH_PULL_TYPE GPIO_IN_PU + #define PCBREV_VALUE() ((gpio_read(PCBREV_GPIO_1) ? 1 : 0) + ((gpio_read(PCBREV_GPIO_2) ? 1 : 0) << 1)) * (gpio_read(PCBREV_TOUCH_GPIO) ? 1 : 0) #else #define PCBREV_GPIO GPIO_PIN(GPIOI, 11) // PI.11 #define PCBREV_VALUE() (gpio_read(PCBREV_GPIO) >> 11) #endif +#if defined(PCBREV_TOUCH_GPIO) && !defined(PCBREV_TOUCH_PULL_TYPE) + #define PCBREV_TOUCH_PULL_TYPE GPIO_IN_PD + #pragma message "PCBREV_TOUCH_PULL_TYPE not defined, defaulting to GPIO_IN_PD" +#endif + // Led #define STATUS_LEDS #if defined(PCBX12S) diff --git a/radio/src/targets/taranis/hal.h b/radio/src/targets/taranis/hal.h index a21d19c3a..27c0abe0e 100644 --- a/radio/src/targets/taranis/hal.h +++ b/radio/src/targets/taranis/hal.h @@ -2366,7 +2366,7 @@ // PCBREV #if defined(RADIO_X7) && !defined(DEBUG_SEGGER_RTT) - #define PCBREV_GPIO_PIN GPIO_PIN(GPIOA, 14) // PA.14 + #define PCBREV_GPIO GPIO_PIN(GPIOA, 14) // PA.14 #define PCBREV_GPIO_PULL_DOWN #define PCBREV_VALUE() (gpio_read(PCBREV_GPIO) >> 14) #endif