diff --git a/platformio.ini b/platformio.ini index 7cfea7ea..1d8ce655 100644 --- a/platformio.ini +++ b/platformio.ini @@ -13,10 +13,10 @@ [platformio] ;env_default = lolin32lite, heltec, generic ;env_default = generic -env_default = heltec +;env_default = heltec ;env_default = ttgov1 ;env_default = ttgov2 -;env_default = ttgov21 +env_default = ttgov21 ;env_default = ttgobeam ;env_default = lopy ;env_default = lopy4 diff --git a/src/display.cpp b/src/display.cpp index 2a7c9779..d1d4019d 100644 --- a/src/display.cpp +++ b/src/display.cpp @@ -109,16 +109,22 @@ void refreshDisplay() { u8x8.draw2x2String(0, 0, buff); // display number on unique macs total Wifi + BLE - // update GPS status (line 2) +// update Battery status (line 2) +#ifdef HAS_BATTERY_PROBE + u8x8.setCursor(0, 2); + u8x8.printf("B=%.1fV", read_voltage() / 1000.0); +#endif + +// update GPS status (line 2) #ifdef HAS_GPS - u8x8.setCursor(7, 2); + u8x8.setCursor(8, 2); if (!gps.location.isValid()) // if no fix then display Sats value inverse { u8x8.setInverseFont(1); - u8x8.printf("Sats: %.3d", gps.satellites.value()); + u8x8.printf("Sat %.3d", gps.satellites.value()); u8x8.setInverseFont(0); } else - u8x8.printf("Sats: %.3d", gps.satellites.value()); + u8x8.printf("Sat %.3d", gps.satellites.value()); #endif // update bluetooth counter + LoRa SF (line 3)