feedc0de/arduino-esp32
1
0
Fork 0
forked from espressif/arduino-esp32
Code Pull Requests Activity

Implemented new types of SmartConfig (#6367)

Browse Source
This commit is contained in:
P-R-O-C-H-Y
2022-03-02 14:18:20 +01:00
committed by GitHub
parent 683dbf3b1b
commit e8d6050a7b
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libraries/WiFi/src/WiFiSTA.cpp
View File

@ -655,8 +655,15 @@ IPv6Address WiFiSTAClass::localIPv6()
bool WiFiSTAClass::_smartConfigStarted = false; bool WiFiSTAClass::_smartConfigStarted = false;
bool WiFiSTAClass::_smartConfigDone = false; bool WiFiSTAClass::_smartConfigDone = false;
/**
bool WiFiSTAClass::beginSmartConfig() { * @brief
*
* @param type Select type of SmartConfig. Default type is SC_TYPE_ESPTOUCH
* @param crypt_key When using type SC_TYPE_ESPTOUTCH_V2 crypt key needed, else ignored. Lenght should be 16 chars.
* @return true if configuration is successful.
* @return false if configuration fails.
*/
bool WiFiSTAClass::beginSmartConfig(smartconfig_type_t type, char* crypt_key) {
esp_err_t err; esp_err_t err;
if (_smartConfigStarted) { if (_smartConfigStarted) {
return false; return false;
@ -668,7 +675,13 @@ bool WiFiSTAClass::beginSmartConfig() {
esp_wifi_disconnect(); esp_wifi_disconnect();
smartconfig_start_config_t conf = SMARTCONFIG_START_CONFIG_DEFAULT(); smartconfig_start_config_t conf = SMARTCONFIG_START_CONFIG_DEFAULT();
err = esp_smartconfig_set_type(SC_TYPE_ESPTOUCH);
if (type == SC_TYPE_ESPTOUCH_V2){
conf.esp_touch_v2_enable_crypt = true;
conf.esp_touch_v2_key = crypt_key;
}
err = esp_smartconfig_set_type(type);
if (err != ESP_OK) { if (err != ESP_OK) {
log_e("SmartConfig Set Type Failed!"); log_e("SmartConfig Set Type Failed!");
return false; return false;

2
libraries/WiFi/src/WiFiSTA.h
View File

@ -92,7 +92,7 @@ protected:
static bool _autoReconnect; static bool _autoReconnect;
public: public:
bool beginSmartConfig(); bool beginSmartConfig(smartconfig_type_t type = SC_TYPE_ESPTOUCH, char* crypt_key = NULL);
bool stopSmartConfig(); bool stopSmartConfig();
bool smartConfigDone(); bool smartConfigDone();