Merge pull request #149 from melkati/development

Development
melkati · Jan 29, 2024 · 12324ef · 12324ef
2 parents 92f567e + 670f511
commit 12324ef
Show file tree

Hide file tree

Showing 5 changed files with 259 additions and 125 deletions.
diff --git a/CO2_Gadget.ino b/CO2_Gadget.ino
@@ -476,8 +476,9 @@ void setup() {
 #ifdef SUPPORT_BLE
     initBLE();
 #endif
-    initWifi();
     initSensors();
+    initWifi();
+    wifiChanged = false;
 #ifdef SUPPORT_ESPNOW
     initESPNow();
 #endif

diff --git a/CO2_Gadget_BLE.h b/CO2_Gadget_BLE.h
@@ -5,14 +5,16 @@
 #include "Sensirion_Gadget_BLE.h"
 #include "WifiMultiLibraryWrapper.h"
 
+// clang-format on
+
 NimBLELibraryWrapper lib;
 WifiMultiLibraryWrapper wifi;
 DataProvider provider(lib, DataType::T_RH_CO2_ALT, true, false, false, &wifi);
 // DataProvider provider(lib, DataType::T_RH_CO2_ALT);
 #endif
 
 void initBLE() {
-#ifdef SUPPORT_BLE    
+#ifdef SUPPORT_BLE
     if (activeBLE) {
         if (bleInitialized) {
             Serial.print(
@@ -36,7 +38,7 @@ void initBLE() {
 
 void publishBLE() {
 #ifdef SUPPORT_BLE
-    if (activeBLE) {
+    if ((activeBLE) && (co2 > 0)) {
         provider.writeValueToCurrentSample(co2, SignalType::CO2_PARTS_PER_MILLION);
         provider.writeValueToCurrentSample(temp, SignalType::TEMPERATURE_DEGREES_CELSIUS);
         provider.writeValueToCurrentSample(hum, SignalType::RELATIVE_HUMIDITY_PERCENTAGE);

diff --git a/CO2_Gadget_Preferences.h b/CO2_Gadget_Preferences.h
@@ -152,7 +152,9 @@ void initPreferences() {
     wifiPass.trim();
     hostName.trim();
     preferences.end();
+    #ifdef DEBUG_PREFERENCES
     printPreferences();
+    #endif
 }
 
 void putPreferences() {