Skip to content

Commit 16b2d74

Browse files
me-no-devpre-commit-ci-lite[bot]
me-no-dev
and
pre-commit-ci-lite[bot]
authored
IDF release/v5.1 (espressif#10162)
* fix(prov): Use network_provisioning * IDF release/v5.1 5c57dfe949 * fix(prov): Add sketch and CMake fixes * fix(prov): Fix build for ESP32-C2 * ci(pre-commit): Apply automatic fixes * fix(prov): Improve WiFiProv library and QRcode print * IDF release/v5.1 c608177cf9 --------- Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
1 parent ae71b2d commit 16b2d74

File tree

13 files changed

+235
-160
lines changed

13 files changed

+235
-160
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ endforeach()
293293
set(includedirs variants/${CONFIG_ARDUINO_VARIANT}/ cores/esp32/ ${ARDUINO_LIBRARIES_INCLUDEDIRS})
294294
set(srcs ${CORE_SRCS} ${ARDUINO_LIBRARIES_SRCS})
295295
set(priv_includes cores/esp32/libb64)
296-
set(requires spi_flash esp_partition mbedtls wifi_provisioning wpa_supplicant esp_adc esp_eth http_parser)
296+
set(requires spi_flash esp_partition mbedtls wpa_supplicant esp_adc esp_eth http_parser espressif__network_provisioning)
297297
set(priv_requires fatfs nvs_flash app_update spiffs bootloader_support bt esp_hid usb esp_psram ${ARDUINO_LIBRARIES_REQUIRES})
298298

299299
if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_OpenThread)

‎idf_component.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ dependencies:
4949
require: public
5050
espressif/esp_modem:
5151
version: "^1.1.0"
52+
espressif/network_provisioning:
53+
version: "~1.0.0"
5254
espressif/esp-zboss-lib:
5355
version: "^1.0.1"
5456
rules:

‎libraries/Network/src/NetworkEvents.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#if SOC_WIFI_SUPPORTED
2121
#include "esp_wifi_types.h"
2222
#include "esp_smartconfig.h"
23-
#include "wifi_provisioning/wifi_config.h"
23+
#include "network_provisioning/network_config.h"
2424
#endif
2525

2626
#if SOC_WIFI_SUPPORTED
@@ -105,7 +105,7 @@ typedef union {
105105
wifi_event_ap_stadisconnected_t wifi_ap_stadisconnected;
106106
wifi_event_ftm_report_t wifi_ftm_report;
107107
wifi_sta_config_t prov_cred_recv;
108-
wifi_prov_sta_fail_reason_t prov_fail_reason;
108+
network_prov_wifi_sta_fail_reason_t prov_fail_reason;
109109
smartconfig_event_got_ssid_pswd_t sc_got_ssid_pswd;
110110
#endif
111111
} arduino_event_info_t;

‎libraries/RainMaker/examples/RMakerCustom/RMakerCustom.ino‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ void sysProvEvent(arduino_event_t *sys_event) {
3030
case ARDUINO_EVENT_PROV_START:
3131
#if CONFIG_IDF_TARGET_ESP32S2
3232
Serial.printf("\nProvisioning Started with name \"%s\" and PoP \"%s\" on SoftAP\n", service_name, pop);
33-
printQR(service_name, pop, "softap");
33+
WiFiProv.printQR(service_name, pop, "softap");
3434
#else
3535
Serial.printf("\nProvisioning Started with name \"%s\" and PoP \"%s\" on BLE\n", service_name, pop);
36-
printQR(service_name, pop, "ble");
36+
WiFiProv.printQR(service_name, pop, "ble");
3737
#endif
3838
break;
39-
case ARDUINO_EVENT_PROV_INIT: wifi_prov_mgr_disable_auto_stop(10000); break;
40-
case ARDUINO_EVENT_PROV_CRED_SUCCESS: wifi_prov_mgr_stop_provisioning(); break;
39+
case ARDUINO_EVENT_PROV_INIT: WiFiProv.disableAutoStop(10000); break;
40+
case ARDUINO_EVENT_PROV_CRED_SUCCESS: WiFiProv.endProvision(); break;
4141
default: ;
4242
}
4343
}
@@ -101,9 +101,9 @@ void setup() {
101101

102102
WiFi.onEvent(sysProvEvent); // Will call sysProvEvent() from another thread.
103103
#if CONFIG_IDF_TARGET_ESP32S2
104-
WiFiProv.beginProvision(WIFI_PROV_SCHEME_SOFTAP, WIFI_PROV_SCHEME_HANDLER_NONE, WIFI_PROV_SECURITY_1, pop, service_name);
104+
WiFiProv.beginProvision(NETWORK_PROV_SCHEME_SOFTAP, NETWORK_PROV_SCHEME_HANDLER_NONE, NETWORK_PROV_SECURITY_1, pop, service_name);
105105
#else
106-
WiFiProv.beginProvision(WIFI_PROV_SCHEME_BLE, WIFI_PROV_SCHEME_HANDLER_FREE_BTDM, WIFI_PROV_SECURITY_1, pop, service_name);
106+
WiFiProv.beginProvision(NETWORK_PROV_SCHEME_BLE, NETWORK_PROV_SCHEME_HANDLER_FREE_BTDM, NETWORK_PROV_SECURITY_1, pop, service_name);
107107
#endif
108108
}
109109

‎libraries/RainMaker/examples/RMakerCustomAirCooler/RMakerCustomAirCooler.ino‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ void sysProvEvent(arduino_event_t *sys_event) {
4646
case ARDUINO_EVENT_PROV_START:
4747
#if CONFIG_IDF_TARGET_ESP32S2
4848
Serial.printf("\nProvisioning Started with name \"%s\" and PoP \"%s\" on SoftAP\n", service_name, pop);
49-
printQR(service_name, pop, "softap");
49+
WiFiProv.printQR(service_name, pop, "softap");
5050
#else
5151
Serial.printf("\nProvisioning Started with name \"%s\" and PoP \"%s\" on BLE\n", service_name, pop);
52-
printQR(service_name, pop, "ble");
52+
WiFiProv.printQR(service_name, pop, "ble");
5353
#endif
5454
break;
55-
case ARDUINO_EVENT_PROV_INIT: wifi_prov_mgr_disable_auto_stop(10000); break;
56-
case ARDUINO_EVENT_PROV_CRED_SUCCESS: wifi_prov_mgr_stop_provisioning(); break;
55+
case ARDUINO_EVENT_PROV_INIT: WiFiProv.disableAutoStop(10000); break;
56+
case ARDUINO_EVENT_PROV_CRED_SUCCESS: WiFiProv.endProvision(); break;
5757
default: ;
5858
}
5959
}
@@ -166,9 +166,9 @@ void setup() {
166166

167167
WiFi.onEvent(sysProvEvent); // Will call sysProvEvent() from another thread.
168168
#if CONFIG_IDF_TARGET_ESP32S2
169-
WiFiProv.beginProvision(WIFI_PROV_SCHEME_SOFTAP, WIFI_PROV_SCHEME_HANDLER_NONE, WIFI_PROV_SECURITY_1, pop, service_name);
169+
WiFiProv.beginProvision(NETWORK_PROV_SCHEME_SOFTAP, NETWORK_PROV_SCHEME_HANDLER_NONE, NETWORK_PROV_SECURITY_1, pop, service_name);
170170
#else
171-
WiFiProv.beginProvision(WIFI_PROV_SCHEME_BLE, WIFI_PROV_SCHEME_HANDLER_FREE_BTDM, WIFI_PROV_SECURITY_1, pop, service_name);
171+
WiFiProv.beginProvision(NETWORK_PROV_SCHEME_BLE, NETWORK_PROV_SCHEME_HANDLER_FREE_BTDM, NETWORK_PROV_SECURITY_1, pop, service_name);
172172
#endif
173173
}
174174

‎libraries/RainMaker/examples/RMakerSonoffDualR3/RMakerSonoffDualR3.ino‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,18 @@ void sysProvEvent(arduino_event_t *sys_event) {
4040
case ARDUINO_EVENT_PROV_START:
4141
#if CONFIG_IDF_TARGET_ESP32
4242
Serial.printf("\nProvisioning Started with name \"%s\" and PoP \"%s\" on BLE\n", service_name, pop);
43-
printQR(service_name, pop, "ble");
43+
WiFiProv.printQR(service_name, pop, "ble");
4444
#else
4545
Serial.printf("\nProvisioning Started with name \"%s\" and PoP \"%s\" on SoftAP\n", service_name, pop);
46-
printQR(service_name, pop, "softap");
46+
WiFiProv.printQR(service_name, pop, "softap");
4747
#endif
4848
break;
4949
case ARDUINO_EVENT_WIFI_STA_CONNECTED:
5050
Serial.printf("\nConnected to Wi-Fi!\n");
5151
digitalWrite(gpio_led, true);
5252
break;
53-
case ARDUINO_EVENT_PROV_INIT: wifi_prov_mgr_disable_auto_stop(10000); break;
54-
case ARDUINO_EVENT_PROV_CRED_SUCCESS: wifi_prov_mgr_stop_provisioning(); break;
53+
case ARDUINO_EVENT_PROV_INIT: WiFiProv.disableAutoStop(10000); break;
54+
case ARDUINO_EVENT_PROV_CRED_SUCCESS: WiFiProv.endProvision(); break;
5555
default: ;
5656
}
5757
}
@@ -151,9 +151,9 @@ void setup() {
151151

152152
WiFi.onEvent(sysProvEvent); // Will call sysProvEvent() from another thread.
153153
#if CONFIG_IDF_TARGET_ESP32
154-
WiFiProv.beginProvision(WIFI_PROV_SCHEME_BLE, WIFI_PROV_SCHEME_HANDLER_FREE_BTDM, WIFI_PROV_SECURITY_1, pop, service_name);
154+
WiFiProv.beginProvision(NETWORK_PROV_SCHEME_BLE, NETWORK_PROV_SCHEME_HANDLER_FREE_BTDM, NETWORK_PROV_SECURITY_1, pop, service_name);
155155
#else
156-
WiFiProv.beginProvision(WIFI_PROV_SCHEME_SOFTAP, WIFI_PROV_SCHEME_HANDLER_NONE, WIFI_PROV_SECURITY_1, pop, service_name);
156+
WiFiProv.beginProvision(NETWORK_PROV_SCHEME_SOFTAP, NETWORK_PROV_SCHEME_HANDLER_NONE, NETWORK_PROV_SECURITY_1, pop, service_name);
157157
#endif
158158
}
159159

‎libraries/RainMaker/examples/RMakerSwitch/RMakerSwitch.ino‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ void sysProvEvent(arduino_event_t *sys_event) {
3131
case ARDUINO_EVENT_PROV_START:
3232
#if CONFIG_IDF_TARGET_ESP32S2
3333
Serial.printf("\nProvisioning Started with name \"%s\" and PoP \"%s\" on SoftAP\n", service_name, pop);
34-
printQR(service_name, pop, "softap");
34+
WiFiProv.printQR(service_name, pop, "softap");
3535
#else
3636
Serial.printf("\nProvisioning Started with name \"%s\" and PoP \"%s\" on BLE\n", service_name, pop);
37-
printQR(service_name, pop, "ble");
37+
WiFiProv.printQR(service_name, pop, "ble");
3838
#endif
3939
break;
40-
case ARDUINO_EVENT_PROV_INIT: wifi_prov_mgr_disable_auto_stop(10000); break;
41-
case ARDUINO_EVENT_PROV_CRED_SUCCESS: wifi_prov_mgr_stop_provisioning(); break;
40+
case ARDUINO_EVENT_PROV_INIT: WiFiProv.disableAutoStop(10000); break;
41+
case ARDUINO_EVENT_PROV_CRED_SUCCESS: WiFiProv.endProvision(); break;
4242
default: ;
4343
}
4444
}
@@ -98,9 +98,9 @@ void setup() {
9898

9999
WiFi.onEvent(sysProvEvent); // Will call sysProvEvent() from another thread.
100100
#if CONFIG_IDF_TARGET_ESP32S2
101-
WiFiProv.beginProvision(WIFI_PROV_SCHEME_SOFTAP, WIFI_PROV_SCHEME_HANDLER_NONE, WIFI_PROV_SECURITY_1, pop, service_name);
101+
WiFiProv.beginProvision(NETWORK_PROV_SCHEME_SOFTAP, NETWORK_PROV_SCHEME_HANDLER_NONE, NETWORK_PROV_SECURITY_1, pop, service_name);
102102
#else
103-
WiFiProv.beginProvision(WIFI_PROV_SCHEME_BLE, WIFI_PROV_SCHEME_HANDLER_FREE_BTDM, WIFI_PROV_SECURITY_1, pop, service_name);
103+
WiFiProv.beginProvision(NETWORK_PROV_SCHEME_BLE, NETWORK_PROV_SCHEME_HANDLER_FREE_BTDM, NETWORK_PROV_SECURITY_1, pop, service_name);
104104
#endif
105105
}
106106

‎libraries/WiFi/src/WiFiGeneric.cpp‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -126,34 +126,34 @@ static void _arduino_event_cb(void *arg, esp_event_base_t event_base, int32_t ev
126126
/*
127127
* Provisioning
128128
* */
129-
} else if (event_base == WIFI_PROV_EVENT && event_id == WIFI_PROV_INIT) {
129+
} else if (event_base == NETWORK_PROV_EVENT && event_id == NETWORK_PROV_INIT) {
130130
log_v("Provisioning Initialized!");
131131
arduino_event.event_id = ARDUINO_EVENT_PROV_INIT;
132-
} else if (event_base == WIFI_PROV_EVENT && event_id == WIFI_PROV_DEINIT) {
132+
} else if (event_base == NETWORK_PROV_EVENT && event_id == NETWORK_PROV_DEINIT) {
133133
log_v("Provisioning Uninitialized!");
134134
arduino_event.event_id = ARDUINO_EVENT_PROV_DEINIT;
135-
} else if (event_base == WIFI_PROV_EVENT && event_id == WIFI_PROV_START) {
135+
} else if (event_base == NETWORK_PROV_EVENT && event_id == NETWORK_PROV_START) {
136136
log_v("Provisioning Start!");
137137
arduino_event.event_id = ARDUINO_EVENT_PROV_START;
138-
} else if (event_base == WIFI_PROV_EVENT && event_id == WIFI_PROV_END) {
138+
} else if (event_base == NETWORK_PROV_EVENT && event_id == NETWORK_PROV_END) {
139139
log_v("Provisioning End!");
140-
wifi_prov_mgr_deinit();
140+
network_prov_mgr_deinit();
141141
arduino_event.event_id = ARDUINO_EVENT_PROV_END;
142-
} else if (event_base == WIFI_PROV_EVENT && event_id == WIFI_PROV_CRED_RECV) {
142+
} else if (event_base == NETWORK_PROV_EVENT && event_id == NETWORK_PROV_WIFI_CRED_RECV) {
143143
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_VERBOSE
144144
wifi_sta_config_t *event = (wifi_sta_config_t *)event_data;
145145
log_v("Provisioned Credentials: SSID: %s, Password: %s", (const char *)event->ssid, (const char *)event->password);
146146
#endif
147147
arduino_event.event_id = ARDUINO_EVENT_PROV_CRED_RECV;
148148
memcpy(&arduino_event.event_info.prov_cred_recv, event_data, sizeof(wifi_sta_config_t));
149-
} else if (event_base == WIFI_PROV_EVENT && event_id == WIFI_PROV_CRED_FAIL) {
149+
} else if (event_base == NETWORK_PROV_EVENT && event_id == NETWORK_PROV_WIFI_CRED_FAIL) {
150150
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_ERROR
151-
wifi_prov_sta_fail_reason_t *reason = (wifi_prov_sta_fail_reason_t *)event_data;
152-
log_e("Provisioning Failed: Reason : %s", (*reason == WIFI_PROV_STA_AUTH_ERROR) ? "Authentication Failed" : "AP Not Found");
151+
network_prov_wifi_sta_fail_reason_t *reason = (network_prov_wifi_sta_fail_reason_t *)event_data;
152+
log_e("Provisioning Failed: Reason : %s", (*reason == NETWORK_PROV_WIFI_STA_AUTH_ERROR) ? "Authentication Failed" : "AP Not Found");
153153
#endif
154154
arduino_event.event_id = ARDUINO_EVENT_PROV_CRED_FAIL;
155-
memcpy(&arduino_event.event_info.prov_fail_reason, event_data, sizeof(wifi_prov_sta_fail_reason_t));
156-
} else if (event_base == WIFI_PROV_EVENT && event_id == WIFI_PROV_CRED_SUCCESS) {
155+
memcpy(&arduino_event.event_info.prov_fail_reason, event_data, sizeof(network_prov_wifi_sta_fail_reason_t));
156+
} else if (event_base == NETWORK_PROV_EVENT && event_id == NETWORK_PROV_WIFI_CRED_SUCCESS) {
157157
log_v("Provisioning Success!");
158158
arduino_event.event_id = ARDUINO_EVENT_PROV_CRED_SUCCESS;
159159
}
@@ -174,8 +174,8 @@ static bool initWiFiEvents() {
174174
return false;
175175
}
176176

177-
if (esp_event_handler_instance_register(WIFI_PROV_EVENT, ESP_EVENT_ANY_ID, &_arduino_event_cb, NULL, NULL)) {
178-
log_e("event_handler_instance_register for WIFI_PROV_EVENT Failed!");
177+
if (esp_event_handler_instance_register(NETWORK_PROV_EVENT, ESP_EVENT_ANY_ID, &_arduino_event_cb, NULL, NULL)) {
178+
log_e("event_handler_instance_register for NETWORK_PROV_EVENT Failed!");
179179
return false;
180180
}
181181

@@ -193,8 +193,8 @@ static bool deinitWiFiEvents() {
193193
return false;
194194
}
195195

196-
if (esp_event_handler_unregister(WIFI_PROV_EVENT, ESP_EVENT_ANY_ID, &_arduino_event_cb)) {
197-
log_e("esp_event_handler_unregister for WIFI_PROV_EVENT Failed!");
196+
if (esp_event_handler_unregister(NETWORK_PROV_EVENT, ESP_EVENT_ANY_ID, &_arduino_event_cb)) {
197+
log_e("esp_event_handler_unregister for NETWORK_PROV_EVENT Failed!");
198198
return false;
199199
}
200200

‎libraries/WiFi/src/WiFiGeneric.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include "esp_smartconfig.h"
3434
#include "esp_netif_types.h"
3535
#include "esp_eth_driver.h"
36-
#include "wifi_provisioning/manager.h"
36+
#include "network_provisioning/manager.h"
3737
#include "lwip/ip_addr.h"
3838

3939
#include "Network.h"

‎libraries/WiFiProv/examples/WiFiProv/WiFiProv.ino‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ void SysProvEvent(arduino_event_t *sys_event) {
3838
case ARDUINO_EVENT_PROV_CRED_FAIL:
3939
{
4040
Serial.println("\nProvisioning failed!\nPlease reset to factory and retry provisioning\n");
41-
if (sys_event->event_info.prov_fail_reason == WIFI_PROV_STA_AUTH_ERROR) {
41+
if (sys_event->event_info.prov_fail_reason == NETWORK_PROV_WIFI_STA_AUTH_ERROR) {
4242
Serial.println("\nWi-Fi AP password incorrect");
4343
} else {
4444
Serial.println("\nWi-Fi AP not found....Add API \" nvs_flash_erase() \" before beginProvision()");
@@ -62,13 +62,13 @@ void setup() {
6262
// Sample uuid that user can pass during provisioning using BLE
6363
uint8_t uuid[16] = {0xb4, 0xdf, 0x5a, 0x1c, 0x3f, 0x6b, 0xf4, 0xbf, 0xea, 0x4a, 0x82, 0x03, 0x04, 0x90, 0x1a, 0x02};
6464
WiFiProv.beginProvision(
65-
WIFI_PROV_SCHEME_BLE, WIFI_PROV_SCHEME_HANDLER_FREE_BLE, WIFI_PROV_SECURITY_1, pop, service_name, service_key, uuid, reset_provisioned
65+
NETWORK_PROV_SCHEME_BLE, NETWORK_PROV_SCHEME_HANDLER_FREE_BLE, NETWORK_PROV_SECURITY_1, pop, service_name, service_key, uuid, reset_provisioned
6666
);
6767
log_d("ble qr");
6868
WiFiProv.printQR(service_name, pop, "ble");
6969
#else
7070
Serial.println("Begin Provisioning using Soft AP");
71-
WiFiProv.beginProvision(WIFI_PROV_SCHEME_SOFTAP, WIFI_PROV_SCHEME_HANDLER_NONE, WIFI_PROV_SECURITY_1, pop, service_name, service_key);
71+
WiFiProv.beginProvision(NETWORK_PROV_SCHEME_SOFTAP, NETWORK_PROV_SCHEME_HANDLER_NONE, NETWORK_PROV_SECURITY_1, pop, service_name, service_key);
7272
log_d("wifi qr");
7373
WiFiProv.printQR(service_name, pop, "softap");
7474
#endif

0 commit comments

Comments
 (0)