Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-15 20:35:17 +03:00
Code Issues Wiki Activity

[Horus] Pots / Sliders default config was wrong. Is it better?

Browse source
This commit is contained in:
Bertrand Songis 2016-08-31 19:48:17 +02:00
parent f97eda2b4f
commit 4e576efdd7
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
radio/src/datastructs.h
View file

@ -876,8 +876,8 @@ PACK(struct TrainerData {
#if defined(PCBHORUS) #if defined(PCBHORUS)
#define EXTRA_GENERAL_FIELDS \ #define EXTRA_GENERAL_FIELDS \
EXTRA_GENERAL_FIELDS_ARM \ EXTRA_GENERAL_FIELDS_ARM \
NOBACKUP(uint8_t serial2Mode:6); \ NOBACKUP(uint8_t serial2Mode:4); \
uint8_t slidersConfig:2; \ uint8_t slidersConfig:4; \
uint32_t switchConfig; \ uint32_t switchConfig; \
uint8_t potsConfig; /* two bits per pot */ \ uint8_t potsConfig; /* two bits per pot */ \
NOBACKUP(char switchNames[NUM_SWITCHES][LEN_SWITCH_NAME]); \ NOBACKUP(char switchNames[NUM_SWITCHES][LEN_SWITCH_NAME]); \

4
radio/src/gui/480x272/radio_hardware.cpp
View file

@ -83,6 +83,7 @@ bool menuRadioHardware(event_t event)
case ITEM_RADIO_HARDWARE_LABEL_STICKS: case ITEM_RADIO_HARDWARE_LABEL_STICKS:
lcdDrawText(MENUS_MARGIN_LEFT, y, STR_STICKS); lcdDrawText(MENUS_MARGIN_LEFT, y, STR_STICKS);
break; break;
case ITEM_RADIO_HARDWARE_STICK1: case ITEM_RADIO_HARDWARE_STICK1:
case ITEM_RADIO_HARDWARE_STICK2: case ITEM_RADIO_HARDWARE_STICK2:
case ITEM_RADIO_HARDWARE_STICK3: case ITEM_RADIO_HARDWARE_STICK3:
@ -96,6 +97,7 @@ bool menuRadioHardware(event_t event)
lcdDrawTextAtIndex(HW_SETTINGS_COLUMN, y, STR_MMMINV, 0, 0); lcdDrawTextAtIndex(HW_SETTINGS_COLUMN, y, STR_MMMINV, 0, 0);
break; break;
} }
case ITEM_RADIO_HARDWARE_LS: case ITEM_RADIO_HARDWARE_LS:
case ITEM_RADIO_HARDWARE_RS: case ITEM_RADIO_HARDWARE_RS:
case ITEM_RADIO_HARDWARE_LS2: case ITEM_RADIO_HARDWARE_LS2:
@ -114,9 +116,11 @@ bool menuRadioHardware(event_t event)
g_eeGeneral.slidersConfig |= (potType << idx); g_eeGeneral.slidersConfig |= (potType << idx);
break; break;
} }
case ITEM_RADIO_HARDWARE_LABEL_POTS: case ITEM_RADIO_HARDWARE_LABEL_POTS:
lcdDrawText(MENUS_MARGIN_LEFT, y, STR_POTS); lcdDrawText(MENUS_MARGIN_LEFT, y, STR_POTS);
break; break;
case ITEM_RADIO_HARDWARE_POT1: case ITEM_RADIO_HARDWARE_POT1:
case ITEM_RADIO_HARDWARE_POT2: case ITEM_RADIO_HARDWARE_POT2:
case ITEM_RADIO_HARDWARE_POT3: case ITEM_RADIO_HARDWARE_POT3:

4
radio/src/opentx.cpp
View file

@ -239,8 +239,8 @@ void generalDefault()
g_eeGeneral.vBatMin = -60; // 0 is 9.0V g_eeGeneral.vBatMin = -60; // 0 is 9.0V
g_eeGeneral.vBatMax = -78; // 0 is 12.0V g_eeGeneral.vBatMax = -78; // 0 is 12.0V
#elif defined(PCBHORUS) #elif defined(PCBHORUS)
g_eeGeneral.potsConfig = 0x05; // S1 and S2 = pots with detent g_eeGeneral.potsConfig = 0x19; // S1 and S2 = pots with detent
g_eeGeneral.slidersConfig = 0x03; // LS and RS = sliders with detent g_eeGeneral.slidersConfig = 0x0f; // 4 sliders
g_eeGeneral.blOffBright = 20; g_eeGeneral.blOffBright = 20;
#elif defined(PCBTARANIS) #elif defined(PCBTARANIS)
g_eeGeneral.potsConfig = 0x05; // S1 and S2 = pots with detent g_eeGeneral.potsConfig = 0x05; // S1 and S2 = pots with detent