/branches/extra_encoders_rework merged

This commit is contained in:
maxim.karban@gmail.com
2012-05-21 19:08:21 +00:00
parent 8a62c195d2
commit 0682da0ff1
12 changed files with 105 additions and 60 deletions
+15 -7
View File
@@ -443,17 +443,24 @@ PACK(typedef struct t_SwashRingData { // Swash Ring data
#if defined(PCBV4)
#if defined(EXTRA_ROTARY_ENCODERS)
#define NUM_EXTRA_ROTARY_ENCODERS 3
#else
#define NUM_EXTRA_ROTARY_ENCODERS 0
#endif
#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];
#else //EXTRA_ROTARY_ENCODERS
#define NUM_EXTRA_ROTARY_ENCODERS 0
#define NUM_ROTARY_ENCODERS 2
#define ROTARY_ENCODER_ARRAY_EXTRA
#endif //EXTRA_ROTARY_ENCODERS
#define ROTARY_ENCODER_MAX 1024
#define ROTARY_ENCODER_ARRAY int16_t rotaryEncoders[NUM_ROTARY_ENCODERS];
#else
#define ROTARY_ENCODER_ARRAY int16_t rotaryEncoders[2];
#else //PCBV4
#define NUM_ROTARY_ENCODERS 0
#define NUM_EXTRA_ROTARY_ENCODERS 0
#define ROTARY_ENCODER_ARRAY
#endif
#define ROTARY_ENCODER_ARRAY_EXTRA
#endif //PCBV4
#if defined(PCBSTD)
#define TRIM_ARRAY int8_t trim[4]; int8_t trim_ext:8
@@ -576,6 +583,7 @@ PACK(typedef struct t_ModelData {
uint8_t varioSpeedDownMin;
uint8_t switchWarningStates;
ROTARY_ENCODER_ARRAY_EXTRA;
}) ModelData;
extern EEGeneral g_eeGeneral;