From 206d194cc11e136566cc84c4b97d7de9c8e07220 Mon Sep 17 00:00:00 2001
From: Gregg <gregg.berman@me.com>
Date: Wed, 7 Oct 2020 22:20:44 -0500
Subject: [PATCH] Created commandMode()

Universal command mode for control button operation.
---
 src/HomeSpan.cpp | 78 ++++++++++++++++++++++++++++++++++++++++++++----
 src/HomeSpan.h   |  1 +
 2 files changed, 73 insertions(+), 6 deletions(-)

diff --git a/src/HomeSpan.cpp b/src/HomeSpan.cpp
index fcb2743..6228388 100644
--- a/src/HomeSpan.cpp
+++ b/src/HomeSpan.cpp
@@ -59,6 +59,7 @@ void Span::begin(Category catID, char *displayName, char *hostNameBase, char *mo
   Serial.print(homeSpan.displayName);  
   Serial.print("\n\n");
 
+/*
   if(!digitalRead(controlPin)){                     // factory reset pin is low upon start-up
     Serial.print("** CONTROL BUTTON PRESSED DURING STARTUP!  PERFORMING FACTORY RESET **\n\n");
     statusLED.start(LED_ALERT);
@@ -68,6 +69,7 @@ void Span::begin(Category catID, char *displayName, char *hostNameBase, char *mo
     statusLED.off();
     ESP.restart();
   }
+*/
       
 }  // begin
 
@@ -190,13 +192,12 @@ void Span::poll() {
     statusLED.start(LED_ALERT);
   }
   
-  if(controlButton.triggered(5000,10000)){
+  if(controlButton.triggered(3000,10000)){
     statusLED.off();
     if(controlButton.longPress()){
-      processSerialCommand("W");        // DELETE WiFi Data      
+      processSerialCommand("F");        // FACTORY RESET
     } else {
-      controlButton.reset();
-      processSerialCommand("U");        // UNPAIR Device
+      commandMode();                    // COMMAND MODE
     }
   }
     
@@ -216,6 +217,57 @@ int Span::getFreeSlot(){
 
 //////////////////////////////////////
 
+void Span::commandMode(){
+  
+  Serial.print("*** ENTERING COMMAND MODE ***\n\n");
+  int mode=1;
+  boolean done=false;
+  statusLED.start(500,0.3,mode,1000);
+
+  while(!done){
+    if(controlButton.triggered(10,3000)){
+      if(!controlButton.longPress()){
+        mode++;
+        if(mode==4)
+          mode=1;
+        statusLED.start(500,0.3,mode,1000);        
+      } else {
+        done=true;
+      }
+    } // button press
+  } // while
+
+  statusLED.start(LED_ALERT);
+  delay(2000);
+  
+  switch(mode){
+
+    case 1:
+      Serial.print("*** NO ACTION\n\n");
+      if(strlen(network.wifiData.ssid)==0)
+        statusLED.start(LED_WIFI_NEEDED);
+      else
+      if(!HAPClient::nAdminControllers())
+        statusLED.start(LED_PAIRING_NEEDED);
+      else
+        statusLED.on();
+    break;
+
+    case 2:
+      processSerialCommand("X");
+    break;
+      
+    case 3:
+      processSerialCommand("U");
+    break;    
+    
+  } // switch
+  
+  Serial.print("*** EXITING COMMAND MODE ***\n\n");
+}
+
+//////////////////////////////////////
+
 void Span::initWifi(){
 
   char id[18];                              // create string version of Accessory ID for MDNS broadcast
@@ -543,13 +595,25 @@ void Span::processSerialCommand(char *c){
 
     case 'F': {
       
-      nvs_flash_erase();
+      nvs_erase_all(HAPClient::hapNVS);
+      nvs_commit(HAPClient::hapNVS);      
+      nvs_erase_all(HAPClient::wifiNVS);
+      nvs_commit(HAPClient::wifiNVS);      
       Serial.print("\n** FACTORY RESET **\n** Restarting...\n\n");
       delay(1000);
       ESP.restart();
     }
     break;
 
+    case 'E': {
+      
+      nvs_flash_erase();
+      Serial.print("\n** ALL DATA ERASED **\n** Restarting...\n\n");
+      delay(1000);
+      ESP.restart();
+    }
+    break;
+
     case 'L': {
 
       int level=0;
@@ -600,8 +664,10 @@ void Span::processSerialCommand(char *c){
       Serial.print("  i - print detailed info about configuration\n");
       Serial.print("  U - unpair device by deleting all Controller data\n");
       Serial.print("  X - disconnect from WiFi and delete WiFi credentials\n");      
+      Serial.print("  W - configure WiFi credentials and connect\n");      
       Serial.print("  H - delete stored HomeKit Pairing data and restart\n");      
-      Serial.print("  F - delete all stored data (Factory Reset) and restart\n");      
+      Serial.print("  F - factory reset\n");      
+      Serial.print("  E - delete all stored data and restart\n");      
       Serial.print("  ? - print this list of commands\n");
       Serial.print("  L <level> - change Log Level to <level>\n");
       Serial.print("  S <code>  - change Setup Code to 8-digit <code>\n");
diff --git a/src/HomeSpan.h b/src/HomeSpan.h
index 4acdf3c..ac65959 100644
--- a/src/HomeSpan.h
+++ b/src/HomeSpan.h
@@ -81,6 +81,7 @@ struct Span{
   void poll();                                  // poll HAP Clients and process any new HAP requests
   int getFreeSlot();                            // returns free HAPClient slot number. HAPClients slot keep track of each active HAPClient connection
   void initWifi();                              // initialize and connect to WiFi network
+  void commandMode();                           // allows user to control and reset HomeSpan settings with the control button
   void processSerialCommand(char *c);           // process command 'c' (typically from readSerial, though can be called with any 'c')
 
   int sprintfAttributes(char *cBuf);            // prints Attributes JSON database into buf, unless buf=NULL; return number of characters printed, excluding null terminator, even if buf=NULL