diff --git a/Images/ESP32S2_DEV.png b/Images/ESP32S2_DEV.png new file mode 100644 index 0000000..b73e4d0 Binary files /dev/null and b/Images/ESP32S2_DEV.png differ diff --git a/Images/ESP32_C3_DevKitC_02.png b/Images/ESP32_C3_DevKitC_02.png new file mode 100644 index 0000000..1189334 Binary files /dev/null and b/Images/ESP32_C3_DevKitC_02.png differ diff --git a/changelog.md b/changelog.md index 201dbe1..c4f196e 100644 --- a/changelog.md +++ b/changelog.md @@ -16,6 +16,7 @@ ## Table of contents * [Changelog](#changelog) + * [Releases v1.1.0](#releases-v110) * [Releases v1.0.0](#releases-v100) @@ -25,6 +26,10 @@ ## Changelog +#### Releases v1.1.0 + +1. Add support to `ESP32_S2/C3` boards using `LwIP W5500 Ethernet`. + #### Releases v1.0.0 1. Initial coding to port [ESPAsync_WiFiManager](https://github.com/khoih-prog/ESPAsync_WiFiManager) to ESP32_S3 boards using `LwIP W5500 Ethernet`. diff --git a/examples/Async_ConfigOnDoubleReset/Async_ConfigOnDoubleReset.ino b/examples/Async_ConfigOnDoubleReset/Async_ConfigOnDoubleReset.ino index 1e86354..d61a5bf 100644 --- a/examples/Async_ConfigOnDoubleReset/Async_ConfigOnDoubleReset.ino +++ b/examples/Async_ConfigOnDoubleReset/Async_ConfigOnDoubleReset.ino @@ -26,7 +26,7 @@ *****************************************************************************************************************************/ #if !( defined(ESP32) ) - #error This code is designed for (SP32_S2/3, ESP32_C3 + W5500) to run on ESP32 platform! Please check your Tools->Board setting. + #error This code is designed for (ESP32_S2/3, ESP32_C3 + W5500) to run on ESP32 platform! Please check your Tools->Board setting. #endif // Use from 0 to 4. Higher number, more debugging messages and memory usage. @@ -67,6 +67,7 @@ byte mac[][NUMBER_OF_MAC] = ////////////////////////////////////////////////////////// +// For ESP32-S3 // Optional values to override default settings // Don't change unless you know what you're doing //#define ETH_SPI_HOST SPI3_HOST @@ -80,6 +81,20 @@ byte mac[][NUMBER_OF_MAC] = //#define SCK_GPIO 12 //#define CS_GPIO 10 +// For ESP32_C3 +// Optional values to override default settings +// Don't change unless you know what you're doing +//#define ETH_SPI_HOST SPI2_HOST +//#define SPI_CLOCK_MHZ 25 + +// Must connect INT to GPIOxx or not working +//#define INT_GPIO 10 + +//#define MISO_GPIO 5 +//#define MOSI_GPIO 6 +//#define SCK_GPIO 4 +//#define CS_GPIO 7 + ////////////////////////////////////////////////////////// #include @@ -588,14 +603,11 @@ void setup() AsyncESP32_SC_W5500_manager.setCORSHeader("Your Access-Control-Allow-Origin"); #endif - bool configDataLoaded = false; - if (loadConfigData()) { - configDataLoaded = true; - - AsyncESP32_SC_W5500_manager.setConfigPortalTimeout( - 120); //If no access point name has been previously entered disable timeout. + //If no access point name has been previously entered disable timeout. + AsyncESP32_SC_W5500_manager.setConfigPortalTimeout(120); + Serial.println(F("Got stored Credentials. Timeout 120s for Config Portal")); #if USE_ESP_ETH_MANAGER_NTP diff --git a/examples/Async_ConfigOnDoubleReset_TZ/Async_ConfigOnDoubleReset_TZ.ino b/examples/Async_ConfigOnDoubleReset_TZ/Async_ConfigOnDoubleReset_TZ.ino index a31e53f..7d95805 100644 --- a/examples/Async_ConfigOnDoubleReset_TZ/Async_ConfigOnDoubleReset_TZ.ino +++ b/examples/Async_ConfigOnDoubleReset_TZ/Async_ConfigOnDoubleReset_TZ.ino @@ -67,6 +67,7 @@ byte mac[][NUMBER_OF_MAC] = ////////////////////////////////////////////////////////// +// For ESP32-S3 // Optional values to override default settings // Don't change unless you know what you're doing //#define ETH_SPI_HOST SPI3_HOST @@ -80,6 +81,20 @@ byte mac[][NUMBER_OF_MAC] = //#define SCK_GPIO 12 //#define CS_GPIO 10 +// For ESP32_C3 +// Optional values to override default settings +// Don't change unless you know what you're doing +//#define ETH_SPI_HOST SPI2_HOST +//#define SPI_CLOCK_MHZ 25 + +// Must connect INT to GPIOxx or not working +//#define INT_GPIO 10 + +//#define MISO_GPIO 5 +//#define MOSI_GPIO 6 +//#define SCK_GPIO 4 +//#define CS_GPIO 7 + ////////////////////////////////////////////////////////// #include @@ -624,14 +639,11 @@ void setup() AsyncESP32_SC_W5500_manager.setCORSHeader("Your Access-Control-Allow-Origin"); #endif - bool configDataLoaded = false; - if (loadConfigData()) { - configDataLoaded = true; - - AsyncESP32_SC_W5500_manager.setConfigPortalTimeout( - 120); //If no access point name has been previously entered disable timeout. + //If no access point name has been previously entered disable timeout. + AsyncESP32_SC_W5500_manager.setConfigPortalTimeout(120); + Serial.println(F("Got stored Credentials. Timeout 120s for Config Portal")); #if USE_ESP_ETH_MANAGER_NTP diff --git a/examples/Async_ConfigOnSwitch/Async_ConfigOnSwitch.ino b/examples/Async_ConfigOnSwitch/Async_ConfigOnSwitch.ino index 46037b2..18cdd85 100644 --- a/examples/Async_ConfigOnSwitch/Async_ConfigOnSwitch.ino +++ b/examples/Async_ConfigOnSwitch/Async_ConfigOnSwitch.ino @@ -65,6 +65,7 @@ byte mac[][NUMBER_OF_MAC] = ////////////////////////////////////////////////////////// +// For ESP32-S3 // Optional values to override default settings // Don't change unless you know what you're doing //#define ETH_SPI_HOST SPI3_HOST @@ -78,6 +79,20 @@ byte mac[][NUMBER_OF_MAC] = //#define SCK_GPIO 12 //#define CS_GPIO 10 +// For ESP32_C3 +// Optional values to override default settings +// Don't change unless you know what you're doing +//#define ETH_SPI_HOST SPI2_HOST +//#define SPI_CLOCK_MHZ 25 + +// Must connect INT to GPIOxx or not working +//#define INT_GPIO 10 + +//#define MISO_GPIO 5 +//#define MOSI_GPIO 6 +//#define SCK_GPIO 4 +//#define CS_GPIO 7 + ////////////////////////////////////////////////////////// //For ESP32, To use ESP32 Dev Module, QIO, Flash 4MB/80MHz, Upload 921600 @@ -219,12 +234,12 @@ byte mac[][NUMBER_OF_MAC] = const int TRIGGER_PIN2 = PIN_D4; // Pin D4 mapped to pin GPIO04/ADC1_3/TOUCH4 of ESP32-S2 #else - const int TRIGGER_PIN = PIN_D0; // Pin D0 mapped to pin GPIO0/BOOT/ADC11/TOUCH1 of ESP32 + const int TRIGGER_PIN = PIN_D0; // Pin D0 mapped to pin GPIO0/BOOT of ESP32_S3 /* Alternative trigger pin. Needs to be connected to a button to use this pin. It must be a momentary connection not connected permanently to ground. Either trigger pin will work. */ - const int TRIGGER_PIN2 = PIN_D25; // Pin D25 mapped to pin GPIO25/ADC18/DAC1 of ESP32 + const int TRIGGER_PIN2 = PIN_D7; // Pin D7 mapped to pin GPIO7/ADC1_6/TOUCH7 of ESP32_S3 #endif ////////////////////////////////////////////////////////////// @@ -687,14 +702,11 @@ void setup() AsyncESP32_SC_W5500_manager.setCORSHeader("Your Access-Control-Allow-Origin"); #endif - bool configDataLoaded = false; - if (loadConfigData()) { - configDataLoaded = true; - - AsyncESP32_SC_W5500_manager.setConfigPortalTimeout( - 120); //If no access point name has been previously entered disable timeout. + //If no access point name has been previously entered disable timeout. + AsyncESP32_SC_W5500_manager.setConfigPortalTimeout(120); + Serial.println(F("Got stored Credentials. Timeout 120s for Config Portal")); #if USE_ESP_ETH_MANAGER_NTP @@ -840,8 +852,9 @@ void loop() if (loadConfigData()) { - AsyncESP32_SC_W5500_manager.setConfigPortalTimeout( - 120); //If no access point name has been previously entered disable timeout. + //If no access point name has been previously entered disable timeout. + AsyncESP32_SC_W5500_manager.setConfigPortalTimeout(120); + Serial.println(F("Got stored Credentials. Timeout 120s for Config Portal")); } else diff --git a/examples/Async_ConfigOnSwitchFS/Async_ConfigOnSwitchFS.ino b/examples/Async_ConfigOnSwitchFS/Async_ConfigOnSwitchFS.ino index f336c64..1ee615e 100644 --- a/examples/Async_ConfigOnSwitchFS/Async_ConfigOnSwitchFS.ino +++ b/examples/Async_ConfigOnSwitchFS/Async_ConfigOnSwitchFS.ino @@ -78,6 +78,7 @@ byte mac[][NUMBER_OF_MAC] = ////////////////////////////////////////////////////////// +// For ESP32-S3 // Optional values to override default settings // Don't change unless you know what you're doing //#define ETH_SPI_HOST SPI3_HOST @@ -91,6 +92,20 @@ byte mac[][NUMBER_OF_MAC] = //#define SCK_GPIO 12 //#define CS_GPIO 10 +// For ESP32_C3 +// Optional values to override default settings +// Don't change unless you know what you're doing +//#define ETH_SPI_HOST SPI2_HOST +//#define SPI_CLOCK_MHZ 25 + +// Must connect INT to GPIOxx or not working +//#define INT_GPIO 10 + +//#define MISO_GPIO 5 +//#define MOSI_GPIO 6 +//#define SCK_GPIO 4 +//#define CS_GPIO 7 + ////////////////////////////////////////////////////////// #include @@ -227,15 +242,15 @@ byte mac[][NUMBER_OF_MAC] = Flash button is convenient to use but if it is pressed it will stuff up the serial port device driver until the computer is rebooted on windows machines. */ -const int TRIGGER_PIN = PIN_D0; // Pin D0 mapped to pin GPIO0/BOOT/ADC11/TOUCH1 of ESP32 +const int TRIGGER_PIN = PIN_D0; // Pin D0 mapped to pin GPIO0/BOOT of ESP32_S3 /* Alternative trigger pin. Needs to be connected to a button to use this pin. It must be a momentary connection not connected permanently to ground. Either trigger pin will work. */ #if ( ARDUINO_ESP32C3_DEV ) - const int TRIGGER_PIN2 = PIN_D8; // Pin D8 mapped to pin GPIO8/FLASH_D1 of ESP32 + const int TRIGGER_PIN2 = PIN_D8; // Pin D8 mapped to pin GPIO8/FLASH_D1 of ESP32 #else - const int TRIGGER_PIN2 = PIN_D25; // Pin D25 mapped to pin GPIO25/ADC18/DAC1 of ESP32 + const int TRIGGER_PIN2 = PIN_D7; // Pin D7 mapped to pin GPIO7/ADC1_6/TOUCH7 of ESP32_S3 #endif int pinSda = PIN_SDA; // Pin SDA mapped to pin GPIO21/SDA of ESP32 @@ -855,14 +870,11 @@ void setup() AsyncESP32_SC_W5500_manager.setCORSHeader("Your Access-Control-Allow-Origin"); #endif - bool configDataLoaded = false; - if (loadConfigData()) { - configDataLoaded = true; - - AsyncESP32_SC_W5500_manager.setConfigPortalTimeout( - 120); //If no access point name has been previously entered disable timeout. + //If no access point name has been previously entered disable timeout. + AsyncESP32_SC_W5500_manager.setConfigPortalTimeout(120); + Serial.println(F("Got stored Credentials. Timeout 120s for Config Portal")); #if USE_ESP_ETH_MANAGER_NTP @@ -991,8 +1003,9 @@ void loop() if (loadConfigData()) { - AsyncESP32_SC_W5500_manager.setConfigPortalTimeout( - 120); //If no access point name has been previously entered disable timeout. + //If no access point name has been previously entered disable timeout. + AsyncESP32_SC_W5500_manager.setConfigPortalTimeout(120); + Serial.println(F("Got stored Credentials. Timeout 120s for Config Portal")); } else diff --git a/examples/Async_ConfigPortalParamsOnSwitch/Async_ConfigPortalParamsOnSwitch.ino b/examples/Async_ConfigPortalParamsOnSwitch/Async_ConfigPortalParamsOnSwitch.ino index db13dcf..47627bd 100644 --- a/examples/Async_ConfigPortalParamsOnSwitch/Async_ConfigPortalParamsOnSwitch.ino +++ b/examples/Async_ConfigPortalParamsOnSwitch/Async_ConfigPortalParamsOnSwitch.ino @@ -66,6 +66,7 @@ byte mac[][NUMBER_OF_MAC] = ////////////////////////////////////////////////////////// +// For ESP32-S3 // Optional values to override default settings // Don't change unless you know what you're doing //#define ETH_SPI_HOST SPI3_HOST @@ -79,6 +80,20 @@ byte mac[][NUMBER_OF_MAC] = //#define SCK_GPIO 12 //#define CS_GPIO 10 +// For ESP32_C3 +// Optional values to override default settings +// Don't change unless you know what you're doing +//#define ETH_SPI_HOST SPI2_HOST +//#define SPI_CLOCK_MHZ 25 + +// Must connect INT to GPIOxx or not working +//#define INT_GPIO 10 + +//#define MISO_GPIO 5 +//#define MOSI_GPIO 6 +//#define SCK_GPIO 4 +//#define CS_GPIO 7 + ////////////////////////////////////////////////////////// #include @@ -212,15 +227,15 @@ byte mac[][NUMBER_OF_MAC] = Flash button is convenient to use but if it is pressed it will stuff up the serial port device driver until the computer is rebooted on windows machines. */ -const int TRIGGER_PIN = PIN_D0; // Pin D0 mapped to pin GPIO0/BOOT/ADC11/TOUCH1 of ESP32 +const int TRIGGER_PIN = PIN_D0; // Pin D0 mapped to pin GPIO0/BOOT of ESP32_S3 /* Alternative trigger pin. Needs to be connected to a button to use this pin. It must be a momentary connection not connected permanently to ground. Either trigger pin will work. */ #if ( ARDUINO_ESP32C3_DEV ) - const int TRIGGER_PIN2 = PIN_D8; // Pin D8 mapped to pin GPIO8/FLASH_D1 of ESP32 + const int TRIGGER_PIN2 = PIN_D8; // Pin D8 mapped to pin GPIO8/FLASH_D1 of ESP32 #else - const int TRIGGER_PIN2 = PIN_D25; // Pin D25 mapped to pin GPIO25/ADC18/DAC1 of ESP32 + const int TRIGGER_PIN2 = PIN_D7; // Pin D7 mapped to pin GPIO7/ADC1_6/TOUCH7 of ESP32_S3 #endif ////////////////////////////////////////////////////////////// @@ -786,14 +801,11 @@ void setup() AsyncESP32_SC_W5500_manager.setCORSHeader("Your Access-Control-Allow-Origin"); #endif - bool configDataLoaded = false; - if (loadConfigData()) { - configDataLoaded = true; - - AsyncESP32_SC_W5500_manager.setConfigPortalTimeout( - 120); //If no access point name has been previously entered disable timeout. + //If no access point name has been previously entered disable timeout. + AsyncESP32_SC_W5500_manager.setConfigPortalTimeout(120); + Serial.println(F("Got stored Credentials. Timeout 120s for Config Portal")); #if USE_ESP_ETH_MANAGER_NTP @@ -922,8 +934,9 @@ void loop() if (loadConfigData()) { - AsyncESP32_SC_W5500_manager.setConfigPortalTimeout( - 120); //If no access point name has been previously entered disable timeout. + //If no access point name has been previously entered disable timeout. + AsyncESP32_SC_W5500_manager.setConfigPortalTimeout(120); + Serial.println(F("Got stored Credentials. Timeout 120s for Config Portal")); } else diff --git a/examples/Async_ESP32_FSWebServer/Async_ESP32_FSWebServer.ino b/examples/Async_ESP32_FSWebServer/Async_ESP32_FSWebServer.ino index d5e7555..f226458 100644 --- a/examples/Async_ESP32_FSWebServer/Async_ESP32_FSWebServer.ino +++ b/examples/Async_ESP32_FSWebServer/Async_ESP32_FSWebServer.ino @@ -69,6 +69,7 @@ byte mac[][NUMBER_OF_MAC] = ////////////////////////////////////////////////////////// +// For ESP32-S3 // Optional values to override default settings // Don't change unless you know what you're doing //#define ETH_SPI_HOST SPI3_HOST @@ -82,6 +83,20 @@ byte mac[][NUMBER_OF_MAC] = //#define SCK_GPIO 12 //#define CS_GPIO 10 +// For ESP32_C3 +// Optional values to override default settings +// Don't change unless you know what you're doing +//#define ETH_SPI_HOST SPI2_HOST +//#define SPI_CLOCK_MHZ 25 + +// Must connect INT to GPIOxx or not working +//#define INT_GPIO 10 + +//#define MISO_GPIO 5 +//#define MOSI_GPIO 6 +//#define SCK_GPIO 4 +//#define CS_GPIO 7 + ////////////////////////////////////////////////////////// #include diff --git a/examples/Async_ESP32_FSWebServer_DRD/Async_ESP32_FSWebServer_DRD.ino b/examples/Async_ESP32_FSWebServer_DRD/Async_ESP32_FSWebServer_DRD.ino index cb39980..9103036 100644 --- a/examples/Async_ESP32_FSWebServer_DRD/Async_ESP32_FSWebServer_DRD.ino +++ b/examples/Async_ESP32_FSWebServer_DRD/Async_ESP32_FSWebServer_DRD.ino @@ -69,6 +69,7 @@ byte mac[][NUMBER_OF_MAC] = ////////////////////////////////////////////////////////// +// For ESP32-S3 // Optional values to override default settings // Don't change unless you know what you're doing //#define ETH_SPI_HOST SPI3_HOST @@ -82,6 +83,20 @@ byte mac[][NUMBER_OF_MAC] = //#define SCK_GPIO 12 //#define CS_GPIO 10 +// For ESP32_C3 +// Optional values to override default settings +// Don't change unless you know what you're doing +//#define ETH_SPI_HOST SPI2_HOST +//#define SPI_CLOCK_MHZ 25 + +// Must connect INT to GPIOxx or not working +//#define INT_GPIO 10 + +//#define MISO_GPIO 5 +//#define MOSI_GPIO 6 +//#define SCK_GPIO 4 +//#define CS_GPIO 7 + ////////////////////////////////////////////////////////// #include @@ -692,8 +707,9 @@ void setup() if (configDataLoaded) { - AsyncESP32_SC_W5500_manager.setConfigPortalTimeout( - 120); //If no access point name has been previously entered disable timeout. + //If no access point name has been previously entered disable timeout. + AsyncESP32_SC_W5500_manager.setConfigPortalTimeout(120); + Serial.println(F("Got stored Credentials. Timeout 120s for Config Portal")); #if USE_ESP_ETH_MANAGER_NTP diff --git a/library.json b/library.json index c395f95..ae25f8f 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "AsyncESP32_SC_W5500_Manager", - "version": "1.0.0", + "version": "1.1.0", "keywords": "ethernet, Credentials-Manager, esp32, esp32-s2, esp32-s3, esp32-c3, lwip, w5500, lwip-w5500, lwip-ethernet, AsyncWebServer, Async-Credentials-Manager, Async, Communication, Credentials, Config-Portal, DoubleReset, littlefs, spiffs, dns-server, iot, eeprom", "description": "ESP32_S2/S3/C3 + LwIP W5500 Connection and Credentials Manager using AsyncWebServer, with enhanced GUI and fallback Web ConfigPortal. This Library is used for configuring ESP32_S2/S3/C3 + LwIP W5500 Credentials Manager at runtime. You can also specify static DNS servers, personalized HostName, static or DHCP IP. With configurable CORS Header and auto-Timezone features. Now using AsyncDNSServer instead of DNSServer and correct ESP32 chipIP", "authors": @@ -38,7 +38,7 @@ { "owner": "khoih-prog", "name": "WebServer_ESP32_SC_W5500", - "version": ">=1.0.0", + "version": ">=1.2.1", "platforms": ["espressif32"] }, { diff --git a/library.properties b/library.properties index 092487b..c77c08a 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=AsyncESP32_SC_W5500_Manager -version=1.0.0 +version=1.1.0 author=Khoi Hoang maintainer=Khoi Hoang license=MIT diff --git a/platformio/platformio.ini b/platformio/platformio.ini index 720d28b..b095ab8 100644 --- a/platformio/platformio.ini +++ b/platformio/platformio.ini @@ -45,7 +45,7 @@ lib_deps = ; https://github.com/khoih-prog/ESPAsyncTCP ; AsyncTCP@>=1.1.1 ; ESP_DoubleResetDetector@>=1.3.2 -; WebServer_ESP32_SC_W5500@>=1.0.0 +; WebServer_ESP32_SC_W5500@>=1.2.1 ; PlatformIO 5.x ; me-no-dev/ESP Async WebServer@>=1.2.3 @@ -54,7 +54,7 @@ lib_deps = https://github.com/khoih-prog/ESPAsyncTCP me-no-dev/AsyncTCP@>=1.1.1 khoih-prog/ESP_DoubleResetDetector@>=1.3.2 - khoih-prog/WebServer_ESP32_SC_W5500@>=1.0.0 + khoih-prog/WebServer_ESP32_SC_W5500@>=1.2.1 ; ============================================================ build_flags = diff --git a/src/AsyncESP32_SC_W5500_Manager.h b/src/AsyncESP32_SC_W5500_Manager.h index c91aa14..d57e337 100644 --- a/src/AsyncESP32_SC_W5500_Manager.h +++ b/src/AsyncESP32_SC_W5500_Manager.h @@ -12,11 +12,12 @@ Built by Khoi Hoang https://github.com/khoih-prog/AsyncESP32_SC_W5500_Manager Licensed under MIT license - Version: 1.0.0 + Version: 1.1.0 Version Modified By Date Comments ------- ----------- ---------- ----------- - 1.0.0 K Hoang 14/12/2022 Initial coding for ESP32_S3_W5500 (ESP32_S3 + W5500) + 1.0.0 K Hoang 14/12/2022 Initial coding for ESP32_S3_W5500 (ESP32_S3 + LwIP W5500) + 1.1.0 K Hoang 23/12/2022 Add support to ESP32_S2/C3_W5500 (ESP32_S2/C3 + LwIP W5500) *****************************************************************************************************************************/ #pragma once diff --git a/src/AsyncESP32_SC_W5500_Manager.hpp b/src/AsyncESP32_SC_W5500_Manager.hpp index eca0521..1c49feb 100644 --- a/src/AsyncESP32_SC_W5500_Manager.hpp +++ b/src/AsyncESP32_SC_W5500_Manager.hpp @@ -12,11 +12,12 @@ Built by Khoi Hoang https://github.com/khoih-prog/AsyncESP32_SC_W5500_Manager Licensed under MIT license - Version: 1.0.0 + Version: 1.1.0 Version Modified By Date Comments ------- ----------- ---------- ----------- - 1.0.0 K Hoang 14/12/2022 Initial coding for ESP32_S3_W5500 (ESP32_S3 + W5500) + 1.0.0 K Hoang 14/12/2022 Initial coding for ESP32_S3_W5500 (ESP32_S3 + LwIP W5500) + 1.1.0 K Hoang 23/12/2022 Add support to ESP32_S2/C3_W5500 (ESP32_S2/C3 + LwIP W5500) *****************************************************************************************************************************/ #pragma once @@ -35,8 +36,8 @@ #endif #define USING_ESP32_S2 true - - #error ESP32_S2 not supported yet + +////////////////////////////////////////// #elif ( ARDUINO_ESP32C3_DEV ) #if (_ESPASYNC_ETH_MGR_LOGLEVEL_ > 3) @@ -51,8 +52,8 @@ #endif #define USING_ESP32_C3 true - - #error ESP32_C3 not supported yet + +////////////////////////////////////////// #elif ( defined(ARDUINO_ESP32S3_DEV) || defined(ARDUINO_ESP32_S3_BOX) || defined(ARDUINO_TINYS3) || \ defined(ARDUINO_PROS3) || defined(ARDUINO_FEATHERS3) ) @@ -67,13 +68,13 @@ //////////////////////////////////////////////////// -#define ASYNC_ESP32_SC_W5500_MANAGER_VERSION "AsyncESP32_SC_W5500_Manager v1.0.0" +#define ASYNC_ESP32_SC_W5500_MANAGER_VERSION "AsyncESP32_SC_W5500_Manager v1.1.0" #define ASYNC_ESP32_SC_W5500_MANAGER_VERSION_MAJOR 1 -#define ASYNC_ESP32_SC_W5500_MANAGER_VERSION_MINOR 0 +#define ASYNC_ESP32_SC_W5500_MANAGER_VERSION_MINOR 1 #define ASYNC_ESP32_SC_W5500_MANAGER_VERSION_PATCH 0 -#define ASYNC_ESP32_SC_W5500_MANAGER_VERSION_INT 1000000 +#define ASYNC_ESP32_SC_W5500_MANAGER_VERSION_INT 1001000 //////////////////////////////////////////////////// diff --git a/src/AsyncESP32_SC_W5500_Manager_Debug.h b/src/AsyncESP32_SC_W5500_Manager_Debug.h index a68044c..09cbac4 100644 --- a/src/AsyncESP32_SC_W5500_Manager_Debug.h +++ b/src/AsyncESP32_SC_W5500_Manager_Debug.h @@ -12,11 +12,12 @@ Built by Khoi Hoang https://github.com/khoih-prog/AsyncESP32_SC_W5500_Manager Licensed under MIT license - Version: 1.0.0 + Version: 1.1.0 Version Modified By Date Comments ------- ----------- ---------- ----------- - 1.0.0 K Hoang 14/12/2022 Initial coding for ESP32_S3_W5500 (ESP32_S3 + W5500) + 1.0.0 K Hoang 14/12/2022 Initial coding for ESP32_S3_W5500 (ESP32_S3 + LwIP W5500) + 1.1.0 K Hoang 23/12/2022 Add support to ESP32_S2/C3_W5500 (ESP32_S2/C3 + LwIP W5500) *****************************************************************************************************************************/ #pragma once diff --git a/src/AsyncESP32_SC_W5500_Manager_Impl.h b/src/AsyncESP32_SC_W5500_Manager_Impl.h index 8697218..8bc7c58 100644 --- a/src/AsyncESP32_SC_W5500_Manager_Impl.h +++ b/src/AsyncESP32_SC_W5500_Manager_Impl.h @@ -12,11 +12,12 @@ Built by Khoi Hoang https://github.com/khoih-prog/AsyncESP32_SC_W5500_Manager Licensed under MIT license - Version: 1.0.0 + Version: 1.1.0 Version Modified By Date Comments ------- ----------- ---------- ----------- - 1.0.0 K Hoang 14/12/2022 Initial coding for ESP32_S3_W5500 (ESP32_S3 + W5500) + 1.0.0 K Hoang 14/12/2022 Initial coding for ESP32_S3_W5500 (ESP32_S3 + LwIP W5500) + 1.1.0 K Hoang 23/12/2022 Add support to ESP32_S2/C3_W5500 (ESP32_S2/C3 + LwIP W5500) *****************************************************************************************************************************/ #pragma once @@ -373,16 +374,12 @@ bool AsyncESP32_SC_W5500_Manager::startConfigPortal() setupConfigPortal(); - bool TimedOut = true; - LOGINFO("startConfigPortal : Enter loop"); while (true) { if (connect) { - TimedOut = false; - if (_shouldBreakAfterConfig) { //flag set to exit after config after trying to connect @@ -401,8 +398,6 @@ bool AsyncESP32_SC_W5500_Manager::startConfigPortal() if (stopConfigPortal) { - TimedOut = false; - LOGERROR("stopConfigPortal"); stopConfigPortal = false;