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

Fixes #2577: order of displayed GPS coordinates changed according to ISO 6709 (latitude before longitude) (#3878)

Browse Source
This commit is contained in:
Damjan Adamic
2016-10-08 09:39:46 +02:00
committed by Bertrand Songis
parent c4a1dc4c70
commit 7509146a8f
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/lcd.cpp
+4 -4
View File
@@ -1084,12 +1084,12 @@ void drawGPSPosition(coord_t x, coord_t y, int32_t longitude, int32_t latitude,
if (flags & DBLSIZE) {
x -= (g_eeGeneral.gpsFormat == 0 ? 54 : 51);
flags &= ~0x0F00; // TODO constant
drawGPSCoord(x, y, longitude, "EW", flags);
drawGPSCoord(x, y+FH, latitude, "NS", flags);
drawGPSCoord(x, y, latitude, "NS", flags);
drawGPSCoord(x, y+FH, longitude, "EW", flags);
}
else {
drawGPSCoord(x, y, longitude, "EW", flags, false);
drawGPSCoord(lcdNextPos+FWNUM, y, latitude, "NS", flags, false);
drawGPSCoord(x, y, latitude, "NS", flags, false);
drawGPSCoord(lcdNextPos+FWNUM, y, longitude, "EW", flags, false);
}
}
radio/src/gui/212x64/lcd.cpp
+4 -4
View File
@@ -877,12 +877,12 @@ void drawGPSSensorValue(coord_t x, coord_t y, TelemetryItem & telemetryItem, Lcd
if (att & DBLSIZE) {
x -= (g_eeGeneral.gpsFormat == 0 ? 54 : 51);
att &= ~0x0F00; // TODO constant
drawGPSCoord(x, y, telemetryItem.gps.longitude, "EW", att, true);
drawGPSCoord(x, y+FH, telemetryItem.gps.latitude, "NS", att, true);
drawGPSCoord(x, y, telemetryItem.gps.latitude, "NS", att, true);
drawGPSCoord(x, y+FH, telemetryItem.gps.longitude, "EW", att, true);
}
else {
drawGPSCoord(x, y, telemetryItem.gps.longitude, "EW", att, false);
drawGPSCoord(lcdNextPos+FWNUM, y, telemetryItem.gps.latitude, "NS", att, false);
drawGPSCoord(x, y, telemetryItem.gps.latitude, "NS", att, false);
drawGPSCoord(lcdNextPos+FWNUM, y, telemetryItem.gps.longitude, "EW", att, false);
}
}
radio/src/gui/480x272/lcd.cpp
+4 -4
View File
@@ -371,12 +371,12 @@ void drawGPSCoord(coord_t x, coord_t y, int32_t value, const char * direction, L
void drawGPSPosition(coord_t x, coord_t y, int32_t longitude, int32_t latitude, LcdFlags flags)
{
if (flags & EXPANDED) {
drawGPSCoord(x, y, longitude, "EW", flags, true);
drawGPSCoord(x, y + FH, latitude, "NS", flags, true);
drawGPSCoord(x, y, latitude, "NS", flags, true);
drawGPSCoord(x, y + FH, longitude, "EW", flags, true);
}
else {
drawGPSCoord(x, y, longitude, "EW", flags, false);
drawGPSCoord(lcdNextPos+5, y, latitude, "NS", flags, false);
drawGPSCoord(x, y, latitude, "NS", flags, false);
drawGPSCoord(lcdNextPos+5, y, longitude, "EW", flags, false);
}
}