Add uc8253 3.7" mono

src/Wippersnapper.cpp

@@ -33,7 +33,9 @@
 
 #include "Wippersnapper.h"
 
-Wippersnapper WS;
+// Define the global WS instance as the platform-specific derived class,
+// ensuring virtual methods [_connect()] route to the correct implementation
+Wippersnapper_WiFi WS; //!< Global instance of Wippersnapper_WiFi
 
 Wippersnapper::Wippersnapper() {
   _mqtt = 0; // MQTT Client object
@@ -521,8 +523,7 @@ void publishI2CResponse(wippersnapper_signal_v1_I2CResponse *msgi2cResponse) {
   pb_get_encoded_size(&msgSz, wippersnapper_signal_v1_I2CResponse_fields,
                       msgi2cResponse);
   WS_DEBUG_PRINTLN("Publishing Message: I2CResponse...");
-  if (!WS._mqtt->publish(WS._topic_signal_i2c_device, WS._buffer_outgoing,
-                         msgSz, 0)) {
+  if (!WS.publish(WS._topic_signal_i2c_device, WS._buffer_outgoing, msgSz, 0)) {
     WS_DEBUG_PRINTLN("\tERROR: Failed to publish I2C Response!");
   } else {
     WS_DEBUG_PRINTLN("Published!");
@@ -965,8 +966,7 @@ bool cbDecodeServoMsg(pb_istream_t *stream, const pb_field_t *field,
     pb_get_encoded_size(&msgSz, wippersnapper_signal_v1_ServoResponse_fields,
                         &msgServoResp);
     WS_DEBUG_PRINT("-> Servo Attach Response...");
-    WS._mqtt->publish(WS._topic_signal_servo_device, WS._buffer_outgoing, msgSz,
-                      1);
+    WS.publish(WS._topic_signal_servo_device, WS._buffer_outgoing, msgSz, 1);
     WS_DEBUG_PRINTLN("Published!");
   } else if (field->tag ==
              wippersnapper_signal_v1_ServoRequest_servo_write_tag) {
@@ -1106,8 +1106,8 @@ bool cbPWMDecodeMsg(pb_istream_t *stream, const pb_field_t *field, void **arg) {
     pb_get_encoded_size(&msgSz, wippersnapper_signal_v1_PWMResponse_fields,
                         &msgPWMResponse);
     WS_DEBUG_PRINT("PUBLISHING: PWM Attach Response...");
-    if (!WS._mqtt->publish(WS._topic_signal_pwm_device, WS._buffer_outgoing,
-                           msgSz, 1)) {
+    if (!WS.publish(WS._topic_signal_pwm_device, WS._buffer_outgoing, msgSz,
+                    1)) {
       WS_DEBUG_PRINTLN("ERROR: Failed to publish PWM Attach Response!");
       return false;
     }
@@ -1468,8 +1468,8 @@ bool cbDecodeUARTMessage(pb_istream_t *stream, const pb_field_t *field,
     pb_get_encoded_size(&msgSz, wippersnapper_signal_v1_UARTResponse_fields,
                         &msgUARTResponse);
     WS_DEBUG_PRINT("PUBLISHING: UART Attach Response...");
-    if (!WS._mqtt->publish(WS._topic_signal_uart_device, WS._buffer_outgoing,
-                           msgSz, 1)) {
+    if (!WS.publish(WS._topic_signal_uart_device, WS._buffer_outgoing, msgSz,
+                    1)) {
       WS_DEBUG_PRINTLN("ERROR: Failed to publish UART Attach Response!");
       return false;
     }
@@ -1580,8 +1580,8 @@ bool cbDecodeDisplayMsg(pb_istream_t *stream, const pb_field_t *field,
     pb_get_encoded_size(&msgSz, wippersnapper_signal_v1_DisplayResponse_fields,
                         &msgResp);
     WS_DEBUG_PRINTLN("Publishing DisplayResponse Message...");
-    if (!WS._mqtt->publish(WS._topic_signal_display_device, WS._buffer_outgoing,
-                           msgSz, 0)) {
+    if (!WS.publish(WS._topic_signal_display_device, WS._buffer_outgoing, msgSz,
+                    0)) {
       WS_DEBUG_PRINTLN("ERROR: Failed to Publish DisplayResponse!");
     } else {
       WS_DEBUG_PRINTLN("Published!");
@@ -2418,7 +2418,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;
@@ -2671,16 +2671,38 @@ void Wippersnapper::processPackets() {
             The length of the payload.
     @param  qos
             The Quality of Service to publish with.
+    @return True if publish was successful, False otherwise.
 */
 /*******************************************************/
-void Wippersnapper::publish(const char *topic, uint8_t *payload, uint16_t bLen,
+bool Wippersnapper::publish(const char *topic, uint8_t *payload, uint16_t bLen,
                             uint8_t qos) {
   // runNetFSM(); // NOTE: Removed for now, causes error with virtual _connect
   // method when caused with WS object in another file.
   WS.feedWDT();
   if (!WS._mqtt->publish(topic, payload, bLen, qos)) {
-    WS_DEBUG_PRINTLN("Failed to publish MQTT message!");
+    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 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/Wippersnapper.h

@@ -293,7 +293,7 @@ class Wippersnapper {
   // run() loop
   ws_status_t run();
   void processPackets();
-  void publish(const char *topic, uint8_t *payload, uint16_t bLen,
+  bool publish(const char *topic, uint8_t *payload, uint16_t bLen,
                uint8_t qos = 0);
 
   // Networking helpers
@@ -501,6 +501,10 @@ class Wippersnapper {
   wippersnapper_signal_v1_CreateSignalRequest
       _outgoingSignalMsg; /*!< Outgoing signal message from device */
 };
-extern Wippersnapper WS; ///< Global member variable for callbacks
+
+// Include networking to get the platform-specific Wippersnapper_WiFi typedef
+#include "Wippersnapper_Networking.h"
+
+// Global WS instance - defined as platform-specific type in Wippersnapper.cpp
 
 #endif // ADAFRUIT_WIPPERSNAPPER_H

src/components/analogIO/Wippersnapper_AnalogIO.h

@@ -81,6 +81,5 @@ class Wippersnapper_AnalogIO {
   int32_t _totalAnalogInputPins;      /*!< Total number of analog input pins */
   analogInputPin *_analog_input_pins; /*!< Array of analog pin objects */
 };
-extern Wippersnapper WS; /*!< Wippersnapper variable. */
 
 #endif // WIPPERSNAPPER_DIGITALGPIO_H

src/components/digitalIO/Wippersnapper_DigitalGPIO.h

@@ -57,6 +57,5 @@ class Wippersnapper_DigitalGPIO {
   int32_t
       _totalDigitalInputPins; /*!< Total number of digital-input capable pins */
 };
-extern Wippersnapper WS;
 
 #endif // WIPPERSNAPPER_DIGITALGPIO_H

src/components/display/controller.cpp

@@ -13,6 +13,7 @@
  *
  */
 #include "controller.h"
+#include "Wippersnapper_Networking.h"
 
 /*!
     @brief  Constructs a new DisplayController object
@@ -84,14 +85,17 @@ bool DisplayController::Handle_Display_AddOrReplace(
   }
 
   WS.runNetFSM();
+  WS.pingBroker();
   display->showSplash();
+
   WS.runNetFSM();
+  WS.pingBroker();
   display->drawStatusBar(WS._config.aio_user);
-  WS.runNetFSM();
 
   _hw_instances.push_back(display); // Store the display instance
   WS_DEBUG_PRINTLN("[display] Display added or replaced successfully!");
   WS.runNetFSM();
+  WS.pingBroker();
   return true;
 }
 

src/components/display/controller.h

@@ -43,5 +43,5 @@ class DisplayController {
       _hw_instances; ///< Holds pointers to DisplayHardware instances
   unsigned long _last_bar_update; ///< Timestamp of last status bar update
 };
-extern Wippersnapper WS; ///< Global WS instance
+
 #endif