Seich
/
HomeSpan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Completed and tested all statusCallback and statusString logic

This commit is contained in:
Gregg 2022-10-30 08:49:53 -05:00
parent 0929a04270
commit f775a63b7a
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/HomeSpan.cpp
View File

@ -771,7 +771,7 @@ void Span::processSerialCommand(const char *c){
network.serialConfigure(); network.serialConfigure();
nvs_set_blob(wifiNVS,"WIFIDATA",&network.wifiData,sizeof(network.wifiData)); // update data nvs_set_blob(wifiNVS,"WIFIDATA",&network.wifiData,sizeof(network.wifiData)); // update data
nvs_commit(wifiNVS); // commit to NVS nvs_commit(wifiNVS); // commit to NVS
Serial.print("\n*** WiFi Credentials SAVED! Re-starting ***\n\n"); Serial.print("\n*** WiFi Credentials SAVED! Restarting ***\n\n");
reboot(); reboot();
} }
break; break;
@ -793,7 +793,7 @@ void Span::processSerialCommand(const char *c){
network.apConfigure(); network.apConfigure();
nvs_set_blob(wifiNVS,"WIFIDATA",&network.wifiData,sizeof(network.wifiData)); // update data nvs_set_blob(wifiNVS,"WIFIDATA",&network.wifiData,sizeof(network.wifiData)); // update data
nvs_commit(wifiNVS); // commit to NVS nvs_commit(wifiNVS); // commit to NVS
Serial.print("\n*** Credentials saved!\n\n"); Serial.print("\n*** Credentials saved!\n");
if(strlen(network.setupCode)){ if(strlen(network.setupCode)){
char s[10]; char s[10];
sprintf(s,"S%s",network.setupCode); sprintf(s,"S%s",network.setupCode);
@ -802,7 +802,8 @@ void Span::processSerialCommand(const char *c){
Serial.print("*** Setup Code Unchanged\n"); Serial.print("*** Setup Code Unchanged\n");
} }
Serial.print("\n*** Re-starting ***\n\n"); Serial.print("\n*** Restarting...\n\n");
STATUS_UPDATE(start(LED_ALERT),HS_AP_TERMINATED)
reboot(); reboot();
} }
break; break;
@ -812,7 +813,7 @@ void Span::processSerialCommand(const char *c){
nvs_erase_all(wifiNVS); nvs_erase_all(wifiNVS);
nvs_commit(wifiNVS); nvs_commit(wifiNVS);
WiFi.begin("none"); WiFi.begin("none");
Serial.print("\n*** WiFi Credentials ERASED! Re-starting...\n\n"); Serial.print("\n*** WiFi Credentials ERASED! Restarting...\n\n");
reboot(); reboot();
} }
break; break;

2
src/Network.cpp
View File

@ -153,7 +153,7 @@ void Network::apConfigure(){
while(1){ // loop until we get timed out (which will be accelerated if save/cancel selected) while(1){ // loop until we get timed out (which will be accelerated if save/cancel selected)
if(homeSpan.controlButton && homeSpan.controlButton->triggered(9999,3000)){ if(homeSpan.controlButton && homeSpan.controlButton->triggered(9999,3000)){
Serial.print("\n*** Access Point Terminated."); Serial.print("\n*** Access Point Terminated. Restarting...\n\n");
STATUS_UPDATE(start(LED_ALERT),HS_AP_TERMINATED) STATUS_UPDATE(start(LED_ALERT),HS_AP_TERMINATED)
homeSpan.controlButton->wait(); homeSpan.controlButton->wait();
homeSpan.reboot(); homeSpan.reboot();

2
src/Network.h
View File

@ -44,7 +44,7 @@ struct Network {
const char *apSSID=DEFAULT_AP_SSID; // Access Point SSID const char *apSSID=DEFAULT_AP_SSID; // Access Point SSID
const char *apPassword=DEFAULT_AP_PASSWORD; // Access Point password (does not need to be secret - only used to ensure excrypted WiFi connection) const char *apPassword=DEFAULT_AP_PASSWORD; // Access Point password (does not need to be secret - only used to ensure excrypted WiFi connection)
unsigned long lifetime=DEFAULT_AP_TIMEOUT*1000; // length of time (in milliseconds) to keep Access Point alive before shutting down and re-starting unsigned long lifetime=DEFAULT_AP_TIMEOUT*1000; // length of time (in milliseconds) to keep Access Point alive before shutting down and restarting
char **ssidList=NULL; char **ssidList=NULL;
int numSSID; int numSSID;