Skip to content

Commit 70bfe4a

Browse files
jhiggasonjhiggason
authored
Merge branch 'espressif:master' into master
2 parents 267cae2 + 7438c6e commit 70bfe4a

File tree

5 files changed

+58
-36
lines changed

5 files changed

+58
-36
lines changed

‎.github/scripts/on-release.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,8 @@ PACKAGE_JSON_TEMPLATE="$OUTPUT_DIR/package-$LIBS_PROJ_NAME.json"
312312
## TEMP WORKAROUND FOR RV32 LONG PATH ON WINDOWS
313313
##
314314
RVTC_VERSION=`cat $PACKAGE_JSON_TEMPLATE | jq -r ".packages[0].platforms[0].toolsDependencies[] | select(.name == \"$RVTC_NAME\") | .version" | cut -d '_' -f 2`
315-
RVTC_VERSION=`date -j -f '%Y%m%d' "$RVTC_VERSION" '+%y%m'`
315+
# RVTC_VERSION=`date -j -f '%Y%m%d' "$RVTC_VERSION" '+%y%m'` # MacOS
316+
RVTC_VERSION=`date -d "$RVTC_VERSION" '+%y%m'`
316317
rvtc_jq_arg="\
317318
(.packages[0].platforms[0].toolsDependencies[] | select(.name==\"$RVTC_NAME\")).version = \"$RVTC_VERSION\" |\
318319
(.packages[0].platforms[0].toolsDependencies[] | select(.name==\"$RVTC_NAME\")).name = \"$RVTC_NEW_NAME\" |\

‎libraries/HTTPClient/examples/HTTPClientEnterprise/HTTPClientEnterprise.ino

+11
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55
/*|----------------------------------------------------------|*/
66
#include <WiFi.h>
77
#include <HTTPClient.h>
8+
#if __has_include ("esp_eap_client.h")
9+
#include "esp_eap_client.h"
10+
#else
811
#include "esp_wpa2.h"
12+
#endif
913
#include <Wire.h>
1014
#define EAP_IDENTITY "identity" //if connecting from another corporation, use [email protected] in Eduroam
1115
#define EAP_PASSWORD "password" //your Eduroam password
@@ -42,10 +46,17 @@ void setup() {
4246
Serial.println(ssid);
4347
WiFi.disconnect(true); //disconnect form wifi to set new wifi connection
4448
WiFi.mode(WIFI_STA); //init wifi mode
49+
#if __has_include ("esp_eap_client.h")
50+
esp_eap_client_set_identity((uint8_t *)EAP_IDENTITY, strlen(EAP_IDENTITY)); //provide identity
51+
esp_eap_client_set_username((uint8_t *)EAP_IDENTITY, strlen(EAP_IDENTITY)); //provide username
52+
esp_eap_client_set_password((uint8_t *)EAP_PASSWORD, strlen(EAP_PASSWORD)); //provide password
53+
esp_wifi_sta_enterprise_enable();
54+
#else
4555
esp_wifi_sta_wpa2_ent_set_identity((uint8_t *)EAP_IDENTITY, strlen(EAP_IDENTITY)); //provide identity
4656
esp_wifi_sta_wpa2_ent_set_username((uint8_t *)EAP_IDENTITY, strlen(EAP_IDENTITY)); //provide username --> identity and username is same
4757
esp_wifi_sta_wpa2_ent_set_password((uint8_t *)EAP_PASSWORD, strlen(EAP_PASSWORD)); //provide password
4858
esp_wifi_sta_wpa2_ent_enable();
59+
#endif
4960
WiFi.begin(ssid); //connect to wifi
5061
while (WiFi.status() != WL_CONNECTED) {
5162
delay(500);

‎libraries/WiFi/examples/WiFiClientEnterprise/WiFiClientEnterprise.ino

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#include <WiFi.h> //Wifi library
2-
#include "esp_wpa2.h" //wpa2 library for connections to Enterprise networks
32
#define EAP_IDENTITY "login" //if connecting from another corporation, use [email protected] in Eduroam
43
#define EAP_USERNAME "login" //oftentimes just a repeat of the identity
54
#define EAP_PASSWORD "password" //your Eduroam password

‎libraries/WiFiClientSecure/examples/WiFiClientSecureEnterprise/WiFiClientSecureEnterprise.ino

+11
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@
1515

1616
#include <WiFi.h>
1717
#include <WiFiClientSecure.h>
18+
#if __has_include ("esp_eap_client.h")
19+
#include "esp_eap_client.h"
20+
#else
1821
#include "esp_wpa2.h"
22+
#endif
1923
#include <Wire.h>
2024
#define EAP_ANONYMOUS_IDENTITY "[email protected]" //anonymous identity
2125
#define EAP_IDENTITY "[email protected]" //user identity
@@ -64,10 +68,17 @@ void setup() {
6468
Serial.println(ssid);
6569
WiFi.disconnect(true); //disconnect form wifi to set new wifi connection
6670
WiFi.mode(WIFI_STA); //init wifi mode
71+
#if __has_include ("esp_eap_client.h")
72+
esp_eap_client_set_identity((uint8_t *)EAP_ANONYMOUS_IDENTITY, strlen(EAP_ANONYMOUS_IDENTITY)); //provide identity
73+
esp_eap_client_set_username((uint8_t *)EAP_IDENTITY, strlen(EAP_IDENTITY)); //provide username
74+
esp_eap_client_set_password((uint8_t *)EAP_PASSWORD, strlen(EAP_PASSWORD)); //provide password
75+
esp_wifi_sta_enterprise_enable();
76+
#else
6777
esp_wifi_sta_wpa2_ent_set_identity((uint8_t *)EAP_ANONYMOUS_IDENTITY, strlen(EAP_ANONYMOUS_IDENTITY)); //provide identity
6878
esp_wifi_sta_wpa2_ent_set_username((uint8_t *)EAP_IDENTITY, strlen(EAP_IDENTITY)); //provide username
6979
esp_wifi_sta_wpa2_ent_set_password((uint8_t *)EAP_PASSWORD, strlen(EAP_PASSWORD)); //provide password
7080
esp_wifi_sta_wpa2_ent_enable();
81+
#endif
7182
WiFi.begin(ssid); //connect to wifi
7283
while (WiFi.status() != WL_CONNECTED) {
7384
delay(500);

‎package/package_esp32_index.template.json

+34-34
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
{
4040
"packager": "esp32",
4141
"name": "esp32-arduino-libs",
42-
"version": "idf-release_v5.1-f0437b945f"
42+
"version": "idf-release_v5.1-6b1f40b9bf"
4343
},
4444
{
4545
"packager": "esp32",
@@ -97,63 +97,63 @@
9797
"tools": [
9898
{
9999
"name": "esp32-arduino-libs",
100-
"version": "idf-release_v5.1-f0437b945f",
100+
"version": "idf-release_v5.1-6b1f40b9bf",
101101
"systems": [
102102
{
103103
"host": "i686-mingw32",
104-
"url": "https://github.com/espressif/esp32-arduino-libs/releases/download/0.0.0-alpha/esp32-arduino-libs-0.0.0-alpha.zip",
105-
"archiveFileName": "esp32-arduino-libs-0.0.0-alpha.zip",
106-
"checksum": "SHA-256:096aa276bfe07375f1701f84d05039cb439f48ba1a607676fe27d2807037389a",
107-
"size": "333176544"
104+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/91077b905f50a66c4ecfae2fd5070530c932e97f",
105+
"archiveFileName": "esp32-arduino-libs-91077b905f50a66c4ecfae2fd5070530c932e97f.zip",
106+
"checksum": "SHA-256:7862c881730df293d129a34994c8f0416276c5aa22df01df6f6b9a5ba11b7dd4",
107+
"size": "361692919"
108108
},
109109
{
110110
"host": "x86_64-mingw32",
111-
"url": "https://github.com/espressif/esp32-arduino-libs/releases/download/0.0.0-alpha/esp32-arduino-libs-0.0.0-alpha.zip",
112-
"archiveFileName": "esp32-arduino-libs-0.0.0-alpha.zip",
113-
"checksum": "SHA-256:096aa276bfe07375f1701f84d05039cb439f48ba1a607676fe27d2807037389a",
114-
"size": "333176544"
111+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/91077b905f50a66c4ecfae2fd5070530c932e97f",
112+
"archiveFileName": "esp32-arduino-libs-91077b905f50a66c4ecfae2fd5070530c932e97f.zip",
113+
"checksum": "SHA-256:7862c881730df293d129a34994c8f0416276c5aa22df01df6f6b9a5ba11b7dd4",
114+
"size": "361692919"
115115
},
116116
{
117117
"host": "arm64-apple-darwin",
118-
"url": "https://github.com/espressif/esp32-arduino-libs/releases/download/0.0.0-alpha/esp32-arduino-libs-0.0.0-alpha.zip",
119-
"archiveFileName": "esp32-arduino-libs-0.0.0-alpha.zip",
120-
"checksum": "SHA-256:096aa276bfe07375f1701f84d05039cb439f48ba1a607676fe27d2807037389a",
121-
"size": "333176544"
118+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/91077b905f50a66c4ecfae2fd5070530c932e97f",
119+
"archiveFileName": "esp32-arduino-libs-91077b905f50a66c4ecfae2fd5070530c932e97f.zip",
120+
"checksum": "SHA-256:7862c881730df293d129a34994c8f0416276c5aa22df01df6f6b9a5ba11b7dd4",
121+
"size": "361692919"
122122
},
123123
{
124124
"host": "x86_64-apple-darwin",
125-
"url": "https://github.com/espressif/esp32-arduino-libs/releases/download/0.0.0-alpha/esp32-arduino-libs-0.0.0-alpha.zip",
126-
"archiveFileName": "esp32-arduino-libs-0.0.0-alpha.zip",
127-
"checksum": "SHA-256:096aa276bfe07375f1701f84d05039cb439f48ba1a607676fe27d2807037389a",
128-
"size": "333176544"
125+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/91077b905f50a66c4ecfae2fd5070530c932e97f",
126+
"archiveFileName": "esp32-arduino-libs-91077b905f50a66c4ecfae2fd5070530c932e97f.zip",
127+
"checksum": "SHA-256:7862c881730df293d129a34994c8f0416276c5aa22df01df6f6b9a5ba11b7dd4",
128+
"size": "361692919"
129129
},
130130
{
131131
"host": "x86_64-pc-linux-gnu",
132-
"url": "https://github.com/espressif/esp32-arduino-libs/releases/download/0.0.0-alpha/esp32-arduino-libs-0.0.0-alpha.zip",
133-
"archiveFileName": "esp32-arduino-libs-0.0.0-alpha.zip",
134-
"checksum": "SHA-256:096aa276bfe07375f1701f84d05039cb439f48ba1a607676fe27d2807037389a",
135-
"size": "333176544"
132+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/91077b905f50a66c4ecfae2fd5070530c932e97f",
133+
"archiveFileName": "esp32-arduino-libs-91077b905f50a66c4ecfae2fd5070530c932e97f.zip",
134+
"checksum": "SHA-256:7862c881730df293d129a34994c8f0416276c5aa22df01df6f6b9a5ba11b7dd4",
135+
"size": "361692919"
136136
},
137137
{
138138
"host": "i686-pc-linux-gnu",
139-
"url": "https://github.com/espressif/esp32-arduino-libs/releases/download/0.0.0-alpha/esp32-arduino-libs-0.0.0-alpha.zip",
140-
"archiveFileName": "esp32-arduino-libs-0.0.0-alpha.zip",
141-
"checksum": "SHA-256:096aa276bfe07375f1701f84d05039cb439f48ba1a607676fe27d2807037389a",
142-
"size": "333176544"
139+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/91077b905f50a66c4ecfae2fd5070530c932e97f",
140+
"archiveFileName": "esp32-arduino-libs-91077b905f50a66c4ecfae2fd5070530c932e97f.zip",
141+
"checksum": "SHA-256:7862c881730df293d129a34994c8f0416276c5aa22df01df6f6b9a5ba11b7dd4",
142+
"size": "361692919"
143143
},
144144
{
145145
"host": "aarch64-linux-gnu",
146-
"url": "https://github.com/espressif/esp32-arduino-libs/releases/download/0.0.0-alpha/esp32-arduino-libs-0.0.0-alpha.zip",
147-
"archiveFileName": "esp32-arduino-libs-0.0.0-alpha.zip",
148-
"checksum": "SHA-256:096aa276bfe07375f1701f84d05039cb439f48ba1a607676fe27d2807037389a",
149-
"size": "333176544"
146+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/91077b905f50a66c4ecfae2fd5070530c932e97f",
147+
"archiveFileName": "esp32-arduino-libs-91077b905f50a66c4ecfae2fd5070530c932e97f.zip",
148+
"checksum": "SHA-256:7862c881730df293d129a34994c8f0416276c5aa22df01df6f6b9a5ba11b7dd4",
149+
"size": "361692919"
150150
},
151151
{
152152
"host": "arm-linux-gnueabihf",
153-
"url": "https://github.com/espressif/esp32-arduino-libs/releases/download/0.0.0-alpha/esp32-arduino-libs-0.0.0-alpha.zip",
154-
"archiveFileName": "esp32-arduino-libs-0.0.0-alpha.zip",
155-
"checksum": "SHA-256:096aa276bfe07375f1701f84d05039cb439f48ba1a607676fe27d2807037389a",
156-
"size": "333176544"
153+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/91077b905f50a66c4ecfae2fd5070530c932e97f",
154+
"archiveFileName": "esp32-arduino-libs-91077b905f50a66c4ecfae2fd5070530c932e97f.zip",
155+
"checksum": "SHA-256:7862c881730df293d129a34994c8f0416276c5aa22df01df6f6b9a5ba11b7dd4",
156+
"size": "361692919"
157157
}
158158
]
159159
},

0 commit comments

Comments
 (0)