mirror of
https://github.com/meshtastic/firmware.git
synced 2025-04-25 09:42:35 +00:00
remove Merge duplication
This commit is contained in:
parent
52903f83e3
commit
64895cc7eb
@ -545,23 +545,6 @@ static void drawGPSpowerstat(OLEDDisplay *display, int16_t x, int16_t y, const G
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
//Draw status when gps is disabled by PMU
|
|
||||||
static void drawGPSpowerstat(OLEDDisplay *display, int16_t x, int16_t y, const GPSStatus *gps)
|
|
||||||
{
|
|
||||||
#ifdef HAS_PMU
|
|
||||||
String displayLine = "GPS disabled";
|
|
||||||
int16_t xPos = display->getStringWidth(displayLine);
|
|
||||||
|
|
||||||
if (!config.position.gps_enabled){
|
|
||||||
display->drawString(x + xPos, y, displayLine);
|
|
||||||
#ifdef GPS_POWER_TOGGLE
|
|
||||||
display->drawString(x + xPos, y - 2 + FONT_HEIGHT_SMALL, " by button");
|
|
||||||
#endif
|
|
||||||
//display->drawString(x + xPos, y + 2, displayLine);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
static void drawGPSAltitude(OLEDDisplay *display, int16_t x, int16_t y, const GPSStatus *gps)
|
static void drawGPSAltitude(OLEDDisplay *display, int16_t x, int16_t y, const GPSStatus *gps)
|
||||||
{
|
{
|
||||||
String displayLine = "";
|
String displayLine = "";
|
||||||
|
Loading…
Reference in New Issue
Block a user