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

fix(bw): display GVar name if exist in telemetry screen (#4778)

Browse Source
This commit is contained in:
3djc
2024-03-24 19:21:54 +10:00
committed by GitHub
parent a791bf2e8e
commit f7f886095a
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/view_telemetry.cpp
+6
View File
@@ -122,6 +122,12 @@ bool displayNumbersTelemetryScreen(TelemetryScreenData & screen)
drawTimerWithMode(pos[j+1] + 2, 1+FH+2*FH*i, field - MIXSRC_FIRST_TIMER, RIGHT | DBLSIZE);
continue;
}
if (field >= MIXSRC_FIRST_GVAR && field <= MIXSRC_LAST_GVAR) {
if (g_model.gvars[field - MIXSRC_FIRST_GVAR].name[0])
lcdDrawSizedText(pos[j], 1+FH+2*FH*i,g_model.gvars[field - MIXSRC_FIRST_GVAR].name, LEN_GVAR_NAME, 0);
else
drawSource(pos[j], 1+FH+2*FH*i, field, 0);
}
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
att = RIGHT|DBLSIZE|NO_UNIT; //DBLSIZE ensure the telem screen specific display for GPS is used
radio/src/gui/212x64/view_telemetry.cpp
+6
View File
@@ -126,6 +126,12 @@ bool displayNumbersTelemetryScreen(TelemetryScreenData & screen)
y += FH/2;
}
}
if (field >= MIXSRC_FIRST_GVAR && field <= MIXSRC_LAST_GVAR) {
if (g_model.gvars[field - MIXSRC_FIRST_GVAR].name[0])
lcdDrawSizedText(pos[j], 1+FH+2*FH*i,g_model.gvars[field - MIXSRC_FIRST_GVAR].name, LEN_GVAR_NAME, 0);
else
drawSource(pos[j], 1+FH+2*FH*i, field, 0);
}
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, but we shift x by some pixel to allow it to fit on max coord
x -=2;