From 78f301d5035cb2ea4857ddba19f5f64339b1f9bb Mon Sep 17 00:00:00 2001 From: cschwinne Date: Mon, 6 Jan 2020 01:21:16 +0100 Subject: [PATCH] Removed verbose option from travis --- .travis.yml | 2 +- .../ssd1306_i2c_oled_u8g2/wled06_usermod.ino | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index c4408c4cb..5d9762615 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,4 +32,4 @@ install: - pip install -U platformio - platformio update script: - - platformio ci --project-conf=./platformio.ini -v + - platformio ci --project-conf=./platformio.ini diff --git a/usermods/ssd1306_i2c_oled_u8g2/wled06_usermod.ino b/usermods/ssd1306_i2c_oled_u8g2/wled06_usermod.ino index cef01cddf..03642a54c 100644 --- a/usermods/ssd1306_i2c_oled_u8g2/wled06_usermod.ino +++ b/usermods/ssd1306_i2c_oled_u8g2/wled06_usermod.ino @@ -39,7 +39,7 @@ uint8_t knownMode = 0; uint8_t knownPalette = 0; long lastUpdate = 0; -long startupTimestamp = millis(); +long lastRedraw = 0; bool displayTurnedOff = false; // How often we are redrawing screen #define USER_LOOP_REFRESH_RATE_MS 5000 @@ -51,14 +51,15 @@ void userLoop() { return; } lastUpdate = millis(); -// Turn off display after 5 minutes from powering. - if( !displayTurnedOff && millis() - startupTimestamp > 5*60*1000) { + + // Turn off display after 3 minutes with no change. + if(!displayTurnedOff && millis() - lastRedraw > 3*60*1000) { u8x8.setPowerSave(1); displayTurnedOff = true; } - // Check if values which are shown on display changed from the last tiem. - if ((apActive == true ? String(apSSID) : WiFi.SSID()) != knownSsid) { + // Check if values which are shown on display changed from the last time. + if (((apActive) ? String(apSSID) : WiFi.SSID()) != knownSsid) { needRedraw = true; } else if (knownIp != (apActive ? IPAddress(4, 3, 2, 1) : WiFi.localIP())) { needRedraw = true; @@ -74,6 +75,13 @@ void userLoop() { return; } needRedraw = false; + + if (displayTurnedOff) + { + u8x8.setPowerSave(0); + displayTurnedOff = false; + } + lastRedraw = millis(); // Update last known values. #if defined(ESP8266)