From a8c40a7e23c9c824ad6a377d55a1cebbf2790225 Mon Sep 17 00:00:00 2001 From: klaute Date: Fri, 13 Jul 2018 20:20:56 +0200 Subject: [PATCH] Minimum voltage check moved into a separate function. Minimum voltage constant added. --- firmware/config.h | 1 + firmware/firmware.ino | 21 ++++++++++----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/firmware/config.h b/firmware/config.h index 51c969e..cfaba5b 100644 --- a/firmware/config.h +++ b/firmware/config.h @@ -14,6 +14,7 @@ #define UPDATE_WEBSERVER_INTVERVAL_S 1 #define DELAY_LOOP_MS 50 #define POWERSAVING_SLEEP_S 600 +#define BAT_LOW_VOLTAGE 3.4 #define STATUS_LED_PIN BUILTIN_LED #define ANEMOMETER_PIN D7 diff --git a/firmware/firmware.ino b/firmware/firmware.ino index 3a1a0af..36ad834 100644 --- a/firmware/firmware.ino +++ b/firmware/firmware.ino @@ -106,13 +106,7 @@ void setup() { digitalWrite(STATUS_LED_PIN, LOW); - if (currentSensorData[SENSOR_BAT_VOLTAGE] <= 3.4) - { -#ifdef DEBUG - Serial.println("Low battery, going into deep sleep."); -#endif - ESP.deepSleep(4294967295); // battery low, shutting down - } + lowBatCheck(); WiFi.mode(WIFI_OFF); WiFi.forceSleepBegin(); @@ -126,15 +120,20 @@ void setup() { //*************************************************************************// -void loop() { - - if (currentSensorData[SENSOR_BAT_VOLTAGE] <= 3.4) +void lowBatCheck() +{ + if (currentSensorData[SENSOR_BAT_VOLTAGE] <= BAT_LOW_VOLTAGE) { #ifdef DEBUG Serial.println("Low battery, going into deep sleep."); #endif ESP.deepSleep(4294967295); // battery low, shutting down } +} + +void loop() { + + lowBatCheck(); #ifdef POWERSAVING delay(50); @@ -191,4 +190,4 @@ void _loop() { } //*************************************************************************// - +