Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 01f2f82

Browse filesBrowse files
ladyadaladyada
committed
Merge branch 'espressif-idf-release/v4.2' into v4.2
2 parents 5877b03 + c774878 commit 01f2f82
Copy full SHA for 01f2f82

File tree

1,335 files changed

+30002
-6968
lines changed
Filter options

Some content is hidden

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

1,335 files changed

+30002
-6968
lines changed

‎boards.txt

Copy file name to clipboardExpand all lines: boards.txt
+148Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2808,6 +2808,154 @@ adafruit_magtag29_esp32s2.menu.DebugLevel.debug.build.code_debug=4
28082808
adafruit_magtag29_esp32s2.menu.DebugLevel.verbose=Verbose
28092809
adafruit_magtag29_esp32s2.menu.DebugLevel.verbose.build.code_debug=5
28102810

2811+
##############################################################
2812+
2813+
adafruit_feather_esp32s2_nopsram.name=Adafruit Feather ESP32-S2 (no PSRAM)
2814+
adafruit_feather_esp32s2_nopsram.vid.0=0x239A
2815+
adafruit_feather_esp32s2_nopsram.pid.0=0x80EB
2816+
adafruit_feather_esp32s2_nopsram.vid.1=0x239A
2817+
adafruit_feather_esp32s2_nopsram.pid.1=0x00EB
2818+
adafruit_feather_esp32s2_nopsram.vid.1=0x239A
2819+
adafruit_feather_esp32s2_nopsram.pid.1=0x80EC
2820+
2821+
adafruit_feather_esp32s2_nopsram.upload.tool=esptool_py
2822+
adafruit_feather_esp32s2_nopsram.upload.maximum_size=1310720
2823+
adafruit_feather_esp32s2_nopsram.upload.maximum_data_size=327680
2824+
adafruit_feather_esp32s2_nopsram.upload.flags=
2825+
adafruit_feather_esp32s2_nopsram.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
2826+
2827+
adafruit_feather_esp32s2_nopsram.serial.disableDTR=false
2828+
adafruit_feather_esp32s2_nopsram.serial.disableRTS=false
2829+
2830+
adafruit_feather_esp32s2_nopsram.build.mcu=esp32s2
2831+
adafruit_feather_esp32s2_nopsram.build.core=esp32
2832+
adafruit_feather_esp32s2_nopsram.build.variant=adafruit_feather_esp32s2
2833+
adafruit_feather_esp32s2_nopsram.build.board=ADAFRUIT_FEATHER_ESP32S2_NOPSRAM
2834+
2835+
adafruit_feather_esp32s2_nopsram.build.serial=0
2836+
adafruit_feather_esp32s2_nopsram.build.f_cpu=240000000L
2837+
adafruit_feather_esp32s2_nopsram.build.flash_size=4MB
2838+
adafruit_feather_esp32s2_nopsram.build.flash_freq=80m
2839+
adafruit_feather_esp32s2_nopsram.build.flash_mode=qio
2840+
adafruit_feather_esp32s2_nopsram.build.boot=qio
2841+
adafruit_feather_esp32s2_nopsram.build.partitions=default
2842+
adafruit_feather_esp32s2_nopsram.build.defines=
2843+
2844+
adafruit_feather_esp32s2_nopsram.menu.SerialMode.cdc=USB CDC
2845+
adafruit_feather_esp32s2_nopsram.menu.SerialMode.cdc.build.serial=1
2846+
adafruit_feather_esp32s2_nopsram.menu.SerialMode.default=UART0
2847+
adafruit_feather_esp32s2_nopsram.menu.SerialMode.default.build.serial=0
2848+
2849+
adafruit_feather_esp32s2_nopsram.menu.PSRAM.disabled=Disabled
2850+
adafruit_feather_esp32s2_nopsram.menu.PSRAM.disabled.build.defines=
2851+
adafruit_feather_esp32s2_nopsram.menu.PSRAM.enabled=Enabled
2852+
adafruit_feather_esp32s2_nopsram.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
2853+
2854+
adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
2855+
adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.default.build.partitions=default
2856+
adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
2857+
adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
2858+
adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.default_8MB=8M Flash (3MB APP/1.5MB FAT)
2859+
adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
2860+
adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
2861+
adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
2862+
adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.minimal.build.partitions=minimal
2863+
adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
2864+
adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.no_ota.build.partitions=no_ota
2865+
adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
2866+
adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
2867+
adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
2868+
adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
2869+
adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
2870+
adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
2871+
adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
2872+
adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
2873+
adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
2874+
adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
2875+
adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
2876+
adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.huge_app.build.partitions=huge_app
2877+
adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
2878+
adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
2879+
adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
2880+
adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
2881+
adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FAT)
2882+
adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.fatflash.build.partitions=ffat
2883+
adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
2884+
adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9MB FATFS)
2885+
adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
2886+
adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
2887+
2888+
adafruit_feather_esp32s2_nopsram.menu.CPUFreq.240=240MHz (WiFi)
2889+
adafruit_feather_esp32s2_nopsram.menu.CPUFreq.240.build.f_cpu=240000000L
2890+
adafruit_feather_esp32s2_nopsram.menu.CPUFreq.160=160MHz (WiFi)
2891+
adafruit_feather_esp32s2_nopsram.menu.CPUFreq.160.build.f_cpu=160000000L
2892+
adafruit_feather_esp32s2_nopsram.menu.CPUFreq.80=80MHz (WiFi)
2893+
adafruit_feather_esp32s2_nopsram.menu.CPUFreq.80.build.f_cpu=80000000L
2894+
adafruit_feather_esp32s2_nopsram.menu.CPUFreq.40=40MHz
2895+
adafruit_feather_esp32s2_nopsram.menu.CPUFreq.40.build.f_cpu=40000000L
2896+
adafruit_feather_esp32s2_nopsram.menu.CPUFreq.20=20MHz
2897+
adafruit_feather_esp32s2_nopsram.menu.CPUFreq.20.build.f_cpu=20000000L
2898+
adafruit_feather_esp32s2_nopsram.menu.CPUFreq.10=10MHz
2899+
adafruit_feather_esp32s2_nopsram.menu.CPUFreq.10.build.f_cpu=10000000L
2900+
2901+
adafruit_feather_esp32s2_nopsram.menu.FlashMode.qio=QIO
2902+
adafruit_feather_esp32s2_nopsram.menu.FlashMode.qio.build.flash_mode=dio
2903+
adafruit_feather_esp32s2_nopsram.menu.FlashMode.qio.build.boot=qio
2904+
adafruit_feather_esp32s2_nopsram.menu.FlashMode.dio=DIO
2905+
adafruit_feather_esp32s2_nopsram.menu.FlashMode.dio.build.flash_mode=dio
2906+
adafruit_feather_esp32s2_nopsram.menu.FlashMode.dio.build.boot=dio
2907+
adafruit_feather_esp32s2_nopsram.menu.FlashMode.qout=QOUT
2908+
adafruit_feather_esp32s2_nopsram.menu.FlashMode.qout.build.flash_mode=dout
2909+
adafruit_feather_esp32s2_nopsram.menu.FlashMode.qout.build.boot=qout
2910+
adafruit_feather_esp32s2_nopsram.menu.FlashMode.dout=DOUT
2911+
adafruit_feather_esp32s2_nopsram.menu.FlashMode.dout.build.flash_mode=dout
2912+
adafruit_feather_esp32s2_nopsram.menu.FlashMode.dout.build.boot=dout
2913+
2914+
adafruit_feather_esp32s2_nopsram.menu.FlashFreq.80=80MHz
2915+
adafruit_feather_esp32s2_nopsram.menu.FlashFreq.80.build.flash_freq=80m
2916+
adafruit_feather_esp32s2_nopsram.menu.FlashFreq.40=40MHz
2917+
adafruit_feather_esp32s2_nopsram.menu.FlashFreq.40.build.flash_freq=40m
2918+
2919+
adafruit_feather_esp32s2_nopsram.menu.FlashSize.4M=4MB (32Mb)
2920+
adafruit_feather_esp32s2_nopsram.menu.FlashSize.4M.build.flash_size=4MB
2921+
adafruit_feather_esp32s2_nopsram.menu.FlashSize.8M=8MB (64Mb)
2922+
adafruit_feather_esp32s2_nopsram.menu.FlashSize.8M.build.flash_size=8MB
2923+
adafruit_feather_esp32s2_nopsram.menu.FlashSize.8M.build.partitions=default_8MB
2924+
adafruit_feather_esp32s2_nopsram.menu.FlashSize.2M=2MB (16Mb)
2925+
adafruit_feather_esp32s2_nopsram.menu.FlashSize.2M.build.flash_size=2MB
2926+
adafruit_feather_esp32s2_nopsram.menu.FlashSize.2M.build.partitions=minimal
2927+
adafruit_feather_esp32s2_nopsram.menu.FlashSize.16M=16MB (128Mb)
2928+
adafruit_feather_esp32s2_nopsram.menu.FlashSize.16M.build.flash_size=16MB
2929+
2930+
adafruit_feather_esp32s2_nopsram.menu.UploadSpeed.921600=921600
2931+
adafruit_feather_esp32s2_nopsram.menu.UploadSpeed.921600.upload.speed=921600
2932+
adafruit_feather_esp32s2_nopsram.menu.UploadSpeed.115200=115200
2933+
adafruit_feather_esp32s2_nopsram.menu.UploadSpeed.115200.upload.speed=115200
2934+
adafruit_feather_esp32s2_nopsram.menu.UploadSpeed.256000.windows=256000
2935+
adafruit_feather_esp32s2_nopsram.menu.UploadSpeed.256000.upload.speed=256000
2936+
adafruit_feather_esp32s2_nopsram.menu.UploadSpeed.230400.windows.upload.speed=256000
2937+
adafruit_feather_esp32s2_nopsram.menu.UploadSpeed.230400=230400
2938+
adafruit_feather_esp32s2_nopsram.menu.UploadSpeed.230400.upload.speed=230400
2939+
adafruit_feather_esp32s2_nopsram.menu.UploadSpeed.460800.linux=460800
2940+
adafruit_feather_esp32s2_nopsram.menu.UploadSpeed.460800.macosx=460800
2941+
adafruit_feather_esp32s2_nopsram.menu.UploadSpeed.460800.upload.speed=460800
2942+
adafruit_feather_esp32s2_nopsram.menu.UploadSpeed.512000.windows=512000
2943+
adafruit_feather_esp32s2_nopsram.menu.UploadSpeed.512000.upload.speed=512000
2944+
2945+
adafruit_feather_esp32s2_nopsram.menu.DebugLevel.none=None
2946+
adafruit_feather_esp32s2_nopsram.menu.DebugLevel.none.build.code_debug=0
2947+
adafruit_feather_esp32s2_nopsram.menu.DebugLevel.error=Error
2948+
adafruit_feather_esp32s2_nopsram.menu.DebugLevel.error.build.code_debug=1
2949+
adafruit_feather_esp32s2_nopsram.menu.DebugLevel.warn=Warn
2950+
adafruit_feather_esp32s2_nopsram.menu.DebugLevel.warn.build.code_debug=2
2951+
adafruit_feather_esp32s2_nopsram.menu.DebugLevel.info=Info
2952+
adafruit_feather_esp32s2_nopsram.menu.DebugLevel.info.build.code_debug=3
2953+
adafruit_feather_esp32s2_nopsram.menu.DebugLevel.debug=Debug
2954+
adafruit_feather_esp32s2_nopsram.menu.DebugLevel.debug.build.code_debug=4
2955+
adafruit_feather_esp32s2_nopsram.menu.DebugLevel.verbose=Verbose
2956+
adafruit_feather_esp32s2_nopsram.menu.DebugLevel.verbose.build.code_debug=5
2957+
2958+
28112959
##############################################################
28122960

28132961
nodemcu-32s.name=NodeMCU-32S

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

Copy file name to clipboardExpand all lines: cores/esp32/esp32-hal-uart.c
+1-1Lines 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

Copy file name to clipboardExpand all lines: libraries/ESPmDNS/src/ESPmDNS.cpp
+2-2Lines 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

Copy file name to clipboardExpand all lines: libraries/ESPmDNS/src/ESPmDNS.h
+1-1Lines 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

Copy file name to clipboardExpand all lines: libraries/WiFi/src/WiFi.cpp
+1-1Lines 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

Copy file name to clipboardExpand all lines: libraries/WiFi/src/WiFiAP.cpp
+5-5Lines 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

Copy file name to clipboardExpand all lines: libraries/WiFi/src/WiFiGeneric.cpp
+1-1Lines 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

Copy file name to clipboardExpand all lines: libraries/WiFi/src/WiFiSTA.cpp
+8-8Lines 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

Copy file name to clipboardExpand all lines: libraries/WiFiProv/src/WiFiProv.cpp
+2-2Lines 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

Copy file name to clipboardExpand all lines: package/package_esp32_index.template.json
+2-2Lines 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",

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.