cleanup

Author: brentru

src/components/pixels/controller.cpp

@@ -60,27 +60,25 @@ 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++;
+    WS_DEBUG_PRINT("[pixels]: Added strand #");
+    WS_DEBUG_PRINTLN(_num_strands);
+  }
 
   // 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;
   }
 
-  // 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;
 }
 
@@ -102,7 +100,7 @@ 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 == 0xFF) {
+  if (idx == STRAND_NOT_FOUND) {
     WS_DEBUG_PRINTLN("[pixels]: Failed to find strand index!");
     return false;
   }
@@ -132,7 +130,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 == 0xFF) {
+  if (idx == STRAND_NOT_FOUND) {
     WS_DEBUG_PRINTLN("[pixels]: Failed to find strand index!");
     return false;
   }
@@ -147,7 +145,7 @@ bool PixelsController::Handle_Pixels_Remove(pb_istream_t *stream) {
     @brief  Gets the index of a strand by its data pin
     @param  pin_data
             The desired data pin
-    @returns Desired strand index, or 0xFF if not found.
+    @returns Desired strand index, or STRAND_NOT_FOUND if not found.
 */
 /**************************************************************************/
 uint16_t PixelsController::GetStrandIndex(uint16_t pin_data) {
@@ -156,7 +154,5 @@ uint16_t PixelsController::GetStrandIndex(uint16_t pin_data) {
       return i;
     }
   }
-  WS_DEBUG_PRINT("[pixels]: No strand found on pin ");
-  WS_DEBUG_PRINTLN(pin_data);
-  return 0xFF; // Sentinel value indicating "not found"
+  return STRAND_NOT_FOUND; // Sentinel value indicating "not found"
 }

src/components/pixels/hardware.cpp

@@ -165,13 +165,7 @@ bool PixelsHardware::AddStrand(wippersnapper_pixels_PixelsType type,
 /**************************************************************************/
 void PixelsHardware::FillStrand(uint32_t color) {
   // Apply gamma correction to match IO Web
-  WS_DEBUG_PRINT("[pixels] Filling strand with color: ");
-  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();
@@ -192,14 +186,7 @@ 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);