From 5a9ff398a46c31d8c44d2fa2e2bb9be5af11f7d9 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Mon, 25 Nov 2019 21:06:19 +0100 Subject: [PATCH] fixes --- libraries/includes/defines.h | 4 ++-- sketch/application.cpp | 16 ++++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/libraries/includes/defines.h b/libraries/includes/defines.h index f89c052..bcb9683 100644 --- a/libraries/includes/defines.h +++ b/libraries/includes/defines.h @@ -8,8 +8,8 @@ #ifndef DEFINES_H_ #define DEFINES_H_ -#define DEBUG -//#define SLEEP +// #define DEBUG +#define SLEEP #define EEPROM_ADDR 0 diff --git a/sketch/application.cpp b/sketch/application.cpp index 1da9e94..7166142 100644 --- a/sketch/application.cpp +++ b/sketch/application.cpp @@ -75,25 +75,29 @@ void read_thermometer() { } void loopApplication() { - static uint32_t lastMillis = 0; mqttLoop(); +#ifndef SLEEP + static uint32_t lastMillis = 0; uint32_t currentMillis = millis(); - if (currentMillis - lastMillis > 1000) { + if (currentMillis - lastMillis > (configBlock.measurePeriod * 1000)) { lastMillis = currentMillis; +#endif read_thermometer(); +#ifndef SLEEP + } +#endif #ifdef SLEEP #ifdef DEBUG - Serial.println("Sleeping"); + Serial.println("Sleeping"); #endif - mqttClient.disconnect(); - ESP.deepSleep(configBlock.measurePeriod * 1000000); + mqttClient.disconnect(); + ESP.deepSleep(configBlock.measurePeriod * 1000000); #endif - } }