From 969897af4d00189c345750c0f472a4bb430b50ed Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Sat, 21 Jul 2018 22:35:30 +0200 Subject: [PATCH] battery voltage display --- platformio.ini | 9 ++++----- src/display.cpp | 6 +++--- src/globals.h | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/platformio.ini b/platformio.ini index 1d8ce655..a79d78c6 100644 --- a/platformio.ini +++ b/platformio.ini @@ -11,12 +11,11 @@ ; ---> SELECT TARGET PLATFORM HERE! <--- [platformio] -;env_default = lolin32lite, heltec, generic -;env_default = generic +env_default = generic ;env_default = heltec ;env_default = ttgov1 ;env_default = ttgov2 -env_default = ttgov21 +;env_default = ttgov21 ;env_default = ttgobeam ;env_default = lopy ;env_default = lopy4 @@ -28,8 +27,8 @@ env_default = ttgov21 description = Paxcounter is a proof-of-concept ESP32 device for metering passenger flows in realtime. It counts how many mobile devices are around. [common_env_data] -;platform_espressif32 = espressif32@1.0.2 -platform_espressif32 = https://github.com/platformio/platform-espressif32.git#feature/stage +platform_espressif32 = espressif32@1.0.2 +;platform_espressif32 = https://github.com/platformio/platform-espressif32.git#feature/stage board_build.partitions = no_ota.csv lib_deps_all = lib_deps_display = diff --git a/src/display.cpp b/src/display.cpp index d1d4019d..8671585a 100644 --- a/src/display.cpp +++ b/src/display.cpp @@ -112,7 +112,7 @@ void refreshDisplay() { // update Battery status (line 2) #ifdef HAS_BATTERY_PROBE u8x8.setCursor(0, 2); - u8x8.printf("B=%.1fV", read_voltage() / 1000.0); + u8x8.printf("B:%.1fV", read_voltage() / 1000.0); #endif // update GPS status (line 2) @@ -121,10 +121,10 @@ void refreshDisplay() { if (!gps.location.isValid()) // if no fix then display Sats value inverse { u8x8.setInverseFont(1); - u8x8.printf("Sat %.3d", gps.satellites.value()); + u8x8.printf("Sat:%.3d", gps.satellites.value()); u8x8.setInverseFont(0); } else - u8x8.printf("Sat %.3d", gps.satellites.value()); + u8x8.printf("Sat:%.3d", gps.satellites.value()); #endif // update bluetooth counter + LoRa SF (line 3) diff --git a/src/globals.h b/src/globals.h index f8e81615..2c1408fd 100644 --- a/src/globals.h +++ b/src/globals.h @@ -8,7 +8,7 @@ #include // attn: increment version after modifications to configData_t truct! -#define PROGVERSION "1.3.91" // use max 10 chars here! +#define PROGVERSION "1.3.92" // use max 10 chars here! #define PROGNAME "PAXCNT" // std::set for unified array functions