piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

[all] Small bugs again

Browse Source
This commit is contained in:
bsongis
2013-02-26 17:18:18 +00:00
parent b74f8ee61d
commit 62d80d8145
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main_views.cpp
+14 -10
View File
@@ -197,11 +197,7 @@ void displayTimers()
putsTime(TIMERS_X, TIMER1_Y, s_timerVal[0], MIDSIZE, MIDSIZE);
putsTmrMode(TIMERS_X-16, TIMER1_Y+5, g_model.timers[0].mode, SWCONDENSED|SMLSIZE);
if (g_model.timers[0].persistent) lcd_putcAtt(TIMERS_R, TIMER1_Y+1, 'P', SMLSIZE);
if (s_timerState[0]==TMR_BEEPING) {
lcd_hline(TIMERS_X-6, TIMER1_Y+2, 4);
if (BLINK_ON_PHASE)
lcd_filled_rect(TIMERS_X-17, TIMER1_Y, 70, 12);
}
if (s_timerVal[0] < 0) lcd_hline(TIMERS_X-6, TIMER1_Y+2, 4);
}
// Second timer
@@ -209,11 +205,19 @@ void displayTimers()
putsTime(TIMERS_X, TIMER2_Y, s_timerVal[1], MIDSIZE, MIDSIZE);
putsTmrMode(TIMERS_X-16, TIMER2_Y+5, g_model.timers[1].mode, SWCONDENSED|SMLSIZE);
if (g_model.timers[1].persistent) lcd_putcAtt(TIMERS_R, TIMER2_Y+1, 'P', SMLSIZE);
if (s_timerState[1]==TMR_BEEPING) {
lcd_hline(TIMERS_X-6, TIMER2_Y+2, 4);
if (BLINK_ON_PHASE)
lcd_filled_rect(TIMERS_X-17, TIMER2_Y, 70, 12);
}
if (s_timerVal[1] < 0) lcd_hline(TIMERS_X-6, TIMER2_Y+2, 4);
}
// Main timer beeping
if (s_timerState[0]==TMR_BEEPING) {
if (BLINK_ON_PHASE)
lcd_filled_rect(TIMERS_X-17, TIMER1_Y, 70, 12);
}
// Second timer beeping
if (s_timerState[1]==TMR_BEEPING) {
if (BLINK_ON_PHASE)
lcd_filled_rect(TIMERS_X-17, TIMER2_Y, 70, 12);
}
}
#else
src/open9x.cpp
+1 -1
View File
@@ -2052,7 +2052,7 @@ PLAY_FUNCTION(playValue, uint8_t idx)
default:
{
uint8_t unit = 1;
if (idx < MIXSRC_GVAR1)
if (idx < MIXSRC_GVAR1-1)
val = calcRESXto100(val);
if (idx >= MIXSRC_FIRST_TELEM-1+TELEM_ALT-1 && idx <= MIXSRC_FIRST_TELEM-1+TELEM_GPSALT-1)
unit = idx - (MIXSRC_FIRST_TELEM-1+TELEM_ALT-1);