fix rm neopixel

Author: brentru

src/Wippersnapper_V2.cpp

@@ -1361,10 +1361,7 @@ ws_status_t Wippersnapper_V2::run() {
 
   // TODO: Process I2C sensor events
   WsV2._i2c_controller->update();
-  
-  // Process Pixels events
-  // TODO: Add update() method to PixelsController if needed
-  
+
   // TODO: Process UART sensor events
 
   return WS_NET_CONNECTED; // TODO: Make this funcn void!

src/components/pixels/controller.cpp

@@ -60,7 +60,7 @@ bool PixelsController::Handle_Pixels_Add(pb_istream_t *stream) {
       msg_add->pixels_type, msg_add->pixels_ordering, msg_add->pixels_num,
       msg_add->pixels_brightness, msg_add->pixels_pin_data,
       msg_add->pixels_pin_dotstar_clock);
-  if (! did_init) {
+  if (!did_init) {
     WS_DEBUG_PRINTLN("[pixels] Failed to create strand!");
   } else {
     _num_strands++;
@@ -69,11 +69,11 @@ bool PixelsController::Handle_Pixels_Add(pb_istream_t *stream) {
   }
 
   // Publish PixelsAdded message to the broker
-  if (! _pixels_model->EncodePixelsAdded(msg_add->pixels_pin_data, did_init)) {
+  if (!_pixels_model->EncodePixelsAdded(msg_add->pixels_pin_data, did_init)) {
     WS_DEBUG_PRINTLN("[pixels]: Failed to encode PixelsAdded message!");
     return false;
   }
-  if (! WsV2.PublishSignal(wippersnapper_signal_DeviceToBroker_pixels_added_tag,
+  if (!WsV2.PublishSignal(wippersnapper_signal_DeviceToBroker_pixels_added_tag,
                           _pixels_model->GetPixelsAddedMsg())) {
     WS_DEBUG_PRINTLN("[pixels]: Unable to publish PixelsAdded message!");
     return false;

src/components/pixels/controller.h

@@ -18,11 +18,12 @@
 #include "hardware.h"
 #include "model.h"
 
-#define MAX_PIXEL_STRANDS 5 ///< Maximum number of pixel strands connected to a WipperSnapper device
+#define MAX_PIXEL_STRANDS 10   ///< Maximum number of pixel strands connected to a WipperSnapper device
+#define STRAND_NOT_FOUND 0xFF ///< Strand not found in the array
 
 class Wippersnapper_V2; ///< Forward declaration
-class PixelsModel;     ///< Forward declaration
-class PixelsHardware;  ///< Forward declaration
+class PixelsModel;      ///< Forward declaration
+class PixelsHardware;   ///< Forward declaration
 
 /**************************************************************************/
 /*!
@@ -35,7 +36,6 @@ class PixelsController {
 public:
   PixelsController();
   ~PixelsController();
-  // Called by the cbDecodeBrokerToDevice router function
   bool Handle_Pixels_Add(pb_istream_t *stream);
   bool Handle_Pixels_Write(pb_istream_t *stream);
   bool Handle_Pixels_Remove(pb_istream_t *stream);
@@ -45,5 +45,5 @@ class PixelsController {
   uint8_t _num_strands; ///< Number of pixel strands
   uint16_t GetStrandIndex(uint16_t pin_data); // Returns 0xFF if not found
 };
-extern Wippersnapper_V2 WsV2; ///< Wippersnapper V2 instance
+extern Wippersnapper_V2 WsV2; ///< Global V2 instance
 #endif // WS_PIXELS_CONTROLLER_H

src/components/pixels/hardware.cpp

@@ -1,7 +1,7 @@
 /*!
  * @file hardware.cpp
  *
- * Hardware implementation for pixel strands.
+ * Hardware interface for NeoPixel/DotStar strands.
  *
  * Adafruit invests time and resources providing this open source code,
  * please support Adafruit and open-source hardware by purchasing
@@ -204,21 +204,31 @@ uint32_t PixelsHardware::ApplyGammaCorrection(uint32_t color) {
 void PixelsHardware::RemoveStrand() {
   if (_type == wippersnapper_pixels_PixelsType_PIXELS_TYPE_NEOPIXEL) {
     if (_neopixel != nullptr) {
+      _neopixel->clear();
+      _neopixel->show();
       delete _neopixel;
       _neopixel = nullptr;
     }
   } else if (_type == wippersnapper_pixels_PixelsType_PIXELS_TYPE_DOTSTAR) {
     if (_dotstar != nullptr) {
+      _dotstar->clear();
+      _dotstar->show();
       delete _dotstar;
       _dotstar = nullptr;
     }
   } else {
     WS_DEBUG_PRINTLN("[pixels] Unknown pixel type!");
   }
-
   // Optionally re-init the status pixel for reuse by app.
-  if (getStatusNeoPixelPin() == _pin_data && !WsV2.lockStatusNeoPixelV2)
+  if (getStatusNeoPixelPin() == _pin_data && !WsV2.lockStatusNeoPixelV2) {
+    WS_DEBUG_PRINTLN("[pixels] Re-initializing status pixel");
     initStatusLED();
+  }
+  WS_DEBUG_PRINT("[pixels] Removed pixel strand from pin: ");
+  WS_DEBUG_PRINTLN(_pin_data);
+
+  _pin_data = 0; // Reset the pin data
+  _type = wippersnapper_pixels_PixelsType_PIXELS_TYPE_UNSPECIFIED;
 }
 
 /**************************************************************************/

src/components/pixels/hardware.h

@@ -1,7 +1,7 @@
 /*!
  * @file hardware.h
  *
- * Hardware interface for pixel strands.
+ * Hardware interface for NeoPixel/DotStar strands.
  *
  * Adafruit invests time and resources providing this open source code,
  * please support Adafruit and open-source hardware by purchasing
@@ -16,23 +16,10 @@
 #define WS_PIXELS_HARDWARE_H
 #include "Wippersnapper_V2.h"
 
-// TODO: Do we need this?
-/**
- * @struct PixelStrand
- * @brief This struct represents a NeoPixel or DotStar strand.
- */
-struct PixelStrand {
-  uint8_t pin_data;                       ///< Data pin
-  uint8_t pin_clock;                      ///< Clock pin (for DotStar)
-  wippersnapper_pixels_PixelsType type;   ///< Pixel type
-  wippersnapper_pixels_PixelsOrder order; ///< Color ordering
-  uint32_t num_pixels;                    ///< Number of pixels
-  uint32_t brightness;                    ///< Current brightness (0-255)
-};
-
 /**************************************************************************/
 /*!
-    @brief  Interface for interacting with hardware's pixel strands.
+    @brief  Interface for interacting with NeoPixel or Dotstar
+            pixel strands
 */
 /**************************************************************************/
 class PixelsHardware {
@@ -46,12 +33,11 @@ class PixelsHardware {
   uint16_t GetPinData();
   void FillStrand(uint32_t color);
   void RemoveStrand();
-
 private:
-  Adafruit_NeoPixel *_neopixel = nullptr; ///< Used for NeoPixel pixel strands
-  Adafruit_DotStar *_dotstar = nullptr;   ///< Used for DotStar pixel strands
-  wippersnapper_pixels_PixelsType _type;
-  uint16_t _pin_data; ///< Data pin for the pixel strand
+  Adafruit_NeoPixel *_neopixel = nullptr; ///< Used for NeoPixel strands
+  Adafruit_DotStar *_dotstar = nullptr;   ///< Used for DotStar strands
+  wippersnapper_pixels_PixelsType _type; ///< Holds the type of strand
+  uint16_t _pin_data; ///< Data pin for the strand
   bool AddNeoPixel(uint16_t num_pixels, uint16_t pin_data, neoPixelType order,
                    uint8_t brightness);
   bool AddDotStar(uint16_t num_pixels, uint16_t pin_data, uint16_t pin_clock,