pioarduino

Author: theelims

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file.
 
-## WIP
+## Upcoming [0.5.0] - tbd
 
 > [!CAUTION]
 > This update has breaking changes!
@@ -33,13 +33,13 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
-- Updated platform espressif32 to 6.8.1
 - Lightstate example uses simpler, less explicit constructor
 - MQTT library updated
 - Analytics task was refactored into a loop() function which is called by the ESP32-sveltekit main task.
 - Updated PsychicHttp to v1.2.1 incl. patches.
 - Updated DaisyUI
 - Updated Svelte 5 --> see [Svelte 5 Migration Guide](https://svelte.dev/docs/svelte/v5-migration-guide)
+- Changed platform to latest stable pioarduino (at time of writing: Arduino 3.1.3 and IDF 5.3.2.250210). The code remains fully backward compatible with platform espressif32 6.8.1
 
 ### Fixed
 

lib/framework/APSettingsService.h

@@ -130,9 +130,9 @@ class APSettings
         newSettings.ssidHidden = root["ssid_hidden"] | FACTORY_AP_SSID_HIDDEN;
         newSettings.maxClients = root["max_clients"] | FACTORY_AP_MAX_CLIENTS;
 
-        JsonUtils::readIP(root, "local_ip", newSettings.localIP, FACTORY_AP_LOCAL_IP);
-        JsonUtils::readIP(root, "gateway_ip", newSettings.gatewayIP, FACTORY_AP_GATEWAY_IP);
-        JsonUtils::readIP(root, "subnet_mask", newSettings.subnetMask, FACTORY_AP_SUBNET_MASK);
+        JsonUtils::readIPStr(root, "local_ip", newSettings.localIP, FACTORY_AP_LOCAL_IP);
+        JsonUtils::readIPStr(root, "gateway_ip", newSettings.gatewayIP, FACTORY_AP_GATEWAY_IP);
+        JsonUtils::readIPStr(root, "subnet_mask", newSettings.subnetMask, FACTORY_AP_SUBNET_MASK);
 
         if (newSettings == settings)
         {

lib/framework/DownloadFirmwareService.cpp

@@ -14,6 +14,7 @@
 #include <DownloadFirmwareService.h>
 
 extern const uint8_t rootca_crt_bundle_start[] asm("_binary_src_certs_x509_crt_bundle_bin_start");
+extern const uint8_t rootca_crt_bundle_end[] asm("_binary_src_certs_x509_crt_bundle_bin_end");
 
 static EventSocket *_socket = nullptr;
 static int previousProgress = 0;
@@ -54,7 +55,13 @@ void update_finished()
 void updateTask(void *param)
 {
     WiFiClientSecure client;
+
+#if ESP_ARDUINO_VERSION_MAJOR == 3
+    client.setCACertBundle(rootca_crt_bundle_start, rootca_crt_bundle_end - rootca_crt_bundle_start);
+#else
     client.setCACertBundle(rootca_crt_bundle_start);
+#endif
+
     client.setTimeout(10);
 
     httpUpdate.setFollowRedirects(HTTPC_FORCE_FOLLOW_REDIRECTS);

lib/framework/DownloadFirmwareService.h

@@ -22,7 +22,7 @@
 #include <PsychicHttp.h>
 #include <SecurityManager.h>
 
-#include <HTTPClient.h>
+#include <WiFiClientSecure.h>
 #include <HTTPUpdate.h>
 // #include <SSLCertBundle.h>
 

lib/framework/JsonUtils.h

@@ -22,7 +22,7 @@
 class JsonUtils
 {
 public:
-    static void readIP(JsonObject &root, const String &key, IPAddress &ip, const String &def)
+    static void readIPStr(JsonObject &root, const String &key, IPAddress &ip, const String &def)
     {
         IPAddress defaultIp = {};
         if (!defaultIp.fromString(def))
@@ -31,13 +31,15 @@ class JsonUtils
         }
         readIP(root, key, ip, defaultIp);
     }
+
     static void readIP(JsonObject &root, const String &key, IPAddress &ip, const IPAddress &defaultIp = INADDR_NONE)
     {
         if (!root[key].is<String>() || !ip.fromString(root[key].as<String>()))
         {
             ip = defaultIp;
         }
     }
+
     static void writeIP(JsonObject &root, const String &key, const IPAddress &ip)
     {
         if (IPUtils::isSet(ip))

lib/framework/MqttSettingsService.cpp

@@ -118,9 +118,16 @@ String MqttSettingsService::getLastError()
 
 void MqttSettingsService::onMqttConnect(bool sessionPresent)
 {
-    ESP_LOGI("MQTT", "Connected to MQTT: %s", _mqttClient.getMqttConfig()->uri);
+
+#if ESP_IDF_VERSION_MAJOR == 5
+    String uri = _mqttClient.getMqttConfig()->broker.address.uri;
+#else
+    String uri = _mqttClient.getMqttConfig()->uri;
+#endif
+
+    ESP_LOGI("MQTT", "Connected to MQTT: %s", uri.c_str());
 #ifdef SERIAL_INFO
-    Serial.printf("Connected to MQTT: %s\n", _mqttClient.getMqttConfig()->uri);
+    Serial.printf("Connected to MQTT: %s\n", uri.c_str());
 #endif
     _lastError = "None";
 }

lib/framework/NTPSettingsService.cpp

@@ -74,9 +74,24 @@ void NTPSettingsService::configureNTP()
     }
     else
     {
+
+#ifdef CONFIG_LWIP_TCPIP_CORE_LOCKING
+        if (!sys_thread_tcpip(LWIP_CORE_LOCK_QUERY_HOLDER))
+        {
+            LOCK_TCPIP_CORE();
+        }
+#endif
+
         setenv("TZ", _state.tzFormat.c_str(), 1);
         tzset();
         sntp_stop();
+
+#ifdef CONFIG_LWIP_TCPIP_CORE_LOCKING
+        if (sys_thread_tcpip(LWIP_CORE_LOCK_QUERY_HOLDER))
+        {
+            UNLOCK_TCPIP_CORE();
+        }
+#endif
     }
 }
 

lib/framework/NTPSettingsService.h

@@ -22,6 +22,10 @@
 #include <time.h>
 #include <lwip/apps/sntp.h>
 
+#ifdef CONFIG_LWIP_TCPIP_CORE_LOCKING
+#include "lwip/priv/tcpip_priv.h"
+#endif
+
 #ifndef FACTORY_NTP_ENABLED
 #define FACTORY_NTP_ENABLED true
 #endif

lib/framework/SettingValue.h

@@ -17,6 +17,10 @@
 
 #include <Arduino.h>
 
+#if ESP_ARDUINO_VERSION_MAJOR == 3
+#include <esp_mac.h>
+#endif
+
 namespace SettingValue
 {
     String format(String value);