From 6e8ab94ee9d102c4a5d780eef2a8c9339639c33d Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 20 Oct 2025 21:53:37 +0200
Subject: [PATCH] colorKtoRGB optimization and bugfix

* bug: logf(temp-10) result becomes NaN when kelvin < 1200
* bug (RISC-V only): parameter of Bus::setCCT must be signed, to avoid undefined behaviour
* minor optimization by replacing constrain() with min(max())
---
 wled00/bus_manager.h |  2 +-
 wled00/colors.cpp    | 22 +++++++++++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index 04062215..e49238d6 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -175,7 +175,7 @@ class Bus {
           _type == TYPE_ANALOG_2CH    || _type == TYPE_ANALOG_5CH) return true;
       return false;
     }
-    static void setCCT(uint16_t cct) {
+    static void setCCT(int16_t cct) {  // WLEDMM bugfix: parameter must be signed, otherwise "-1" becomes 65535 --> undefined behaviour on RISC-V
       _cct = cct;
     }
     static void setCCTBlend(uint8_t b) {
diff --git a/wled00/colors.cpp b/wled00/colors.cpp
index 8e72d46b..36cb1b4b 100644
--- a/wled00/colors.cpp
+++ b/wled00/colors.cpp
@@ -142,25 +142,37 @@ void colorHStoRGB(uint16_t hue, byte sat, byte* rgb) //hue, sat to rgb
 //get RGB values from color temperature in K (https://tannerhelland.com/2012/09/18/convert-temperature-rgb-algorithm-code.html)
 void colorKtoRGB(uint16_t kelvin, byte* rgb) //white spectrum to rgb, calc
 {
+  // WLEDMM safe exit (do nothing) to avoid logf domain errors. argument to logf must be >= 1.0f to avoid bad result 0 or -inf; 
+  //        kelvin >65k might be a signed/unsigned conversion error
+  if ((kelvin < 1200) || (kelvin > 65000)) {
+    rgb[0] = 255;
+    rgb[1] = 255;
+    rgb[2] = 255;
+    rgb[3] = 0;
+    return;
+  }
+
   int r = 0, g = 0, b = 0;
-  float temp = kelvin / 100.0f;
+  float temp = float(kelvin) / 100.0f;  // WLEDMM "float()" added - to make sure its done in float, not in double or int
   if (temp <= 66.0f) {
     r = 255;
     g = roundf(99.4708025861f * logf(temp) - 161.1195681661f);
     if (temp <= 19.0f) {
       b = 0;
     } else {
-      b = roundf(138.5177312231f * logf((temp - 10.0f)) - 305.0447927307f);
+      b = roundf(138.5177312231f * logf((temp - 10.0f)) - 305.0447927307f); // safe because temp > 19.0f
     }
   } else {
+    // temp-60.0f is always > 0 here (since temp>66)
     r = roundf(329.698727446f * powf((temp - 60.0f), -0.1332047592f));
     g = roundf(288.1221695283f * powf((temp - 60.0f), -0.0755148492f));
     b = 255;
   }
   //g += 12; //mod by Aircoookie, a bit less accurate but visibly less pinkish
-  rgb[0] = (uint8_t) constrain(r, 0, 255);
-  rgb[1] = (uint8_t) constrain(g, 0, 255);
-  rgb[2] = (uint8_t) constrain(b, 0, 255);
+  // WLEDMM min(max()) is faster than constrain()
+  rgb[0] = (uint8_t) min(max(r, 0), 255);
+  rgb[1] = (uint8_t) min(max(g, 0), 255);
+  rgb[2] = (uint8_t) min(max(b, 0), 255);
   rgb[3] = 0;
 }