diff --git a/radio/src/targets/gruvin9x/board_gruvin9x.cpp b/radio/src/targets/gruvin9x/board_gruvin9x.cpp index 97ac9a5d9..eb00ad7d0 100644 --- a/radio/src/targets/gruvin9x/board_gruvin9x.cpp +++ b/radio/src/targets/gruvin9x/board_gruvin9x.cpp @@ -301,7 +301,6 @@ FORCEINLINE void readKeysAndTrims() #endif } -#if ROTARY_ENCODERS <= 2 ISR(INT2_vect) { uint8_t input = (PIND & 0x0C); @@ -313,7 +312,6 @@ ISR(INT3_vect) uint8_t input = (PIND & 0x0C); if (input == 0 || input == 0x0C) incRotaryEncoder(0, +1); } -#endif ISR(INT5_vect) { diff --git a/radio/src/targets/gruvin9x/board_gruvin9x.h b/radio/src/targets/gruvin9x/board_gruvin9x.h index 756b7c244..026f66523 100644 --- a/radio/src/targets/gruvin9x/board_gruvin9x.h +++ b/radio/src/targets/gruvin9x/board_gruvin9x.h @@ -193,13 +193,8 @@ void pwrOff(); #define HAPTIC_OFF() PORTD |= (1 << OUT_D_HAPTIC) // Rotary encoder driver -#if ROTARY_ENCODERS <= 2 - #define REA_DOWN() (~PIND & 0x20) - #define REB_DOWN() (~PIND & 0x10) -#else - #define REA_DOWN() (0) - #define REB_DOWN() (0) -#endif +#define REA_DOWN() (~PIND & 0x20) +#define REB_DOWN() (~PIND & 0x10) #define ROTENC_DOWN() (REA_DOWN() || REB_DOWN()) #endif diff --git a/radio/src/targets/mega2560/board_mega2560.cpp b/radio/src/targets/mega2560/board_mega2560.cpp index 6472b5c65..5d767e8bf 100644 --- a/radio/src/targets/mega2560/board_mega2560.cpp +++ b/radio/src/targets/mega2560/board_mega2560.cpp @@ -116,12 +116,6 @@ void pwrOff() #endif } -#if ROTARY_ENCODERS <= 2 -#define ROTENC_DOWN() ((~PIND & 0x20) || (~PIND & 0x10)) -#else -#define ROTENC_DOWN() (0) -#endif - FORCEINLINE uint8_t keyDown() { return ((~PINL) & 0x3F) || ROTENC_DOWN(); @@ -196,6 +190,24 @@ bool switchState(EnumKeys enuk) return result; } +// Trim switches ... +static const pm_uchar crossTrim[] PROGMEM ={ + 1<> 3; - for (int i=1; i<7; i++) - { + for (int i=1; i<7; i++) { //INP_B_KEY_MEN 1 .. INP_B_KEY_LFT 6 keys[enuk].input(in & (1<