Implement HandleDisplayRemove

Author: brentru

src/Wippersnapper.cpp

@@ -1682,8 +1682,8 @@ bool cbDecodeDisplayMsg(pb_istream_t *stream, const pb_field_t *field, void **ar
 
     // Attempt to add or replace a display component
     bool did_add = WS._displayController->Handle_Display_AddOrReplace(&msgAddReq);
-    // TODO: Add response handling and publishing here
-
+    // TODO: Add response handling and publishing here, for now it always returns true and doesnt publish back to the broker
+  }
   return true;
 }
 

src/Wippersnapper_demo.ino.cpp

@@ -24,39 +24,64 @@ DisplayController::DisplayController() {
 /*!
     @brief  Destructor
 */
-DisplayController::DisplayController() {
+DisplayController::~DisplayController() {
   // TODO
 }
 
 /*!
     @brief  Handles a Display_AddOrReplace message.
     @param  msgAdd
             Pointer to a DisplayAddOrReplace message structure.
-    @return True if the display was added or replaced successfully, false otherwise.
+    @return True if the display was added or replaced successfully, false
+   otherwise.
 */
-bool DisplayController::Handle_Display_AddOrReplace(wippersnapper_display_v1_DisplayAddOrReplace *msgAdd) {
-    DisplayHardware *display = new DisplayHardware(msgAdd->name);
-
-    // Configure display type
-    display->setType(msgAdd->type);
-
-    // Attempt to initialize display hardware instance
-    bool did_begin = false;
-    if (msgAdd->which_config == wippersnapper_display_v1_DisplayAddOrReplace_epd_config_tag) {
-        did_begin = display->beginEPD(&msgAdd->config.epd_config, &msgAdd->interface_type.spi_epd);
-    } else {
-      WS_DEBUG_PRINTLN("[display] Unsupported display configuration type!");
-      return false;
-    }
+bool DisplayController::Handle_Display_AddOrReplace(
+    wippersnapper_display_v1_DisplayAddOrReplace *msgAdd) {
+  DisplayHardware *display = new DisplayHardware(msgAdd->name);
 
-    // Check if the display began successfully
-    if (!did_begin) {
-      WS_DEBUG_PRINTLN("[display] Failed to initialize display!");
-      delete display; // Clean up if initialization failed
-      return false;
-    }
+  // Configure display type
+  display->setType(msgAdd->type);
+
+  // Attempt to initialize display hardware instance
+  bool did_begin = false;
+  if (msgAdd->which_config ==
+      wippersnapper_display_v1_DisplayAddOrReplace_epd_config_tag) {
+    did_begin = display->beginEPD(&msgAdd->config.epd_config,
+                                  &msgAdd->interface_type.spi_epd);
+  } else {
+    WS_DEBUG_PRINTLN("[display] Unsupported display configuration type!");
+    return false;
+  }
+
+  // Check if the display began successfully
+  if (!did_begin) {
+    WS_DEBUG_PRINTLN("[display] Failed to initialize display!");
+    delete display; // Clean up if initialization failed
+    return false;
+  }
 
-    _hw_instances.push_back(display); // Store the display instance
-    WS_DEBUG_PRINTLN("[display] Display added or replaced successfully!");
-    return true; // Placeholder
+  _hw_instances.push_back(display); // Store the display instance
+  WS_DEBUG_PRINTLN("[display] Display added or replaced successfully!");
+  return true; // Placeholder
 }
+
+/*!
+    @brief  Handles a Display_Remove message.
+    @param  msgRemove
+            Pointer to a DisplayRemove message structure.
+    @return True if the display was removed successfully, false otherwise.
+*/
+bool DisplayController::Handle_Display_Remove(
+    wippersnapper_display_v1_DisplayRemove *msgRemove) {
+  // Find the display instance by name
+  for (auto it = _hw_instances.begin(); it != _hw_instances.end(); ++it) {
+    if (strcmp((*it)->getName(), msgRemove->name) == 0) {
+      delete *it;
+      _hw_instances.erase(it);
+      WS_DEBUG_PRINTLN("[display] Display removed successfully!");
+      return true;
+    }
+  }
+  WS_DEBUG_PRINTLN("[display] Could not remove display, not found!");
+  return false;
+}

src/components/display/controller.cpp

@@ -31,11 +31,13 @@ class DisplayController {
 public:
   DisplayController();
   ~DisplayController();
-  bool Handle_Display_AddOrReplace(wippersnapper_display_v1_DisplayAddOrReplace *msgAdd);
-  //bool Handle_Display_Remove(...);
-  //bool Handle_Display_Write(...);
+  bool Handle_Display_AddOrReplace(
+      wippersnapper_display_v1_DisplayAddOrReplace *msgAdd);
+  bool Handle_Display_Remove(wippersnapper_display_v1_DisplayRemove *msgRemove);
+  // bool Handle_Display_Write(...);
 private:
-  std::vector<DisplayHardware*> _hw_instances; ///< Holds pointers to DisplayHardware instances
+  std::vector<DisplayHardware *>
+      _hw_instances; ///< Holds pointers to DisplayHardware instances
 };
 extern Wippersnapper Ws; ///< Global WS instance
 #endif

src/components/display/controller.h

@@ -171,6 +171,12 @@ bool DisplayHardware::begin(bool reset) {
     @param  sz
             The size of the text to set.
 */
-void setTextSize(uint8_t sz) {
+void DisplayHardware::setTextSize(uint8_t sz) {
   // Placeholder for setting text size on the display TODO
 }
+
+/*!
+    @brief  Gets the name of the display hardware instance.
+    @return The name of the display hardware instance.
+*/
+const char *DisplayHardware::getName() { return _name; }

src/components/display/hardware.cpp

@@ -31,9 +31,11 @@ class DisplayHardware {
   DisplayHardware(const char *name);
   ~DisplayHardware();
   // High-level API functions
+  const char *getName();
   void setType(wippersnapper_display_v1_DisplayType type);
   wippersnapper_display_v1_DisplayType getType();
-  bool beginEPD(wippersnapper_display_v1_EPDConfig *config, wippersnapper_display_v1_EpdSpiConfig *spi_config);
+  bool beginEPD(wippersnapper_display_v1_EPDConfig *config,
+                wippersnapper_display_v1_EpdSpiConfig *spi_config);
   bool begin(bool reset = true);
   // API functions to abstract Adafruit_GFX
   void setTextSize(uint8_t sz);