From be8a7782b8b8565fa22d105cf59a02026130e10c Mon Sep 17 00:00:00 2001 From: Antonio Vanegas Date: Fri, 27 Aug 2021 11:28:38 +0200 Subject: [PATCH 1/3] fixed Altitude offset preset on execution --- lib/configlib/ConfigApp.cpp | 1 + lib/configlib/ConfigApp.hpp | 1 + platformio.ini | 18 +++++++++++++++++- src/main.cpp | 5 +++++ 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/lib/configlib/ConfigApp.cpp b/lib/configlib/ConfigApp.cpp index e6b2315a..67877346 100644 --- a/lib/configlib/ConfigApp.cpp +++ b/lib/configlib/ConfigApp.cpp @@ -158,6 +158,7 @@ bool ConfigApp::saveAltitudeOffset(float offset) { saveFloat("altoffset", offset); Serial.print("-->[CONF] sensor altitude offset: "); Serial.println(offset); + if(mRemoteConfigCallBacks!=nullptr) this->mRemoteConfigCallBacks->onAltitudeOffset(offset); return true; } diff --git a/lib/configlib/ConfigApp.hpp b/lib/configlib/ConfigApp.hpp index 1368d092..1a221bb7 100644 --- a/lib/configlib/ConfigApp.hpp +++ b/lib/configlib/ConfigApp.hpp @@ -147,6 +147,7 @@ class RemoteConfigCallbacks { public: virtual ~RemoteConfigCallbacks () {}; virtual void onCO2Calibration(); + virtual void onAltitudeOffset(float altitude); }; #if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_CFGHANDLER) diff --git a/platformio.ini b/platformio.ini index 193ceedd..bd980553 100644 --- a/platformio.ini +++ b/platformio.ini @@ -25,7 +25,23 @@ lib_deps = bblanchon/ArduinoJson @ ^6 tobiasschuerg/ESP8266 Influxdb @ ^3.8.0 https://github.com/hpsaturn/esp32FOTA.git - hpsaturn/CanAirIO Air Quality Sensors Library @ ^0.2.8 + + adafruit/Adafruit Unified Sensor @ 1.1.4 + adafruit/Adafruit AM2320 sensor library @ 1.1.4 + adafruit/Adafruit BME280 Library @ 2.2.0 + adafruit/Adafruit BME680 Library @ 2.0.1 + adafruit/Adafruit BusIO @ 1.8.3 + adafruit/Adafruit SHT31 Library @ 2.0.0 + enjoyneering/AHT10 @ ^1.1.0 + https://github.com/hpsaturn/DHT_nonblocking.git + paulvha/sps30 @ 1.4.11 + wifwaf/MH-Z19 @ ^1.5.3 + sparkfun/SparkFun SCD30 Arduino Library @ ^1.0.10 + https://github.com/hpsaturn/CM1106_UART.git + https://github.com/paulvha/SN-GCJA5.git + https://github.com/hpsaturn/senseair_s8.git + + ; hpsaturn/CanAirIO Air Quality Sensors Library @ ^0.2.8 [esp32_common] platform = espressif32 diff --git a/src/main.cpp b/src/main.cpp index eb9b5b48..f0bfb8b0 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -76,6 +76,11 @@ class MyRemoteConfigCallBacks : public RemoteConfigCallbacks { Serial.println("-->[MAIN] onRemoteConfig CO2 Calibration"); sensors.setCO2RecalibrationFactor(418); // ==> Calibration factor on outdoors }; + + void onAltitudeOffset (float altitude) { + Serial.println("-->[MAIN] onRemoteConfig new Altitude Offset"); + sensors.setCO2AltitudeOffset(altitude); + }; }; /// sensors data callback From 50cbc3fb1f0d63ffdbd93f05d2c8f4073fd64ed4 Mon Sep 17 00:00:00 2001 From: Antonio Vanegas Date: Fri, 27 Aug 2021 17:49:34 +0200 Subject: [PATCH 2/3] rev817 hotfix for SensorLib issue #87 --- platformio.ini | 2 +- src/main.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platformio.ini b/platformio.ini index bd980553..c00f2076 100644 --- a/platformio.ini +++ b/platformio.ini @@ -11,7 +11,7 @@ framework = arduino upload_speed = 1500000 monitor_speed = 115200 version = 0.4.0 -revision = 815 +revision = 817 target = dev monitor_filters = time extra_scripts = pre:prebuild.py diff --git a/src/main.cpp b/src/main.cpp index f0bfb8b0..4ac7975f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -188,7 +188,7 @@ void setup() { delay(500); gui.showMain(); refreshGUIData(); - delay(500); + delay(600); sensors.loop(); sensors.setSampleTime(cfg.stime); // config sensors sample time (first use) } From 73f30390891f370adf9d1a39a6b972296c2c2715 Mon Sep 17 00:00:00 2001 From: Antonio Vanegas Date: Fri, 27 Aug 2021 23:08:04 +0200 Subject: [PATCH 3/3] rev818 new SensorLib target v0.2.9 --- platformio.ini | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/platformio.ini b/platformio.ini index c00f2076..5a8bb276 100644 --- a/platformio.ini +++ b/platformio.ini @@ -10,8 +10,8 @@ platform = espressif32 framework = arduino upload_speed = 1500000 monitor_speed = 115200 -version = 0.4.0 -revision = 817 +version = 0.4.1 +revision = 818 target = dev monitor_filters = time extra_scripts = pre:prebuild.py @@ -26,22 +26,7 @@ lib_deps = tobiasschuerg/ESP8266 Influxdb @ ^3.8.0 https://github.com/hpsaturn/esp32FOTA.git - adafruit/Adafruit Unified Sensor @ 1.1.4 - adafruit/Adafruit AM2320 sensor library @ 1.1.4 - adafruit/Adafruit BME280 Library @ 2.2.0 - adafruit/Adafruit BME680 Library @ 2.0.1 - adafruit/Adafruit BusIO @ 1.8.3 - adafruit/Adafruit SHT31 Library @ 2.0.0 - enjoyneering/AHT10 @ ^1.1.0 - https://github.com/hpsaturn/DHT_nonblocking.git - paulvha/sps30 @ 1.4.11 - wifwaf/MH-Z19 @ ^1.5.3 - sparkfun/SparkFun SCD30 Arduino Library @ ^1.0.10 - https://github.com/hpsaturn/CM1106_UART.git - https://github.com/paulvha/SN-GCJA5.git - https://github.com/hpsaturn/senseair_s8.git - - ; hpsaturn/CanAirIO Air Quality Sensors Library @ ^0.2.8 + hpsaturn/CanAirIO Air Quality Sensors Library @ ^0.2.9 [esp32_common] platform = espressif32