From b2d513dcded340ebfa7a9f5eab13a91c918b752d Mon Sep 17 00:00:00 2001 From: klaute Date: Sun, 24 Jun 2018 15:53:58 +0200 Subject: [PATCH] The update mechanism is now always enabled. --- firmware/config.h | 3 ++- firmware/firmware.ino | 29 ++++++----------------------- 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/firmware/config.h b/firmware/config.h index 3c2ae5f..c3b087d 100755 --- a/firmware/config.h +++ b/firmware/config.h @@ -1,4 +1,5 @@ -#define DEBUG 1 + +//#define DEBUG 1 #define SENSOR_TEMPERATURE 0 #define SENSOR_HUMIDITY 1 diff --git a/firmware/firmware.ino b/firmware/firmware.ino index 71ebd5a..5951adf 100755 --- a/firmware/firmware.ino +++ b/firmware/firmware.ino @@ -40,9 +40,6 @@ Influxdb influxdb(INFLUXDB_HOST, INFLUXDB_PORT); Adafruit_APDS9960 apds; Adafruit_BME280 bme; -boolean webUpdaterEnabled = false; -uint16_t webserver_timeout = 0; - //*************************************************************************// void setup() { @@ -85,35 +82,20 @@ void setup() { while (1); } + setupWebUpdater(); + delay(100); + + digitalWrite(STATUS_LED_PIN, LOW); } //*************************************************************************// void loop() { - //if (INITIAL_WEBSERVER_TIME * 1000 > webserver_timeout) { - - if (webserver_timeout == 0) { - setupWebUpdater(); - } - doWebUpdater(); + doWebUpdater(); #ifdef DEBUG - //Serial.print("."); -#endif - - webserver_timeout++; - //delay(1); - - //return; - //} - - /**/ - digitalWrite(STATUS_LED_PIN, LOW); - -#ifdef DEBUG - //Serial.println("---"); digitalWrite(STATUS_LED_PIN, HIGH); #endif currentSensorData[SENSOR_TEMPERATURE] = fetchTemperature(); @@ -134,6 +116,7 @@ void loop() { pushToInfluxDB(DEVICE_NAME, currentSensorData); + //ESP.deepSleep(UPDATE_INTERVAL * 1000000); delay(UPDATE_INTERVAL * 1000); /**/ }