From 629c2cd850c925c3aea54e34af6c958b4724c35e Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Wed, 11 Oct 2023 21:03:25 +0000 Subject: [PATCH 1/3] IDF release/v5.1 6b1f40b9bf --- package/package_esp32_index.template.json | 68 +++++++++++------------ 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/package/package_esp32_index.template.json b/package/package_esp32_index.template.json index 982e867fe44..346dd682f00 100644 --- a/package/package_esp32_index.template.json +++ b/package/package_esp32_index.template.json @@ -39,7 +39,7 @@ { "packager": "esp32", "name": "esp32-arduino-libs", - "version": "idf-release_v5.1-f0437b945f" + "version": "idf-release_v5.1-6b1f40b9bf" }, { "packager": "esp32", @@ -97,63 +97,63 @@ "tools": [ { "name": "esp32-arduino-libs", - "version": "idf-release_v5.1-f0437b945f", + "version": "idf-release_v5.1-6b1f40b9bf", "systems": [ { "host": "i686-mingw32", - "url": "https://github.com/espressif/esp32-arduino-libs/releases/download/0.0.0-alpha/esp32-arduino-libs-0.0.0-alpha.zip", - "archiveFileName": "esp32-arduino-libs-0.0.0-alpha.zip", - "checksum": "SHA-256:096aa276bfe07375f1701f84d05039cb439f48ba1a607676fe27d2807037389a", - "size": "333176544" + "url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/91077b905f50a66c4ecfae2fd5070530c932e97f", + "archiveFileName": "esp32-arduino-libs-91077b905f50a66c4ecfae2fd5070530c932e97f.zip", + "checksum": "SHA-256:7862c881730df293d129a34994c8f0416276c5aa22df01df6f6b9a5ba11b7dd4", + "size": "361692919" }, { "host": "x86_64-mingw32", - "url": "https://github.com/espressif/esp32-arduino-libs/releases/download/0.0.0-alpha/esp32-arduino-libs-0.0.0-alpha.zip", - "archiveFileName": "esp32-arduino-libs-0.0.0-alpha.zip", - "checksum": "SHA-256:096aa276bfe07375f1701f84d05039cb439f48ba1a607676fe27d2807037389a", - "size": "333176544" + "url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/91077b905f50a66c4ecfae2fd5070530c932e97f", + "archiveFileName": "esp32-arduino-libs-91077b905f50a66c4ecfae2fd5070530c932e97f.zip", + "checksum": "SHA-256:7862c881730df293d129a34994c8f0416276c5aa22df01df6f6b9a5ba11b7dd4", + "size": "361692919" }, { "host": "arm64-apple-darwin", - "url": "https://github.com/espressif/esp32-arduino-libs/releases/download/0.0.0-alpha/esp32-arduino-libs-0.0.0-alpha.zip", - "archiveFileName": "esp32-arduino-libs-0.0.0-alpha.zip", - "checksum": "SHA-256:096aa276bfe07375f1701f84d05039cb439f48ba1a607676fe27d2807037389a", - "size": "333176544" + "url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/91077b905f50a66c4ecfae2fd5070530c932e97f", + "archiveFileName": "esp32-arduino-libs-91077b905f50a66c4ecfae2fd5070530c932e97f.zip", + "checksum": "SHA-256:7862c881730df293d129a34994c8f0416276c5aa22df01df6f6b9a5ba11b7dd4", + "size": "361692919" }, { "host": "x86_64-apple-darwin", - "url": "https://github.com/espressif/esp32-arduino-libs/releases/download/0.0.0-alpha/esp32-arduino-libs-0.0.0-alpha.zip", - "archiveFileName": "esp32-arduino-libs-0.0.0-alpha.zip", - "checksum": "SHA-256:096aa276bfe07375f1701f84d05039cb439f48ba1a607676fe27d2807037389a", - "size": "333176544" + "url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/91077b905f50a66c4ecfae2fd5070530c932e97f", + "archiveFileName": "esp32-arduino-libs-91077b905f50a66c4ecfae2fd5070530c932e97f.zip", + "checksum": "SHA-256:7862c881730df293d129a34994c8f0416276c5aa22df01df6f6b9a5ba11b7dd4", + "size": "361692919" }, { "host": "x86_64-pc-linux-gnu", - "url": "https://github.com/espressif/esp32-arduino-libs/releases/download/0.0.0-alpha/esp32-arduino-libs-0.0.0-alpha.zip", - "archiveFileName": "esp32-arduino-libs-0.0.0-alpha.zip", - "checksum": "SHA-256:096aa276bfe07375f1701f84d05039cb439f48ba1a607676fe27d2807037389a", - "size": "333176544" + "url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/91077b905f50a66c4ecfae2fd5070530c932e97f", + "archiveFileName": "esp32-arduino-libs-91077b905f50a66c4ecfae2fd5070530c932e97f.zip", + "checksum": "SHA-256:7862c881730df293d129a34994c8f0416276c5aa22df01df6f6b9a5ba11b7dd4", + "size": "361692919" }, { "host": "i686-pc-linux-gnu", - "url": "https://github.com/espressif/esp32-arduino-libs/releases/download/0.0.0-alpha/esp32-arduino-libs-0.0.0-alpha.zip", - "archiveFileName": "esp32-arduino-libs-0.0.0-alpha.zip", - "checksum": "SHA-256:096aa276bfe07375f1701f84d05039cb439f48ba1a607676fe27d2807037389a", - "size": "333176544" + "url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/91077b905f50a66c4ecfae2fd5070530c932e97f", + "archiveFileName": "esp32-arduino-libs-91077b905f50a66c4ecfae2fd5070530c932e97f.zip", + "checksum": "SHA-256:7862c881730df293d129a34994c8f0416276c5aa22df01df6f6b9a5ba11b7dd4", + "size": "361692919" }, { "host": "aarch64-linux-gnu", - "url": "https://github.com/espressif/esp32-arduino-libs/releases/download/0.0.0-alpha/esp32-arduino-libs-0.0.0-alpha.zip", - "archiveFileName": "esp32-arduino-libs-0.0.0-alpha.zip", - "checksum": "SHA-256:096aa276bfe07375f1701f84d05039cb439f48ba1a607676fe27d2807037389a", - "size": "333176544" + "url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/91077b905f50a66c4ecfae2fd5070530c932e97f", + "archiveFileName": "esp32-arduino-libs-91077b905f50a66c4ecfae2fd5070530c932e97f.zip", + "checksum": "SHA-256:7862c881730df293d129a34994c8f0416276c5aa22df01df6f6b9a5ba11b7dd4", + "size": "361692919" }, { "host": "arm-linux-gnueabihf", - "url": "https://github.com/espressif/esp32-arduino-libs/releases/download/0.0.0-alpha/esp32-arduino-libs-0.0.0-alpha.zip", - "archiveFileName": "esp32-arduino-libs-0.0.0-alpha.zip", - "checksum": "SHA-256:096aa276bfe07375f1701f84d05039cb439f48ba1a607676fe27d2807037389a", - "size": "333176544" + "url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/91077b905f50a66c4ecfae2fd5070530c932e97f", + "archiveFileName": "esp32-arduino-libs-91077b905f50a66c4ecfae2fd5070530c932e97f.zip", + "checksum": "SHA-256:7862c881730df293d129a34994c8f0416276c5aa22df01df6f6b9a5ba11b7dd4", + "size": "361692919" } ] }, From e4da840e28f6fbc225c92cc8a7f01c992117026f Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Thu, 12 Oct 2023 08:54:21 +0300 Subject: [PATCH 2/3] Fix WPA2 examples --- .../HTTPClientEnterprise/HTTPClientEnterprise.ino | 11 +++++++++++ .../WiFiClientEnterprise/WiFiClientEnterprise.ino | 1 - .../WiFiClientSecureEnterprise.ino | 11 +++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/libraries/HTTPClient/examples/HTTPClientEnterprise/HTTPClientEnterprise.ino b/libraries/HTTPClient/examples/HTTPClientEnterprise/HTTPClientEnterprise.ino index b229a8687bb..d7ec57767e7 100644 --- a/libraries/HTTPClient/examples/HTTPClientEnterprise/HTTPClientEnterprise.ino +++ b/libraries/HTTPClient/examples/HTTPClientEnterprise/HTTPClientEnterprise.ino @@ -5,7 +5,11 @@ /*|----------------------------------------------------------|*/ #include #include +#if __has_include ("esp_eap_client.h") +#include "esp_eap_client.h" +#else #include "esp_wpa2.h" +#endif #include #define EAP_IDENTITY "identity" //if connecting from another corporation, use identity@organisation.domain in Eduroam #define EAP_PASSWORD "password" //your Eduroam password @@ -42,10 +46,17 @@ void setup() { Serial.println(ssid); WiFi.disconnect(true); //disconnect form wifi to set new wifi connection WiFi.mode(WIFI_STA); //init wifi mode +#if __has_include ("esp_eap_client.h") + esp_eap_clien_set_identity((uint8_t *)EAP_IDENTITY, strlen(EAP_IDENTITY)); //provide identity + esp_eap_clien_set_username((uint8_t *)EAP_IDENTITY, strlen(EAP_IDENTITY)); //provide username + esp_eap_clien_set_password((uint8_t *)EAP_PASSWORD, strlen(EAP_PASSWORD)); //provide password + esp_wifi_sta_enterprise_enable(); +#else esp_wifi_sta_wpa2_ent_set_identity((uint8_t *)EAP_IDENTITY, strlen(EAP_IDENTITY)); //provide identity esp_wifi_sta_wpa2_ent_set_username((uint8_t *)EAP_IDENTITY, strlen(EAP_IDENTITY)); //provide username --> identity and username is same esp_wifi_sta_wpa2_ent_set_password((uint8_t *)EAP_PASSWORD, strlen(EAP_PASSWORD)); //provide password esp_wifi_sta_wpa2_ent_enable(); +#endif WiFi.begin(ssid); //connect to wifi while (WiFi.status() != WL_CONNECTED) { delay(500); diff --git a/libraries/WiFi/examples/WiFiClientEnterprise/WiFiClientEnterprise.ino b/libraries/WiFi/examples/WiFiClientEnterprise/WiFiClientEnterprise.ino index caaa2139170..7ae10f99e73 100644 --- a/libraries/WiFi/examples/WiFiClientEnterprise/WiFiClientEnterprise.ino +++ b/libraries/WiFi/examples/WiFiClientEnterprise/WiFiClientEnterprise.ino @@ -1,5 +1,4 @@ #include //Wifi library -#include "esp_wpa2.h" //wpa2 library for connections to Enterprise networks #define EAP_IDENTITY "login" //if connecting from another corporation, use identity@organisation.domain in Eduroam #define EAP_USERNAME "login" //oftentimes just a repeat of the identity #define EAP_PASSWORD "password" //your Eduroam password diff --git a/libraries/WiFiClientSecure/examples/WiFiClientSecureEnterprise/WiFiClientSecureEnterprise.ino b/libraries/WiFiClientSecure/examples/WiFiClientSecureEnterprise/WiFiClientSecureEnterprise.ino index be051adaadc..4dc2794fe3a 100644 --- a/libraries/WiFiClientSecure/examples/WiFiClientSecureEnterprise/WiFiClientSecureEnterprise.ino +++ b/libraries/WiFiClientSecure/examples/WiFiClientSecureEnterprise/WiFiClientSecureEnterprise.ino @@ -15,7 +15,11 @@ #include #include +#if __has_include ("esp_eap_client.h") +#include "esp_eap_client.h" +#else #include "esp_wpa2.h" +#endif #include #define EAP_ANONYMOUS_IDENTITY "anonymous@example.com" //anonymous identity #define EAP_IDENTITY "id@example.com" //user identity @@ -64,10 +68,17 @@ void setup() { Serial.println(ssid); WiFi.disconnect(true); //disconnect form wifi to set new wifi connection WiFi.mode(WIFI_STA); //init wifi mode +#if __has_include ("esp_eap_client.h") + esp_eap_clien_set_identity((uint8_t *)EAP_ANONYMOUS_IDENTITY, strlen(EAP_ANONYMOUS_IDENTITY)); //provide identity + esp_eap_clien_set_username((uint8_t *)EAP_IDENTITY, strlen(EAP_IDENTITY)); //provide username + esp_eap_clien_set_password((uint8_t *)EAP_PASSWORD, strlen(EAP_PASSWORD)); //provide password + esp_wifi_sta_enterprise_enable(); +#else esp_wifi_sta_wpa2_ent_set_identity((uint8_t *)EAP_ANONYMOUS_IDENTITY, strlen(EAP_ANONYMOUS_IDENTITY)); //provide identity esp_wifi_sta_wpa2_ent_set_username((uint8_t *)EAP_IDENTITY, strlen(EAP_IDENTITY)); //provide username esp_wifi_sta_wpa2_ent_set_password((uint8_t *)EAP_PASSWORD, strlen(EAP_PASSWORD)); //provide password esp_wifi_sta_wpa2_ent_enable(); +#endif WiFi.begin(ssid); //connect to wifi while (WiFi.status() != WL_CONNECTED) { delay(500); From d4f55a4964fc2868c1b626d2b58763e90f54a8cd Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Thu, 12 Oct 2023 09:16:36 +0300 Subject: [PATCH 3/3] Fix typo --- .../examples/HTTPClientEnterprise/HTTPClientEnterprise.ino | 6 +++--- .../WiFiClientSecureEnterprise.ino | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/HTTPClient/examples/HTTPClientEnterprise/HTTPClientEnterprise.ino b/libraries/HTTPClient/examples/HTTPClientEnterprise/HTTPClientEnterprise.ino index d7ec57767e7..c6b9e7d36ab 100644 --- a/libraries/HTTPClient/examples/HTTPClientEnterprise/HTTPClientEnterprise.ino +++ b/libraries/HTTPClient/examples/HTTPClientEnterprise/HTTPClientEnterprise.ino @@ -47,9 +47,9 @@ void setup() { WiFi.disconnect(true); //disconnect form wifi to set new wifi connection WiFi.mode(WIFI_STA); //init wifi mode #if __has_include ("esp_eap_client.h") - esp_eap_clien_set_identity((uint8_t *)EAP_IDENTITY, strlen(EAP_IDENTITY)); //provide identity - esp_eap_clien_set_username((uint8_t *)EAP_IDENTITY, strlen(EAP_IDENTITY)); //provide username - esp_eap_clien_set_password((uint8_t *)EAP_PASSWORD, strlen(EAP_PASSWORD)); //provide password + esp_eap_client_set_identity((uint8_t *)EAP_IDENTITY, strlen(EAP_IDENTITY)); //provide identity + esp_eap_client_set_username((uint8_t *)EAP_IDENTITY, strlen(EAP_IDENTITY)); //provide username + esp_eap_client_set_password((uint8_t *)EAP_PASSWORD, strlen(EAP_PASSWORD)); //provide password esp_wifi_sta_enterprise_enable(); #else esp_wifi_sta_wpa2_ent_set_identity((uint8_t *)EAP_IDENTITY, strlen(EAP_IDENTITY)); //provide identity diff --git a/libraries/WiFiClientSecure/examples/WiFiClientSecureEnterprise/WiFiClientSecureEnterprise.ino b/libraries/WiFiClientSecure/examples/WiFiClientSecureEnterprise/WiFiClientSecureEnterprise.ino index 4dc2794fe3a..6bd68367526 100644 --- a/libraries/WiFiClientSecure/examples/WiFiClientSecureEnterprise/WiFiClientSecureEnterprise.ino +++ b/libraries/WiFiClientSecure/examples/WiFiClientSecureEnterprise/WiFiClientSecureEnterprise.ino @@ -69,9 +69,9 @@ void setup() { WiFi.disconnect(true); //disconnect form wifi to set new wifi connection WiFi.mode(WIFI_STA); //init wifi mode #if __has_include ("esp_eap_client.h") - esp_eap_clien_set_identity((uint8_t *)EAP_ANONYMOUS_IDENTITY, strlen(EAP_ANONYMOUS_IDENTITY)); //provide identity - esp_eap_clien_set_username((uint8_t *)EAP_IDENTITY, strlen(EAP_IDENTITY)); //provide username - esp_eap_clien_set_password((uint8_t *)EAP_PASSWORD, strlen(EAP_PASSWORD)); //provide password + esp_eap_client_set_identity((uint8_t *)EAP_ANONYMOUS_IDENTITY, strlen(EAP_ANONYMOUS_IDENTITY)); //provide identity + esp_eap_client_set_username((uint8_t *)EAP_IDENTITY, strlen(EAP_IDENTITY)); //provide username + esp_eap_client_set_password((uint8_t *)EAP_PASSWORD, strlen(EAP_PASSWORD)); //provide password esp_wifi_sta_enterprise_enable(); #else esp_wifi_sta_wpa2_ent_set_identity((uint8_t *)EAP_ANONYMOUS_IDENTITY, strlen(EAP_ANONYMOUS_IDENTITY)); //provide identity