fix(x10): wrong PCB detected with touch screen mod (#6108)
Co-authored-by: Peter Feerick <peter.feerick@gmail.com>
This commit is contained in:
committed by
Peter Feerick
co-authored by
Peter Feerick
parent
b8d55c28e6
commit
de93e27959
@@ -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
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user