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

Fix timer displays in telem view (#7146)

Browse Source 
Fix timer displays in telem view
This commit is contained in:
3djc
2019-12-03 16:31:58 +01:00
committed by Bertrand Songis
parent ce602c261a
commit 177787da18
4 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/view_telemetry.cpp
+5 -5
View File
@@ -45,8 +45,6 @@ void displayRssiLine()
}
}
uint8_t barCoord(int16_t value, int16_t min, int16_t max)
{
if (value <= min)
@@ -57,7 +55,6 @@ uint8_t barCoord(int16_t value, int16_t min, int16_t max)
return ((int32_t)(BAR_WIDTH-1) * (value - min)) / (max - min);
}
bool displayGaugesTelemetryScreen(TelemetryScreenData & screen)
{
// Custom Screen with gauges
@@ -125,9 +122,11 @@ bool displayNumbersTelemetryScreen(TelemetryScreenData & screen)
if (field) {
LcdFlags att = (i==3 ? RIGHT|NO_UNIT : RIGHT|MIDSIZE|NO_UNIT);
coord_t pos[] = {0, 65, 130};
if (field >= MIXSRC_FIRST_TIMER && field <= MIXSRC_LAST_TIMER && i!=3) {
if (field >= MIXSRC_FIRST_TIMER && field <= MIXSRC_LAST_TIMER && i != 3) {
// there is not enough space on LCD for displaying "Tmr1" or "Tmr2" and still see the - sign, we write "T1" or "T2" instead
drawStringWithIndex(pos[j], 1+FH+2*FH*i, "T", field-MIXSRC_FIRST_TIMER+1, 0);
drawTimerWithMode(pos[j+1] + 2, 1+FH+2*FH*i, field - MIXSRC_FIRST_TIMER, RIGHT | DBLSIZE);
continue;
}
else if (field >= MIXSRC_FIRST_TELEM && isGPSSensor(1+(field-MIXSRC_FIRST_TELEM)/3) && telemetryItems[(field-MIXSRC_FIRST_TELEM)/3].isAvailable()) {
// we don't display GPS name, no space for it
@@ -146,7 +145,8 @@ bool displayNumbersTelemetryScreen(TelemetryScreenData & screen)
att |= INVERS|BLINK;
}
}
if(isSensorUnit(1+(field-MIXSRC_FIRST_TELEM)/3, UNIT_DATETIME) && field >= MIXSRC_FIRST_TELEM) {
if (isSensorUnit(1+(field-MIXSRC_FIRST_TELEM)/3, UNIT_DATETIME) && field >= MIXSRC_FIRST_TELEM) {
drawTelemScreenDate(pos[j+1]-36, 6+FH+2*FH*i, field, SMLSIZE|NO_UNIT);
}
else {