Platform io platform version set to 3.0.2

nopizzaa · nopizzaa · commit fb25ce46b3db · 2023-02-02T23:44:22.000+01:00
Prevent system crash with Exception (0) due to software serial bug in the latest core version. esp8266/Arduino#8830
diff --git a/platformio.ini b/platformio.ini
@@ -9,19 +9,21 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [env:d1_mini]
-platform = espressif8266
+platform = espressif8266@^3.2.0 ; software serial Exception 0 bug will be fixed in espressif8266 core 3.1.2 https://github.com/esp8266/Arduino/issues/8830
 board = d1_mini
 framework = arduino
-upload_speed = 115200
+upload_speed = 57600
 monitor_speed = 115200
 board_build.filesystem = littlefs
+lib_compat_mode = strict
+lib_ldf_mode = chain+
 upload_port = /dev/ttyUSB0
 lib_deps = 
 	bblanchon/ArduinoJson@^6.19.4
-	knolleary/PubSubClient @ ^2.8
-	alanswx/ESPAsyncWiFiManager@^0.31
-	me-no-dev/ESP Async WebServer@^1.2.3
-	me-no-dev/ESPAsyncTCP@^1.2.2
-	adafruit/Adafruit AHTX0@^2.0.3
-	adafruit/Adafruit BMP280 Library@^2.6.6
-	adafruit/Adafruit SGP30 Sensor@^2.0.0
+	sparkfun/SparkFun SGP30 Arduino Library@^1.0.5
+	sparkfun/SparkFun Qwiic Humidity AHT20@^1.0.3
+	arkhipenko/TaskScheduler@^3.7.0
+	knolleary/PubSubClient @^2.8
+	https://github.com/khoih-prog/ESPAsyncTCP
+ 	https://github.com/khoih-prog/ESPAsyncWebServer
+	https://github.com/alanswx/ESPAsyncWiFiManager
diff --git a/src/Config.h b/src/Config.h
@@ -11,6 +11,9 @@ namespace Config
     char mqtt_server[80] = "";
     char username[24] = "";
     char password[24] = "";
+    
+    uint16_t sgp30ECo2Base = 0;
+    uint16_t sgp30TvocBase = 0;
 
     bool save()
     {
@@ -19,37 +22,40 @@ namespace Config
         json["username"] = username;
         json["password"] = password;
 
+        json["sgp_eco2_base"] = sgp30ECo2Base;
+        json["sgp_tvoc_base"] = sgp30TvocBase;
+
         File configFile = LittleFS.open(CONFIG_FILE_PATH, "w");
         if (!configFile)
         {
-            Serial.println("Failed to open configurationfile for reading");
+            Serial.println(F("Failed to open configurationfile for reading"));
             return false;
         }
 
         serializeJson(json, configFile);
         configFile.close();
 
         return true;
-    }
+    } 
 
     bool load()
     {
         if (!LittleFS.begin())
         {
-            Serial.println("An Error has occurred while mounting LittleFS");
+            Serial.println(F("An Error has occurred while mounting LittleFS"));
             return false;
         }
 
         if (!LittleFS.exists(CONFIG_FILE_PATH))
         {
-            Serial.println("Configuration file does not exist");
+            Serial.println(F("Configuration file does not exist"));
             return false;
         }
 
         File configFile = LittleFS.open(CONFIG_FILE_PATH, "r");
         if (!configFile)
         {
-            Serial.println("Failed to open configurationfile for reading");
+            Serial.println(F("Failed to open configurationfile for reading"));
             return false;
         }
 
@@ -61,14 +67,17 @@ namespace Config
         DeserializationError error = deserializeJson(json, buf.get());
         if (error)
         {
-            Serial.println("JSON deserialization failed");
+            Serial.println(F("JSON deserialization failed"));
             return false;
         }
 
         strcpy(mqtt_server, json["mqtt_server"]);
         strcpy(username, json["username"]);
         strcpy(password, json["password"]);
 
+        sgp30ECo2Base = json["sgp_eco2_base"].as<uint16_t>();
+        sgp30TvocBase = json["sgp_tvoc_base"].as<uint16_t>();
+
         return true;
     }
 } // namespace Config
diff --git a/src/SerialCom.h b/src/SerialCom.h
@@ -5,30 +5,18 @@
 #include "Types.h"
 
 namespace SerialCom {
-    constexpr static const uint8_t PIN_UART_RX = 14; // receive sensor response
-    constexpr static const uint8_t PIN_UART_TX = 12; // send request
+    constexpr static const uint8_t PIN_UART_RX = 13; // D2 on Wemos D1 Mini
+    constexpr static const uint8_t PIN_UART_TX = 16; // UNUSED
 
     SoftwareSerial sensorSerial(PIN_UART_RX, PIN_UART_TX);
 
-    const byte init_request[] = {0x11, 0x03, 0x0c, 0x02, 0x1e, 0xc0};
-    const byte request[] = {0x11, 0x02, 0x0b, 0x01, 0xe1};
-
     uint8_t serialRxBuf[255];
     uint8_t rxBufIdx = 0;
 
     void setup() {
         sensorSerial.begin(9600);
     }
 
-    void init() {
-        sensorSerial.write(init_request, sizeof(init_request));
-    }
-
-    void sendRequest() {
-        Serial.println("Request sent...");
-        sensorSerial.write(request, sizeof(request));
-    }
-
     void clearRxBuf() {
         // Clear everything for the next message
         memset(serialRxBuf, 0, sizeof(serialRxBuf));
@@ -42,20 +30,17 @@ namespace SerialCom {
          */
         const uint16_t pm25 = (serialRxBuf[5] << 8) | serialRxBuf[6];
 
-        Serial.printf("Received PM 2.5 reading: %d\n", pm25);
-
-        state.measurements[state.measurementIdx] = pm25;
+        state.measurements += pm25;
 
         state.measurementIdx = (state.measurementIdx + 1) % 5;
 
         if (state.measurementIdx == 0) {
             float avgPM25 = 0.0f;
 
-            for (uint8_t i = 0; i < 5; ++i) {
-                avgPM25 += state.measurements[i] / 5.0f;
-            }
+            avgPM25 = state.measurements / 5.0f;
 
             state.avgPM25 = avgPM25;
+            state.measurements = 0;
             state.valid = true;
 
             Serial.printf("New Avg PM25: %d\n", state.avgPM25);
@@ -67,8 +52,8 @@ namespace SerialCom {
     bool isValidHeader() {
         bool headerValid = serialRxBuf[0] == 0x16 && serialRxBuf[1] == 0x11 && serialRxBuf[2] == 0x0B;
 
-        if (!headerValid) {
-            Serial.println("Received message with invalid header.");
+        if (! headerValid) {
+            Serial.println(F("Received message with invalid header."));
         }
 
         return headerValid;
@@ -93,34 +78,20 @@ namespace SerialCom {
             return;
         }
 
-        Serial.print("Receiving:");
         while (sensorSerial.available()) {
             serialRxBuf[rxBufIdx++] = sensorSerial.read();
-            Serial.print(".");
-
             // Without this delay, receiving data breaks for reasons that are beyond me
             delay(15);
 
             if (rxBufIdx >= 64) {
                 clearRxBuf();
             }
         }
-        Serial.println("Done.");
 
         if (isValidHeader() && isValidChecksum()) {
             parseState(state);
-
-            Serial.printf(
-                "Current measurements: %d, %d, %d, %d, %d\n",
-
-                state.measurements[0],
-                state.measurements[1],
-                state.measurements[2],
-                state.measurements[3],
-                state.measurements[4]
-            );
         } else {
             clearRxBuf();
         }
     }
-} // namespace SerialCom
+} // namespace SerialCom
diff --git a/src/Types.h b/src/Types.h
@@ -1,29 +1,17 @@
 #pragma once
 
-struct particleSensorState_t
-{
+struct particleSensorState_t {
     uint16_t avgPM25 = 0;
-    uint16_t measurements[5] = {0, 0, 0, 0, 0};
+    uint16_t measurements = 0;
     uint8_t measurementIdx = 0;
     boolean valid = false;
 };
 
-struct aht10SensorState_t
-{
-    float temperature;
-    float humidity;
-};
-
-struct bmp280SensorState_t
-{
-    float temperature;
-    float altitude;
-    float pressure;
-    float waterBoilingPoint;
+struct vocSensorState_t {
+    uint16_t avgTVOC = 0;
+    uint16_t avgECO2 = 0;
+    uint32_t sumTVOC = 0;
+    uint32_t sumECO2 = 0;
+    uint8_t measurementIdx = 0;
+    boolean valid = false;
 };
-
-struct sgp30SensorState_t
-{
-    uint16_t tvoc;
-    uint16_t eCo2;
-};
diff --git a/src/esp8266-vindriktning-particle-sensor.ino b/src/esp8266-vindriktning-particle-sensor.ino

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,9 @@ namespace Config`
`11`	`11`	`char mqtt_server[80] = "";`
`12`	`12`	`char username[24] = "";`
`13`	`13`	`char password[24] = "";`
	`14`	`+`
	`15`	`+ uint16_t sgp30ECo2Base = 0;`
	`16`	`+ uint16_t sgp30TvocBase = 0;`
`14`	`17`
`15`	`18`	`bool save()`
`16`	`19`	`{`
`@@ -19,37 +22,40 @@ namespace Config`
`19`	`22`	`json["username"] = username;`
`20`	`23`	`json["password"] = password;`
`21`	`24`
	`25`	`+ json["sgp_eco2_base"] = sgp30ECo2Base;`
	`26`	`+ json["sgp_tvoc_base"] = sgp30TvocBase;`
	`27`	`+`
`22`	`28`	`File configFile = LittleFS.open(CONFIG_FILE_PATH, "w");`
`23`	`29`	`if (!configFile)`
`24`	`30`	`{`
`25`		`- Serial.println("Failed to open configurationfile for reading");`
	`31`	`+ Serial.println(F("Failed to open configurationfile for reading"));`
`26`	`32`	`return false;`
`27`	`33`	`}`
`28`	`34`
`29`	`35`	`serializeJson(json, configFile);`
`30`	`36`	`configFile.close();`
`31`	`37`
`32`	`38`	`return true;`
`33`		`- }`
	`39`	`+ }`
`34`	`40`
`35`	`41`	`bool load()`
`36`	`42`	`{`
`37`	`43`	`if (!LittleFS.begin())`
`38`	`44`	`{`
`39`		`- Serial.println("An Error has occurred while mounting LittleFS");`
	`45`	`+ Serial.println(F("An Error has occurred while mounting LittleFS"));`
`40`	`46`	`return false;`
`41`	`47`	`}`
`42`	`48`
`43`	`49`	`if (!LittleFS.exists(CONFIG_FILE_PATH))`
`44`	`50`	`{`
`45`		`- Serial.println("Configuration file does not exist");`
	`51`	`+ Serial.println(F("Configuration file does not exist"));`
`46`	`52`	`return false;`
`47`	`53`	`}`
`48`	`54`
`49`	`55`	`File configFile = LittleFS.open(CONFIG_FILE_PATH, "r");`
`50`	`56`	`if (!configFile)`
`51`	`57`	`{`
`52`		`- Serial.println("Failed to open configurationfile for reading");`
	`58`	`+ Serial.println(F("Failed to open configurationfile for reading"));`
`53`	`59`	`return false;`
`54`	`60`	`}`
`55`	`61`
`@@ -61,14 +67,17 @@ namespace Config`
`61`	`67`	`DeserializationError error = deserializeJson(json, buf.get());`
`62`	`68`	`if (error)`
`63`	`69`	`{`
`64`		`- Serial.println("JSON deserialization failed");`
	`70`	`+ Serial.println(F("JSON deserialization failed"));`
`65`	`71`	`return false;`
`66`	`72`	`}`
`67`	`73`
`68`	`74`	`strcpy(mqtt_server, json["mqtt_server"]);`
`69`	`75`	`strcpy(username, json["username"]);`
`70`	`76`	`strcpy(password, json["password"]);`
`71`	`77`
	`78`	`+ sgp30ECo2Base = json["sgp_eco2_base"].as<uint16_t>();`
	`79`	`+ sgp30TvocBase = json["sgp_tvoc_base"].as<uint16_t>();`
	`80`	`+`
`72`	`81`	`return true;`
`73`	`82`	`}`
`74`	`83`	`} // namespace Config`