Issue232 fixed (Steps for sky9x rotary encoder)

This commit is contained in:
bsongis
2013-03-16 20:50:31 +00:00
parent 2a41cec5ae
commit b0ae67e2e5
3 changed files with 11 additions and 5 deletions
+7 -2
View File
@@ -952,6 +952,7 @@ enum menuGeneralHwItems {
ITEM_SETUP_HW_STICK_LH_GAIN, ITEM_SETUP_HW_STICK_LH_GAIN,
ITEM_SETUP_HW_STICK_RV_GAIN, ITEM_SETUP_HW_STICK_RV_GAIN,
ITEM_SETUP_HW_STICK_RH_GAIN, ITEM_SETUP_HW_STICK_RH_GAIN,
ITEM_SETUP_HW_ROTARY_ENCODER,
IF_BLUETOOTH(ITEM_SETUP_HW_BT_BAUDRATE) IF_BLUETOOTH(ITEM_SETUP_HW_BT_BAUDRATE)
ITEM_SETUP_HW_MAX ITEM_SETUP_HW_MAX
}; };
@@ -987,7 +988,7 @@ void menuGeneralHardware(uint8_t event)
lcd_puts(INDENT_WIDTH+3*FW, y, PSTR("Gain")); lcd_puts(INDENT_WIDTH+3*FW, y, PSTR("Gain"));
uint8_t mask = (1<<(k-ITEM_SETUP_HW_STICK_LV_GAIN)); uint8_t mask = (1<<(k-ITEM_SETUP_HW_STICK_LV_GAIN));
uint8_t val = (g_eeGeneral.sticksGain & mask ? 1 : 0); uint8_t val = (g_eeGeneral.sticksGain & mask ? 1 : 0);
lcd_putcAtt(15*FW, y, val ? '2' : '1', attr); lcd_putcAtt(GENERAL_HW_PARAM_OFS, y, val ? '2' : '1', attr);
if (attr) { if (attr) {
CHECK_INCDEC_GENVAR(event, val, 0, 1); CHECK_INCDEC_GENVAR(event, val, 0, 1);
if (checkIncDec_Ret) { if (checkIncDec_Ret) {
@@ -998,9 +999,13 @@ void menuGeneralHardware(uint8_t event)
break; break;
} }
case ITEM_SETUP_HW_ROTARY_ENCODER:
g_eeGeneral.rotarySteps = selectMenuItem(GENERAL_HW_PARAM_OFS, y, PSTR("Rotary Encoder"), PSTR("\0062steps4steps"), g_eeGeneral.rotarySteps, 0, 1, attr, event);
break;
#if defined(BLUETOOTH) #if defined(BLUETOOTH)
case ITEM_SETUP_HW_BT_BAUDRATE: case ITEM_SETUP_HW_BT_BAUDRATE:
g_eeGeneral.btBaudrate = selectMenuItem(RADIO_SETUP_2ND_COLUMN, y, STR_BAUDRATE, PSTR("\005115k 9600 19200"), g_eeGeneral.btBaudrate, 0, 2, attr, event); g_eeGeneral.btBaudrate = selectMenuItem(GENERAL_HW_PARAM_OFS, y, STR_BAUDRATE, PSTR("\005115k 9600 19200"), g_eeGeneral.btBaudrate, 0, 2, attr, event);
if (attr && checkIncDec_Ret) { if (attr && checkIncDec_Ret) {
btInit(); btInit();
} }
+2 -1
View File
@@ -146,7 +146,8 @@ enum BeeperMode {
int8_t temperatureCalib; \ int8_t temperatureCalib; \
uint8_t btBaudrate; \ uint8_t btBaudrate; \
uint8_t optrexDisplay; \ uint8_t optrexDisplay; \
uint8_t sticksGain; uint8_t sticksGain; \
uint8_t rotarySteps;
#else #else
#define EXTRA_GENERAL_FIELDS #define EXTRA_GENERAL_FIELDS
#endif #endif
+2 -2
View File
@@ -733,9 +733,9 @@ extern void setTrimValue(uint8_t phase, uint8_t idx, int16_t trim);
#endif #endif
#if defined(PCBGRUVIN9X) #if defined(PCBGRUVIN9X)
#define ROTARY_ENCODER_GRANULARITY 1 #define ROTARY_ENCODER_GRANULARITY (1)
#else #else
#define ROTARY_ENCODER_GRANULARITY 2 #define ROTARY_ENCODER_GRANULARITY (2 << g_eeGeneral.rotarySteps)
#endif #endif
#if defined(GVARS) #if defined(GVARS)