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

fix(color): Refreshing of GPS and DATE_TIME telemetry when using Value Widget (#4250)

Browse Source
This commit is contained in:
Frankie Arzu
2023-11-04 15:26:50 +10:00
committed by GitHub
parent 89378e294f
commit cd89e06194
4 changed files with 63 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/draw_functions.cpp
+23 -24
View File
@@ -294,34 +294,33 @@ void drawTrimMode(BitmapBuffer * dc, coord_t x, coord_t y, uint8_t phase, uint8_
void drawDate(BitmapBuffer * dc, coord_t x, coord_t y, TelemetryItem & telemetryItem, LcdFlags att)
{
// TODO
bool doTwoLines = false;
coord_t ox = x;
if (att & FONT(XL)) {
x -= 42;
att &= ~FONT_MASK;
x = dc->drawNumber(x, y, telemetryItem.datetime.day, att|LEADING0|LEFT, 2);
x = dc->drawText(x - 1, y, "-", att);
x = dc->drawNumber(x - 1, y, telemetryItem.datetime.month, att|LEFT, 2);
x = dc->drawText(x - 1, y, "-", att);
x = dc->drawNumber(x - 1, y, telemetryItem.datetime.year-2000, att|LEFT);
y += FH;
/* TODO dc->drawNumber(x, y, telemetryItem.datetime.hour, att|LEADING0|LEFT, 2);
dc->drawText(lcdNextPos, y, ":", att);
dc->drawNumber(lcdNextPos, y, telemetryItem.datetime.min, att|LEADING0|LEFT, 2);
dc->drawText(lcdNextPos, y, ":", att);
dc->drawNumber(lcdNextPos, y, telemetryItem.datetime.sec, att|LEADING0|LEFT, 2); */
doTwoLines = true;
}
else {
x = dc->drawNumber(x, y, telemetryItem.datetime.day, att|LEADING0|LEFT, 2);
x = dc->drawText(x - 1, y, "-", att);
x = dc->drawNumber(x, y, telemetryItem.datetime.month, att|LEFT, 2);
x = dc->drawText(x - 1, y, "-", att);
x = dc->drawNumber(x, y, telemetryItem.datetime.year-2000, att|LEFT);
x = dc->drawNumber(x + 11, y, telemetryItem.datetime.hour, att|LEADING0|LEFT, 2);
x = dc->drawText(x, y, ":", att);
x = dc->drawNumber(x, y, telemetryItem.datetime.min, att|LEADING0|LEFT, 2);
x = dc->drawText(x, y, ":", att);
dc->drawNumber(x, y, telemetryItem.datetime.sec, att|LEADING0|LEFT, 2);
LcdFlags fl = att|LEADING0|LEFT;
x = dc->drawNumber(x, y, telemetryItem.datetime.year, fl,4);
x = dc->drawText(x, y, "-", att);
x = dc->drawNumber(x, y, telemetryItem.datetime.month, fl, 2);
x = dc->drawText(x, y, "-", att);
x = dc->drawNumber(x, y, telemetryItem.datetime.day, fl, 2);
if (doTwoLines) {
y += FH; x = ox;
} else {
x += 11;
}
x = dc->drawNumber(x, y, telemetryItem.datetime.hour, fl, 2);
x = dc->drawText(x, y, ":", att);
x = dc->drawNumber(x, y, telemetryItem.datetime.min, fl, 2);
x = dc->drawText(x, y, ":", att);
dc->drawNumber(x, y, telemetryItem.datetime.sec, fl, 2);
}
coord_t drawGPSCoord(BitmapBuffer * dc, coord_t x, coord_t y, int32_t value, const char * direction, LcdFlags flags, bool seconds=true)
radio/src/gui/colorlcd/model_telemetry.cpp
+3 -3
View File
@@ -998,9 +998,9 @@ void ModelTelemetryPage::build(FormWindow * window)
std::string getDate(TelemetryItem & telemetryItem)
{
return
formatNumberAsString(telemetryItem.datetime.day, LEADING0|LEFT, 2) + "-" +
formatNumberAsString(telemetryItem.datetime.month, LEFT, 2) + "-" +
formatNumberAsString(telemetryItem.datetime.year-2000, LEFT) + " " +
formatNumberAsString(telemetryItem.datetime.year, LEADING0|LEFT,4) + "-" +
formatNumberAsString(telemetryItem.datetime.month, LEADING0|LEFT, 2) + "-" +
formatNumberAsString(telemetryItem.datetime.day, LEADING0|LEFT, 2) + " " +
formatNumberAsString(telemetryItem.datetime.hour, LEADING0|LEFT, 2) + ":" +
formatNumberAsString(telemetryItem.datetime.min, LEADING0|LEFT, 2) + ":" +
formatNumberAsString(telemetryItem.datetime.sec, LEADING0|LEFT, 2);