From 4176d79ee950074aeab01f2546a641e1776d44b9 Mon Sep 17 00:00:00 2001 From: geeksville Date: Fri, 1 May 2020 16:33:26 -0700 Subject: [PATCH 1/4] fix warnings --- src/screen.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/screen.cpp b/src/screen.cpp index 54c57457b..a390520c4 100644 --- a/src/screen.cpp +++ b/src/screen.cpp @@ -21,7 +21,6 @@ along with this program. If not, see . */ #include -#include #include "GPS.h" #include "NodeDB.h" @@ -55,7 +54,6 @@ static void drawBootScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int1 // draw an xbm image. // Please note that everything that should be transitioned // needs to be drawn relative to x and y - display->drawXbm(x + 32, y, icon_width, icon_height, (const uint8_t *)icon_bits); display->setFont(ArialMT_Plain_16); @@ -320,11 +318,11 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_ uint32_t agoSecs = sinceLastSeen(node); static char lastStr[20]; if (agoSecs < 120) // last 2 mins? - snprintf(lastStr, sizeof(lastStr), "%lu seconds ago", agoSecs); + snprintf(lastStr, sizeof(lastStr), "%u seconds ago", agoSecs); else if (agoSecs < 120 * 60) // last 2 hrs - snprintf(lastStr, sizeof(lastStr), "%lu minutes ago", agoSecs / 60); + snprintf(lastStr, sizeof(lastStr), "%u minutes ago", agoSecs / 60); else - snprintf(lastStr, sizeof(lastStr), "%lu hours ago", agoSecs / 60 / 60); + snprintf(lastStr, sizeof(lastStr), "%u hours ago", agoSecs / 60 / 60); static float simRadian; simRadian += 0.1; // For testing, have the compass spin unless both @@ -412,6 +410,7 @@ void Screen::handleSetOn(bool on) if (on) { DEBUG_MSG("Turning on screen\n"); dispdev.displayOn(); + dispdev.displayOn(); } else { DEBUG_MSG("Turning off screen\n"); dispdev.displayOff(); @@ -594,7 +593,7 @@ void Screen::handleStartBluetoothPinScreen(uint32_t pin) static FrameCallback btFrames[] = {drawFrameBluetooth}; - snprintf(btPIN, sizeof(btPIN), "%06lu", pin); + snprintf(btPIN, sizeof(btPIN), "%06u", pin); ui.disableAllIndicators(); ui.setFrames(btFrames, 1); From 4f7a25f5622716bdafa722bad36ecc853175b3d7 Mon Sep 17 00:00:00 2001 From: geeksville Date: Fri, 1 May 2020 16:33:40 -0700 Subject: [PATCH 2/4] remove unneeded include --- src/sleep.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/sleep.cpp b/src/sleep.cpp index 39710ad4c..9693a8fc6 100644 --- a/src/sleep.cpp +++ b/src/sleep.cpp @@ -8,7 +8,6 @@ #include "main.h" #include "target_specific.h" -#include #ifndef NO_ESP32 #include "esp32/pm.h" From cfd6483ea5f61e6e2e7f09c2fbed411d232dd153 Mon Sep 17 00:00:00 2001 From: geeksville Date: Fri, 1 May 2020 16:34:16 -0700 Subject: [PATCH 3/4] oops - platform IO can have stale target specific builds without this --- bin/build-all.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/build-all.sh b/bin/build-all.sh index 2b31a3061..44a7d875c 100755 --- a/bin/build-all.sh +++ b/bin/build-all.sh @@ -39,6 +39,9 @@ function do_build { cp $SRCELF $OUTDIR/elfs/firmware-$ENV_NAME-$COUNTRY-$VERSION.elf } +# Important to pull latest version of libs into all device flavors, otherwise some devices might be stale +platformio lib update + for COUNTRY in $COUNTRIES; do for BOARD in $BOARDS; do do_build $BOARD From 4735b3ff5be2da0ef5d775728fd8ae0b3b73e739 Mon Sep 17 00:00:00 2001 From: geeksville Date: Fri, 1 May 2020 16:35:32 -0700 Subject: [PATCH 4/4] 0.6.1 hotfix build for busted heltec style devices --- bin/version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/version.sh b/bin/version.sh index f0cbb5657..6b0158eb3 100644 --- a/bin/version.sh +++ b/bin/version.sh @@ -1,3 +1,3 @@ -export VERSION=0.6.0 \ No newline at end of file +export VERSION=0.6.1 \ No newline at end of file