From da8aad7596af07dd6359ff641b68c0568f1e7060 Mon Sep 17 00:00:00 2001 From: Davide Perini Date: Tue, 3 Jan 2023 11:26:26 +0100 Subject: [PATCH] feed the dog --- CMakeListsUser.txt | 2 +- include/Version.h | 4 ++-- platformio.ini | 12 ++++++------ src/Watchwinder.cpp | 14 ++++++++++++-- version | 2 +- 5 files changed, 22 insertions(+), 12 deletions(-) diff --git a/CMakeListsUser.txt b/CMakeListsUser.txt index 9783f73..cac1afa 100644 --- a/CMakeListsUser.txt +++ b/CMakeListsUser.txt @@ -1,6 +1,6 @@ add_custom_target( LIBS_UPDATE - COMMAND platformio lib update + COMMAND pio pkg update WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) diff --git a/include/Version.h b/include/Version.h index b37becc..edecd9c 100644 --- a/include/Version.h +++ b/include/Version.h @@ -1,9 +1,9 @@ // AUTO GENERATED FILE, DO NOT EDIT #ifndef VERSION - #define VERSION "2.16.12" + #define VERSION "2.16.18" #endif #ifndef BUILD_TIMESTAMP - #define BUILD_TIMESTAMP "2022-08-28 14:05:48.082634" + #define BUILD_TIMESTAMP "2023-01-03 11:24:09.041019" #endif \ No newline at end of file diff --git a/platformio.ini b/platformio.ini index 370b14d..c6f5300 100644 --- a/platformio.ini +++ b/platformio.ini @@ -25,12 +25,12 @@ monitor_filters = esp8266_exception_decoder, colorize extra_scripts = pre:platformio_version_increment/version_increment_pre.py post:platformio_version_increment/version_increment_post.py -lib_deps = - ArduinoJson - PubSubClient - Adafruit GFX Library - Adafruit BusIO - Adafruit SSD1306 +lib_deps = + bblanchon/ArduinoJson + knolleary/PubSubClient + adafruit/Adafruit GFX Library + adafruit/Adafruit BusIO + adafruit/Adafruit SSD1306 lib_extra_dirs = arduino_bootstrapper common_build_flags = '-D AUTHOR="DPsoftware"' diff --git a/src/Watchwinder.cpp b/src/Watchwinder.cpp index 8aafdea..0e22c26 100644 --- a/src/Watchwinder.cpp +++ b/src/Watchwinder.cpp @@ -46,13 +46,16 @@ void setup() { Serial.println(F("SSD1306 allocation failed")); for(;;); // Don't proceed, loop forever } + ESP.wdtFeed(); display.setTextColor(WHITE); // Bootsrap setup() with Wifi and MQTT functions bootstrapManager.bootstrapSetup(manageDisconnections, manageHardwareButton, callback); + ESP.wdtFeed(); readConfigFromStorage(); + ESP.wdtFeed(); } @@ -575,13 +578,16 @@ void loop() { // Bootsrap loop() with Wifi, MQTT and OTA functions bootstrapManager.bootstrapLoop(manageDisconnections, manageQueueSubscription, manageHardwareButton); + ESP.wdtFeed(); // Send status on MQTT Broker every n seconds delayAndSendStatus(); - + ESP.wdtFeed(); + // Trigger screensaver every 5 minutes triggerScreenSaverAfterFiveMinutes(); - + ESP.wdtFeed(); + // Write SPIFFS every minute, saves the numbers of rotation. if (stepperMotorOn == true) { writeConfigToStorageAfterMinute(); @@ -591,6 +597,7 @@ void loop() { pingESP.ping(WiFi.gatewayIP()); } } + ESP.wdtFeed(); // Shut down stepper motor if numbers of daily rotation has been reached if (numbersOfRotationDone > rotationNumber) { @@ -609,6 +616,7 @@ void loop() { } else if (showLastPage) { drawOrShutDownDisplay(); } + ESP.wdtFeed(); // Manage Stepper Motor every two seconds if (stepperMotorOn) { @@ -623,7 +631,9 @@ void loop() { display.display(); } } + ESP.wdtFeed(); bootstrapManager.nonBlokingBlink(); + ESP.wdtFeed(); } \ No newline at end of file diff --git a/version b/version index b7c6729..a9b0bd8 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.16.12 \ No newline at end of file +2.16.18 \ No newline at end of file