WIP: logging around connected/publish

Author: tyeth

src/Wippersnapper.cpp

@@ -2364,7 +2364,7 @@ void Wippersnapper::runNetFSM() {
   while (fsmNetwork != FSM_NET_CONNECTED) {
     switch (fsmNetwork) {
     case FSM_NET_CHECK_MQTT:
-      if (WS._mqtt->connected()) {
+      if (WS._mqtt->connected() && networkStatus() == WS_NET_CONNECTED) {
         // WS_DEBUG_PRINTLN("Connected to Adafruit IO!");
         fsmNetwork = FSM_NET_CONNECTED;
         return;
@@ -2659,18 +2659,26 @@ bool Wippersnapper::publish(const char *topic, uint8_t *payload, uint16_t bLen,
   // method when caused with WS object in another file.
   WS.feedWDT();
   if (!WS._mqtt->publish(topic, payload, bLen, qos)) {
-    if (WS._mqtt->connected()) {
+    WS_DEBUG_PRINTLN("FAILED!");
+    WS_DEBUG_PRINT("Mqtt connected: ");
+    WS_DEBUG_PRINTLN(WS._mqtt->connected());
+    WS_DEBUG_PRINT("Network status: ");
+    WS_DEBUG_PRINTLN(networkStatus());
+    if (WS._mqtt->connected() && networkStatus() == WS_NET_CONNECTED) {
       WS_DEBUG_PRINTLN("Failed to publish MQTT message, retrying!");
     } else {
-      WS_DEBUG_PRINTLN("MQTT Disconnected! Running network FSM then publish...");
+      WS_DEBUG_PRINTLN("MQTT connection broken! Running network FSM then publish...");
       WS._mqtt->disconnect();
+      WS_DEBUG_PRINTLN("MQTT forcibly disconnected. Running Network FSM...");
       runNetFSM();
     }
     WS.feedWDT();
+    WS_DEBUG_PRINTLN("Retrying publish...");
     if (!WS._mqtt->publish(topic, payload, bLen, qos)) {
       WS_DEBUG_PRINTLN("Failed to publish MQTT message!");
       return false;
     }
+    WS_DEBUG_PRINTLN("MQTT message published successfully!");
   }
   return true;
 }

src/nanopb/ws_pb_helpers.cpp

@@ -30,6 +30,27 @@
 // *****************************************************************************
 bool ws_pb_decode(pb_istream_t *stream, const pb_msgdesc_t *fields,
                   void *dest_struct) {
+  if(!stream || !fields || !dest_struct) {
+    WS_DEBUG_PRINTLN("Protobuf decode error: Invalid arguments to function");
+    if (!stream) {
+      WS_DEBUG_PRINTLN("stream is NULL");
+    } else if (stream == nullptr) {
+      WS_DEBUG_PRINTLN("stream is nullptr");
+    }
+    
+    if (!fields) {
+      WS_DEBUG_PRINTLN("fields is NULL");
+    } else if (fields == nullptr) {
+      WS_DEBUG_PRINTLN("fields is nullptr");
+    }
+
+    if (!dest_struct) {
+      WS_DEBUG_PRINTLN("dest_struct is NULL");
+    } else if (dest_struct == nullptr) {
+      WS_DEBUG_PRINTLN("dest_struct is nullptr");
+    }
+    return false;
+  }
   bool status = pb_decode(stream, fields, dest_struct);
   if (!status) {
     WS_DEBUG_PRINT("Protobuf decode error: ");
@@ -52,6 +73,27 @@ bool ws_pb_decode(pb_istream_t *stream, const pb_msgdesc_t *fields,
 // *****************************************************************************
 bool ws_pb_encode(pb_ostream_t *stream, const pb_msgdesc_t *fields,
                   const void *src_struct) {
+  if(!stream || !fields || !src_struct) {
+    WS_DEBUG_PRINTLN("Protobuf encode error: Invalid arguments to function");
+    if (!stream) {
+      WS_DEBUG_PRINTLN("stream is NULL");
+    } else if (stream == nullptr) {
+      WS_DEBUG_PRINTLN("stream is nullptr");
+    }
+    
+    if (!fields) {
+      WS_DEBUG_PRINTLN("fields is NULL");
+    } else if (fields == nullptr) {
+      WS_DEBUG_PRINTLN("fields is nullptr");
+    }
+
+    if (!src_struct) {
+      WS_DEBUG_PRINTLN("src_struct is NULL");
+    } else if (src_struct == nullptr) {
+      WS_DEBUG_PRINTLN("src_struct is nullptr");
+    }
+    return false;
+  }
   bool status = pb_encode(stream, fields, src_struct);
   if (!status) {
     WS_DEBUG_PRINT("Protobuf encode error: ");