simplify ESP32_NVS to one funcn call

Author: brentru

src/Wippersnapper.cpp

@@ -84,15 +84,8 @@ void Wippersnapper::provision() {
 #elif defined(USE_NVS)
   // init esp32 nvs partition namespace
   _nvs = new Wippersnapper_ESP32_nvs();
-  // validate esp32 has been programmed with credentials
-  if (!_nvs->validateNVSConfig()) {
-    WS_DEBUG_PRINTLN(
-        "ERROR: NVS partition or credentials not found - was NVS flashed?");
-    while (1)
-      yield();
-  }
-  // pull values out of NVS configuration
-  _nvs->setNVSConfig();
+  // parse out secrets
+  _nvs->parseSecrets();
 #endif
   // Set credentials
   set_user_key();

src/network_interfaces/Wippersnapper_ESP32.h

@@ -100,6 +100,14 @@ class Wippersnapper_ESP32 : public Wippersnapper {
   */
   /********************************************************/
   void setupMQTTClient(const char *clientID) {
+    WS_DEBUG_PRINT("BROKER URL: ");
+    WS_DEBUG_PRINT(WS._mqttBrokerURL);
+
+    WS_DEBUG_PRINT("USERNAME: ");
+    WS_DEBUG_PRINT(WS._username);
+    WS_DEBUG_PRINT("KEY: ");
+    WS_DEBUG_PRINT(WS._key);
+
     if (WS._mqttBrokerURL == nullptr) {
       WS._mqttBrokerURL = "io.adafruit.com";
       _mqtt_client->setCACert(_aio_root_ca_prod);

src/provisioning/Wippersnapper_ESP32_nvs.cpp

@@ -22,8 +22,12 @@
 */
 /****************************************************************************/
 Wippersnapper_ESP32_nvs::Wippersnapper_ESP32_nvs() {
-  // init. nvs, read-only
-  nvs.begin("wsNamespace", false);
+  // Attempt to initialize NVS partition
+  if (!nvs.begin("wsNamespace", false)) {
+    WS.setStatusLEDColor(RED);
+    while (1)
+      ;
+  }
 }
 
 /****************************************************************************/
@@ -35,39 +39,31 @@ Wippersnapper_ESP32_nvs::~Wippersnapper_ESP32_nvs() { nvs.end(); }
 
 /****************************************************************************/
 /*!
-    @brief    Reads and validates credentials from nvs' "wsNamespace"
+    @brief    Reads, validates, and sets credentials from nvs' "wsNamespace"
                 namespace.
-    @returns  True if credentials were found, False otherwise.
 */
 /****************************************************************************/
-bool Wippersnapper_ESP32_nvs::validateNVSConfig() {
+void Wippersnapper_ESP32_nvs::parseSecrets() {
+  // parsey
   _ssid = nvs.getString("wsNetSSID", "");
   _ssidPass = nvs.getString("wsNetPass", "");
   _aioUser = nvs.getString("wsAIOUser", "");
   _aioPass = nvs.getString("wsAIOKey", "");
   _aioURL = nvs.getString("wsAIOURL", "");
 
-  // validate config properly set in partition
+  // Validate configuration was set within the partition
   if (_ssid == "" || _ssidPass == "" || _aioUser == "" || _aioPass == "") {
-    // TODO: Possibly LED blink/some external error handling around this
-    return false;
+    WS.setStatusLEDColor(RED);
+    while (1)
+      ;
   }
-  return true;
-}
 
-/****************************************************************************/
-/*!
-    @brief    Sets Wippersnapper configuration using nvs configuration
-    @returns  True if credentials set successfully, False otherwise.
-*/
-/****************************************************************************/
-bool Wippersnapper_ESP32_nvs::setNVSConfig() {
+  // Set global configuration strings
   WS._network_ssid = _ssid.c_str();
   WS._network_pass = _ssidPass.c_str();
   WS._username = _aioUser.c_str();
   WS._key = _aioPass.c_str();
   WS._mqttBrokerURL = _aioURL.c_str();
-  return true;
 }
 
 #endif // ARDUINO_ARCH_ESP32

src/provisioning/Wippersnapper_ESP32_nvs.h

@@ -29,9 +29,7 @@ class Wippersnapper_ESP32_nvs {
 public:
   Wippersnapper_ESP32_nvs();
   ~Wippersnapper_ESP32_nvs();
-
-  bool validateNVSConfig();
-  bool setNVSConfig();
+  void parseSecrets();
 
   Preferences nvs; ///< Provides access to ESP32's Non-Volatile Storage