[Horus] GPS display fix
This commit is contained in:
@@ -817,6 +817,7 @@ void drawGPSCoord(coord_t x, coord_t y, int32_t value, const char * direction, L
|
|||||||
uint32_t absvalue = abs(value);
|
uint32_t absvalue = abs(value);
|
||||||
lcdDrawNumber(x, y, absvalue / 1000000, att); // ddd
|
lcdDrawNumber(x, y, absvalue / 1000000, att); // ddd
|
||||||
lcdDrawChar(lcdLastPos, y, '@', att);
|
lcdDrawChar(lcdLastPos, y, '@', att);
|
||||||
|
att &= ~RIGHT;
|
||||||
absvalue = absvalue % 1000000;
|
absvalue = absvalue % 1000000;
|
||||||
absvalue *= 60;
|
absvalue *= 60;
|
||||||
if (g_eeGeneral.gpsFormat == 0 || !seconds) {
|
if (g_eeGeneral.gpsFormat == 0 || !seconds) {
|
||||||
@@ -876,8 +877,8 @@ void drawGPSSensorValue(coord_t x, coord_t y, TelemetryItem & telemetryItem, Lcd
|
|||||||
if (att & DBLSIZE) {
|
if (att & DBLSIZE) {
|
||||||
x -= (g_eeGeneral.gpsFormat == 0 ? 54 : 51);
|
x -= (g_eeGeneral.gpsFormat == 0 ? 54 : 51);
|
||||||
att &= ~0x0F00; // TODO constant
|
att &= ~0x0F00; // TODO constant
|
||||||
drawGPSCoord(x, y, telemetryItem.gps.longitude, "EW", att);
|
drawGPSCoord(x, y, telemetryItem.gps.longitude, "EW", att, true);
|
||||||
drawGPSCoord(x, y+FH, telemetryItem.gps.latitude, "NS", att);
|
drawGPSCoord(x, y+FH, telemetryItem.gps.latitude, "NS", att, true);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
drawGPSCoord(x, y, telemetryItem.gps.longitude, "EW", att, false);
|
drawGPSCoord(x, y, telemetryItem.gps.longitude, "EW", att, false);
|
||||||
|
|||||||
@@ -360,8 +360,14 @@ 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)
|
void drawGPSPosition(coord_t x, coord_t y, int32_t longitude, int32_t latitude, LcdFlags flags)
|
||||||
{
|
{
|
||||||
drawGPSCoord(x, y, longitude, "EW", flags);
|
if (flags & EXPANDED) {
|
||||||
drawGPSCoord(x, y+FH, latitude, "NS", flags);
|
drawGPSCoord(x, y, longitude, "EW", flags, true);
|
||||||
|
drawGPSCoord(x, y + FH, latitude, "NS", flags, true);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
drawGPSCoord(x, y, longitude, "EW", flags, false);
|
||||||
|
drawGPSCoord(lcdNextPos+5, y, latitude, "NS", flags, false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void drawGPSSensorValue(coord_t x, coord_t y, TelemetryItem & telemetryItem, LcdFlags flags)
|
void drawGPSSensorValue(coord_t x, coord_t y, TelemetryItem & telemetryItem, LcdFlags flags)
|
||||||
|
|||||||
@@ -88,6 +88,7 @@ enum FontSizeIndex {
|
|||||||
|
|
||||||
#define TIMEBLINK 0x1000
|
#define TIMEBLINK 0x1000
|
||||||
#define TIMEHOUR 0x2000
|
#define TIMEHOUR 0x2000
|
||||||
|
#define EXPANDED 0x2000
|
||||||
#define VERTICAL 0x4000
|
#define VERTICAL 0x4000
|
||||||
#define NO_FONTCACHE 0x8000
|
#define NO_FONTCACHE 0x8000
|
||||||
|
|
||||||
|
|||||||
@@ -75,13 +75,20 @@ void ValueWidget::refresh()
|
|||||||
yValue = y+18;
|
yValue = y+18;
|
||||||
xLabel = x+NUMBERS_PADDING;
|
xLabel = x+NUMBERS_PADDING;
|
||||||
yLabel = y+2;
|
yLabel = y+2;
|
||||||
|
if (field >= MIXSRC_FIRST_TELEM) {
|
||||||
|
if (isGPSSensor(1+(field-MIXSRC_FIRST_TELEM)/3)) {
|
||||||
|
attrValue = LEFT | MIDSIZE | EXPANDED;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
attrValue = LEFT | DBLSIZE;
|
||||||
|
}
|
||||||
|
}
|
||||||
#if defined(INTERNAL_GPS)
|
#if defined(INTERNAL_GPS)
|
||||||
if (field == MIXSRC_TX_GPS) {
|
else if (field == MIXSRC_TX_GPS) {
|
||||||
attrValue = LEFT | MIDSIZE;
|
attrValue = LEFT | MIDSIZE | EXPANDED;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
#endif
|
#endif
|
||||||
{
|
else {
|
||||||
attrValue = LEFT | DBLSIZE;
|
attrValue = LEFT | DBLSIZE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user