Skip to content

Commit c774878

Browse files
ladyadaladyada
committed
Merge branch 'idf-release/v4.2' of https://github.com/espressif/arduino-esp32 into espressif-idf-release/v4.2
2 parents b2108e9 + 71e2142 commit c774878

File tree

1,330 files changed

+29781
-6968
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,330 files changed

+29781
-6968
lines changed

‎cores/esp32/esp32-hal-uart.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,8 @@ void uartAttachRx(uart_t* uart, uint8_t rxPin, bool inverted)
185185
return;
186186
}
187187
pinMode(rxPin, INPUT);
188-
pinMatrixInAttach(rxPin, UART_RXD_IDX(uart->num), inverted);
189188
uartEnableInterrupt(uart);
189+
pinMatrixInAttach(rxPin, UART_RXD_IDX(uart->num), inverted);
190190
}
191191

192192
void uartAttachTx(uart_t* uart, uint8_t txPin, bool inverted)

‎libraries/ESPmDNS/src/ESPmDNS.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,10 @@ void MDNSResponder::disableArduino(){
111111
}
112112
}
113113

114-
void MDNSResponder::enableWorkstation(wifi_interface_t interface){
114+
void MDNSResponder::enableWorkstation(esp_interface_t interface){
115115
char winstance[21+_hostname.length()];
116116
uint8_t mac[6];
117-
esp_wifi_get_mac(interface, mac);
117+
esp_wifi_get_mac((wifi_interface_t)interface, mac);
118118
sprintf(winstance, "%s [%02x:%02x:%02x:%02x:%02x:%02x]", _hostname.c_str(), mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
119119

120120
if(mdns_service_add(NULL, "_workstation", "_tcp", 9, NULL, 0)) {

‎libraries/ESPmDNS/src/ESPmDNS.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class MDNSResponder {
8484
void enableArduino(uint16_t port=3232, bool auth=false);
8585
void disableArduino();
8686

87-
void enableWorkstation(wifi_interface_t interface=ESP_IF_WIFI_STA);
87+
void enableWorkstation(esp_interface_t interface=ESP_IF_WIFI_STA);
8888
void disableWorkstation();
8989

9090
IPAddress queryHost(char *host, uint32_t timeout=2000);

‎libraries/WiFi/src/WiFi.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ void WiFiClass::printDiag(Print& p)
7070
*/
7171

7272
wifi_config_t conf;
73-
esp_wifi_get_config(WIFI_IF_STA, &conf);
73+
esp_wifi_get_config((wifi_interface_t)WIFI_IF_STA, &conf);
7474

7575
const char* ssid = reinterpret_cast<const char*>(conf.sta.ssid);
7676
p.print("SSID (");

‎libraries/WiFi/src/WiFiAP.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,13 +134,13 @@ bool WiFiAPClass::softAP(const char* ssid, const char* passphrase, int channel,
134134
wifi_config_t conf;
135135
wifi_config_t conf_current;
136136
wifi_softap_config(&conf, ssid, passphrase, channel, WIFI_AUTH_WPA_WPA2_PSK, ssid_hidden, max_connection);
137-
esp_err_t err = esp_wifi_get_config(WIFI_IF_AP, &conf_current);
137+
esp_err_t err = esp_wifi_get_config((wifi_interface_t)WIFI_IF_AP, &conf_current);
138138
if(err){
139139
log_e("get AP config failed");
140140
return false;
141141
}
142142
if(!softap_config_equal(conf, conf_current)) {
143-
err = esp_wifi_set_config(WIFI_IF_AP, &conf);
143+
err = esp_wifi_set_config((wifi_interface_t)WIFI_IF_AP, &conf);
144144
if(err){
145145
log_e("set AP config failed");
146146
return false;
@@ -187,7 +187,7 @@ bool WiFiAPClass::softAPdisconnect(bool wifioff)
187187
return false;
188188
}
189189

190-
ret = esp_wifi_set_config(WIFI_IF_AP, &conf) == ESP_OK;
190+
ret = esp_wifi_set_config((wifi_interface_t)WIFI_IF_AP, &conf) == ESP_OK;
191191

192192
if(ret && wifioff) {
193193
ret = WiFi.enableAP(false) == ESP_OK;
@@ -289,7 +289,7 @@ uint8_t WiFiAPClass::softAPSubnetCIDR()
289289
uint8_t* WiFiAPClass::softAPmacAddress(uint8_t* mac)
290290
{
291291
if(WiFiGenericClass::getMode() != WIFI_MODE_NULL){
292-
esp_wifi_get_mac(WIFI_IF_AP, mac);
292+
esp_wifi_get_mac((wifi_interface_t)WIFI_IF_AP, mac);
293293
}
294294
return mac;
295295
}
@@ -305,7 +305,7 @@ String WiFiAPClass::softAPmacAddress(void)
305305
if(WiFiGenericClass::getMode() == WIFI_MODE_NULL){
306306
return String();
307307
}
308-
esp_wifi_get_mac(WIFI_IF_AP, mac);
308+
esp_wifi_get_mac((wifi_interface_t)WIFI_IF_AP, mac);
309309

310310
sprintf(macStr, "%02X:%02X:%02X:%02X:%02X:%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
311311
return String(macStr);

‎libraries/WiFi/src/WiFiGeneric.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ static char default_hostname[32] = {0,};
216216
static const char * get_esp_netif_hostname(){
217217
if(default_hostname[0] == 0){
218218
uint8_t eth_mac[6];
219-
esp_wifi_get_mac(WIFI_IF_STA, eth_mac);
219+
esp_wifi_get_mac((wifi_interface_t)WIFI_IF_STA, eth_mac);
220220
snprintf(default_hostname, 32, "%s%02X%02X%02X", CONFIG_IDF_TARGET "-", eth_mac[3], eth_mac[4], eth_mac[5]);
221221
}
222222
return (const char *)default_hostname;

‎libraries/WiFi/src/WiFiSTA.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ wl_status_t WiFiSTAClass::begin(const char* ssid, const char *passphrase, int32_
168168

169169
wifi_sta_config(&conf, ssid, passphrase, bssid, channel);
170170

171-
if(esp_wifi_get_config(ESP_IF_WIFI_STA, &current_conf) != ESP_OK){
171+
if(esp_wifi_get_config((wifi_interface_t)ESP_IF_WIFI_STA, &current_conf) != ESP_OK){
172172
log_e("get current config failed!");
173173
return WL_CONNECT_FAILED;
174174
}
@@ -178,14 +178,14 @@ wl_status_t WiFiSTAClass::begin(const char* ssid, const char *passphrase, int32_
178178
return WL_CONNECT_FAILED;
179179
}
180180

181-
if(esp_wifi_set_config(ESP_IF_WIFI_STA, &conf) != ESP_OK){
181+
if(esp_wifi_set_config((wifi_interface_t)ESP_IF_WIFI_STA, &conf) != ESP_OK){
182182
log_e("set config failed!");
183183
return WL_CONNECT_FAILED;
184184
}
185185
} else if(status() == WL_CONNECTED){
186186
return WL_CONNECTED;
187187
} else {
188-
if(esp_wifi_set_config(ESP_IF_WIFI_STA, &conf) != ESP_OK){
188+
if(esp_wifi_set_config((wifi_interface_t)ESP_IF_WIFI_STA, &conf) != ESP_OK){
189189
log_e("set config failed!");
190190
return WL_CONNECT_FAILED;
191191
}
@@ -225,7 +225,7 @@ wl_status_t WiFiSTAClass::begin()
225225
}
226226

227227
wifi_config_t current_conf;
228-
if(esp_wifi_get_config(ESP_IF_WIFI_STA, &current_conf) != ESP_OK || esp_wifi_set_config(ESP_IF_WIFI_STA, &current_conf) != ESP_OK) {
228+
if(esp_wifi_get_config((wifi_interface_t)ESP_IF_WIFI_STA, &current_conf) != ESP_OK || esp_wifi_set_config((wifi_interface_t)ESP_IF_WIFI_STA, &current_conf) != ESP_OK) {
229229
log_e("config failed");
230230
return WL_CONNECT_FAILED;
231231
}
@@ -272,7 +272,7 @@ bool WiFiSTAClass::disconnect(bool wifioff, bool eraseap)
272272

273273
if(WiFi.getMode() & WIFI_MODE_STA){
274274
if(eraseap){
275-
if(esp_wifi_set_config(ESP_IF_WIFI_STA, &conf)){
275+
if(esp_wifi_set_config((wifi_interface_t)ESP_IF_WIFI_STA, &conf)){
276276
log_e("clear config failed!");
277277
}
278278
}
@@ -398,7 +398,7 @@ IPAddress WiFiSTAClass::localIP()
398398
uint8_t* WiFiSTAClass::macAddress(uint8_t* mac)
399399
{
400400
if(WiFiGenericClass::getMode() != WIFI_MODE_NULL){
401-
esp_wifi_get_mac(ESP_IF_WIFI_STA, mac);
401+
esp_wifi_get_mac((wifi_interface_t)ESP_IF_WIFI_STA, mac);
402402
}
403403
else{
404404
esp_read_mac(mac, ESP_MAC_WIFI_STA);
@@ -418,7 +418,7 @@ String WiFiSTAClass::macAddress(void)
418418
esp_read_mac(mac, ESP_MAC_WIFI_STA);
419419
}
420420
else{
421-
esp_wifi_get_mac(ESP_IF_WIFI_STA, mac);
421+
esp_wifi_get_mac((wifi_interface_t)ESP_IF_WIFI_STA, mac);
422422
}
423423
sprintf(macStr, "%02X:%02X:%02X:%02X:%02X:%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
424424
return String(macStr);
@@ -549,7 +549,7 @@ String WiFiSTAClass::psk() const
549549
return String();
550550
}
551551
wifi_config_t conf;
552-
esp_wifi_get_config(ESP_IF_WIFI_STA, &conf);
552+
esp_wifi_get_config((wifi_interface_t)ESP_IF_WIFI_STA, &conf);
553553
return String(reinterpret_cast<char*>(conf.sta.password));
554554
}
555555

‎libraries/WiFiProv/src/WiFiProv.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ static const uint8_t custom_service_uuid[16] = { 0xb4, 0xdf, 0x5a, 0x1c, 0x3f,
5151
static void get_device_service_name(prov_scheme_t prov_scheme, char *service_name, size_t max)
5252
{
5353
uint8_t eth_mac[6] = {0,0,0,0,0,0};
54-
if(esp_wifi_get_mac(WIFI_IF_STA, eth_mac) != ESP_OK){
54+
if(esp_wifi_get_mac((wifi_interface_t)WIFI_IF_STA, eth_mac) != ESP_OK){
5555
log_e("esp_wifi_get_mac failed!");
5656
return;
5757
}
@@ -158,7 +158,7 @@ void WiFiProvClass :: beginProvision(prov_scheme_t prov_scheme, scheme_handler_t
158158
log_i("Already Provisioned");
159159
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_INFO
160160
static wifi_config_t conf;
161-
esp_wifi_get_config(WIFI_IF_STA,&conf);
161+
esp_wifi_get_config((wifi_interface_t)WIFI_IF_STA,&conf);
162162
log_i("Attempting connect to AP: %s\n",conf.sta.ssid);
163163
#endif
164164
esp_wifi_start();

‎package/package_esp32_index.template.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@
149149
"host": "x86_64-apple-darwin",
150150
"url": "https://dl.espressif.com/dl/esptool-3.0.0.2-macos.tar.gz",
151151
"archiveFileName": "esptool-3.0.0.2-macos.tar.gz",
152-
"checksum": "SHA-256:9213f46d5aa865558da4a2ef4218e87eef4782779128083c15ce2b3e4d07a1ea",
153-
"size": "3849615"
152+
"checksum": "SHA-256:2cafab7f1ebce89475b84c115548eaace40b6366d7b3f9862cdb2fc64f806643",
153+
"size": "3859642"
154154
},
155155
{
156156
"host": "x86_64-pc-linux-gnu",

‎platform.txt

Lines changed: 6 additions & 6 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)