fix missing SoftwareSerial dependency: upgrade some dependencies

Author: coding-lemur

platformio.ini

@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [env:esp32dev]
-platform = espressif32@2.1.0
+platform = espressif32@3.4.0
 framework = arduino
 
 board = esp32doit-devkit-v1
@@ -29,8 +29,9 @@ upload_port = COM3 # /dev/ttyUSB0
 #  --auth=waaatering
 
 lib_deps = 
-    https://github.com/marvinroger/async-mqtt-client.git
-    https://github.com/tobiasschuerg/MH-Z-CO2-Sensors.git
-    ArduinoJson@6.16.0
+    https://github.com/marvinroger/async-mqtt-client.git#v0.9.0
+    https://github.com/tobiasschuerg/MH-Z-CO2-Sensors.git#7be7cf0f22e8c3bcd9c7357b2a1ef2f70d8d0c8a
+    bblanchon/ArduinoJson @ ^6.18.5
     juerd/ESP-WiFiSettings @ ^3.6.0
     adafruit/Adafruit SSD1306 @ ^2.4.3
+    plerup/EspSoftwareSerial @ ^6.15.1

src/main.cpp

@@ -9,6 +9,7 @@
 #include <Adafruit_GFX.h>
 #include <Adafruit_SSD1306.h>
 #include <Adafruit_I2CDevice.h>
+#include <SoftwareSerial.h>
 
 #include "config.h"
 
@@ -18,7 +19,14 @@ extern "C"
 #include "freertos/timers.h"
 }
 
-#define Sprintf(f, ...) ({ char* s; asprintf(&s, f, __VA_ARGS__); String r = s; free(s); r; })
+#define Sprintf(f, ...) (             \
+    {                                 \
+        char *s;                      \
+        asprintf(&s, f, __VA_ARGS__); \
+        String r = s;                 \
+        free(s);                      \
+        r;                            \
+    })
 #define DEVICE_ID (Sprintf("%06" PRIx64, ESP.getEfuseMac() >> 24)) // unique device ID
 #define uS_TO_S_FACTOR 1000000                                     // Conversion factor for micro seconds to seconds
 
@@ -318,76 +326,80 @@ void setupOTA()
     ArduinoOTA
         .setHostname(WiFiSettings.hostname.c_str())
         .setPassword(WiFiSettings.password.c_str())
-        .onStart([]() {
-            isUpdating = true;
-
-            String type;
-
-            if (ArduinoOTA.getCommand() == U_FLASH)
-            {
-                type = "sketch";
-            }
-            else
-            { // U_FS
-                type = "filesystem";
-            }
-
-            // NOTE: if updating FS this would be the place to unmount FS using FS.end()
-            Serial.println("Start updating " + type);
-
-            display.clearDisplay();
-            display.setTextSize(1);
-            display.print("updating...");
-
-            display.display();
-        })
-        .onEnd([]() {
-            Serial.println("\nEnd");
-
-            isUpdating = false;
-        })
-        .onProgress([](unsigned int progress, unsigned int total) {
-            unsigned int percentValue = progress / (total / 100);
-
-            Serial.printf("Progress: %u%%\r", percentValue);
-
-            display.clearDisplay();
-
-            display.setCursor(0, 0);
-            display.setTextSize(1);
-            display.print("updating...");
-
-            display.setCursor(0, 40);
-            display.setTextSize(2);
-            display.print(percentValue);
-            display.print("%");
-
-            display.display();
-        })
-        .onError([](ota_error_t error) {
-            Serial.printf("Error[%u]: ", error);
-
-            if (error == OTA_AUTH_ERROR)
-            {
-                Serial.println("Auth Failed");
-            }
-            else if (error == OTA_BEGIN_ERROR)
-            {
-                Serial.println("Begin Failed");
-            }
-            else if (error == OTA_CONNECT_ERROR)
-            {
-                Serial.println("Connect Failed");
-            }
-            else if (error == OTA_RECEIVE_ERROR)
-            {
-                Serial.println("Receive Failed");
-            }
-            else if (error == OTA_END_ERROR)
-            {
-                Serial.println("End Failed");
-            }
-        })
+        .onStart([]()
+                 {
+                     isUpdating = true;
+
+                     String type;
+
+                     if (ArduinoOTA.getCommand() == U_FLASH)
+                     {
+                         type = "sketch";
+                     }
+                     else
+                     { // U_FS
+                         type = "filesystem";
+                     }
+
+                     // NOTE: if updating FS this would be the place to unmount FS using FS.end()
+                     Serial.println("Start updating " + type);
+
+                     display.clearDisplay();
+                     display.setTextSize(1);
+                     display.print("updating...");
+
+                     display.display();
+                 })
+        .onEnd([]()
+               {
+                   Serial.println("\nEnd");
+
+                   isUpdating = false;
+               })
+        .onProgress([](unsigned int progress, unsigned int total)
+                    {
+                        unsigned int percentValue = progress / (total / 100);
+
+                        Serial.printf("Progress: %u%%\r", percentValue);
+
+                        display.clearDisplay();
+
+                        display.setCursor(0, 0);
+                        display.setTextSize(1);
+                        display.print("updating...");
+
+                        display.setCursor(0, 40);
+                        display.setTextSize(2);
+                        display.print(percentValue);
+                        display.print("%");
+
+                        display.display();
+                    })
+        .onError([](ota_error_t error)
+                 {
+                     Serial.printf("Error[%u]: ", error);
+
+                     if (error == OTA_AUTH_ERROR)
+                     {
+                         Serial.println("Auth Failed");
+                     }
+                     else if (error == OTA_BEGIN_ERROR)
+                     {
+                         Serial.println("Begin Failed");
+                     }
+                     else if (error == OTA_CONNECT_ERROR)
+                     {
+                         Serial.println("Connect Failed");
+                     }
+                     else if (error == OTA_RECEIVE_ERROR)
+                     {
+                         Serial.println("Receive Failed");
+                     }
+                     else if (error == OTA_END_ERROR)
+                     {
+                         Serial.println("End Failed");
+                     }
+                 })
         .begin();
 }
 
@@ -445,18 +457,21 @@ void setup()
     WiFiSettings.password = PASSWORD;
 
     // Set callbacks to start OTA when the portal is active
-    WiFiSettings.onPortal = []() {
+    WiFiSettings.onPortal = []()
+    {
         isPortalActive = true;
 
         Serial.println("WiFi config portal active");
 
         setupOTA();
     };
-    WiFiSettings.onPortalWaitLoop = []() {
+    WiFiSettings.onPortalWaitLoop = []()
+    {
         ArduinoOTA.handle();
     };
 
-    WiFiSettings.onConfigSaved = []() {
+    WiFiSettings.onConfigSaved = []()
+    {
         ESP.restart();
     };