From da482b48b1eb0fc8dc8120b5ff01960865002809 Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Sat, 12 Mar 2022 13:22:40 +1000 Subject: [PATCH] fix: Trainer Slave not recognized in Master for ACCESS radios Fixes #1587 --- radio/src/targets/taranis/board.h | 2 +- radio/src/targets/taranis/hal.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/radio/src/targets/taranis/board.h b/radio/src/targets/taranis/board.h index e79a92492..e6ef1cfeb 100644 --- a/radio/src/targets/taranis/board.h +++ b/radio/src/targets/taranis/board.h @@ -151,7 +151,7 @@ void extmoduleSendInvertedByte(uint8_t byte); #if defined(TRAINER_DETECT_GPIO) // Trainer detect is a switch on the jack - #define TRAINER_CONNECTED() (GPIO_ReadInputDataBit(TRAINER_DETECT_GPIO, TRAINER_DETECT_GPIO_PIN) == Bit_RESET) + #define TRAINER_CONNECTED() (GPIO_ReadInputDataBit(TRAINER_DETECT_GPIO, TRAINER_DETECT_GPIO_PIN) == TRAINER_DETECT_GPIO_PIN_VALUE) #elif defined(PCBXLITES) // Trainer is on the same connector than Headphones enum JackState diff --git a/radio/src/targets/taranis/hal.h b/radio/src/targets/taranis/hal.h index fbb9b87ac..6549c2d4a 100644 --- a/radio/src/targets/taranis/hal.h +++ b/radio/src/targets/taranis/hal.h @@ -1585,6 +1585,7 @@ #if defined(PCBX9LITE) #define TRAINER_DETECT_GPIO GPIOD #define TRAINER_DETECT_GPIO_PIN GPIO_Pin_11 // PD.11 + #define TRAINER_DETECT_GPIO_PIN_VALUE Bit_SET #endif #define TRAINER_TIMER TIM4 #define TRAINER_GPIO_AF GPIO_AF_TIM4 // TIM4_CH1 (Out) + TIM4_CH2 (In) @@ -1619,6 +1620,11 @@ #define TRAINER_OUT_GPIO_PinSource GPIO_PinSource9 #define TRAINER_DETECT_GPIO GPIOA #define TRAINER_DETECT_GPIO_PIN GPIO_Pin_8 // PA.08 +#if defined(RADIO_X9DP2019) || defined(RADIO_X7ACCESS) + #define TRAINER_DETECT_GPIO_PIN_VALUE Bit_SET +#else + #define TRAINER_DETECT_GPIO_PIN_VALUE Bit_RESET +#endif #define TRAINER_TIMER TIM3 #define TRAINER_TIMER_IRQn TIM3_IRQn #define TRAINER_GPIO_AF GPIO_AF_TIM3