From 1ab87150d83231febd8487336620ad9704033a58 Mon Sep 17 00:00:00 2001 From: "maxim.karban@gmail.com" Date: Thu, 24 May 2012 18:07:27 +0000 Subject: [PATCH] EXTRA_ROTARY_ENCODERS: redefined some variables, cosmetic --- src/lcd.cpp | 4 ++-- src/model_menus.cpp | 8 ++++---- src/myeeprom.h | 11 +++++------ src/open9x.cpp | 12 ++++++------ 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/lcd.cpp b/src/lcd.cpp index 064702c57..92926cba7 100644 --- a/src/lcd.cpp +++ b/src/lcd.cpp @@ -583,10 +583,10 @@ void putsRotaryEncoderMode(uint8_t x, uint8_t y, uint8_t phase, uint8_t idx, uin { #if defined(EXTRA_ROTARY_ENCODERS) int16_t v; - if(idx < (NUM_ROTARY_ENCODERS - NUM_EXTRA_ROTARY_ENCODERS)) + if(idx < (NUM_ROTARY_ENCODERS - NUM_ROTARY_ENCODERS_EXTRA)) v = phaseaddress(phase)->rotaryEncoders[idx]; else - v = g_model.rotaryEncodersExtra[phase][idx - (NUM_ROTARY_ENCODERS - NUM_EXTRA_ROTARY_ENCODERS)]; + v = g_model.rotaryEncodersExtra[phase][idx - (NUM_ROTARY_ENCODERS - NUM_ROTARY_ENCODERS_EXTRA)]; #else int16_t v = phaseaddress(phase)->rotaryEncoders[idx]; #endif diff --git a/src/model_menus.cpp b/src/model_menus.cpp index fe8cd259e..fefa2128f 100644 --- a/src/model_menus.cpp +++ b/src/model_menus.cpp @@ -861,10 +861,10 @@ void menuProcPhaseOne(uint8_t event) if (attr && m_posHorz==4+t && ((s_editMode>0) || p1valdiff)) { #if defined(EXTRA_ROTARY_ENCODERS) int16_t v; - if(t < (NUM_ROTARY_ENCODERS - NUM_EXTRA_ROTARY_ENCODERS)) + if(t < (NUM_ROTARY_ENCODERS - NUM_ROTARY_ENCODERS_EXTRA)) v = phaseaddress(s_currIdx)->rotaryEncoders[t]; else - v = g_model.rotaryEncodersExtra[s_currIdx][t-(NUM_ROTARY_ENCODERS - NUM_EXTRA_ROTARY_ENCODERS)]; + v = g_model.rotaryEncodersExtra[s_currIdx][t-(NUM_ROTARY_ENCODERS - NUM_ROTARY_ENCODERS_EXTRA)]; #else int16_t v = phaseaddress(s_currIdx)->rotaryEncoders[t]; #endif @@ -873,10 +873,10 @@ void menuProcPhaseOne(uint8_t event) if (checkIncDec_Ret) { if (v == ROTARY_ENCODER_MAX) v = 0; #if defined(EXTRA_ROTARY_ENCODERS) - if (t < (NUM_ROTARY_ENCODERS - NUM_EXTRA_ROTARY_ENCODERS)) + if (t < (NUM_ROTARY_ENCODERS - NUM_ROTARY_ENCODERS_EXTRA)) phaseaddress(s_currIdx)->rotaryEncoders[t] = v; else - g_model.rotaryEncodersExtra[s_currIdx][t-(NUM_ROTARY_ENCODERS - NUM_EXTRA_ROTARY_ENCODERS)] = v; + g_model.rotaryEncodersExtra[s_currIdx][t-(NUM_ROTARY_ENCODERS - NUM_ROTARY_ENCODERS_EXTRA)] = v; #else phaseaddress(s_currIdx)->rotaryEncoders[t] = v; #endif diff --git a/src/myeeprom.h b/src/myeeprom.h index 035c94cb7..b9164002c 100644 --- a/src/myeeprom.h +++ b/src/myeeprom.h @@ -442,12 +442,11 @@ PACK(typedef struct t_SwashRingData { // Swash Ring data #if defined(PCBV4) #if defined(EXTRA_ROTARY_ENCODERS) -#define NUM_EXTRA_ROTARY_ENCODERS 2 -#define NUM_ROTARY_ENCODERS (2+NUM_EXTRA_ROTARY_ENCODERS) -#define NUM_UART_ROTARY_ENCODERS 3 -#define ROTARY_ENCODER_ARRAY_EXTRA int16_t rotaryEncodersExtra[MAX_PHASES][2]; +#define NUM_ROTARY_ENCODERS_EXTRA 2 +#define NUM_ROTARY_ENCODERS (2+NUM_ROTARY_ENCODERS_EXTRA) +#define ROTARY_ENCODER_ARRAY_EXTRA int16_t rotaryEncodersExtra[MAX_PHASES][NUM_ROTARY_ENCODERS_EXTRA]; #else //EXTRA_ROTARY_ENCODERS -#define NUM_EXTRA_ROTARY_ENCODERS 0 +#define NUM_ROTARY_ENCODERS_EXTRA 0 #define NUM_ROTARY_ENCODERS 2 #define ROTARY_ENCODER_ARRAY_EXTRA #endif //EXTRA_ROTARY_ENCODERS @@ -455,8 +454,8 @@ PACK(typedef struct t_SwashRingData { // Swash Ring data #define ROTARY_ENCODER_ARRAY int16_t rotaryEncoders[2]; #else //PCBV4 +#define NUM_ROTARY_ENCODERS_EXTRA 0 #define NUM_ROTARY_ENCODERS 0 -#define NUM_EXTRA_ROTARY_ENCODERS 0 #define ROTARY_ENCODER_ARRAY #define ROTARY_ENCODER_ARRAY_EXTRA #endif //PCBV4 diff --git a/src/open9x.cpp b/src/open9x.cpp index df72347bc..4ba22db50 100644 --- a/src/open9x.cpp +++ b/src/open9x.cpp @@ -693,10 +693,10 @@ uint8_t getRotaryEncoderFlightPhase(uint8_t idx) if (phase == 0) return 0; #if defined(EXTRA_ROTARY_ENCODERS) int16_t value; - if(idx<(NUM_ROTARY_ENCODERS - NUM_EXTRA_ROTARY_ENCODERS)) + if(idx<(NUM_ROTARY_ENCODERS - NUM_ROTARY_ENCODERS_EXTRA)) value = phaseaddress(phase)->rotaryEncoders[idx]; else - value = g_model.rotaryEncodersExtra[phase][idx-(NUM_ROTARY_ENCODERS - NUM_EXTRA_ROTARY_ENCODERS)]; + value = g_model.rotaryEncodersExtra[phase][idx-(NUM_ROTARY_ENCODERS - NUM_ROTARY_ENCODERS_EXTRA)]; #else int16_t value = phaseaddress(phase)->rotaryEncoders[idx]; #endif @@ -711,8 +711,8 @@ uint8_t getRotaryEncoderFlightPhase(uint8_t idx) int16_t getRotaryEncoder(uint8_t idx) { #if defined(EXTRA_ROTARY_ENCODERS) - if(idx >= (NUM_ROTARY_ENCODERS - NUM_EXTRA_ROTARY_ENCODERS)) - return g_model.rotaryEncodersExtra[getRotaryEncoderFlightPhase(idx)][idx-(NUM_ROTARY_ENCODERS - NUM_EXTRA_ROTARY_ENCODERS)]; + if(idx >= (NUM_ROTARY_ENCODERS - NUM_ROTARY_ENCODERS_EXTRA)) + return g_model.rotaryEncodersExtra[getRotaryEncoderFlightPhase(idx)][idx-(NUM_ROTARY_ENCODERS - NUM_ROTARY_ENCODERS_EXTRA)]; #endif return phaseaddress(getRotaryEncoderFlightPhase(idx))->rotaryEncoders[idx]; } @@ -722,10 +722,10 @@ void incRotaryEncoder(uint8_t idx, int8_t inc) g_rotenc[idx] += inc; #if defined(EXTRA_ROTARY_ENCODERS) int16_t *value; - if (idx < (NUM_ROTARY_ENCODERS - NUM_EXTRA_ROTARY_ENCODERS)) + if (idx < (NUM_ROTARY_ENCODERS - NUM_ROTARY_ENCODERS_EXTRA)) value = &(phaseaddress(getRotaryEncoderFlightPhase(idx))->rotaryEncoders[idx]); else - value = &(g_model.rotaryEncodersExtra[getRotaryEncoderFlightPhase(idx)][idx-(NUM_ROTARY_ENCODERS - NUM_EXTRA_ROTARY_ENCODERS)]); + value = &(g_model.rotaryEncodersExtra[getRotaryEncoderFlightPhase(idx)][idx-(NUM_ROTARY_ENCODERS - NUM_ROTARY_ENCODERS_EXTRA)]); #else int16_t *value = &(phaseaddress(getRotaryEncoderFlightPhase(idx))->rotaryEncoders[idx]); #endif