Commit 59d51de

authored

Merge pull request #10677 from kvp1703/fix/wifi_provision

fix: Split provisioning into two parts for better synchronization

2 parents d55160c + 4ecfd35 commit 59d51deCopy full SHA for 59d51de

File tree

3 files changed

+30

-8

lines changed

libraries
- RainMaker/examples/RMakerSwitch
  - RMakerSwitch.ino
- WiFiProv/src
  - WiFiProv.cpp
  - WiFiProv.h

3 files changed

+30

-8

lines changed

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

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,12 @@ void setup() {`
`94`	`94`
`95`	`95`	`RMaker.enableSystemService(SYSTEM_SERV_FLAGS_ALL, 2, 2, 2);`
`96`	`96`
	`97`	`+#if CONFIG_IDF_TARGET_ESP32S2`
	`98`	`+ WiFiProv.initProvision(NETWORK_PROV_SCHEME_SOFTAP, NETWORK_PROV_SCHEME_HANDLER_NONE);`
	`99`	`+#else`
	`100`	`+ WiFiProv.initProvision(NETWORK_PROV_SCHEME_BLE, NETWORK_PROV_SCHEME_HANDLER_FREE_BTDM);`
	`101`	`+#endif`
	`102`	`+`
`97`	`103`	`RMaker.start();`
`98`	`104`
`99`	`105`	`WiFi.onEvent(sysProvEvent); // Will call sysProvEvent() from another thread.`

`‎libraries/WiFiProv/src/WiFiProv.cpp‎`

Lines changed: 17 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -72,13 +72,11 @@ static void get_device_service_name(prov_scheme_t prov_scheme, char *service_nam`
`72`	`72`	`#endif`
`73`	`73`	`}`
`74`	`74`
`75`		`-void WiFiProvClass ::beginProvision(`
`76`		`- prov_scheme_t prov_scheme, scheme_handler_t scheme_handler, network_prov_security_t security, const char pop, const char service_name,`
`77`		`- const char service_key, uint8_t uuid, bool reset_provisioned`
`78`		`-) {`
`79`		`- bool provisioned = false;`
`80`		`- static char service_name_temp[32];`
`81`		`-`
	`75`	`+void WiFiProvClass ::initProvision(prov_scheme_t prov_scheme, scheme_handler_t scheme_handler, bool reset_provisioned) {`
	`76`	`+ if (this->provInitDone) {`
	`77`	`+ log_i("provInit was already done!");`
	`78`	`+ return;`
	`79`	`+ }`
`82`	`80`	`network_prov_mgr_config_t config;`
`83`	`81`	`#if CONFIG_BLUEDROID_ENABLED`
`84`	`82`	`if (prov_scheme == NETWORK_PROV_SCHEME_BLE) {`
`@@ -118,11 +116,22 @@ void WiFiProvClass ::beginProvision(`
`118`	`116`	`if (reset_provisioned) {`
`119`	`117`	`log_i("Resetting provisioned data.");`
`120`	`118`	`network_prov_mgr_reset_wifi_provisioning();`
`121`		`- } else if (network_prov_mgr_is_wifi_provisioned(&provisioned) != ESP_OK) {`
	`119`	`+ } else if (network_prov_mgr_is_wifi_provisioned(&(this->provisioned)) != ESP_OK) {`
`122`	`120`	`log_e("network_prov_mgr_is_wifi_provisioned failed!");`
`123`	`121`	`network_prov_mgr_deinit();`
`124`	`122`	`return;`
`125`	`123`	`}`
	`124`	`+ this->provInitDone = true;`
	`125`	`+}`
	`126`	`+`
	`127`	`+void WiFiProvClass ::beginProvision(`
	`128`	`+ prov_scheme_t prov_scheme, scheme_handler_t scheme_handler, network_prov_security_t security, const char pop, const char service_name,`
	`129`	`+ const char service_key, uint8_t uuid, bool reset_provisioned`
	`130`	`+) {`
	`131`	`+ if (!this->provInitDone) {`
	`132`	`+ WiFiProvClass ::initProvision(prov_scheme, scheme_handler, reset_provisioned);`
	`133`	`+ }`
	`134`	`+ static char service_name_temp[32];`
`126`	`135`	`if (provisioned == false) {`
`127`	`136`	`#if CONFIG_BLUEDROID_ENABLED`
`128`	`137`	`if (prov_scheme == NETWORK_PROV_SCHEME_BLE) {`

`‎libraries/WiFiProv/src/WiFiProv.h‎`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,14 @@ typedef enum {`
`47`	`47`
`48`	`48`	`//Provisioning class`
`49`	`49`	`class WiFiProvClass {`
	`50`	`+private:`
	`51`	`+ bool provInitDone = false;`
	`52`	`+ bool provisioned = false;`
	`53`	`+`
`50`	`54`	`public:`
	`55`	`+ void initProvision(`
	`56`	`+ prov_scheme_t prov_scheme = NETWORK_PROV_SCHEME_SOFTAP, scheme_handler_t scheme_handler = NETWORK_PROV_SCHEME_HANDLER_NONE, bool reset_provisioned = false`
	`57`	`+ );`
`51`	`58`	`void beginProvision(`
`52`	`59`	`prov_scheme_t prov_scheme = NETWORK_PROV_SCHEME_SOFTAP, scheme_handler_t scheme_handler = NETWORK_PROV_SCHEME_HANDLER_NONE,`
`53`	`60`	`network_prov_security_t security = NETWORK_PROV_SECURITY_1, const char pop = "abcd1234", const char service_name = NULL, const char *service_key = NULL,`

0 commit comments

Comments

(0)

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 59d51de

File tree

3 files changed

3 files changed

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

`‎libraries/WiFiProv/src/WiFiProv.cpp‎`

`‎libraries/WiFiProv/src/WiFiProv.h‎`

0 commit comments