From 64ff78b59848cbf30bcd6f78cfb78f94b18bc740 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Mon, 27 May 2019 17:47:46 +0200 Subject: [PATCH] Refactoring --- radio/src/targets/taranis/board.h | 3 +-- radio/src/targets/taranis/hal.h | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/radio/src/targets/taranis/board.h b/radio/src/targets/taranis/board.h index abd446e82..ecd80852c 100644 --- a/radio/src/targets/taranis/board.h +++ b/radio/src/targets/taranis/board.h @@ -94,9 +94,8 @@ extern "C" { } #endif -#if defined(PCBX9E) || defined(RADIO_X7) || defined(PCBX9LITE) +#if defined(ROTARY_ENCODER_NAVIGATION) // Rotary Encoder driver -#define ROTARY_ENCODER_NAVIGATION void rotaryEncoderInit(void); void rotaryEncoderCheck(void); #endif diff --git a/radio/src/targets/taranis/hal.h b/radio/src/targets/taranis/hal.h index 92dac4b2b..a24812a33 100644 --- a/radio/src/targets/taranis/hal.h +++ b/radio/src/targets/taranis/hal.h @@ -94,6 +94,7 @@ // Rotary Encoder #if defined(PCBX9E) + #define ROTARY_ENCODER_NAVIGATION #define ROTARY_ENCODER_GPIO GPIOD #define ROTARY_ENCODER_GPIO_PIN_A GPIO_Pin_12 // PD.12 #define ROTARY_ENCODER_GPIO_PIN_B GPIO_Pin_13 // PD.13 @@ -106,6 +107,7 @@ #define ROTARY_ENCODER_EXTI_PinSource1 EXTI_PinSource12 #define ROTARY_ENCODER_EXTI_PinSource2 EXTI_PinSource13 #elif defined(RADIO_X7) + #define ROTARY_ENCODER_NAVIGATION #define ROTARY_ENCODER_GPIO GPIOE #define ROTARY_ENCODER_GPIO_PIN_A GPIO_Pin_9 // PE.09 #define ROTARY_ENCODER_GPIO_PIN_B GPIO_Pin_11 // PE.11 @@ -120,6 +122,7 @@ #define ROTARY_ENCODER_EXTI_PinSource1 EXTI_PinSource9 #define ROTARY_ENCODER_EXTI_PinSource2 EXTI_PinSource11 #elif defined(PCBX9LITE) + #define ROTARY_ENCODER_NAVIGATION #define ROTARY_ENCODER_GPIO GPIOE #define ROTARY_ENCODER_GPIO_PIN_A GPIO_Pin_10 // PE.10 #define ROTARY_ENCODER_GPIO_PIN_B GPIO_Pin_12 // PE.12