set to nullptr to allow reusability within _esp32.h network iface

Author: brentru

src/Wippersnapper.cpp

@@ -83,8 +83,8 @@ void Wippersnapper::provision() {
   _nvs = new Wippersnapper_ESP32_nvs();
   _nvs->parseSecrets();
 #endif
-  // Set credentials
-  set_user_key();
+
+  // Set WiFi credentials within network interface
   set_ssid_pass();
 }
 
@@ -1194,8 +1194,6 @@ void Wippersnapper::errorWriteHang(String error) {
 /**************************************************************************/
 void Wippersnapper::runNetFSM() {
   WS.feedWDT();
-  // MQTT connack RC
-  int mqttRC;
   // Initial state
   fsm_net_t fsmNetwork;
   fsmNetwork = FSM_NET_CHECK_MQTT;
@@ -1250,7 +1248,7 @@ void Wippersnapper::runNetFSM() {
       maxAttempts = 10;
       while (maxAttempts >= 0) {
         setStatusLEDColor(LED_IO_CONNECT);
-        mqttRC = WS._mqtt->connect();
+        int8_t mqttRC = WS._mqtt->connect(WS._username, WS._key);
         if (mqttRC == WS_MQTT_CONNECTED) {
           fsmNetwork = FSM_NET_CHECK_MQTT;
           break;

src/network_interfaces/Wippersnapper_ESP32.h

@@ -100,15 +100,8 @@ 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_DEBUG_PRINTLN("IO ADAFRUIT TEST L114");
       WS._mqttBrokerURL = "io.adafruit.com";
       _mqtt_client->setCACert(_aio_root_ca_prod);
     } else {

src/provisioning/Wippersnapper_ESP32_nvs.cpp

@@ -59,17 +59,12 @@ void Wippersnapper_ESP32_nvs::parseSecrets() {
       ;
   }
 
-  // optional NVS staging url
-  _aioURL = nvs.getString("wsAIOURL", "");
-  if (_aioURL.length() == 0)
-    _aioURL = "io.adafruit.com";
-
   // 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();
+  WS._mqttBrokerURL = nullptr;
 }
 
 #endif // ARDUINO_ARCH_ESP32

src/provisioning/tinyusb/Wippersnapper_FS.cpp

@@ -340,7 +340,7 @@ void Wippersnapper_FS::parseSecrets() {
         "effect");
     fsHalt();
   }
-  WS._username = _fileSystem->io_username;
+  WS._username = io_username;
 
   // Get io key
   io_key = doc["io_key"];
@@ -350,7 +350,7 @@ void Wippersnapper_FS::parseSecrets() {
     writeErrorToBootOut("ERROR: invalid io_key value in secrets.json!");
     fsHalt();
   }
-  WS._key = _fileSystem->io_key;
+  WS._key = io_key;
 
   // next, we detect the network interface from the `secrets.json`
   WS_DEBUG_PRINTLN("Attempting to find network interface...");