From 82468868de1484c8ec620023d2a969d5125b22dc Mon Sep 17 00:00:00 2001 From: ogiewon Date: Mon, 24 Feb 2025 22:35:44 -0500 Subject: [PATCH] Fix compiler issues with ESP32 v3.x versions of board manager --- Arduino/libraries/ST_Anything/EX_RGBW_Dim.cpp | 21 ++++++++++++------- Arduino/libraries/ST_Anything/EX_RGBW_Dim.h | 1 + Arduino/libraries/ST_Anything/EX_RGB_Dim.cpp | 16 ++++++++------ Arduino/libraries/ST_Anything/EX_RGB_Dim.h | 1 + .../SmartThingsESP32WiFi.cpp | 13 ++++++++---- .../SmartThingsESP32WiFi.h | 1 + 6 files changed, 35 insertions(+), 18 deletions(-) diff --git a/Arduino/libraries/ST_Anything/EX_RGBW_Dim.cpp b/Arduino/libraries/ST_Anything/EX_RGBW_Dim.cpp index b2043691..b0ab08f8 100644 --- a/Arduino/libraries/ST_Anything/EX_RGBW_Dim.cpp +++ b/Arduino/libraries/ST_Anything/EX_RGBW_Dim.cpp @@ -31,6 +31,7 @@ // 2017-10-12 Allan (vseven) Modified EX_RGBW_Dim for support of a White LED channel // 2018-04-02 Dan Ogorchock Fixed Typo // 2020-06-09 Dan Ogorchock Scaled the 8bit values to 10bit for ESP8266 "analogWrite()" +// 2025-02-23 Dan Ogorchock Modified to work with the ESP32 v3.0 and newer board manager package // //****************************************************************************************** #include "EX_RGBW_Dim.h" @@ -193,8 +194,9 @@ namespace st m_nChannelR = channel; #if defined(ARDUINO_ARCH_ESP32) - ledcAttachPin(m_nPinR, m_nChannelR); - ledcSetup(m_nChannelR, 5000, 8); + //ledcAttachPin(m_nPinR, m_nChannelR); + //ledcSetup(m_nChannelR, 5000, 8); + ledcAttach(m_nPinR, 5000, 8); #else pinMode(m_nPinR, OUTPUT); #endif @@ -205,8 +207,9 @@ namespace st m_nChannelG = channel; #if defined(ARDUINO_ARCH_ESP32) - ledcAttachPin(m_nPinG, m_nChannelG); - ledcSetup(m_nChannelG, 5000, 8); + //ledcAttachPin(m_nPinG, m_nChannelG); + //ledcSetup(m_nChannelG, 5000, 8); + ledcAttach(m_nPinG, 5000, 8); #else pinMode(m_nPinG, OUTPUT); #endif @@ -217,8 +220,9 @@ namespace st m_nChannelB = channel; #if defined(ARDUINO_ARCH_ESP32) - ledcAttachPin(m_nPinB, m_nChannelB); - ledcSetup(m_nChannelB, 5000, 8); + //ledcAttachPin(m_nPinB, m_nChannelB); + //ledcSetup(m_nChannelB, 5000, 8); + ledcAttach(m_nPinB, 5000, 8); #else pinMode(m_nPinB, OUTPUT); #endif @@ -229,8 +233,9 @@ namespace st m_nChannelW = channel; #if defined(ARDUINO_ARCH_ESP32) - ledcAttachPin(m_nPinW, m_nChannelW); - ledcSetup(m_nChannelW, 5000, 8); + //ledcAttachPin(m_nPinW, m_nChannelW); + //ledcSetup(m_nChannelW, 5000, 8); + ledcAttach(m_nPinW, 5000, 8); #else pinMode(m_nPinW, OUTPUT); #endif diff --git a/Arduino/libraries/ST_Anything/EX_RGBW_Dim.h b/Arduino/libraries/ST_Anything/EX_RGBW_Dim.h index f9de159e..8e1d4ab1 100644 --- a/Arduino/libraries/ST_Anything/EX_RGBW_Dim.h +++ b/Arduino/libraries/ST_Anything/EX_RGBW_Dim.h @@ -30,6 +30,7 @@ // 2017-10-06 Allan (vseven) Modified original code from EX_Switch_Dim to be used for RGB lighting // 2017-10-12 Allan (vseven) Modified EX_RGB_Dim for support of a White LEd channel // 2020-06-09 Dan Ogorchock Scaled the 8bit values to 10bit for ESP8266 "analogWrite()" +// 2025-02-23 Dan Ogorchock Modified to work with the ESP32 v3.0 and newer board manager package // //****************************************************************************************** #ifndef ST_EX_RGBW_Dim diff --git a/Arduino/libraries/ST_Anything/EX_RGB_Dim.cpp b/Arduino/libraries/ST_Anything/EX_RGB_Dim.cpp index a1d38ceb..31749a62 100644 --- a/Arduino/libraries/ST_Anything/EX_RGB_Dim.cpp +++ b/Arduino/libraries/ST_Anything/EX_RGB_Dim.cpp @@ -28,6 +28,7 @@ // 2018-08-14 Dan Ogorchock Modified to avoid compiler errors on ESP32 since it currently does not support "analogWrite()" // 2020-03-29 DOUG (M2) Scaled the 8bit values to 10bit for ESP8266 "analogWrite()" // 2020-04-01 Dan Ogorchock Added back in functionality for traditional Arduino Boards +// 2025-02-23 Dan Ogorchock Modified to work with the ESP32 v3.0 and newer board manager package // //****************************************************************************************** #include "EX_RGB_Dim.h" @@ -179,8 +180,9 @@ namespace st m_nChannelR = channel; #if defined(ARDUINO_ARCH_ESP32) - ledcAttachPin(m_nPinR, m_nChannelR); - ledcSetup(m_nChannelR, 5000, 8); + //ledcAttachPin(m_nPinR, m_nChannelR); + //ledcSetup(m_nChannelR, 5000, 8); + ledcAttach(m_nPinR, 5000, 8); #else pinMode(m_nPinR, OUTPUT); #endif @@ -191,8 +193,9 @@ namespace st m_nChannelG = channel; #if defined(ARDUINO_ARCH_ESP32) - ledcAttachPin(m_nPinG, m_nChannelG); - ledcSetup(m_nChannelG, 5000, 8); + //ledcAttachPin(m_nPinG, m_nChannelG); + //ledcSetup(m_nChannelG, 5000, 8); + ledcAttach(m_nPinG, 5000, 8); #else pinMode(m_nPinG, OUTPUT); #endif @@ -203,8 +206,9 @@ namespace st m_nChannelB = channel; #if defined(ARDUINO_ARCH_ESP32) - ledcAttachPin(m_nPinB, m_nChannelB); - ledcSetup(m_nChannelB, 5000, 8); + //ledcAttachPin(m_nPinB, m_nChannelB); + //ledcSetup(m_nChannelB, 5000, 8); + ledcAttach(m_nPinB, 5000, 8); #else pinMode(m_nPinB, OUTPUT); #endif diff --git a/Arduino/libraries/ST_Anything/EX_RGB_Dim.h b/Arduino/libraries/ST_Anything/EX_RGB_Dim.h index fedfed72..6ea85e1b 100644 --- a/Arduino/libraries/ST_Anything/EX_RGB_Dim.h +++ b/Arduino/libraries/ST_Anything/EX_RGB_Dim.h @@ -28,6 +28,7 @@ // 2018-08-14 Dan Ogorchock Modified to avoid compiler errors on ESP32 since it currently does not support "analogWrite()" // 2020-03-29 DOUG (M2) Scaled the 8bit values to 10bit for ESP8266 "analogWrite()" // 2020-04-01 Dan Ogorchock Added back in functionality for traditional Arduino Boards +// 2025-02-23 Dan Ogorchock Modified to work with the ESP32 v3.0 and newer board manager package // //****************************************************************************************** #ifndef ST_EX_RGB_DIM diff --git a/Arduino/libraries/SmartThingsESP32WiFi/SmartThingsESP32WiFi.cpp b/Arduino/libraries/SmartThingsESP32WiFi/SmartThingsESP32WiFi.cpp index 49457649..3c36f048 100644 --- a/Arduino/libraries/SmartThingsESP32WiFi/SmartThingsESP32WiFi.cpp +++ b/Arduino/libraries/SmartThingsESP32WiFi/SmartThingsESP32WiFi.cpp @@ -14,6 +14,7 @@ // 2020-04-10 Dan Ogorchock Improved network performance by disabling WiFi Sleep // 2020-06-20 Dan Ogorchock Add user selectable host name (repurposing the old shieldType variable) // 2024-04-28 Dan Ogorchock Added OTA update capability +// 2025-02-23 Dan Ogorchock Modified to work with the ESP32 v3.0 and newer board manager package // //******************************************************************************* @@ -71,12 +72,14 @@ namespace st Serial.printf("[WiFi-event] event: %d\n", event); switch (event) { - case SYSTEM_EVENT_STA_GOT_IP: + //case SYSTEM_EVENT_STA_GOT_IP: + case ARDUINO_EVENT_WIFI_STA_GOT_IP: Serial.println("WiFi connected"); Serial.println("IP address: "); Serial.println(WiFi.localIP()); break; - case SYSTEM_EVENT_STA_DISCONNECTED: + //case SYSTEM_EVENT_STA_DISCONNECTED: + case ARDUINO_EVENT_WIFI_STA_DISCONNECTED: Serial.println("WiFi lost connection. Attempting to reconnect..."); WiFi.reconnect(); disconnectCounter++; @@ -85,10 +88,12 @@ namespace st ESP.restart(); } break; - case SYSTEM_EVENT_STA_START: + //case SYSTEM_EVENT_STA_START: + case ARDUINO_EVENT_WIFI_STA_START: Serial.println("ESP32 station start"); break; - case SYSTEM_EVENT_STA_CONNECTED: + //case SYSTEM_EVENT_STA_CONNECTED: + case ARDUINO_EVENT_WIFI_STA_CONNECTED: Serial.println("ESP32 station connected to AP"); disconnectCounter = 0; break; diff --git a/Arduino/libraries/SmartThingsESP32WiFi/SmartThingsESP32WiFi.h b/Arduino/libraries/SmartThingsESP32WiFi/SmartThingsESP32WiFi.h index 26dd7110..d7cf3f24 100644 --- a/Arduino/libraries/SmartThingsESP32WiFi/SmartThingsESP32WiFi.h +++ b/Arduino/libraries/SmartThingsESP32WiFi/SmartThingsESP32WiFi.h @@ -13,6 +13,7 @@ // 500ms to prevent duplicate child devices // 2020-06-20 Dan Ogorchock Add user selectable host name (repurposing the old shieldType variable) // 2024-04-28 Dan Ogorchock Added OTA update capability +// 2025-02-23 Dan Ogorchock Modified to work with the ESP32 v3.0 and newer board manager package // //*******************************************************************************