From 7770f83ef75bdda746785ba53aa36de6897ea96c Mon Sep 17 00:00:00 2001 From: Kai Lauterbach Date: Tue, 13 Sep 2022 13:17:38 +0200 Subject: [PATCH] Removed sensor_ids array, increased logger list length. --- firmware/firmware.ino | 15 +++------------ firmware/webUpdater.ino | 2 +- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/firmware/firmware.ino b/firmware/firmware.ino index 492bba4..f6759ff 100644 --- a/firmware/firmware.ino +++ b/firmware/firmware.ino @@ -32,15 +32,6 @@ float currentSensorData[VALUES] = { nanf("no value"), nanf("no value"), nanf("no nanf("no value"), nanf("no value") }; float (*sensors[VALUES])() = {}; -uint8_t sensor_ids[] = { SENSOR_TEMPERATURE, - SENSOR_HUMIDITY, - SENSOR_LIGHT, - SENSOR_WINDSPEED, - SENSOR_PRESSURE, - SENSOR_BAT_VOLTAGE, - SENSOR_ESAVEMODE, - SENSOR_BATCHARGESTATE }; - uint32_t update_sensor_cnt = 0; uint32_t update_webserver_cnt = 0; uint32_t update_windspeed_exceed_cnt = 0; @@ -351,13 +342,13 @@ void _loop() debug("read sensor data " + String(sensor_cnt)); if (sensors[sensor_cnt]) { - debug("sensors[sensor_ids[" + String(sensor_cnt) + " ]]=" + String((int)sensors[sensor_cnt]) + ":" + String((int)sensors[sensor_ids[sensor_cnt]]) + ":" + String(sensor_ids[sensor_cnt])); - //currentSensorData[sensor_cnt] = sensors[sensor_ids[sensor_cnt]](); + debug("sensors[sensor_ids[" + String(sensor_cnt) + "]]=" + String((int)sensors[sensor_cnt])); + //currentSensorData[sensor_cnt] = sensors[sensor_cnt](); currentSensorData[sensor_cnt] = sensor_cnt; } else { - debug("sensors[sensor_ids[" + String(sensor_cnt) + "]]=nan"); + debug("sensors[" + String(sensor_cnt) + "]=nan"); currentSensorData[sensor_cnt] = nan("no value"); } diff --git a/firmware/webUpdater.ino b/firmware/webUpdater.ino index 7d23753..45780e4 100644 --- a/firmware/webUpdater.ino +++ b/firmware/webUpdater.ino @@ -210,7 +210,7 @@ void measureWindspeed() #ifdef USE_LOGGER -#define LOGFILE_SIZE 20 +#define LOGFILE_SIZE 25 String logfile[LOGFILE_SIZE];