Code cleanup; remove a use of min/max which does not belong in the co…

…re due to arduino and c++ playing badly together
keyboardio · Dec 9, 2024 · 2004037 · 2004037
1 parent 04104c0
commit 2004037
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/plugins/Kaleidoscope-LED-Stalker/src/kaleidoscope/plugin/LED-Stalker.cpp b/plugins/Kaleidoscope-LED-Stalker/src/kaleidoscope/plugin/LED-Stalker.cpp
@@ -83,9 +83,16 @@ Haunt::Haunt(const cRGB highlight_color) {
 }
 
 cRGB Haunt::compute(uint8_t *step) {
-  cRGB color = CRGB((uint8_t)min(*step * highlight_color_.r / 255, 255),
-                    (uint8_t)min(*step * highlight_color_.g / 255, 255),
-                    (uint8_t)min(*step * highlight_color_.b / 255, 255));
+  // Calculate scaled RGB values, capped at 255
+  uint16_t r = (*step * highlight_color_.r) / 255;
+  uint16_t g = (*step * highlight_color_.g) / 255;
+  uint16_t b = (*step * highlight_color_.b) / 255;
+
+  cRGB color = CRGB(
+    (uint8_t)(r < 255 ? r : 255),
+    (uint8_t)(g < 255 ? g : 255),
+    (uint8_t)(b < 255 ? b : 255)
+  );
 
   if (*step >= 0xf0)
     *step -= 1;