Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-23 16:25:16 +03:00
Code Issues Wiki Activity

Bug found in Pots Warning (Auto mode)

Browse source
This commit is contained in:
bsongis 2014-06-02 10:58:30 +02:00
parent 207fc721fa
commit 0ea3daa4c4
4 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
radio/src/gui/menu_model.cpp
View file

@ -1305,7 +1305,7 @@ void menuModelSetup(uint8_t event)
case EVT_KEY_LONG(KEY_ENTER): case EVT_KEY_LONG(KEY_ENTER):
killEvents(event); killEvents(event);
if (potMode == 1) { if (potMode == 1) {
g_model.potPosition[m_posHorz-1] = getValue(MIXSRC_FIRST_POT+m_posHorz-1) >> 4; SAVE_POT_POSITION(m_posHorz-1);
AUDIO_WARNING1(); AUDIO_WARNING1();
eeDirty(EE_MODEL); eeDirty(EE_MODEL);
} }

4
radio/src/opentx.cpp
View file

@ -2460,9 +2460,9 @@ void opentxClose()
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
if ((g_model.nPotsToWarn >> 6) == 2) { if ((g_model.nPotsToWarn >> 6) == 2) {
for (uint8_t i=0; i<NUM_POTS ; i++) for (uint8_t i=0; i<NUM_POTS; i++)
if (!(g_model.nPotsToWarn & (1 << i))) if (!(g_model.nPotsToWarn & (1 << i)))
g_model.potPosition[i] = getValue(MIXSRC_FIRST_POT+i) >> 3; SAVE_POT_POSITION(i);
eeDirty(EE_MODEL); eeDirty(EE_MODEL);
} }
#endif #endif

3
radio/src/opentx.h
View file

@ -361,6 +361,9 @@ enum PotType {
#define IS_POT_MULTIPOS(x) (false) #define IS_POT_MULTIPOS(x) (false)
#endif #endif
#define GET_LOWRES_POT_POSITION(i) (getValue(MIXSRC_FIRST_POT+(i)) >> 4)
#define SAVE_POT_POSITION(i) g_model.potPosition[i] = GET_LOWRES_POT_POSITION(i)
#if ROTARY_ENCODERS > 0 #if ROTARY_ENCODERS > 0
#define IF_ROTARY_ENCODERS(x) x, #define IF_ROTARY_ENCODERS(x) x,
#else #else

8
radio/src/switches.cpp
View file

@ -552,7 +552,7 @@ void checkSwitches()
evalFlightModeMixes(e_perout_mode_normal, 0); evalFlightModeMixes(e_perout_mode_normal, 0);
bad_pots = 0; bad_pots = 0;
for (uint8_t i=0; i<NUM_POTS; i++) { for (uint8_t i=0; i<NUM_POTS; i++) {
if (!(g_model.nPotsToWarn & (1 << i)) && (abs(g_model.potPosition[i] - (getValue(MIXSRC_FIRST_POT+i) >> 4)) > 1)) { if (!(g_model.nPotsToWarn & (1 << i)) && (abs(g_model.potPosition[i] - GET_LOWRES_POT_POSITION(i)) > 1)) {
warn = true; warn = true;
bad_pots |= (1<<i); bad_pots |= (1<<i);
} }
@ -598,16 +598,16 @@ void checkSwitches()
for (uint8_t i=0; i<NUM_POTS; i++) { for (uint8_t i=0; i<NUM_POTS; i++) {
if (!(g_model.nPotsToWarn & (1 << i))) { if (!(g_model.nPotsToWarn & (1 << i))) {
uint8_t flags = 0; uint8_t flags = 0;
if (abs(g_model.potPosition[i] - (getValue(MIXSRC_FIRST_POT+i) >> 4)) > 1) { if (abs(g_model.potPosition[i] - GET_LOWRES_POT_POSITION(i)) > 1) {
switch (i) { switch (i) {
case 0: case 0:
case 1: case 1:
case 2: case 2:
lcd_putc(60+i*(5*FW)+2*FW+2, 6*FH-2, g_model.potPosition[i] > (getValue(MIXSRC_FIRST_POT+i) >> 4) ? 126 : 127); lcd_putc(60+i*(5*FW)+2*FW+2, 6*FH-2, g_model.potPosition[i] > GET_LOWRES_POT_POSITION(i) ? 126 : 127);
break; break;
case 3: case 3:
case 4: case 4:
lcd_putc(60+i*(5*FW)+2*FW+2, 6*FH-2, g_model.potPosition[i] > (getValue(MIXSRC_FIRST_POT+i) >> 4) ? '\300' : '\301'); lcd_putc(60+i*(5*FW)+2*FW+2, 6*FH-2, g_model.potPosition[i] > GET_LOWRES_POT_POSITION(i) ? '\300' : '\301');
break; break;
} }
flags = INVERS; flags = INVERS;