diff --git a/README.md b/README.md index 569842f7..001151d8 100644 --- a/README.md +++ b/README.md @@ -140,6 +140,7 @@ * [9.3 Normal running with correct local time, TZ set and using NTP](#93-normal-running-with-correct-local-time-tz-set-and-using-ntp) * [10. Async_ConfigOnDoubleReset_TZ on ESP32C3_DEV using SPIFFS](#10-async_configondoublereset_tz-on-esp32c3_dev-using-spiffs) * [11. Async_ConfigOnDoubleReset on ESP32S3_DEV using LittleFS](#11-Async_ConfigOnDoubleReset-on-ESP32S3_DEV-using-LittleFS) **New** + * [12. Async_ConfigOnDoubleReset on ESP32C3_DEV using LittleFS](#12-Async_ConfigOnDoubleReset-on-ESP32C3_DEV-using-LittleFS) **New** * [Debug](#debug) * [Troubleshooting](#troubleshooting) * [Issues](#issues) @@ -255,7 +256,7 @@ This [**ESPAsync_WiFiManager** library](https://github.com/khoih-prog/ESPAsync_W 1. **ESP8266 and ESP32-based boards using EEPROM, SPIFFS or LittleFS**. 2. **ESP32-S2 (ESP32-S2 Saola, AI-Thinker ESP-12K, etc.) using EEPROM, SPIFFS or LittleFS**. - 3. **ESP32-C3 (ARDUINO_ESP32C3_DEV) using EEPROM or SPIFFS**. + 3. **ESP32-C3 (ARDUINO_ESP32C3_DEV) using EEPROM, SPIFFS or LittleFS**. 4. **ESP32-S3 (ESP32S3_DEV, ESP32_S3_BOX, UM TINYS3, UM PROS3, UM FEATHERS3, etc.) using EEPROM, SPIFFS or LittleFS**. --- @@ -440,8 +441,14 @@ then connect WebBrowser to configurable ConfigPortal IP address, default is 192. WiFiMulti wifiMulti; // LittleFS has higher priority than SPIFFS - #define USE_LITTLEFS true - #define USE_SPIFFS false + #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) + #define USE_LITTLEFS true + #define USE_SPIFFS false + #elif defined(ARDUINO_ESP32C3_DEV) + // For core v1.0.6-, ESP32-C3 only supporting SPIFFS and EEPROM. To use v2.0.0+ for LittleFS + #define USE_LITTLEFS false + #define USE_SPIFFS true + #endif #if USE_LITTLEFS // Use LittleFS @@ -452,7 +459,7 @@ then connect WebBrowser to configurable ConfigPortal IP address, default is 192. #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #warning Using ESP32 Core 1.0.6 or 2.0.0+ // The library has been merged into esp32 core from release 1.0.6 - #include + #include // https://github.com/espressif/arduino-esp32/tree/master/libraries/LittleFS FS* filesystem = &LittleFS; #define FileFS LittleFS @@ -460,7 +467,7 @@ then connect WebBrowser to configurable ConfigPortal IP address, default is 192. #else #warning Using ESP32 Core 1.0.5-. You must install LITTLEFS library // The library has been merged into esp32 core from release 1.0.6 - #include // https://github.com/lorol/LITTLEFS + #include // https://github.com/lorol/LITTLEFS FS* filesystem = &LITTLEFS; #define FileFS LITTLEFS @@ -582,8 +589,14 @@ WM_Config WM_config; WiFiMulti wifiMulti; // LittleFS has higher priority than SPIFFS - #define USE_LITTLEFS true - #define USE_SPIFFS false + #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) + #define USE_LITTLEFS true + #define USE_SPIFFS false + #elif defined(ARDUINO_ESP32C3_DEV) + // For core v1.0.6-, ESP32-C3 only supporting SPIFFS and EEPROM. To use v2.0.0+ for LittleFS + #define USE_LITTLEFS false + #define USE_SPIFFS true + #endif #if USE_LITTLEFS // Use LittleFS @@ -594,7 +607,7 @@ WM_Config WM_config; #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #warning Using ESP32 Core 1.0.6 or 2.0.0+ // The library has been merged into esp32 core from release 1.0.6 - #include + #include // https://github.com/espressif/arduino-esp32/tree/master/libraries/LittleFS FS* filesystem = &LittleFS; #define FileFS LittleFS @@ -602,7 +615,7 @@ WM_Config WM_config; #else #warning Using ESP32 Core 1.0.5-. You must install LITTLEFS library // The library has been merged into esp32 core from release 1.0.6 - #include // https://github.com/lorol/LITTLEFS + #include // https://github.com/lorol/LITTLEFS FS* filesystem = &LITTLEFS; #define FileFS LITTLEFS @@ -2182,7 +2195,7 @@ ESPAsync_wifiManager.setRemoveDuplicateAPs(false); #error This code is intended to run on the ESP8266 or ESP32 platform! Please check your Tools->Board setting. #endif -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.0" +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.1" #define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012000 // Use from 0 to 4. Higher number, more debugging messages and memory usage. @@ -2205,13 +2218,13 @@ ESPAsync_wifiManager.setRemoveDuplicateAPs(false); WiFiMulti wifiMulti; // LittleFS has higher priority than SPIFFS - #if ( ARDUINO_ESP32C3_DEV ) - // Currently, ESP32-C3 only supporting SPIFFS and EEPROM. Will fix to support LittleFS - #define USE_LITTLEFS false - #define USE_SPIFFS true - #else + #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #define USE_LITTLEFS true #define USE_SPIFFS false + #elif defined(ARDUINO_ESP32C3_DEV) + // For core v1.0.6-, ESP32-C3 only supporting SPIFFS and EEPROM. To use v2.0.0+ for LittleFS + #define USE_LITTLEFS false + #define USE_SPIFFS true #endif #if USE_LITTLEFS @@ -2223,7 +2236,7 @@ ESPAsync_wifiManager.setRemoveDuplicateAPs(false); #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #warning Using ESP32 Core 1.0.6 or 2.0.0+ // The library has been merged into esp32 core from release 1.0.6 - #include + #include // https://github.com/espressif/arduino-esp32/tree/master/libraries/LittleFS FS* filesystem = &LittleFS; #define FileFS LittleFS @@ -2231,7 +2244,7 @@ ESPAsync_wifiManager.setRemoveDuplicateAPs(false); #else #warning Using ESP32 Core 1.0.5-. You must install LITTLEFS library // The library has been merged into esp32 core from release 1.0.6 - #include // https://github.com/lorol/LITTLEFS + #include // https://github.com/lorol/LITTLEFS FS* filesystem = &LITTLEFS; #define FileFS LITTLEFS @@ -3554,7 +3567,7 @@ This is terminal debug output when running [Async_ConfigOnDRD_FS_MQTT_Ptr_Medium ``` Starting Async_ConfigOnDRD_FS_MQTT_Ptr_Medium using LittleFS on ESP32_DEV -ESPAsync_WiFiManager v1.12.0 +ESPAsync_WiFiManager v1.12.1 ESP_DoubleResetDetector v1.3.0 Config File not found Can't read Config File, using default values @@ -3573,7 +3586,7 @@ Opening Configuration Portal. No timeout : DRD or No stored Credentials.. ``` Starting Async_ConfigOnDRD_FS_MQTT_Ptr_Medium using LittleFS on ESP32_DEV -ESPAsync_WiFiManager v1.12.0 +ESPAsync_WiFiManager v1.12.1 ESP_DoubleResetDetector v1.3.0 Config File not found Can't read Config File, using default values @@ -3661,7 +3674,7 @@ This is terminal debug output when running [Async_ConfigOnDRD_FS_MQTT_Ptr_Comple ``` Starting Async_ConfigOnDRD_FS_MQTT_Ptr_Complex using LittleFS on ESP8266_NODEMCU_ESP12E -ESPAsync_WiFiManager v1.12.0 +ESPAsync_WiFiManager v1.12.1 ESP_DoubleResetDetector v1.3.0 {"AIO_SERVER_Label":"io.adafruit.com","AIO_SERVERPORT_Label":"1883","AIO_USERNAME_Label":"user_name","AIO_KEY_Label":"aio_key"} Config File successfully parsed @@ -3701,7 +3714,7 @@ TWWWW WTWWW ``` Starting Async_ConfigOnDRD_FS_MQTT_Ptr_Complex using LittleFS on ESP8266_NODEMCU_ESP12E -ESPAsync_WiFiManager v1.12.0 +ESPAsync_WiFiManager v1.12.1 ESP_DoubleResetDetector v1.3.0 {"AIO_SERVER_Label":"io.adafruit.com","AIO_SERVERPORT_Label":"1883","AIO_USERNAME_Label":"user_name","AIO_KEY_Label":"aio_key"} Config File successfully parsed @@ -3791,7 +3804,7 @@ This is terminal debug output when running [Async_ConfigOnDoubleReset](examples/ ```cpp Starting Async_ConfigOnDoubleReset with DoubleResetDetect using SPIFFS on ESP32_DEV -ESPAsync_WiFiManager v1.12.0 +ESPAsync_WiFiManager v1.12.1 ESP_DoubleResetDetector v1.3.0 [WM] RFC925 Hostname = ConfigOnDoubleReset [WM] setSTAStaticIPConfig for USE_CONFIGURABLE_DNS @@ -3850,7 +3863,7 @@ This is terminal debug output when running [Async_ConfigOnDoubleReset](examples/ ```cpp Starting Async_ConfigOnDoubleReset with DoubleResetDetect using LittleFS on ESP8266_NODEMCU_ESP12E -ESPAsync_WiFiManager v1.12.0 +ESPAsync_WiFiManager v1.12.1 ESP_DoubleResetDetector v1.3.0 [WM] RFC925 Hostname = ConfigOnDoubleReset [WM] setSTAStaticIPConfig for USE_CONFIGURABLE_DNS @@ -3910,7 +3923,7 @@ This is terminal debug output when running [Async_ESP_FSWebServer_DRD](examples/ ```cpp Starting Async_ESP_FSWebServer_DRD using LittleFS on ESP8266_NODEMCU_ESP12E -ESPAsync_WiFiManager v1.12.0 +ESPAsync_WiFiManager v1.12.1 ESP_DoubleResetDetector v1.3.0 Opening / directory FS File: CanadaFlag_1.png, size: 40.25KB @@ -3988,7 +4001,7 @@ This is terminal debug output when running [Async_ESP32_FSWebServer_DRD](example ``` Starting Async_ESP32_FSWebServer_DRD using LittleFS on ESP32_DEV -ESPAsync_WiFiManager v1.12.0 +ESPAsync_WiFiManager v1.12.1 ESP_DoubleResetDetector v1.3.0 FS File: /CanadaFlag_1.png, size: 40.25KB FS File: /CanadaFlag_2.png, size: 8.12KB @@ -4099,7 +4112,7 @@ This is terminal debug output when running [Async_ConfigOnDoubleReset](examples/ ``` Starting Async_ConfigOnDoubleReset using LittleFS on ESP32S2_DEV -ESPAsync_WiFiManager v1.12.0 +ESPAsync_WiFiManager v1.12.1 ESP_DoubleResetDetector v1.3.0 ESP Self-Stored: SSID = HueNet1, Pass = 12345678 [WM] * Add SSID = HueNet1 , PW = 12345678 @@ -4136,7 +4149,7 @@ This is terminal debug output when running [Async_ConfigOnDoubleReset_TZ](exampl ``` Starting Async_ConfigOnDoubleReset_TZ using LittleFS on ESP32_DEV -ESPAsync_WiFiManager v1.12.0 +ESPAsync_WiFiManager v1.12.1 ESP_DoubleResetDetector v1.3.0 ESP Self-Stored: SSID = HueNet1, Pass = password [WM] * Add SSID = HueNet1 , PW = password @@ -4178,7 +4191,7 @@ Local Date/Time: Thu Feb 10 23:50:26 2022 ``` Starting Async_ConfigOnDoubleReset_TZ using LittleFS on ESP32_DEV -ESPAsync_WiFiManager v1.12.0 +ESPAsync_WiFiManager v1.12.1 ESP_DoubleResetDetector v1.3.0 ESP Self-Stored: SSID = HueNet1, Pass = password [WM] * Add SSID = HueNet1 , PW = password @@ -4227,7 +4240,7 @@ This is terminal debug output when running [Async_ESP_FSWebServer_DRD](examples/ ``` Starting Async_ESP_FSWebServer_DRD using LittleFS on ESP8266_NODEMCU_ESP12E -ESPAsync_WiFiManager v1.12.0 +ESPAsync_WiFiManager v1.12.1 ESP_DoubleResetDetector v1.3.0 Opening / directory FS File: drd.dat, size: 4B @@ -4300,7 +4313,7 @@ Local Date/Time: Thu Feb 10 23:16:26 2022 ``` Starting Async_ESP_FSWebServer_DRD using LittleFS on ESP8266_NODEMCU_ESP12E -ESPAsync_WiFiManager v1.12.0 +ESPAsync_WiFiManager v1.12.1 ESP_DoubleResetDetector v1.3.0 Opening / directory FS File: drd.dat, size: 4B @@ -4359,7 +4372,7 @@ This is terminal debug output when running [Async_ConfigOnDoubleReset_TZ](exampl ``` Starting Async_ConfigOnDoubleReset_TZ using SPIFFS on ESP32C3_DEV -ESPAsync_WiFiManager v1.12.0 +ESPAsync_WiFiManager v1.12.1 ESP_DoubleResetDetector v1.3.0 ESP Self-Stored: SSID = HueNet1, Pass = 12345678 [WM] * Add SSID = HueNet1 , PW = 12345678 @@ -4405,7 +4418,7 @@ This is terminal debug output when running [Async_ConfigOnDoubleReset](examples/ ``` Starting Async_ConfigOnDoubleReset using LittleFS on ESP32S3_DEV -ESPAsync_WiFiManager v1.12.0 +ESPAsync_WiFiManager v1.12.1 ESP_DoubleResetDetector v1.3.0 ESP Self-Stored: SSID = HueNet1, Pass = password [WM] * Add SSID = HueNet1 , PW = password @@ -4440,6 +4453,48 @@ HHHHHHHHH HHHHHHHHHH HHHHHHHHHH HHHHHHHHHH HHHHHHHHHH HHHHHHHHHH HHHHHHHHHH HHHH HHHHHHHHHH HHHHHHHHHH HHH ``` +--- + +#### 12. [Async_ConfigOnDoubleReset](examples/Async_ConfigOnDoubleReset) on ESP32C3_DEV using LittleFS + +This is terminal debug output when running [Async_ConfigOnDoubleReset](examples/Async_ConfigOnDoubleReset) on **ESP32C3_DEV using LittleFS and ESP32 core v2.0.2**. + +``` +Starting Async_ConfigOnDoubleReset using LittleFS on ESP32C3_DEV +ESPAsync_WiFiManager v1.12.1 +ESP_DoubleResetDetector v1.3.0 +ESP Self-Stored: SSID = HueNet1, Pass = password +[WM] * Add SSID = HueNet1 , PW = password +Got ESP Self-Stored Credentials. Timeout 120s for Config Portal +[WM] LoadWiFiCfgFile +[WM] OK +[WM] stationIP = 0.0.0.0 , gatewayIP = 192.168.2.1 +[WM] netMask = 255.255.255.0 +[WM] dns1IP = 192.168.2.1 , dns2IP = 8.8.8.8 +Got stored Credentials. Timeout 120s for Config Portal +LittleFS Flag read = 0xD0D04321 +No doubleResetDetected +Saving config file... +Saving config file OK +[WM] * Add SSID = HueNet1 , PW = password +[WM] * Add SSID = HueNet2 , PW = password +ConnectMultiWiFi in setup +[WM] ConnectMultiWiFi with : +[WM] * Flash-stored Router_SSID = HueNet1 , Router_Pass = password +[WM] * Add SSID = HueNet1 , PW = password +[WM] * Additional SSID = HueNet1 , PW = password +[WM] * Additional SSID = HueNet2 , PW = password +[WM] Connecting MultiWifi... +[WM] WiFi connected after time: 1 +[WM] SSID: HueNet1 ,RSSI= -19 +[WM] Channel: 2 ,IP address: 192.168.2.85 +After waiting 8.41 secs more in setup(), connection result is connected. Local IP: 192.168.2.85 +HStop doubleResetDetecting +Saving config file... +Saving config file OK +HHH +``` + --- --- diff --git a/changelog.md b/changelog.md index a812acde..3e09305c 100644 --- a/changelog.md +++ b/changelog.md @@ -12,6 +12,7 @@ ## Table of Contents * [Changelog](#changelog) + * [Releases v1.12.1](#releases-v1121) * [Releases v1.12.0](#releases-v1120) * [Releases v1.11.0](#releases-v1110) * [Releases v1.10.0](#releases-v1100) @@ -48,6 +49,11 @@ ## Changelog +### Releases v1.12.1 + +1. Add LittleFS support to `ESP32-C3`. +2. Use ESP32-core's LittleFS library instead of Lorol's LITTLEFS library for v2.0.0+ + ### Releases v1.12.0 1. Add support to `ESP32-S3` (`ESP32S3_DEV, ESP32_S3_BOX, UM TINYS3, UM PROS3, UM FEATHERS3`, etc.) using [ESP32 core, esp32-s3-support branch, v2.0.2+](https://github.com/espressif/arduino-esp32/tree/esp32-s3-support) diff --git a/examples/Async_AutoConnect/Async_AutoConnect.ino b/examples/Async_AutoConnect/Async_AutoConnect.ino index 6a8cee90..7a6b749c 100644 --- a/examples/Async_AutoConnect/Async_AutoConnect.ino +++ b/examples/Async_AutoConnect/Async_AutoConnect.ino @@ -18,8 +18,8 @@ #error This code is intended to run on the ESP8266 or ESP32 platform! Please check your Tools->Board setting. #endif -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.0" -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012000 +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.1" +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012001 // Use from 0 to 4. Higher number, more debugging messages and memory usage. #define _ESPASYNC_WIFIMGR_LOGLEVEL_ 3 @@ -35,13 +35,13 @@ WiFiMulti wifiMulti; // LittleFS has higher priority than SPIFFS - #if ( ARDUINO_ESP32C3_DEV ) - // Currently, ESP32-C3 only supporting SPIFFS and EEPROM. Will fix to support LittleFS - #define USE_LITTLEFS false - #define USE_SPIFFS true - #else + #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #define USE_LITTLEFS true #define USE_SPIFFS false + #elif defined(ARDUINO_ESP32C3_DEV) + // For core v1.0.6-, ESP32-C3 only supporting SPIFFS and EEPROM. To use v2.0.0+ for LittleFS + #define USE_LITTLEFS false + #define USE_SPIFFS true #endif #if USE_LITTLEFS @@ -53,7 +53,7 @@ #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #warning Using ESP32 Core 1.0.6 or 2.0.0+ // The library has been merged into esp32 core from release 1.0.6 - #include + #include // https://github.com/espressif/arduino-esp32/tree/master/libraries/LittleFS FS* filesystem = &LittleFS; #define FileFS LittleFS @@ -61,7 +61,7 @@ #else #warning Using ESP32 Core 1.0.5-. You must install LITTLEFS library // The library has been merged into esp32 core from release 1.0.6 - #include // https://github.com/lorol/LITTLEFS + #include // https://github.com/lorol/LITTLEFS FS* filesystem = &LITTLEFS; #define FileFS LITTLEFS diff --git a/examples/Async_AutoConnectWithFSParameters/Async_AutoConnectWithFSParameters.ino b/examples/Async_AutoConnectWithFSParameters/Async_AutoConnectWithFSParameters.ino index 9e5f8754..93e30715 100644 --- a/examples/Async_AutoConnectWithFSParameters/Async_AutoConnectWithFSParameters.ino +++ b/examples/Async_AutoConnectWithFSParameters/Async_AutoConnectWithFSParameters.ino @@ -19,8 +19,8 @@ #error This code is intended to run on the ESP8266 or ESP32 platform! Please check your Tools->Board setting. #endif -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.0" -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012000 +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.1" +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012001 // Use from 0 to 4. Higher number, more debugging messages and memory usage. #define _ESPASYNC_WIFIMGR_LOGLEVEL_ 3 @@ -38,13 +38,13 @@ WiFiMulti wifiMulti; // LittleFS has higher priority than SPIFFS - #if ( ARDUINO_ESP32C3_DEV ) - // Currently, ESP32-C3 only supporting SPIFFS and EEPROM. Will fix to support LittleFS - #define USE_LITTLEFS false - #define USE_SPIFFS true - #else + #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #define USE_LITTLEFS true #define USE_SPIFFS false + #elif defined(ARDUINO_ESP32C3_DEV) + // For core v1.0.6-, ESP32-C3 only supporting SPIFFS and EEPROM. To use v2.0.0+ for LittleFS + #define USE_LITTLEFS false + #define USE_SPIFFS true #endif #if USE_LITTLEFS @@ -56,7 +56,7 @@ #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #warning Using ESP32 Core 1.0.6 or 2.0.0+ // The library has been merged into esp32 core from release 1.0.6 - #include + #include // https://github.com/espressif/arduino-esp32/tree/master/libraries/LittleFS FS* filesystem = &LittleFS; #define FileFS LittleFS @@ -64,7 +64,7 @@ #else #warning Using ESP32 Core 1.0.5-. You must install LITTLEFS library // The library has been merged into esp32 core from release 1.0.6 - #include // https://github.com/lorol/LITTLEFS + #include // https://github.com/lorol/LITTLEFS FS* filesystem = &LITTLEFS; #define FileFS LITTLEFS diff --git a/examples/Async_AutoConnectWithFSParametersAndCustomIP/Async_AutoConnectWithFSParametersAndCustomIP.ino b/examples/Async_AutoConnectWithFSParametersAndCustomIP/Async_AutoConnectWithFSParametersAndCustomIP.ino index 50107b9a..ec8a362d 100644 --- a/examples/Async_AutoConnectWithFSParametersAndCustomIP/Async_AutoConnectWithFSParametersAndCustomIP.ino +++ b/examples/Async_AutoConnectWithFSParametersAndCustomIP/Async_AutoConnectWithFSParametersAndCustomIP.ino @@ -19,8 +19,8 @@ #error This code is intended to run on the ESP8266 or ESP32 platform! Please check your Tools->Board setting. #endif -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.0" -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012000 +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.1" +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012001 // Use from 0 to 4. Higher number, more debugging messages and memory usage. #define _ESPASYNC_WIFIMGR_LOGLEVEL_ 3 @@ -39,13 +39,13 @@ WiFiMulti wifiMulti; // LittleFS has higher priority than SPIFFS - #if ( ARDUINO_ESP32C3_DEV ) - // Currently, ESP32-C3 only supporting SPIFFS and EEPROM. Will fix to support LittleFS - #define USE_LITTLEFS false - #define USE_SPIFFS true - #else + #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #define USE_LITTLEFS true #define USE_SPIFFS false + #elif defined(ARDUINO_ESP32C3_DEV) + // For core v1.0.6-, ESP32-C3 only supporting SPIFFS and EEPROM. To use v2.0.0+ for LittleFS + #define USE_LITTLEFS false + #define USE_SPIFFS true #endif #if USE_LITTLEFS @@ -57,7 +57,7 @@ #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #warning Using ESP32 Core 1.0.6 or 2.0.0+ // The library has been merged into esp32 core from release 1.0.6 - #include + #include // https://github.com/espressif/arduino-esp32/tree/master/libraries/LittleFS FS* filesystem = &LittleFS; #define FileFS LittleFS @@ -65,7 +65,7 @@ #else #warning Using ESP32 Core 1.0.5-. You must install LITTLEFS library // The library has been merged into esp32 core from release 1.0.6 - #include // https://github.com/lorol/LITTLEFS + #include // https://github.com/lorol/LITTLEFS FS* filesystem = &LITTLEFS; #define FileFS LITTLEFS diff --git a/examples/Async_AutoConnectWithFeedback/Async_AutoConnectWithFeedback.ino b/examples/Async_AutoConnectWithFeedback/Async_AutoConnectWithFeedback.ino index 03268835..d3ebd7ae 100644 --- a/examples/Async_AutoConnectWithFeedback/Async_AutoConnectWithFeedback.ino +++ b/examples/Async_AutoConnectWithFeedback/Async_AutoConnectWithFeedback.ino @@ -18,8 +18,8 @@ #error This code is intended to run on the ESP8266 or ESP32 platform! Please check your Tools->Board setting. #endif -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.0" -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012000 +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.1" +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012001 // Use from 0 to 4. Higher number, more debugging messages and memory usage. #define _ESPASYNC_WIFIMGR_LOGLEVEL_ 3 @@ -35,13 +35,13 @@ WiFiMulti wifiMulti; // LittleFS has higher priority than SPIFFS - #if ( ARDUINO_ESP32C3_DEV ) - // Currently, ESP32-C3 only supporting SPIFFS and EEPROM. Will fix to support LittleFS - #define USE_LITTLEFS false - #define USE_SPIFFS true - #else + #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #define USE_LITTLEFS true #define USE_SPIFFS false + #elif defined(ARDUINO_ESP32C3_DEV) + // For core v1.0.6-, ESP32-C3 only supporting SPIFFS and EEPROM. To use v2.0.0+ for LittleFS + #define USE_LITTLEFS false + #define USE_SPIFFS true #endif #if USE_LITTLEFS @@ -53,7 +53,7 @@ #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #warning Using ESP32 Core 1.0.6 or 2.0.0+ // The library has been merged into esp32 core from release 1.0.6 - #include + #include // https://github.com/espressif/arduino-esp32/tree/master/libraries/LittleFS FS* filesystem = &LittleFS; #define FileFS LittleFS @@ -61,7 +61,7 @@ #else #warning Using ESP32 Core 1.0.5-. You must install LITTLEFS library // The library has been merged into esp32 core from release 1.0.6 - #include // https://github.com/lorol/LITTLEFS + #include // https://github.com/lorol/LITTLEFS FS* filesystem = &LITTLEFS; #define FileFS LITTLEFS diff --git a/examples/Async_AutoConnectWithFeedbackLED/Async_AutoConnectWithFeedbackLED.ino b/examples/Async_AutoConnectWithFeedbackLED/Async_AutoConnectWithFeedbackLED.ino index 6e665a6d..651a83b4 100644 --- a/examples/Async_AutoConnectWithFeedbackLED/Async_AutoConnectWithFeedbackLED.ino +++ b/examples/Async_AutoConnectWithFeedbackLED/Async_AutoConnectWithFeedbackLED.ino @@ -19,8 +19,8 @@ #error This code is intended to run on the ESP8266 or ESP32 platform! Please check your Tools->Board setting. #endif -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.0" -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012000 +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.1" +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012001 // Use from 0 to 4. Higher number, more debugging messages and memory usage. #define _ESPASYNC_WIFIMGR_LOGLEVEL_ 3 @@ -36,13 +36,13 @@ WiFiMulti wifiMulti; // LittleFS has higher priority than SPIFFS - #if ( ARDUINO_ESP32C3_DEV ) - // Currently, ESP32-C3 only supporting SPIFFS and EEPROM. Will fix to support LittleFS - #define USE_LITTLEFS false - #define USE_SPIFFS true - #else + #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #define USE_LITTLEFS true #define USE_SPIFFS false + #elif defined(ARDUINO_ESP32C3_DEV) + // For core v1.0.6-, ESP32-C3 only supporting SPIFFS and EEPROM. To use v2.0.0+ for LittleFS + #define USE_LITTLEFS false + #define USE_SPIFFS true #endif #if USE_LITTLEFS @@ -54,7 +54,7 @@ #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #warning Using ESP32 Core 1.0.6 or 2.0.0+ // The library has been merged into esp32 core from release 1.0.6 - #include + #include // https://github.com/espressif/arduino-esp32/tree/master/libraries/LittleFS FS* filesystem = &LittleFS; #define FileFS LittleFS @@ -62,7 +62,7 @@ #else #warning Using ESP32 Core 1.0.5-. You must install LITTLEFS library // The library has been merged into esp32 core from release 1.0.6 - #include // https://github.com/lorol/LITTLEFS + #include // https://github.com/lorol/LITTLEFS FS* filesystem = &LITTLEFS; #define FileFS LITTLEFS diff --git a/examples/Async_ConfigOnDRD_FS_MQTT_Ptr/Async_ConfigOnDRD_FS_MQTT_Ptr.ino b/examples/Async_ConfigOnDRD_FS_MQTT_Ptr/Async_ConfigOnDRD_FS_MQTT_Ptr.ino index 282d3ada..80fc34df 100644 --- a/examples/Async_ConfigOnDRD_FS_MQTT_Ptr/Async_ConfigOnDRD_FS_MQTT_Ptr.ino +++ b/examples/Async_ConfigOnDRD_FS_MQTT_Ptr/Async_ConfigOnDRD_FS_MQTT_Ptr.ino @@ -31,8 +31,8 @@ #error This code is intended to run on the ESP8266 or ESP32 platform! Please check your Tools->Board setting. #endif -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.0" -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012000 +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.1" +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012001 // Use from 0 to 4. Higher number, more debugging messages and memory usage. #define _ESPASYNC_WIFIMGR_LOGLEVEL_ 3 @@ -54,13 +54,13 @@ WiFiMulti wifiMulti; // LittleFS has higher priority than SPIFFS - #if ( ARDUINO_ESP32C3_DEV ) - // Currently, ESP32-C3 only supporting SPIFFS and EEPROM. Will fix to support LittleFS - #define USE_LITTLEFS false - #define USE_SPIFFS true - #else + #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #define USE_LITTLEFS true #define USE_SPIFFS false + #elif defined(ARDUINO_ESP32C3_DEV) + // For core v1.0.6-, ESP32-C3 only supporting SPIFFS and EEPROM. To use v2.0.0+ for LittleFS + #define USE_LITTLEFS false + #define USE_SPIFFS true #endif #if USE_LITTLEFS @@ -72,7 +72,7 @@ #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #warning Using ESP32 Core 1.0.6 or 2.0.0+ // The library has been merged into esp32 core from release 1.0.6 - #include + #include // https://github.com/espressif/arduino-esp32/tree/master/libraries/LittleFS FS* filesystem = &LittleFS; #define FileFS LittleFS @@ -80,7 +80,7 @@ #else #warning Using ESP32 Core 1.0.5-. You must install LITTLEFS library // The library has been merged into esp32 core from release 1.0.6 - #include // https://github.com/lorol/LITTLEFS + #include // https://github.com/lorol/LITTLEFS FS* filesystem = &LITTLEFS; #define FileFS LITTLEFS diff --git a/examples/Async_ConfigOnDRD_FS_MQTT_Ptr_Complex/Async_ConfigOnDRD_FS_MQTT_Ptr_Complex.ino b/examples/Async_ConfigOnDRD_FS_MQTT_Ptr_Complex/Async_ConfigOnDRD_FS_MQTT_Ptr_Complex.ino index d9313144..8e7aa699 100644 --- a/examples/Async_ConfigOnDRD_FS_MQTT_Ptr_Complex/Async_ConfigOnDRD_FS_MQTT_Ptr_Complex.ino +++ b/examples/Async_ConfigOnDRD_FS_MQTT_Ptr_Complex/Async_ConfigOnDRD_FS_MQTT_Ptr_Complex.ino @@ -31,8 +31,8 @@ #error This code is intended to run on the ESP8266 or ESP32 platform! Please check your Tools->Board setting. #endif -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.0" -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012000 +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.1" +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012001 // Use from 0 to 4. Higher number, more debugging messages and memory usage. #define _ESPASYNC_WIFIMGR_LOGLEVEL_ 2 @@ -57,13 +57,13 @@ WiFiMulti wifiMulti; // LittleFS has higher priority than SPIFFS - #if ( ARDUINO_ESP32C3_DEV ) - // Currently, ESP32-C3 only supporting SPIFFS and EEPROM. Will fix to support LittleFS - #define USE_LITTLEFS false - #define USE_SPIFFS true - #else + #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #define USE_LITTLEFS true #define USE_SPIFFS false + #elif defined(ARDUINO_ESP32C3_DEV) + // For core v1.0.6-, ESP32-C3 only supporting SPIFFS and EEPROM. To use v2.0.0+ for LittleFS + #define USE_LITTLEFS false + #define USE_SPIFFS true #endif #if USE_LITTLEFS @@ -75,7 +75,7 @@ #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #warning Using ESP32 Core 1.0.6 or 2.0.0+ // The library has been merged into esp32 core from release 1.0.6 - #include + #include // https://github.com/espressif/arduino-esp32/tree/master/libraries/LittleFS FS* filesystem = &LittleFS; #define FileFS LittleFS @@ -83,7 +83,7 @@ #else #warning Using ESP32 Core 1.0.5-. You must install LITTLEFS library // The library has been merged into esp32 core from release 1.0.6 - #include // https://github.com/lorol/LITTLEFS + #include // https://github.com/lorol/LITTLEFS FS* filesystem = &LITTLEFS; #define FileFS LITTLEFS diff --git a/examples/Async_ConfigOnDRD_FS_MQTT_Ptr_Medium/Async_ConfigOnDRD_FS_MQTT_Ptr_Medium.ino b/examples/Async_ConfigOnDRD_FS_MQTT_Ptr_Medium/Async_ConfigOnDRD_FS_MQTT_Ptr_Medium.ino index d6079e13..cdfedf80 100644 --- a/examples/Async_ConfigOnDRD_FS_MQTT_Ptr_Medium/Async_ConfigOnDRD_FS_MQTT_Ptr_Medium.ino +++ b/examples/Async_ConfigOnDRD_FS_MQTT_Ptr_Medium/Async_ConfigOnDRD_FS_MQTT_Ptr_Medium.ino @@ -31,8 +31,8 @@ #error This code is intended to run on the ESP8266 or ESP32 platform! Please check your Tools->Board setting. #endif -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.0" -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012000 +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.1" +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012001 // Use from 0 to 4. Higher number, more debugging messages and memory usage. #define _ESPASYNC_WIFIMGR_LOGLEVEL_ 3 @@ -54,13 +54,13 @@ WiFiMulti wifiMulti; // LittleFS has higher priority than SPIFFS - #if ( ARDUINO_ESP32C3_DEV ) - // Currently, ESP32-C3 only supporting SPIFFS and EEPROM. Will fix to support LittleFS - #define USE_LITTLEFS false - #define USE_SPIFFS true - #else + #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #define USE_LITTLEFS true #define USE_SPIFFS false + #elif defined(ARDUINO_ESP32C3_DEV) + // For core v1.0.6-, ESP32-C3 only supporting SPIFFS and EEPROM. To use v2.0.0+ for LittleFS + #define USE_LITTLEFS false + #define USE_SPIFFS true #endif #if USE_LITTLEFS @@ -72,7 +72,7 @@ #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #warning Using ESP32 Core 1.0.6 or 2.0.0+ // The library has been merged into esp32 core from release 1.0.6 - #include + #include // https://github.com/espressif/arduino-esp32/tree/master/libraries/LittleFS FS* filesystem = &LittleFS; #define FileFS LittleFS @@ -80,7 +80,7 @@ #else #warning Using ESP32 Core 1.0.5-. You must install LITTLEFS library // The library has been merged into esp32 core from release 1.0.6 - #include // https://github.com/lorol/LITTLEFS + #include // https://github.com/lorol/LITTLEFS FS* filesystem = &LITTLEFS; #define FileFS LITTLEFS diff --git a/examples/Async_ConfigOnDoubleReset/Async_ConfigOnDoubleReset.ino b/examples/Async_ConfigOnDoubleReset/Async_ConfigOnDoubleReset.ino index 243e7c89..5582ad36 100644 --- a/examples/Async_ConfigOnDoubleReset/Async_ConfigOnDoubleReset.ino +++ b/examples/Async_ConfigOnDoubleReset/Async_ConfigOnDoubleReset.ino @@ -42,8 +42,8 @@ #error This code is intended to run on the ESP8266 or ESP32 platform! Please check your Tools->Board setting. #endif -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.0" -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012000 +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.1" +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012001 // Use from 0 to 4. Higher number, more debugging messages and memory usage. #define _ESPASYNC_WIFIMGR_LOGLEVEL_ 1 @@ -61,13 +61,13 @@ WiFiMulti wifiMulti; // LittleFS has higher priority than SPIFFS - #if ( ARDUINO_ESP32C3_DEV ) - // Currently, ESP32-C3 only supporting SPIFFS and EEPROM. Will fix to support LittleFS - #define USE_LITTLEFS false - #define USE_SPIFFS true - #else + #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #define USE_LITTLEFS true #define USE_SPIFFS false + #elif defined(ARDUINO_ESP32C3_DEV) + // For core v1.0.6-, ESP32-C3 only supporting SPIFFS and EEPROM. To use v2.0.0+ for LittleFS + #define USE_LITTLEFS false + #define USE_SPIFFS true #endif #if USE_LITTLEFS @@ -79,7 +79,7 @@ #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #warning Using ESP32 Core 1.0.6 or 2.0.0+ // The library has been merged into esp32 core from release 1.0.6 - #include + #include // https://github.com/espressif/arduino-esp32/tree/master/libraries/LittleFS FS* filesystem = &LittleFS; #define FileFS LittleFS @@ -87,7 +87,7 @@ #else #warning Using ESP32 Core 1.0.5-. You must install LITTLEFS library // The library has been merged into esp32 core from release 1.0.6 - #include // https://github.com/lorol/LITTLEFS + #include // https://github.com/lorol/LITTLEFS FS* filesystem = &LITTLEFS; #define FileFS LITTLEFS diff --git a/examples/Async_ConfigOnDoubleReset_Multi/Async_ConfigOnDoubleReset_Multi.h b/examples/Async_ConfigOnDoubleReset_Multi/Async_ConfigOnDoubleReset_Multi.h index 100a3565..7609d9dd 100644 --- a/examples/Async_ConfigOnDoubleReset_Multi/Async_ConfigOnDoubleReset_Multi.h +++ b/examples/Async_ConfigOnDoubleReset_Multi/Async_ConfigOnDoubleReset_Multi.h @@ -42,8 +42,8 @@ #error This code is intended to run on the ESP8266 or ESP32 platform! Please check your Tools->Board setting. #endif -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.0" -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012000 +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.1" +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012001 // Use from 0 to 4. Higher number, more debugging messages and memory usage. #define _ESPASYNC_WIFIMGR_LOGLEVEL_ 1 @@ -61,13 +61,13 @@ extern WiFiMulti wifiMulti; // LittleFS has higher priority than SPIFFS - #if ( ARDUINO_ESP32C3_DEV ) - // Currently, ESP32-C3 only supporting SPIFFS and EEPROM. Will fix to support LittleFS - #define USE_LITTLEFS false - #define USE_SPIFFS true - #else + #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #define USE_LITTLEFS true #define USE_SPIFFS false + #elif defined(ARDUINO_ESP32C3_DEV) + // For core v1.0.6-, ESP32-C3 only supporting SPIFFS and EEPROM. To use v2.0.0+ for LittleFS + #define USE_LITTLEFS false + #define USE_SPIFFS true #endif #if USE_LITTLEFS @@ -79,17 +79,17 @@ #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #warning Using ESP32 Core 1.0.6 or 2.0.0+ // The library has been merged into esp32 core from release 1.0.6 - #include + #include // https://github.com/espressif/arduino-esp32/tree/master/libraries/LittleFS - extern FS* filesystem; // = &LittleFS; + extern FS* filesystem; // = &LittleFS; #define FileFS LittleFS #define FS_Name "LittleFS" #else #warning Using ESP32 Core 1.0.5-. You must install LITTLEFS library // The library has been merged into esp32 core from release 1.0.6 - #include // https://github.com/lorol/LITTLEFS + #include // https://github.com/lorol/LITTLEFS - exern FS* filesystem; // = &LITTLEFS; + extern FS* filesystem; // = &LITTLEFS; #define FileFS LITTLEFS #define FS_Name "LittleFS" #endif diff --git a/examples/Async_ConfigOnDoubleReset_TZ/Async_ConfigOnDoubleReset_TZ.ino b/examples/Async_ConfigOnDoubleReset_TZ/Async_ConfigOnDoubleReset_TZ.ino index 244bfdac..217e694b 100644 --- a/examples/Async_ConfigOnDoubleReset_TZ/Async_ConfigOnDoubleReset_TZ.ino +++ b/examples/Async_ConfigOnDoubleReset_TZ/Async_ConfigOnDoubleReset_TZ.ino @@ -42,8 +42,8 @@ #error This code is intended to run on the ESP8266 or ESP32 platform! Please check your Tools->Board setting. #endif -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.0" -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012000 +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.1" +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012001 // Use from 0 to 4. Higher number, more debugging messages and memory usage. #define _ESPASYNC_WIFIMGR_LOGLEVEL_ 1 @@ -61,13 +61,13 @@ WiFiMulti wifiMulti; // LittleFS has higher priority than SPIFFS - #if ( ARDUINO_ESP32C3_DEV ) - // Currently, ESP32-C3 only supporting SPIFFS and EEPROM. Will fix to support LittleFS - #define USE_LITTLEFS false - #define USE_SPIFFS true - #else + #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #define USE_LITTLEFS true #define USE_SPIFFS false + #elif defined(ARDUINO_ESP32C3_DEV) + // For core v1.0.6-, ESP32-C3 only supporting SPIFFS and EEPROM. To use v2.0.0+ for LittleFS + #define USE_LITTLEFS false + #define USE_SPIFFS true #endif #if USE_LITTLEFS @@ -79,7 +79,7 @@ #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #warning Using ESP32 Core 1.0.6 or 2.0.0+ // The library has been merged into esp32 core from release 1.0.6 - #include + #include // https://github.com/espressif/arduino-esp32/tree/master/libraries/LittleFS FS* filesystem = &LittleFS; #define FileFS LittleFS @@ -87,7 +87,7 @@ #else #warning Using ESP32 Core 1.0.5-. You must install LITTLEFS library // The library has been merged into esp32 core from release 1.0.6 - #include // https://github.com/lorol/LITTLEFS + #include // https://github.com/lorol/LITTLEFS FS* filesystem = &LITTLEFS; #define FileFS LITTLEFS diff --git a/examples/Async_ConfigOnStartup/Async_ConfigOnStartup.ino b/examples/Async_ConfigOnStartup/Async_ConfigOnStartup.ino index 8825015c..9e8b7953 100644 --- a/examples/Async_ConfigOnStartup/Async_ConfigOnStartup.ino +++ b/examples/Async_ConfigOnStartup/Async_ConfigOnStartup.ino @@ -33,8 +33,8 @@ #error This code is intended to run on the ESP8266 or ESP32 platform! Please check your Tools->Board setting. #endif -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.0" -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012000 +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.1" +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012001 // Use from 0 to 4. Higher number, more debugging messages and memory usage. #define _ESPASYNC_WIFIMGR_LOGLEVEL_ 3 @@ -52,13 +52,13 @@ WiFiMulti wifiMulti; // LittleFS has higher priority than SPIFFS - #if ( ARDUINO_ESP32C3_DEV ) - // Currently, ESP32-C3 only supporting SPIFFS and EEPROM. Will fix to support LittleFS - #define USE_LITTLEFS false - #define USE_SPIFFS true - #else + #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #define USE_LITTLEFS true #define USE_SPIFFS false + #elif defined(ARDUINO_ESP32C3_DEV) + // For core v1.0.6-, ESP32-C3 only supporting SPIFFS and EEPROM. To use v2.0.0+ for LittleFS + #define USE_LITTLEFS false + #define USE_SPIFFS true #endif #if USE_LITTLEFS @@ -70,7 +70,7 @@ #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #warning Using ESP32 Core 1.0.6 or 2.0.0+ // The library has been merged into esp32 core from release 1.0.6 - #include + #include // https://github.com/espressif/arduino-esp32/tree/master/libraries/LittleFS FS* filesystem = &LittleFS; #define FileFS LittleFS @@ -78,7 +78,7 @@ #else #warning Using ESP32 Core 1.0.5-. You must install LITTLEFS library // The library has been merged into esp32 core from release 1.0.6 - #include // https://github.com/lorol/LITTLEFS + #include // https://github.com/lorol/LITTLEFS FS* filesystem = &LITTLEFS; #define FileFS LITTLEFS diff --git a/examples/Async_ConfigOnSwitch/Async_ConfigOnSwitch.ino b/examples/Async_ConfigOnSwitch/Async_ConfigOnSwitch.ino index 4bf9b70b..3225c868 100644 --- a/examples/Async_ConfigOnSwitch/Async_ConfigOnSwitch.ino +++ b/examples/Async_ConfigOnSwitch/Async_ConfigOnSwitch.ino @@ -30,8 +30,8 @@ #error This code is intended to run on the ESP8266 or ESP32 platform! Please check your Tools->Board setting. #endif -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.0" -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012000 +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.1" +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012001 // Use from 0 to 4. Higher number, more debugging messages and memory usage. #define _ESPASYNC_WIFIMGR_LOGLEVEL_ 3 @@ -49,13 +49,13 @@ WiFiMulti wifiMulti; // LittleFS has higher priority than SPIFFS - #if ( ARDUINO_ESP32C3_DEV ) - // Currently, ESP32-C3 only supporting SPIFFS and EEPROM. Will fix to support LittleFS - #define USE_LITTLEFS false - #define USE_SPIFFS true - #else + #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #define USE_LITTLEFS true #define USE_SPIFFS false + #elif defined(ARDUINO_ESP32C3_DEV) + // For core v1.0.6-, ESP32-C3 only supporting SPIFFS and EEPROM. To use v2.0.0+ for LittleFS + #define USE_LITTLEFS false + #define USE_SPIFFS true #endif #if USE_LITTLEFS @@ -67,7 +67,7 @@ #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #warning Using ESP32 Core 1.0.6 or 2.0.0+ // The library has been merged into esp32 core from release 1.0.6 - #include + #include // https://github.com/espressif/arduino-esp32/tree/master/libraries/LittleFS FS* filesystem = &LittleFS; #define FileFS LittleFS @@ -75,7 +75,7 @@ #else #warning Using ESP32 Core 1.0.5-. You must install LITTLEFS library // The library has been merged into esp32 core from release 1.0.6 - #include // https://github.com/lorol/LITTLEFS + #include // https://github.com/lorol/LITTLEFS FS* filesystem = &LITTLEFS; #define FileFS LITTLEFS diff --git a/examples/Async_ConfigOnSwitchFS/Async_ConfigOnSwitchFS.ino b/examples/Async_ConfigOnSwitchFS/Async_ConfigOnSwitchFS.ino index aee27d67..8c89d695 100644 --- a/examples/Async_ConfigOnSwitchFS/Async_ConfigOnSwitchFS.ino +++ b/examples/Async_ConfigOnSwitchFS/Async_ConfigOnSwitchFS.ino @@ -53,8 +53,8 @@ #error This code is intended to run on the ESP8266 or ESP32 platform! Please check your Tools->Board setting. #endif -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.0" -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012000 +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.1" +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012001 // Use from 0 to 4. Higher number, more debugging messages and memory usage. #define _ESPASYNC_WIFIMGR_LOGLEVEL_ 3 @@ -75,13 +75,13 @@ WiFiMulti wifiMulti; // LittleFS has higher priority than SPIFFS - #if ( ARDUINO_ESP32C3_DEV ) - // Currently, ESP32-C3 only supporting SPIFFS and EEPROM. Will fix to support LittleFS - #define USE_LITTLEFS false - #define USE_SPIFFS true - #else + #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #define USE_LITTLEFS true #define USE_SPIFFS false + #elif defined(ARDUINO_ESP32C3_DEV) + // For core v1.0.6-, ESP32-C3 only supporting SPIFFS and EEPROM. To use v2.0.0+ for LittleFS + #define USE_LITTLEFS false + #define USE_SPIFFS true #endif #if USE_LITTLEFS @@ -93,7 +93,7 @@ #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #warning Using ESP32 Core 1.0.6 or 2.0.0+ // The library has been merged into esp32 core from release 1.0.6 - #include + #include // https://github.com/espressif/arduino-esp32/tree/master/libraries/LittleFS FS* filesystem = &LittleFS; #define FileFS LittleFS @@ -101,7 +101,7 @@ #else #warning Using ESP32 Core 1.0.5-. You must install LITTLEFS library // The library has been merged into esp32 core from release 1.0.6 - #include // https://github.com/lorol/LITTLEFS + #include // https://github.com/lorol/LITTLEFS FS* filesystem = &LITTLEFS; #define FileFS LITTLEFS diff --git a/examples/Async_ConfigOnSwitchFS_MQTT_Ptr/Async_ConfigOnSwitchFS_MQTT_Ptr.ino b/examples/Async_ConfigOnSwitchFS_MQTT_Ptr/Async_ConfigOnSwitchFS_MQTT_Ptr.ino index d010d1cc..e6f55da9 100644 --- a/examples/Async_ConfigOnSwitchFS_MQTT_Ptr/Async_ConfigOnSwitchFS_MQTT_Ptr.ino +++ b/examples/Async_ConfigOnSwitchFS_MQTT_Ptr/Async_ConfigOnSwitchFS_MQTT_Ptr.ino @@ -35,8 +35,8 @@ #error This code is intended to run on the ESP8266 or ESP32 platform! Please check your Tools->Board setting. #endif -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.0" -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012000 +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.1" +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012001 // Use from 0 to 4. Higher number, more debugging messages and memory usage. #define _ESPASYNC_WIFIMGR_LOGLEVEL_ 3 @@ -61,13 +61,13 @@ WiFiMulti wifiMulti; // LittleFS has higher priority than SPIFFS - #if ( ARDUINO_ESP32C3_DEV ) - // Currently, ESP32-C3 only supporting SPIFFS and EEPROM. Will fix to support LittleFS - #define USE_LITTLEFS false - #define USE_SPIFFS true - #else + #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #define USE_LITTLEFS true #define USE_SPIFFS false + #elif defined(ARDUINO_ESP32C3_DEV) + // For core v1.0.6-, ESP32-C3 only supporting SPIFFS and EEPROM. To use v2.0.0+ for LittleFS + #define USE_LITTLEFS false + #define USE_SPIFFS true #endif #if USE_LITTLEFS @@ -79,7 +79,7 @@ #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #warning Using ESP32 Core 1.0.6 or 2.0.0+ // The library has been merged into esp32 core from release 1.0.6 - #include + #include // https://github.com/espressif/arduino-esp32/tree/master/libraries/LittleFS FS* filesystem = &LittleFS; #define FileFS LittleFS @@ -87,7 +87,7 @@ #else #warning Using ESP32 Core 1.0.5-. You must install LITTLEFS library // The library has been merged into esp32 core from release 1.0.6 - #include // https://github.com/lorol/LITTLEFS + #include // https://github.com/lorol/LITTLEFS FS* filesystem = &LITTLEFS; #define FileFS LITTLEFS diff --git a/examples/Async_ConfigPortalParamsOnSwitch/Async_ConfigPortalParamsOnSwitch.ino b/examples/Async_ConfigPortalParamsOnSwitch/Async_ConfigPortalParamsOnSwitch.ino index 3dab29d9..535d0f2e 100644 --- a/examples/Async_ConfigPortalParamsOnSwitch/Async_ConfigPortalParamsOnSwitch.ino +++ b/examples/Async_ConfigPortalParamsOnSwitch/Async_ConfigPortalParamsOnSwitch.ino @@ -32,8 +32,8 @@ #error This code is intended to run on the ESP8266 or ESP32 platform! Please check your Tools->Board setting. #endif -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.0" -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012000 +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.1" +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012001 // Use from 0 to 4. Higher number, more debugging messages and memory usage. #define _ESPASYNC_WIFIMGR_LOGLEVEL_ 3 @@ -54,13 +54,13 @@ WiFiMulti wifiMulti; // LittleFS has higher priority than SPIFFS - #if ( ARDUINO_ESP32C3_DEV ) - // Currently, ESP32-C3 only supporting SPIFFS and EEPROM. Will fix to support LittleFS - #define USE_LITTLEFS false - #define USE_SPIFFS true - #else + #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #define USE_LITTLEFS true #define USE_SPIFFS false + #elif defined(ARDUINO_ESP32C3_DEV) + // For core v1.0.6-, ESP32-C3 only supporting SPIFFS and EEPROM. To use v2.0.0+ for LittleFS + #define USE_LITTLEFS false + #define USE_SPIFFS true #endif #if USE_LITTLEFS @@ -72,7 +72,7 @@ #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #warning Using ESP32 Core 1.0.6 or 2.0.0+ // The library has been merged into esp32 core from release 1.0.6 - #include + #include // https://github.com/espressif/arduino-esp32/tree/master/libraries/LittleFS FS* filesystem = &LittleFS; #define FileFS LittleFS @@ -80,7 +80,7 @@ #else #warning Using ESP32 Core 1.0.5-. You must install LITTLEFS library // The library has been merged into esp32 core from release 1.0.6 - #include // https://github.com/lorol/LITTLEFS + #include // https://github.com/lorol/LITTLEFS FS* filesystem = &LITTLEFS; #define FileFS LITTLEFS diff --git a/examples/Async_ESP32_FSWebServer/Async_ESP32_FSWebServer.ino b/examples/Async_ESP32_FSWebServer/Async_ESP32_FSWebServer.ino index 62c15791..3ec8a4e6 100644 --- a/examples/Async_ESP32_FSWebServer/Async_ESP32_FSWebServer.ino +++ b/examples/Async_ESP32_FSWebServer/Async_ESP32_FSWebServer.ino @@ -34,8 +34,8 @@ #error This code is intended to run only on the ESP32 platform! Please check your Tools->Board setting. #endif -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.0" -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012000 +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.1" +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012001 // Use from 0 to 4. Higher number, more debugging messages and memory usage. #define _ESPASYNC_WIFIMGR_LOGLEVEL_ 3 @@ -54,13 +54,13 @@ WiFiMulti wifiMulti; #define FORMAT_FILESYSTEM false // LittleFS has higher priority than SPIFFS -#if ( ARDUINO_ESP32C3_DEV ) - // Currently, ESP32-C3 only supporting SPIFFS and EEPROM. Will fix to support LittleFS - #define USE_LITTLEFS false - #define USE_SPIFFS true -#else +#if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #define USE_LITTLEFS true #define USE_SPIFFS false +#elif defined(ARDUINO_ESP32C3_DEV) + // For core v1.0.6-, ESP32-C3 only supporting SPIFFS and EEPROM. To use v2.0.0+ for LittleFS + #define USE_LITTLEFS false + #define USE_SPIFFS true #endif #if USE_LITTLEFS @@ -72,7 +72,7 @@ WiFiMulti wifiMulti; #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #warning Using ESP32 Core 1.0.6 or 2.0.0+ // The library has been merged into esp32 core from release 1.0.6 - #include + #include // https://github.com/espressif/arduino-esp32/tree/master/libraries/LittleFS FS* filesystem = &LittleFS; #define FileFS LittleFS @@ -80,7 +80,7 @@ WiFiMulti wifiMulti; #else #warning Using ESP32 Core 1.0.5-. You must install LITTLEFS library // The library has been merged into esp32 core from release 1.0.6 - #include // https://github.com/lorol/LITTLEFS + #include // https://github.com/lorol/LITTLEFS FS* filesystem = &LITTLEFS; #define FileFS LITTLEFS 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 8148fe8d..56cde33e 100644 --- a/examples/Async_ESP32_FSWebServer_DRD/Async_ESP32_FSWebServer_DRD.ino +++ b/examples/Async_ESP32_FSWebServer_DRD/Async_ESP32_FSWebServer_DRD.ino @@ -34,8 +34,8 @@ #error This code is intended to run only on the ESP32 platform! Please check your Tools->Board setting. #endif -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.0" -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012000 +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.1" +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012001 // Use from 0 to 4. Higher number, more debugging messages and memory usage. #define _ESPASYNC_WIFIMGR_LOGLEVEL_ 3 @@ -54,13 +54,13 @@ WiFiMulti wifiMulti; #define FORMAT_FILESYSTEM false // LittleFS has higher priority than SPIFFS -#if ( ARDUINO_ESP32C3_DEV ) - // Currently, ESP32-C3 only supporting SPIFFS and EEPROM. Will fix to support LittleFS - #define USE_LITTLEFS false - #define USE_SPIFFS true -#else +#if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #define USE_LITTLEFS true #define USE_SPIFFS false +#elif defined(ARDUINO_ESP32C3_DEV) + // For core v1.0.6-, ESP32-C3 only supporting SPIFFS and EEPROM. To use v2.0.0+ for LittleFS + #define USE_LITTLEFS false + #define USE_SPIFFS true #endif #if USE_LITTLEFS @@ -72,7 +72,7 @@ WiFiMulti wifiMulti; #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) #warning Using ESP32 Core 1.0.6 or 2.0.0+ // The library has been merged into esp32 core from release 1.0.6 - #include + #include // https://github.com/espressif/arduino-esp32/tree/master/libraries/LittleFS FS* filesystem = &LittleFS; #define FileFS LittleFS @@ -80,7 +80,7 @@ WiFiMulti wifiMulti; #else #warning Using ESP32 Core 1.0.5-. You must install LITTLEFS library // The library has been merged into esp32 core from release 1.0.6 - #include // https://github.com/lorol/LITTLEFS + #include // https://github.com/lorol/LITTLEFS FS* filesystem = &LITTLEFS; #define FileFS LITTLEFS diff --git a/examples/Async_ESP_FSWebServer/Async_ESP_FSWebServer.ino b/examples/Async_ESP_FSWebServer/Async_ESP_FSWebServer.ino index cd097312..8c475078 100644 --- a/examples/Async_ESP_FSWebServer/Async_ESP_FSWebServer.ino +++ b/examples/Async_ESP_FSWebServer/Async_ESP_FSWebServer.ino @@ -34,8 +34,8 @@ #error This code is intended to run on the ESP8266 platform! Please check your Tools->Board setting. #endif -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.0" -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012000 +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.1" +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012001 // Use from 0 to 4. Higher number, more debugging messages and memory usage. #define _ESPASYNC_WIFIMGR_LOGLEVEL_ 3 diff --git a/examples/Async_ESP_FSWebServer_DRD/Async_ESP_FSWebServer_DRD.ino b/examples/Async_ESP_FSWebServer_DRD/Async_ESP_FSWebServer_DRD.ino index 7234efe8..4820722c 100644 --- a/examples/Async_ESP_FSWebServer_DRD/Async_ESP_FSWebServer_DRD.ino +++ b/examples/Async_ESP_FSWebServer_DRD/Async_ESP_FSWebServer_DRD.ino @@ -34,8 +34,8 @@ #error This code is intended to run on the ESP8266 platform! Please check your Tools->Board setting. #endif -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.0" -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012000 +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.1" +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012001 // Use from 0 to 4. Higher number, more debugging messages and memory usage. #define _ESPASYNC_WIFIMGR_LOGLEVEL_ 3 diff --git a/examples/ModelessConnect/ModelessConnect.ino b/examples/ModelessConnect/ModelessConnect.ino index 1f5a7fd8..be382c77 100644 --- a/examples/ModelessConnect/ModelessConnect.ino +++ b/examples/ModelessConnect/ModelessConnect.ino @@ -19,8 +19,8 @@ #error This code is intended to run on the ESP8266 or ESP32 platform! Please check your Tools->Board setting. #endif -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.0" -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012000 +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.1" +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012001 // Use from 0 to 4. Higher number, more debugging messages and memory usage. #define _ESPASYNC_WIFIMGR_LOGLEVEL_ 3 diff --git a/examples/ModelessWithInterrupts/ModelessWithInterrupts.ino b/examples/ModelessWithInterrupts/ModelessWithInterrupts.ino index 253d87ba..55da8cee 100644 --- a/examples/ModelessWithInterrupts/ModelessWithInterrupts.ino +++ b/examples/ModelessWithInterrupts/ModelessWithInterrupts.ino @@ -19,8 +19,8 @@ #error This code is intended to run on the ESP8266! Please check your Tools->Board setting. #endif -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.0" -#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012000 +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.12.1" +#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1012001 // Use from 0 to 4. Higher number, more debugging messages and memory usage. #define _ESPASYNC_WIFIMGR_LOGLEVEL_ 3 diff --git a/library.json b/library.json index 6537287a..0b1e7633 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "ESPAsync_WiFiManager", - "version": "1.12.0", + "version": "1.12.1", "keywords": "wifi, WiFiManager, esp8266, esp32, esp32-s2, esp32-s3, esp32-c3, AsyncWebServer, Async-WiFiManager, MultiWiFi, Async, Communication, Credentials, Config-Portal, DoubleReset, MultiReset, littlefs, spiffs, dns-server, iot, eeprom", "description": "ESP32 (including ESP32-S2, ESP32-S3 and ESP32-C3), ESP8266 WiFi Connection Manager using AsyncWebServer, with enhanced GUI and fallback Web ConfigPortal. This Library is used for configuring ESP32 (including ESP32-S2, ESP32-S3 and ESP32-C3), ESP8266 modules WiFi Credentials at runtime. You can also specify static DNS servers, personalized HostName, fixed or random AP channel. Now with MultiWiFi auto(Re)connect, configurable CORS Header and auto-Timezone features. Auto detect ESP32 core and use either built-in LittleFS or external LITTLEFS library", "authors": diff --git a/library.properties b/library.properties index 868564cd..3d68f6a2 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=ESPAsync_WiFiManager -version=1.12.0 +version=1.12.1 author=Khoi Hoang maintainer=Khoi Hoang license=MIT diff --git a/src/ESPAsync_WiFiManager-Impl.h b/src/ESPAsync_WiFiManager-Impl.h index d12ff8f4..bc0efbc2 100644 --- a/src/ESPAsync_WiFiManager-Impl.h +++ b/src/ESPAsync_WiFiManager-Impl.h @@ -14,7 +14,7 @@ Built by Khoi Hoang https://github.com/khoih-prog/ESPAsync_WiFiManager Licensed under MIT license - Version: 1.12.0 + Version: 1.12.1 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -50,6 +50,7 @@ 1.10.0 K Hoang 29/12/2021 Fix `multiple-definitions` linker error and weird bug related to src_cpp 1.11.0 K Hoang 17/01/2022 Enable compatibility with old code to include only ESP_WiFiManager.h 1.12.0 K Hoang 10/02/2022 Add support to new ESP32-S3 + 1.12.1 K Hoang 11/02/2022 Add LittleFS support to ESP32-C3. Use core LittleFS instead of Lorol's LITTLEFS for v2.0.0+ *****************************************************************************************************************************/ #pragma once diff --git a/src/ESPAsync_WiFiManager.h b/src/ESPAsync_WiFiManager.h index e81d2291..19c6e083 100644 --- a/src/ESPAsync_WiFiManager.h +++ b/src/ESPAsync_WiFiManager.h @@ -14,7 +14,7 @@ Built by Khoi Hoang https://github.com/khoih-prog/ESPAsync_WiFiManager Licensed under MIT license - Version: 1.12.0 + Version: 1.12.1 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -50,6 +50,7 @@ 1.10.0 K Hoang 29/12/2021 Fix `multiple-definitions` linker error and weird bug related to src_cpp 1.11.0 K Hoang 17/01/2022 Enable compatibility with old code to include only ESP_WiFiManager.h 1.12.0 K Hoang 10/02/2022 Add support to new ESP32-S3 + 1.12.1 K Hoang 11/02/2022 Add LittleFS support to ESP32-C3. Use core LittleFS instead of Lorol's LITTLEFS for v2.0.0+ *****************************************************************************************************************************/ #pragma once diff --git a/src/ESPAsync_WiFiManager.hpp b/src/ESPAsync_WiFiManager.hpp index ef8cfa0e..08184864 100644 --- a/src/ESPAsync_WiFiManager.hpp +++ b/src/ESPAsync_WiFiManager.hpp @@ -14,7 +14,7 @@ Built by Khoi Hoang https://github.com/khoih-prog/ESPAsync_WiFiManager Licensed under MIT license - Version: 1.12.0 + Version: 1.12.1 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -50,6 +50,7 @@ 1.10.0 K Hoang 29/12/2021 Fix `multiple-definitions` linker error and weird bug related to src_cpp 1.11.0 K Hoang 17/01/2022 Enable compatibility with old code to include only ESP_WiFiManager.h 1.12.0 K Hoang 10/02/2022 Add support to new ESP32-S3 + 1.12.1 K Hoang 11/02/2022 Add LittleFS support to ESP32-C3. Use core LittleFS instead of Lorol's LITTLEFS for v2.0.0+ *****************************************************************************************************************************/ #pragma once @@ -65,8 +66,13 @@ #warning Using ESP32_S2. To follow library instructions to install esp32-s2 core and WebServer Patch #warning You have to select HUGE APP or 1.9-2.0 MB APP to be able to run Config Portal. Must use PSRAM #define USING_ESP32_S2 true -#elif defined( ARDUINO_ESP32C3_DEV ) - #warning Using ESP32_C3. To follow library instructions to install esp32-c3 core. Only SPIFFS and EEPROM OK. +#elif ( ARDUINO_ESP32C3_DEV ) + #if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) ) + #warning Using ESP32_C3 using core v2.0.0+. Either LittleFS, SPIFFS or EEPROM OK. + #else + #warning Using ESP32_C3 using core v1.0.6-. To follow library instructions to install esp32-c3 core. Only SPIFFS and EEPROM OK. + #endif + #warning You have to select Flash size 2MB and Minimal APP (1.3MB + 700KB) for some boards #define USING_ESP32_C3 true #elif ( defined(ARDUINO_ESP32S3_DEV) || defined(ARDUINO_ESP32_S3_BOX) || defined(ARDUINO_TINYS3) || \ @@ -75,13 +81,13 @@ #define USING_ESP32_S3 true #endif -#define ESP_ASYNC_WIFIMANAGER_VERSION "ESPAsync_WiFiManager v1.12.0" +#define ESP_ASYNC_WIFIMANAGER_VERSION "ESPAsync_WiFiManager v1.12.1" #define ESP_ASYNC_WIFIMANAGER_VERSION_MAJOR 1 #define ESP_ASYNC_WIFIMANAGER_VERSION_MINOR 12 -#define ESP_ASYNC_WIFIMANAGER_VERSION_PATCH 0 +#define ESP_ASYNC_WIFIMANAGER_VERSION_PATCH 1 -#define ESP_ASYNC_WIFIMANAGER_VERSION_INT 1012000 +#define ESP_ASYNC_WIFIMANAGER_VERSION_INT 1012001 #if ESP8266 #if (ARDUINO_ESP8266_GIT_VER == 0xcf6ff4c4) diff --git a/src/ESPAsync_WiFiManager_Debug.h b/src/ESPAsync_WiFiManager_Debug.h index 16ce437d..277df620 100644 --- a/src/ESPAsync_WiFiManager_Debug.h +++ b/src/ESPAsync_WiFiManager_Debug.h @@ -14,7 +14,7 @@ Built by Khoi Hoang https://github.com/khoih-prog/ESPAsync_WiFiManager Licensed under MIT license - Version: 1.12.0 + Version: 1.12.1 Version Modified By Date Comments ------- ----------- ---------- ----------- @@ -50,6 +50,7 @@ 1.10.0 K Hoang 29/12/2021 Fix `multiple-definitions` linker error and weird bug related to src_cpp 1.11.0 K Hoang 17/01/2022 Enable compatibility with old code to include only ESP_WiFiManager.h 1.12.0 K Hoang 10/02/2022 Add support to new ESP32-S3 + 1.12.1 K Hoang 11/02/2022 Add LittleFS support to ESP32-C3. Use core LittleFS instead of Lorol's LITTLEFS for v2.0.0+ *****************************************************************************************************************************/ #pragma once diff --git a/src/utils/TZ.h b/src/utils/TZ.h index fa896550..ee26e914 100644 --- a/src/utils/TZ.h +++ b/src/utils/TZ.h @@ -71,8 +71,6 @@ //////////////////////////////////////////////////// -#if 1 - #define TZ_Africa_Abidjan ("GMT0") #define TZ_Africa_Accra ("GMT0") #define TZ_Africa_Addis_Ababa ("EAT-3") @@ -534,478 +532,10 @@ #define TZ_Etc_Universal ("UTC0") #define TZ_Etc_Zulu ("UTC0") - -#else - - -#define TZ_Africa_Abidjan PSTR("GMT0") -#define TZ_Africa_Accra PSTR("GMT0") -#define TZ_Africa_Addis_Ababa PSTR("EAT-3") -#define TZ_Africa_Algiers PSTR("CET-1") -#define TZ_Africa_Asmara PSTR("EAT-3") -#define TZ_Africa_Bamako PSTR("GMT0") -#define TZ_Africa_Bangui PSTR("WAT-1") -#define TZ_Africa_Banjul PSTR("GMT0") -#define TZ_Africa_Bissau PSTR("GMT0") -#define TZ_Africa_Blantyre PSTR("CAT-2") -#define TZ_Africa_Brazzaville PSTR("WAT-1") -#define TZ_Africa_Bujumbura PSTR("CAT-2") -#define TZ_Africa_Cairo PSTR("EET-2") -#define TZ_Africa_Casablanca PSTR("<+01>-1") -#define TZ_Africa_Ceuta PSTR("CET-1CEST,M3.5.0,M10.5.0/3") -#define TZ_Africa_Conakry PSTR("GMT0") -#define TZ_Africa_Dakar PSTR("GMT0") -#define TZ_Africa_Dar_es_Salaam PSTR("EAT-3") -#define TZ_Africa_Djibouti PSTR("EAT-3") -#define TZ_Africa_Douala PSTR("WAT-1") -#define TZ_Africa_El_Aaiun PSTR("<+01>-1") -#define TZ_Africa_Freetown PSTR("GMT0") -#define TZ_Africa_Gaborone PSTR("CAT-2") -#define TZ_Africa_Harare PSTR("CAT-2") -#define TZ_Africa_Johannesburg PSTR("SAST-2") -#define TZ_Africa_Juba PSTR("EAT-3") -#define TZ_Africa_Kampala PSTR("EAT-3") -#define TZ_Africa_Khartoum PSTR("CAT-2") -#define TZ_Africa_Kigali PSTR("CAT-2") -#define TZ_Africa_Kinshasa PSTR("WAT-1") -#define TZ_Africa_Lagos PSTR("WAT-1") -#define TZ_Africa_Libreville PSTR("WAT-1") -#define TZ_Africa_Lome PSTR("GMT0") -#define TZ_Africa_Luanda PSTR("WAT-1") -#define TZ_Africa_Lubumbashi PSTR("CAT-2") -#define TZ_Africa_Lusaka PSTR("CAT-2") -#define TZ_Africa_Malabo PSTR("WAT-1") -#define TZ_Africa_Maputo PSTR("CAT-2") -#define TZ_Africa_Maseru PSTR("SAST-2") -#define TZ_Africa_Mbabane PSTR("SAST-2") -#define TZ_Africa_Mogadishu PSTR("EAT-3") -#define TZ_Africa_Monrovia PSTR("GMT0") -#define TZ_Africa_Nairobi PSTR("EAT-3") -#define TZ_Africa_Ndjamena PSTR("WAT-1") -#define TZ_Africa_Niamey PSTR("WAT-1") -#define TZ_Africa_Nouakchott PSTR("GMT0") -#define TZ_Africa_Ouagadougou PSTR("GMT0") -#define TZ_Africa_PortomNovo PSTR("WAT-1") -#define TZ_Africa_Sao_Tome PSTR("GMT0") -#define TZ_Africa_Tripoli PSTR("EET-2") -#define TZ_Africa_Tunis PSTR("CET-1") -#define TZ_Africa_Windhoek PSTR("CAT-2") -#define TZ_America_Adak PSTR("HST10HDT,M3.2.0,M11.1.0") -#define TZ_America_Anchorage PSTR("AKST9AKDT,M3.2.0,M11.1.0") -#define TZ_America_Anguilla PSTR("AST4") -#define TZ_America_Antigua PSTR("AST4") -#define TZ_America_Araguaina PSTR("<-03>3") -#define TZ_America_Argentina_Buenos_Aires PSTR("<-03>3") -#define TZ_America_Argentina_Catamarca PSTR("<-03>3") -#define TZ_America_Argentina_Cordoba PSTR("<-03>3") -#define TZ_America_Argentina_Jujuy PSTR("<-03>3") -#define TZ_America_Argentina_La_Rioja PSTR("<-03>3") -#define TZ_America_Argentina_Mendoza PSTR("<-03>3") -#define TZ_America_Argentina_Rio_Gallegos PSTR("<-03>3") -#define TZ_America_Argentina_Salta PSTR("<-03>3") -#define TZ_America_Argentina_San_Juan PSTR("<-03>3") -#define TZ_America_Argentina_San_Luis PSTR("<-03>3") -#define TZ_America_Argentina_Tucuman PSTR("<-03>3") -#define TZ_America_Argentina_Ushuaia PSTR("<-03>3") -#define TZ_America_Aruba PSTR("AST4") -#define TZ_America_Asuncion PSTR("<-04>4<-03>,M10.1.0/0,M3.4.0/0") -#define TZ_America_Atikokan PSTR("EST5") -#define TZ_America_Bahia PSTR("<-03>3") -#define TZ_America_Bahia_Banderas PSTR("CST6CDT,M4.1.0,M10.5.0") -#define TZ_America_Barbados PSTR("AST4") -#define TZ_America_Belem PSTR("<-03>3") -#define TZ_America_Belize PSTR("CST6") -#define TZ_America_BlancmSablon PSTR("AST4") -#define TZ_America_Boa_Vista PSTR("<-04>4") -#define TZ_America_Bogota PSTR("<-05>5") -#define TZ_America_Boise PSTR("MST7MDT,M3.2.0,M11.1.0") -#define TZ_America_Cambridge_Bay PSTR("MST7MDT,M3.2.0,M11.1.0") -#define TZ_America_Campo_Grande PSTR("<-04>4") -#define TZ_America_Cancun PSTR("EST5") -#define TZ_America_Caracas PSTR("<-04>4") -#define TZ_America_Cayenne PSTR("<-03>3") -#define TZ_America_Cayman PSTR("EST5") -#define TZ_America_Chicago PSTR("CST6CDT,M3.2.0,M11.1.0") -#define TZ_America_Chihuahua PSTR("MST7MDT,M4.1.0,M10.5.0") -#define TZ_America_Costa_Rica PSTR("CST6") -#define TZ_America_Creston PSTR("MST7") -#define TZ_America_Cuiaba PSTR("<-04>4") -#define TZ_America_Curacao PSTR("AST4") -#define TZ_America_Danmarkshavn PSTR("GMT0") -#define TZ_America_Dawson PSTR("MST7") -#define TZ_America_Dawson_Creek PSTR("MST7") -#define TZ_America_Denver PSTR("MST7MDT,M3.2.0,M11.1.0") -#define TZ_America_Detroit PSTR("EST5EDT,M3.2.0,M11.1.0") -#define TZ_America_Dominica PSTR("AST4") -#define TZ_America_Edmonton PSTR("MST7MDT,M3.2.0,M11.1.0") -#define TZ_America_Eirunepe PSTR("<-05>5") -#define TZ_America_El_Salvador PSTR("CST6") -#define TZ_America_Fortaleza PSTR("<-03>3") -#define TZ_America_Fort_Nelson PSTR("MST7") -#define TZ_America_Glace_Bay PSTR("AST4ADT,M3.2.0,M11.1.0") -#define TZ_America_Godthab PSTR("<-03>3<-02>,M3.5.0/-2,M10.5.0/-1") -#define TZ_America_Goose_Bay PSTR("AST4ADT,M3.2.0,M11.1.0") -#define TZ_America_Grand_Turk PSTR("EST5EDT,M3.2.0,M11.1.0") -#define TZ_America_Grenada PSTR("AST4") -#define TZ_America_Guadeloupe PSTR("AST4") -#define TZ_America_Guatemala PSTR("CST6") -#define TZ_America_Guayaquil PSTR("<-05>5") -#define TZ_America_Guyana PSTR("<-04>4") -#define TZ_America_Halifax PSTR("AST4ADT,M3.2.0,M11.1.0") -#define TZ_America_Havana PSTR("CST5CDT,M3.2.0/0,M11.1.0/1") -#define TZ_America_Hermosillo PSTR("MST7") -#define TZ_America_Indiana_Indianapolis PSTR("EST5EDT,M3.2.0,M11.1.0") -#define TZ_America_Indiana_Knox PSTR("CST6CDT,M3.2.0,M11.1.0") -#define TZ_America_Indiana_Marengo PSTR("EST5EDT,M3.2.0,M11.1.0") -#define TZ_America_Indiana_Petersburg PSTR("EST5EDT,M3.2.0,M11.1.0") -#define TZ_America_Indiana_Tell_City PSTR("CST6CDT,M3.2.0,M11.1.0") -#define TZ_America_Indiana_Vevay PSTR("EST5EDT,M3.2.0,M11.1.0") -#define TZ_America_Indiana_Vincennes PSTR("EST5EDT,M3.2.0,M11.1.0") -#define TZ_America_Indiana_Winamac PSTR("EST5EDT,M3.2.0,M11.1.0") -#define TZ_America_Inuvik PSTR("MST7MDT,M3.2.0,M11.1.0") -#define TZ_America_Iqaluit PSTR("EST5EDT,M3.2.0,M11.1.0") -#define TZ_America_Jamaica PSTR("EST5") -#define TZ_America_Juneau PSTR("AKST9AKDT,M3.2.0,M11.1.0") -#define TZ_America_Kentucky_Louisville PSTR("EST5EDT,M3.2.0,M11.1.0") -#define TZ_America_Kentucky_Monticello PSTR("EST5EDT,M3.2.0,M11.1.0") -#define TZ_America_Kralendijk PSTR("AST4") -#define TZ_America_La_Paz PSTR("<-04>4") -#define TZ_America_Lima PSTR("<-05>5") -#define TZ_America_Los_Angeles PSTR("PST8PDT,M3.2.0,M11.1.0") -#define TZ_America_Lower_Princes PSTR("AST4") -#define TZ_America_Maceio PSTR("<-03>3") -#define TZ_America_Managua PSTR("CST6") -#define TZ_America_Manaus PSTR("<-04>4") -#define TZ_America_Marigot PSTR("AST4") -#define TZ_America_Martinique PSTR("AST4") -#define TZ_America_Matamoros PSTR("CST6CDT,M3.2.0,M11.1.0") -#define TZ_America_Mazatlan PSTR("MST7MDT,M4.1.0,M10.5.0") -#define TZ_America_Menominee PSTR("CST6CDT,M3.2.0,M11.1.0") -#define TZ_America_Merida PSTR("CST6CDT,M4.1.0,M10.5.0") -#define TZ_America_Metlakatla PSTR("AKST9AKDT,M3.2.0,M11.1.0") -#define TZ_America_Mexico_City PSTR("CST6CDT,M4.1.0,M10.5.0") -#define TZ_America_Miquelon PSTR("<-03>3<-02>,M3.2.0,M11.1.0") -#define TZ_America_Moncton PSTR("AST4ADT,M3.2.0,M11.1.0") -#define TZ_America_Monterrey PSTR("CST6CDT,M4.1.0,M10.5.0") -#define TZ_America_Montevideo PSTR("<-03>3") -#define TZ_America_Montreal PSTR("EST5EDT,M3.2.0,M11.1.0") -#define TZ_America_Montserrat PSTR("AST4") -#define TZ_America_Nassau PSTR("EST5EDT,M3.2.0,M11.1.0") -#define TZ_America_New_York PSTR("EST5EDT,M3.2.0,M11.1.0") -#define TZ_America_Nipigon PSTR("EST5EDT,M3.2.0,M11.1.0") -#define TZ_America_Nome PSTR("AKST9AKDT,M3.2.0,M11.1.0") -#define TZ_America_Noronha PSTR("<-02>2") -#define TZ_America_North_Dakota_Beulah PSTR("CST6CDT,M3.2.0,M11.1.0") -#define TZ_America_North_Dakota_Center PSTR("CST6CDT,M3.2.0,M11.1.0") -#define TZ_America_North_Dakota_New_Salem PSTR("CST6CDT,M3.2.0,M11.1.0") -#define TZ_America_Ojinaga PSTR("MST7MDT,M3.2.0,M11.1.0") -#define TZ_America_Panama PSTR("EST5") -#define TZ_America_Pangnirtung PSTR("EST5EDT,M3.2.0,M11.1.0") -#define TZ_America_Paramaribo PSTR("<-03>3") -#define TZ_America_Phoenix PSTR("MST7") -#define TZ_America_PortmaumPrince PSTR("EST5EDT,M3.2.0,M11.1.0") -#define TZ_America_Port_of_Spain PSTR("AST4") -#define TZ_America_Porto_Velho PSTR("<-04>4") -#define TZ_America_Puerto_Rico PSTR("AST4") -#define TZ_America_Punta_Arenas PSTR("<-03>3") -#define TZ_America_Rainy_River PSTR("CST6CDT,M3.2.0,M11.1.0") -#define TZ_America_Rankin_Inlet PSTR("CST6CDT,M3.2.0,M11.1.0") -#define TZ_America_Recife PSTR("<-03>3") -#define TZ_America_Regina PSTR("CST6") -#define TZ_America_Resolute PSTR("CST6CDT,M3.2.0,M11.1.0") -#define TZ_America_Rio_Branco PSTR("<-05>5") -#define TZ_America_Santarem PSTR("<-03>3") -#define TZ_America_Santiago PSTR("<-04>4<-03>,M9.1.6/24,M4.1.6/24") -#define TZ_America_Santo_Domingo PSTR("AST4") -#define TZ_America_Sao_Paulo PSTR("<-03>3") -#define TZ_America_Scoresbysund PSTR("<-01>1<+00>,M3.5.0/0,M10.5.0/1") -#define TZ_America_Sitka PSTR("AKST9AKDT,M3.2.0,M11.1.0") -#define TZ_America_St_Barthelemy PSTR("AST4") -#define TZ_America_St_Johns PSTR("NST3:30NDT,M3.2.0,M11.1.0") -#define TZ_America_St_Kitts PSTR("AST4") -#define TZ_America_St_Lucia PSTR("AST4") -#define TZ_America_St_Thomas PSTR("AST4") -#define TZ_America_St_Vincent PSTR("AST4") -#define TZ_America_Swift_Current PSTR("CST6") -#define TZ_America_Tegucigalpa PSTR("CST6") -#define TZ_America_Thule PSTR("AST4ADT,M3.2.0,M11.1.0") -#define TZ_America_Thunder_Bay PSTR("EST5EDT,M3.2.0,M11.1.0") -#define TZ_America_Tijuana PSTR("PST8PDT,M3.2.0,M11.1.0") -#define TZ_America_Toronto PSTR("EST5EDT,M3.2.0,M11.1.0") -#define TZ_America_Tortola PSTR("AST4") -#define TZ_America_Vancouver PSTR("PST8PDT,M3.2.0,M11.1.0") -#define TZ_America_Whitehorse PSTR("MST7") -#define TZ_America_Winnipeg PSTR("CST6CDT,M3.2.0,M11.1.0") -#define TZ_America_Yakutat PSTR("AKST9AKDT,M3.2.0,M11.1.0") -#define TZ_America_Yellowknife PSTR("MST7MDT,M3.2.0,M11.1.0") -#define TZ_Antarctica_Casey PSTR("<+11>-11") -#define TZ_Antarctica_Davis PSTR("<+07>-7") -#define TZ_Antarctica_DumontDUrville PSTR("<+10>-10") -#define TZ_Antarctica_Macquarie PSTR("AEST-10AEDT,M10.1.0,M4.1.0/3") -#define TZ_Antarctica_Mawson PSTR("<+05>-5") -#define TZ_Antarctica_McMurdo PSTR("NZST-12NZDT,M9.5.0,M4.1.0/3") -#define TZ_Antarctica_Palmer PSTR("<-03>3") -#define TZ_Antarctica_Rothera PSTR("<-03>3") -#define TZ_Antarctica_Syowa PSTR("<+03>-3") -#define TZ_Antarctica_Troll PSTR("<+00>0<+02>-2,M3.5.0/1,M10.5.0/3") -#define TZ_Antarctica_Vostok PSTR("<+06>-6") -#define TZ_Arctic_Longyearbyen PSTR("CET-1CEST,M3.5.0,M10.5.0/3") -#define TZ_Asia_Aden PSTR("<+03>-3") -#define TZ_Asia_Almaty PSTR("<+06>-6") -#define TZ_Asia_Amman PSTR("EET-2EEST,M3.5.4/24,M10.5.5/1") -#define TZ_Asia_Anadyr PSTR("<+12>-12") -#define TZ_Asia_Aqtau PSTR("<+05>-5") -#define TZ_Asia_Aqtobe PSTR("<+05>-5") -#define TZ_Asia_Ashgabat PSTR("<+05>-5") -#define TZ_Asia_Atyrau PSTR("<+05>-5") -#define TZ_Asia_Baghdad PSTR("<+03>-3") -#define TZ_Asia_Bahrain PSTR("<+03>-3") -#define TZ_Asia_Baku PSTR("<+04>-4") -#define TZ_Asia_Bangkok PSTR("<+07>-7") -#define TZ_Asia_Barnaul PSTR("<+07>-7") -#define TZ_Asia_Beirut PSTR("EET-2EEST,M3.5.0/0,M10.5.0/0") -#define TZ_Asia_Bishkek PSTR("<+06>-6") -#define TZ_Asia_Brunei PSTR("<+08>-8") -#define TZ_Asia_Chita PSTR("<+09>-9") -#define TZ_Asia_Choibalsan PSTR("<+08>-8") -#define TZ_Asia_Colombo PSTR("<+0530>-5:30") -#define TZ_Asia_Damascus PSTR("EET-2EEST,M3.5.5/0,M10.5.5/0") -#define TZ_Asia_Dhaka PSTR("<+06>-6") -#define TZ_Asia_Dili PSTR("<+09>-9") -#define TZ_Asia_Dubai PSTR("<+04>-4") -#define TZ_Asia_Dushanbe PSTR("<+05>-5") -#define TZ_Asia_Famagusta PSTR("EET-2EEST,M3.5.0/3,M10.5.0/4") -#define TZ_Asia_Gaza PSTR("EET-2EEST,M3.4.4/48,M10.4.4/49") -#define TZ_Asia_Hebron PSTR("EET-2EEST,M3.4.4/48,M10.4.4/49") -#define TZ_Asia_Ho_Chi_Minh PSTR("<+07>-7") -#define TZ_Asia_Hong_Kong PSTR("HKT-8") -#define TZ_Asia_Hovd PSTR("<+07>-7") -#define TZ_Asia_Irkutsk PSTR("<+08>-8") -#define TZ_Asia_Jakarta PSTR("WIB-7") -#define TZ_Asia_Jayapura PSTR("WIT-9") -#define TZ_Asia_Jerusalem PSTR("IST-2IDT,M3.4.4/26,M10.5.0") -#define TZ_Asia_Kabul PSTR("<+0430>-4:30") -#define TZ_Asia_Kamchatka PSTR("<+12>-12") -#define TZ_Asia_Karachi PSTR("PKT-5") -#define TZ_Asia_Kathmandu PSTR("<+0545>-5:45") -#define TZ_Asia_Khandyga PSTR("<+09>-9") -#define TZ_Asia_Kolkata PSTR("IST-5:30") -#define TZ_Asia_Krasnoyarsk PSTR("<+07>-7") -#define TZ_Asia_Kuala_Lumpur PSTR("<+08>-8") -#define TZ_Asia_Kuching PSTR("<+08>-8") -#define TZ_Asia_Kuwait PSTR("<+03>-3") -#define TZ_Asia_Macau PSTR("CST-8") -#define TZ_Asia_Magadan PSTR("<+11>-11") -#define TZ_Asia_Makassar PSTR("WITA-8") -#define TZ_Asia_Manila PSTR("PST-8") -#define TZ_Asia_Muscat PSTR("<+04>-4") -#define TZ_Asia_Nicosia PSTR("EET-2EEST,M3.5.0/3,M10.5.0/4") -#define TZ_Asia_Novokuznetsk PSTR("<+07>-7") -#define TZ_Asia_Novosibirsk PSTR("<+07>-7") -#define TZ_Asia_Omsk PSTR("<+06>-6") -#define TZ_Asia_Oral PSTR("<+05>-5") -#define TZ_Asia_Phnom_Penh PSTR("<+07>-7") -#define TZ_Asia_Pontianak PSTR("WIB-7") -#define TZ_Asia_Pyongyang PSTR("KST-9") -#define TZ_Asia_Qatar PSTR("<+03>-3") -#define TZ_Asia_Qyzylorda PSTR("<+05>-5") -#define TZ_Asia_Riyadh PSTR("<+03>-3") -#define TZ_Asia_Sakhalin PSTR("<+11>-11") -#define TZ_Asia_Samarkand PSTR("<+05>-5") -#define TZ_Asia_Seoul PSTR("KST-9") -#define TZ_Asia_Shanghai PSTR("CST-8") -#define TZ_Asia_Singapore PSTR("<+08>-8") -#define TZ_Asia_Srednekolymsk PSTR("<+11>-11") -#define TZ_Asia_Taipei PSTR("CST-8") -#define TZ_Asia_Tashkent PSTR("<+05>-5") -#define TZ_Asia_Tbilisi PSTR("<+04>-4") -#define TZ_Asia_Tehran PSTR("<+0330>-3:30<+0430>,J79/24,J263/24") -#define TZ_Asia_Thimphu PSTR("<+06>-6") -#define TZ_Asia_Tokyo PSTR("JST-9") -#define TZ_Asia_Tomsk PSTR("<+07>-7") -#define TZ_Asia_Ulaanbaatar PSTR("<+08>-8") -#define TZ_Asia_Urumqi PSTR("<+06>-6") -#define TZ_Asia_UstmNera PSTR("<+10>-10") -#define TZ_Asia_Vientiane PSTR("<+07>-7") -#define TZ_Asia_Vladivostok PSTR("<+10>-10") -#define TZ_Asia_Yakutsk PSTR("<+09>-9") -#define TZ_Asia_Yangon PSTR("<+0630>-6:30") -#define TZ_Asia_Yekaterinburg PSTR("<+05>-5") -#define TZ_Asia_Yerevan PSTR("<+04>-4") -#define TZ_Atlantic_Azores PSTR("<-01>1<+00>,M3.5.0/0,M10.5.0/1") -#define TZ_Atlantic_Bermuda PSTR("AST4ADT,M3.2.0,M11.1.0") -#define TZ_Atlantic_Canary PSTR("WET0WEST,M3.5.0/1,M10.5.0") -#define TZ_Atlantic_Cape_Verde PSTR("<-01>1") -#define TZ_Atlantic_Faroe PSTR("WET0WEST,M3.5.0/1,M10.5.0") -#define TZ_Atlantic_Madeira PSTR("WET0WEST,M3.5.0/1,M10.5.0") -#define TZ_Atlantic_Reykjavik PSTR("GMT0") -#define TZ_Atlantic_South_Georgia PSTR("<-02>2") -#define TZ_Atlantic_Stanley PSTR("<-03>3") -#define TZ_Atlantic_St_Helena PSTR("GMT0") -#define TZ_Australia_Adelaide PSTR("ACST-9:30ACDT,M10.1.0,M4.1.0/3") -#define TZ_Australia_Brisbane PSTR("AEST-10") -#define TZ_Australia_Broken_Hill PSTR("ACST-9:30ACDT,M10.1.0,M4.1.0/3") -#define TZ_Australia_Currie PSTR("AEST-10AEDT,M10.1.0,M4.1.0/3") -#define TZ_Australia_Darwin PSTR("ACST-9:30") -#define TZ_Australia_Eucla PSTR("<+0845>-8:45") -#define TZ_Australia_Hobart PSTR("AEST-10AEDT,M10.1.0,M4.1.0/3") -#define TZ_Australia_Lindeman PSTR("AEST-10") -#define TZ_Australia_Lord_Howe PSTR("<+1030>-10:30<+11>-11,M10.1.0,M4.1.0") -#define TZ_Australia_Melbourne PSTR("AEST-10AEDT,M10.1.0,M4.1.0/3") -#define TZ_Australia_Perth PSTR("AWST-8") -#define TZ_Australia_Sydney PSTR("AEST-10AEDT,M10.1.0,M4.1.0/3") -#define TZ_Europe_Amsterdam PSTR("CET-1CEST,M3.5.0,M10.5.0/3") -#define TZ_Europe_Andorra PSTR("CET-1CEST,M3.5.0,M10.5.0/3") -#define TZ_Europe_Astrakhan PSTR("<+04>-4") -#define TZ_Europe_Athens PSTR("EET-2EEST,M3.5.0/3,M10.5.0/4") -#define TZ_Europe_Belgrade PSTR("CET-1CEST,M3.5.0,M10.5.0/3") -#define TZ_Europe_Berlin PSTR("CET-1CEST,M3.5.0,M10.5.0/3") -#define TZ_Europe_Bratislava PSTR("CET-1CEST,M3.5.0,M10.5.0/3") -#define TZ_Europe_Brussels PSTR("CET-1CEST,M3.5.0,M10.5.0/3") -#define TZ_Europe_Bucharest PSTR("EET-2EEST,M3.5.0/3,M10.5.0/4") -#define TZ_Europe_Budapest PSTR("CET-1CEST,M3.5.0,M10.5.0/3") -#define TZ_Europe_Busingen PSTR("CET-1CEST,M3.5.0,M10.5.0/3") -#define TZ_Europe_Chisinau PSTR("EET-2EEST,M3.5.0,M10.5.0/3") -#define TZ_Europe_Copenhagen PSTR("CET-1CEST,M3.5.0,M10.5.0/3") -#define TZ_Europe_Dublin PSTR("IST-1GMT0,M10.5.0,M3.5.0/1") -#define TZ_Europe_Gibraltar PSTR("CET-1CEST,M3.5.0,M10.5.0/3") -#define TZ_Europe_Guernsey PSTR("GMT0BST,M3.5.0/1,M10.5.0") -#define TZ_Europe_Helsinki PSTR("EET-2EEST,M3.5.0/3,M10.5.0/4") -#define TZ_Europe_Isle_of_Man PSTR("GMT0BST,M3.5.0/1,M10.5.0") -#define TZ_Europe_Istanbul PSTR("<+03>-3") -#define TZ_Europe_Jersey PSTR("GMT0BST,M3.5.0/1,M10.5.0") -#define TZ_Europe_Kaliningrad PSTR("EET-2") -#define TZ_Europe_Kiev PSTR("EET-2EEST,M3.5.0/3,M10.5.0/4") -#define TZ_Europe_Kirov PSTR("<+03>-3") -#define TZ_Europe_Lisbon PSTR("WET0WEST,M3.5.0/1,M10.5.0") -#define TZ_Europe_Ljubljana PSTR("CET-1CEST,M3.5.0,M10.5.0/3") -#define TZ_Europe_London PSTR("GMT0BST,M3.5.0/1,M10.5.0") -#define TZ_Europe_Luxembourg PSTR("CET-1CEST,M3.5.0,M10.5.0/3") -#define TZ_Europe_Madrid PSTR("CET-1CEST,M3.5.0,M10.5.0/3") -#define TZ_Europe_Malta PSTR("CET-1CEST,M3.5.0,M10.5.0/3") -#define TZ_Europe_Mariehamn PSTR("EET-2EEST,M3.5.0/3,M10.5.0/4") -#define TZ_Europe_Minsk PSTR("<+03>-3") -#define TZ_Europe_Monaco PSTR("CET-1CEST,M3.5.0,M10.5.0/3") -#define TZ_Europe_Moscow PSTR("MSK-3") -#define TZ_Europe_Oslo PSTR("CET-1CEST,M3.5.0,M10.5.0/3") -#define TZ_Europe_Paris PSTR("CET-1CEST,M3.5.0,M10.5.0/3") -#define TZ_Europe_Podgorica PSTR("CET-1CEST,M3.5.0,M10.5.0/3") -#define TZ_Europe_Prague PSTR("CET-1CEST,M3.5.0,M10.5.0/3") -#define TZ_Europe_Riga PSTR("EET-2EEST,M3.5.0/3,M10.5.0/4") -#define TZ_Europe_Rome PSTR("CET-1CEST,M3.5.0,M10.5.0/3") -#define TZ_Europe_Samara PSTR("<+04>-4") -#define TZ_Europe_San_Marino PSTR("CET-1CEST,M3.5.0,M10.5.0/3") -#define TZ_Europe_Sarajevo PSTR("CET-1CEST,M3.5.0,M10.5.0/3") -#define TZ_Europe_Saratov PSTR("<+04>-4") -#define TZ_Europe_Simferopol PSTR("MSK-3") -#define TZ_Europe_Skopje PSTR("CET-1CEST,M3.5.0,M10.5.0/3") -#define TZ_Europe_Sofia PSTR("EET-2EEST,M3.5.0/3,M10.5.0/4") -#define TZ_Europe_Stockholm PSTR("CET-1CEST,M3.5.0,M10.5.0/3") -#define TZ_Europe_Tallinn PSTR("EET-2EEST,M3.5.0/3,M10.5.0/4") -#define TZ_Europe_Tirane PSTR("CET-1CEST,M3.5.0,M10.5.0/3") -#define TZ_Europe_Ulyanovsk PSTR("<+04>-4") -#define TZ_Europe_Uzhgorod PSTR("EET-2EEST,M3.5.0/3,M10.5.0/4") -#define TZ_Europe_Vaduz PSTR("CET-1CEST,M3.5.0,M10.5.0/3") -#define TZ_Europe_Vatican PSTR("CET-1CEST,M3.5.0,M10.5.0/3") -#define TZ_Europe_Vienna PSTR("CET-1CEST,M3.5.0,M10.5.0/3") -#define TZ_Europe_Vilnius PSTR("EET-2EEST,M3.5.0/3,M10.5.0/4") -#define TZ_Europe_Volgograd PSTR("<+04>-4") -#define TZ_Europe_Warsaw PSTR("CET-1CEST,M3.5.0,M10.5.0/3") -#define TZ_Europe_Zagreb PSTR("CET-1CEST,M3.5.0,M10.5.0/3") -#define TZ_Europe_Zaporozhye PSTR("EET-2EEST,M3.5.0/3,M10.5.0/4") -#define TZ_Europe_Zurich PSTR("CET-1CEST,M3.5.0,M10.5.0/3") -#define TZ_Indian_Antananarivo PSTR("EAT-3") -#define TZ_Indian_Chagos PSTR("<+06>-6") -#define TZ_Indian_Christmas PSTR("<+07>-7") -#define TZ_Indian_Cocos PSTR("<+0630>-6:30") -#define TZ_Indian_Comoro PSTR("EAT-3") -#define TZ_Indian_Kerguelen PSTR("<+05>-5") -#define TZ_Indian_Mahe PSTR("<+04>-4") -#define TZ_Indian_Maldives PSTR("<+05>-5") -#define TZ_Indian_Mauritius PSTR("<+04>-4") -#define TZ_Indian_Mayotte PSTR("EAT-3") -#define TZ_Indian_Reunion PSTR("<+04>-4") -#define TZ_Pacific_Apia PSTR("<+13>-13<+14>,M9.5.0/3,M4.1.0/4") -#define TZ_Pacific_Auckland PSTR("NZST-12NZDT,M9.5.0,M4.1.0/3") -#define TZ_Pacific_Bougainville PSTR("<+11>-11") -#define TZ_Pacific_Chatham PSTR("<+1245>-12:45<+1345>,M9.5.0/2:45,M4.1.0/3:45") -#define TZ_Pacific_Chuuk PSTR("<+10>-10") -#define TZ_Pacific_Easter PSTR("<-06>6<-05>,M9.1.6/22,M4.1.6/22") -#define TZ_Pacific_Efate PSTR("<+11>-11") -#define TZ_Pacific_Enderbury PSTR("<+13>-13") -#define TZ_Pacific_Fakaofo PSTR("<+13>-13") -#define TZ_Pacific_Fiji PSTR("<+12>-12<+13>,M11.2.0,M1.2.3/99") -#define TZ_Pacific_Funafuti PSTR("<+12>-12") -#define TZ_Pacific_Galapagos PSTR("<-06>6") -#define TZ_Pacific_Gambier PSTR("<-09>9") -#define TZ_Pacific_Guadalcanal PSTR("<+11>-11") -#define TZ_Pacific_Guam PSTR("ChST-10") -#define TZ_Pacific_Honolulu PSTR("HST10") -#define TZ_Pacific_Kiritimati PSTR("<+14>-14") -#define TZ_Pacific_Kosrae PSTR("<+11>-11") -#define TZ_Pacific_Kwajalein PSTR("<+12>-12") -#define TZ_Pacific_Majuro PSTR("<+12>-12") -#define TZ_Pacific_Marquesas PSTR("<-0930>9:30") -#define TZ_Pacific_Midway PSTR("SST11") -#define TZ_Pacific_Nauru PSTR("<+12>-12") -#define TZ_Pacific_Niue PSTR("<-11>11") -#define TZ_Pacific_Norfolk PSTR("<+11>-11<+12>,M10.1.0,M4.1.0/3") -#define TZ_Pacific_Noumea PSTR("<+11>-11") -#define TZ_Pacific_Pago_Pago PSTR("SST11") -#define TZ_Pacific_Palau PSTR("<+09>-9") -#define TZ_Pacific_Pitcairn PSTR("<-08>8") -#define TZ_Pacific_Pohnpei PSTR("<+11>-11") -#define TZ_Pacific_Port_Moresby PSTR("<+10>-10") -#define TZ_Pacific_Rarotonga PSTR("<-10>10") -#define TZ_Pacific_Saipan PSTR("ChST-10") -#define TZ_Pacific_Tahiti PSTR("<-10>10") -#define TZ_Pacific_Tarawa PSTR("<+12>-12") -#define TZ_Pacific_Tongatapu PSTR("<+13>-13") -#define TZ_Pacific_Wake PSTR("<+12>-12") -#define TZ_Pacific_Wallis PSTR("<+12>-12") -#define TZ_Etc_GMT PSTR("GMT0") -#define TZ_Etc_GMTm0 PSTR("GMT0") -#define TZ_Etc_GMTm1 PSTR("<+01>-1") -#define TZ_Etc_GMTm2 PSTR("<+02>-2") -#define TZ_Etc_GMTm3 PSTR("<+03>-3") -#define TZ_Etc_GMTm4 PSTR("<+04>-4") -#define TZ_Etc_GMTm5 PSTR("<+05>-5") -#define TZ_Etc_GMTm6 PSTR("<+06>-6") -#define TZ_Etc_GMTm7 PSTR("<+07>-7") -#define TZ_Etc_GMTm8 PSTR("<+08>-8") -#define TZ_Etc_GMTm9 PSTR("<+09>-9") -#define TZ_Etc_GMTm10 PSTR("<+10>-10") -#define TZ_Etc_GMTm11 PSTR("<+11>-11") -#define TZ_Etc_GMTm12 PSTR("<+12>-12") -#define TZ_Etc_GMTm13 PSTR("<+13>-13") -#define TZ_Etc_GMTm14 PSTR("<+14>-14") -#define TZ_Etc_GMT0 PSTR("GMT0") -#define TZ_Etc_GMTp0 PSTR("GMT0") -#define TZ_Etc_GMTp1 PSTR("<-01>1") -#define TZ_Etc_GMTp2 PSTR("<-02>2") -#define TZ_Etc_GMTp3 PSTR("<-03>3") -#define TZ_Etc_GMTp4 PSTR("<-04>4") -#define TZ_Etc_GMTp5 PSTR("<-05>5") -#define TZ_Etc_GMTp6 PSTR("<-06>6") -#define TZ_Etc_GMTp7 PSTR("<-07>7") -#define TZ_Etc_GMTp8 PSTR("<-08>8") -#define TZ_Etc_GMTp9 PSTR("<-09>9") -#define TZ_Etc_GMTp10 PSTR("<-10>10") -#define TZ_Etc_GMTp11 PSTR("<-11>11") -#define TZ_Etc_GMTp12 PSTR("<-12>12") -#define TZ_Etc_UCT PSTR("UTC0") -#define TZ_Etc_UTC PSTR("UTC0") -#define TZ_Etc_Greenwich PSTR("GMT0") -#define TZ_Etc_Universal PSTR("UTC0") -#define TZ_Etc_Zulu PSTR("UTC0") -#endif - //////////////////////////////////////////////////////////// #define TIMEZONE_MAX_LEN 50 -#if 1 - static const char TZ_NAME[][TIMEZONE_MAX_LEN] /*PROGMEM*/ = { #if USING_AFRICA @@ -1999,152 +1529,4 @@ static const char ESP_TZ_NAME[][TIMEZONE_MAX_LEN] /*PROGMEM*/ = #endif }; - - -#else -static const char TZ_NAME[][TIMEZONE_MAX_LEN] = -{ - "Pacific/Pago_Pago", - "America/Adak", - "Pacific/Honolulu", - "Pacific/Marquesas", - "Pacific/Gambier", - "America/Anchorage", - "America/Los_Angeles", - "Pacific/Pitcairn", - "America/Phoenix", - "America/Denver", - "America/Guatemala", - "America/Chicago", - "Pacific/Easter", - "America/Bogota", - "America/New_York", - "America/Caracas", - "America/Halifax", - "America/Santo_Domingo", - "America/Santiago", - "America/St_Johns", - "America/Godthab", - "America/Argentina/Buenos_Aires", - "America/Montevideo", - "Etc/GMT+2", - "Atlantic/Azores", - "Atlantic/Cape_Verde", - "Etc/UTC", - "Europe/London", - "Europe/Berlin", - "Africa/Lagos", - "Africa/Windhoek", - "Asia/Beirut", - "Africa/Johannesburg", - "Asia/Baghdad", - "Europe/Moscow", - "Asia/Tehran", - "Asia/Dubai", - "Asia/Baku", - "Asia/Kabul", - "Asia/Yekaterinburg", - "Asia/Karachi", - "Asia/Kolkata", - "Asia/Kathmandu", - "Asia/Dhaka", - "Asia/Omsk", - "Asia/Krasnoyarsk", - "Asia/Jakarta", - "Asia/Shanghai", - "Asia/Irkutsk", - "Australia/Eucla", - "Asia/Yakutsk", - "Asia/Tokyo", - "Australia/Darwin", - "Australia/Adelaide", - "Australia/Brisbane", - "Asia/Vladivostok", - "Australia/Sydney", - "Australia/Lord_Howe", - "Asia/Kamchatka", - "Pacific/Noumea", - "Pacific/Norfolk", - "Pacific/Auckland", - "Pacific/Tarawa", - "Pacific/Chatham", - "Pacific/Tongatapu", - "Pacific/Apia", - "Pacific/Kiritimati", -}; - -//////////////////////////////////////////////////////////// - -static const char ESP_TZ_NAME[][TIMEZONE_MAX_LEN] = -{ - TZ_Pacific_Pago_Pago, //PSTR("SST11") - TZ_America_Adak, //PSTR("HST10HDT,M3.2.0,M11.1.0") - TZ_Pacific_Honolulu, //PSTR("HST10") - TZ_Pacific_Marquesas, //PSTR("<-0930>9:30") - TZ_Pacific_Gambier, //PSTR("<-09>9") - TZ_America_Anchorage, //PSTR("AKST9AKDT,M3.2.0,M11.1.0") - TZ_America_Los_Angeles, //"PST8PDT,M3.2.0,M11.1.0", //"America/Los_Angeles", - TZ_Pacific_Pitcairn, //PSTR("<-08>8") - TZ_America_Phoenix, //PSTR("MST7") - TZ_America_Denver, //"MST7MDT,M3.2.0,M11.1.0", //"America/Denver", - TZ_America_Guatemala, //PSTR("CST6") - TZ_America_Chicago, //"CST6CDT,M3.2.0,M11.1.0", //"America/Chicago", - TZ_Pacific_Easter, //PSTR("<-06>6<-05>,M9.1.6/22,M4.1.6/22") - TZ_America_Bogota, //PSTR("<-05>5") - TZ_America_New_York, //"EST5EDT,M3.2.0,M11.1.0", //"America/New_York", - TZ_America_Caracas, //PSTR("<-04>4") - TZ_America_Halifax, //"AST4ADT,M3.2.0,M11.1.0", //"America/Halifax", - TZ_America_Santo_Domingo, //PSTR("AST4") - TZ_America_Santiago, //"<-04>4<-03>,M9.1.6/24,M4.1.6/24", //"America/Santiago", - TZ_America_St_Johns, //PSTR("NST3:30NDT,M3.2.0,M11.1.0") - TZ_America_Godthab, //"<-03>3<-02>,M3.5.0/-2,M10.5.0/-1", //"America/Godthab", - TZ_America_Argentina_Buenos_Aires, //PSTR("<-03>3") - TZ_America_Montevideo, //"<-03>3", //"America/Montevideo", - TZ_Etc_GMTp2, //PSTR("<-02>2") - TZ_Atlantic_Azores, //PSTR("<-01>1<+00>,M3.5.0/0,M10.5.0/1") - TZ_Atlantic_Cape_Verde, //PSTR("<-01>1") - TZ_Etc_UTC, //PSTR("UTC0") - TZ_Europe_London, //PSTR("GMT0BST,M3.5.0/1,M10.5.0") - TZ_Europe_Berlin, //PSTR("CET-1CEST,M3.5.0,M10.5.0/3") - TZ_Africa_Lagos, //PSTR("WAT-1") - TZ_Africa_Windhoek, //PSTR("CAT-2") - TZ_Asia_Beirut, //"EET-2EEST,M3.5.0/0,M10.5.0/0" //"Asia/Beirut", - TZ_Africa_Johannesburg, //"SAST-2", //"Africa/Johannesburg", - TZ_Asia_Baghdad, //"<+03>-3", //"Asia/Baghdad", - TZ_Europe_Moscow, //PSTR("MSK-3") - TZ_Asia_Tehran, //PSTR("<+0330>-3:30<+0430>,J79/24,J263/24") - TZ_Asia_Dubai, //"<+04>-4", //"Asia/Dubai", - TZ_Asia_Baku, //PSTR("<+04>-4") - TZ_Asia_Kabul, //PSTR("<+0430>-4:30") - TZ_Asia_Yekaterinburg, //PSTR("<+05>-5") - TZ_Asia_Karachi, //PSTR("PKT-5") - TZ_Asia_Kolkata, //PSTR("IST-5:30") - TZ_Asia_Kathmandu, //PSTR("<+0545>-5:45") - TZ_Asia_Dhaka, //"<+06>-6", //"Asia/Dhaka", - TZ_Asia_Omsk, //PSTR("<+06>-6") - TZ_Asia_Krasnoyarsk, //PSTR("<+07>-7") - TZ_Asia_Jakarta, //"WIB-7", //"Asia/Jakarta", - TZ_Asia_Shanghai, //"CST-8", //"Asia/Shanghai", - TZ_Asia_Irkutsk, //PSTR("<+08>-8") - TZ_Australia_Eucla, //PSTR("<+0845>-8:45") - TZ_Asia_Yakutsk, //PSTR("<+09>-9") - TZ_Asia_Tokyo, //"JST-9", //"Asia/Tokyo", - TZ_Australia_Darwin, //PSTR("ACST-9:30") - TZ_Australia_Adelaide, //PSTR("ACST-9:30ACDT,M10.1.0,M4.1.0/3") - TZ_Australia_Brisbane, //"AEST-10", //"Australia/Brisbane", - TZ_Asia_Vladivostok, //PSTR("<+10>-10") - TZ_Australia_Sydney, //PSTR("AEST-10AEDT,M10.1.0,M4.1.0/3") - TZ_Australia_Lord_Howe, //PSTR("<+1030>-10:30<+11>-11,M10.1.0,M4.1.0") - TZ_Asia_Kamchatka, //PSTR("<+12>-12") - TZ_Pacific_Noumea, //"<+11>-11", //"Pacific/Noumea", - TZ_Pacific_Norfolk, //PSTR("<+11>-11<+12>,M10.1.0,M4.1.0/3") - TZ_Pacific_Auckland, //"NZST-12NZDT,M9.5.0,M4.1.0/3", //"Pacific/Auckland", - TZ_Pacific_Tarawa, //"<+12>-12", //"Pacific/Tarawa", - TZ_Pacific_Chatham, //PSTR("<+1245>-12:45<+1345>,M9.5.0/2:45,M4.1.0/3:45") - TZ_Pacific_Tongatapu, //PSTR("<+13>-13") - TZ_Pacific_Apia, //PSTR("<+13>-13<+14>,M9.5.0/3,M4.1.0/4") - TZ_Pacific_Kiritimati, //PSTR("<+14>-14") -}; -#endif - #endif // TZDB_H