pass pixel add, write

Author: brentru

src/components/pixels/controller.cpp

@@ -47,8 +47,10 @@ PixelsController::~PixelsController() {
 /**************************************************************************/
 bool PixelsController::Handle_Pixels_Add(pb_istream_t *stream) {
   // Attempt to decode the istream into a PixelsAdd message
-  if (!_pixels_model->DecodePixelsAdd(stream))
+  if (!_pixels_model->DecodePixelsAdd(stream)) {
+    WS_DEBUG_PRINTLN("[pixels]: Failed to decode PixelsAdd message!");
     return false;
+  }
   wippersnapper_pixels_PixelsAdd *msg_add = _pixels_model->GetPixelsAddMsg();
   _pixel_strands[_num_strands] = new PixelsHardware();
 
@@ -72,6 +74,13 @@ bool PixelsController::Handle_Pixels_Add(pb_istream_t *stream) {
     return false;
   }
 
+  // Increment the strand counter if initialization was successful
+  if (did_init) {
+    _num_strands++;
+    WS_DEBUG_PRINT("[pixels]: Added strand #");
+    WS_DEBUG_PRINTLN(_num_strands);
+  }
+
   return true;
 }
 
@@ -93,12 +102,13 @@ bool PixelsController::Handle_Pixels_Write(pb_istream_t *stream) {
       _pixels_model->GetPixelsWriteMsg();
   uint16_t pin_data = atoi(msg_write->pixels_pin_data + 1);
   uint16_t idx = GetStrandIndex(pin_data);
-  if (idx == -1) {
+  if (idx == 0xFF) {
     WS_DEBUG_PRINTLN("[pixels]: Failed to find strand index!");
     return false;
   }
 
   // Call hardware to fill the strand
+  WS_DEBUG_PRINTLN("[pixels]: Filling strand!");
   _pixel_strands[idx]->FillStrand(msg_write->pixels_color);
   return true;
 }
@@ -122,7 +132,7 @@ bool PixelsController::Handle_Pixels_Remove(pb_istream_t *stream) {
 
   uint16_t pin_data = atoi(msg_remove->pixels_pin_data + 1);
   uint16_t idx = GetStrandIndex(pin_data);
-  if (idx == -1) {
+  if (idx == 0xFF) {
     WS_DEBUG_PRINTLN("[pixels]: Failed to find strand index!");
     return false;
   }
@@ -134,17 +144,19 @@ bool PixelsController::Handle_Pixels_Remove(pb_istream_t *stream) {
 
 /**************************************************************************/
 /*!
-    @brief  Handles a request to update the pixel strands
+    @brief  Gets the index of a strand by its data pin
     @param  pin_data
             The desired data pin
-    @returns Desired strand index, -1 if not found.
+    @returns Desired strand index, or 0xFF if not found.
 */
 /**************************************************************************/
 uint16_t PixelsController::GetStrandIndex(uint16_t pin_data) {
-  for (int i = 0; i < _num_strands; i++) {
+  for (uint8_t i = 0; i < _num_strands; i++) {
     if (_pixel_strands[i]->GetPinData() == pin_data) {
       return i;
     }
   }
-  return -1;
+  WS_DEBUG_PRINT("[pixels]: No strand found on pin ");
+  WS_DEBUG_PRINTLN(pin_data);
+  return 0xFF; // Sentinel value indicating "not found"
 }

src/components/pixels/controller.h

@@ -43,7 +43,7 @@ class PixelsController {
   PixelsModel *_pixels_model = nullptr; ///< Pointer to the model class
   PixelsHardware *_pixel_strands[MAX_PIXEL_STRANDS] = {nullptr}; ///< Pointer to the hardware class
   uint8_t _num_strands; ///< Number of pixel strands
-  uint16_t GetStrandIndex(uint16_t pin_data);
+  uint16_t GetStrandIndex(uint16_t pin_data); // Returns 0xFF if not found
 };
 extern Wippersnapper_V2 WsV2; ///< Wippersnapper V2 instance
 #endif // WS_PIXELS_CONTROLLER_H

src/components/pixels/hardware.cpp

@@ -47,8 +47,10 @@ PixelsHardware::~PixelsHardware() {}
 /**************************************************************************/
 bool PixelsHardware::AddNeoPixel(uint16_t num_pixels, uint16_t pin_data,
                                  neoPixelType order, uint8_t brightness) {
-  if (getStatusNeoPixelPin() == pin_data && WsV2.lockStatusNeoPixelV2)
+  if (getStatusNeoPixelPin() == pin_data && WsV2.lockStatusNeoPixelV2) {
+    WS_DEBUG_PRINTLN("[pixels] Releasing status pixel for use");
     ReleaseStatusPixel(); // Release the status pixel for use
+  }
 
   _neopixel = new Adafruit_NeoPixel(num_pixels, pin_data, order);
   _neopixel->begin();
@@ -131,6 +133,8 @@ bool PixelsHardware::AddStrand(wippersnapper_pixels_PixelsType type,
   _type = type;
   // Convert the pin string to an integer
   uint16_t p_data = atoi(pin_data + 1);
+  _pin_data = p_data; // Store the pin data for later reference
+
   if (_type == wippersnapper_pixels_PixelsType_PIXELS_TYPE_NEOPIXEL) {
     if (!AddNeoPixel(num_pixels, p_data, GetStrandOrderNeoPixel(order),
                      (uint8_t)brightness)) {
@@ -144,6 +148,7 @@ bool PixelsHardware::AddStrand(wippersnapper_pixels_PixelsType type,
       WS_DEBUG_PRINTLN("[pixels] Failed to create DotStar strand!");
       return false;
     }
+    return true;
   } else {
     WS_DEBUG_PRINTLN("[pixels] Unknown pixel type!");
     return false;
@@ -160,9 +165,13 @@ bool PixelsHardware::AddStrand(wippersnapper_pixels_PixelsType type,
 /**************************************************************************/
 void PixelsHardware::FillStrand(uint32_t color) {
   // Apply gamma correction to match IO Web
-  uint32_t color_gamma = ApplyGammaCorrection(color);
   WS_DEBUG_PRINT("[pixels] Filling strand with color: ");
-  WS_DEBUG_PRINT(color_gamma, HEX);
+  WS_DEBUG_PRINTLN(color);
+
+  WS_DEBUG_PRINTLN("Applying gamma correction..");
+  uint32_t color_gamma = ApplyGammaCorrection(color);
+  WS_DEBUG_PRINT("[pixels] Filling strand with color_gamma: ");
+  WS_DEBUG_PRINT(color_gamma);
   if (_type == wippersnapper_pixels_PixelsType_PIXELS_TYPE_NEOPIXEL) {
     _neopixel->fill(color_gamma);
     _neopixel->show();
@@ -183,7 +192,14 @@ void PixelsHardware::FillStrand(uint32_t color) {
 */
 /**************************************************************************/
 uint32_t PixelsHardware::ApplyGammaCorrection(uint32_t color) {
+  WS_DEBUG_PRINT("Type: ");
+  WS_DEBUG_PRINTLN(_type);
   if (_type == wippersnapper_pixels_PixelsType_PIXELS_TYPE_NEOPIXEL) {
+    WS_DEBUG_PRINTLN("Applying gamma to neopixel...");
+    if (_neopixel == nullptr) {
+      WS_DEBUG_PRINTLN("[pixels] No neopixel object found!");
+      return color;
+    }
     return _neopixel->gamma32(color);
   } else if (_type == wippersnapper_pixels_PixelsType_PIXELS_TYPE_DOTSTAR) {
     return _dotstar->gamma32(color);
@@ -235,7 +251,8 @@ uint16_t PixelsHardware::GetPinData() { return _pin_data; }
     @returns The color ordering for NeoPixel strands
 */
 /**************************************************************************/
-neoPixelType PixelsHardware::GetStrandOrderNeoPixel(wippersnapper_pixels_PixelsOrder order) {
+neoPixelType
+PixelsHardware::GetStrandOrderNeoPixel(wippersnapper_pixels_PixelsOrder order) {
   switch (order) {
   case wippersnapper_pixels_PixelsOrder_PIXELS_ORDER_GRB:
     return NEO_GRB + NEO_KHZ800;
@@ -260,7 +277,8 @@ neoPixelType PixelsHardware::GetStrandOrderNeoPixel(wippersnapper_pixels_PixelsO
     @returns The color ordering for DotStar strands
 */
 /**************************************************************************/
-uint8_t PixelsHardware::GetStrandOrderDotStar(wippersnapper_pixels_PixelsOrder order) {
+uint8_t
+PixelsHardware::GetStrandOrderDotStar(wippersnapper_pixels_PixelsOrder order) {
   switch (order) {
   case wippersnapper_pixels_PixelsOrder_PIXELS_ORDER_GRB:
     return DOTSTAR_GRB;

src/components/pixels/hardware.h

@@ -46,6 +46,7 @@ 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

src/components/pixels/model.cpp

@@ -93,6 +93,7 @@ wippersnapper_pixels_PixelsRemove *PixelsModel::GetPixelsRemoveMsg() {
 /**************************************************************************/
 bool PixelsModel::DecodePixelsWrite(pb_istream_t *stream) {
   _msg_pixels_write = wippersnapper_pixels_PixelsWrite_init_zero;
+  WS_DEBUG_PRINTLN("Decoding PixelsWrite message...");
   return pb_decode(stream, wippersnapper_pixels_PixelsWrite_fields,
                    &_msg_pixels_write);
 }