Revised arduino code, added custom gamma map

andreabak · Nov 9, 2020 · 567acc0 · 567acc0
1 parent 3d131be
commit 567acc0
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 6 deletions.
diff --git a/arduino/rgb_temps/lights.cpp b/arduino/rgb_temps/lights.cpp
@@ -9,6 +9,11 @@ float mixValues(float firstValue, float secondValue, float strength) {
     return (1.0 - strength) * firstValue + strength * secondValue;
 }
 
+uint8_t applyGamma(float input) {
+    uint32_t index = min(GAMMA_TABLE_SIZE - 1, uint32_t((GAMMA_TABLE_SIZE - 1) * input / 255.0));
+    return pgm_read_byte(&_GammaTable[index]);
+}
+
 RingLights::RingLights(uint16_t _stripPin, uint16_t _numLEDs, neoPixelType stripType=DEFAULT_STRIP_TYPE) {
     stripPin = _stripPin;
     numLEDs = _numLEDs;
@@ -87,7 +92,7 @@ void RingLights::displayRing() {
             }
         }
         Color flameCoolColor = Color(mix);
-        flameCoolColor *= 2.0;
+        flameCoolColor *= 3.0;
         // Apply idle brightness
         mix *= mixValues(idleBrightness, 1.0, load);
         // Apply hot color
@@ -101,11 +106,11 @@ void RingLights::displayRing() {
         if (ringBrightness != 1.0)
             mix *= ringBrightness;
         // Value clipping
-        uint8_t r = max(0.0, min(255.0, mix.r));
-        uint8_t g = max(0.0, min(255.0, mix.g));
-        uint8_t b = max(0.0, min(255.0, mix.b));
+        uint8_t r = applyGamma(max(0.0, min(255.0, mix.r)));
+        uint8_t g = applyGamma(max(0.0, min(255.0, mix.g)));
+        uint8_t b = applyGamma(max(0.0, min(255.0, mix.b)));
         // Gamma and set
-        strip->setPixelColor(i, strip->gamma32(strip->Color(r, g, b)));
+        strip->setPixelColor(i, r, g, b);
     }
     strip->show();
 }

diff --git a/arduino/rgb_temps/lights.h b/arduino/rgb_temps/lights.h
@@ -15,6 +15,41 @@
 #define SETTING_SMOOTHING        64
 #define INITIAL_VALUES          0.5
 
+#define GAMMA_TABLE_SIZE 512
+const uint8_t PROGMEM _GammaTable[GAMMA_TABLE_SIZE] = {  /* gamma = 1.4 */
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   1,   1,   1,   1,   1,
+  2,   2,   2,   2,   2,   2,   3,   3,   3,   3,   3,   4,   4,   4,   4,   5,
+  5,   5,   5,   5,   6,   6,   6,   6,   7,   7,   7,   7,   8,   8,   8,   9,
+  9,   9,   9,  10,  10,  10,  10,  11,  11,  11,  12,  12,  12,  13,  13,  13,
+ 13,  14,  14,  14,  15,  15,  15,  16,  16,  16,  17,  17,  17,  18,  18,  18,
+ 19,  19,  19,  20,  20,  20,  21,  21,  21,  22,  22,  22,  23,  23,  23,  24,
+ 24,  24,  25,  25,  26,  26,  26,  27,  27,  27,  28,  28,  28,  29,  29,  30,
+ 30,  30,  31,  31,  32,  32,  32,  33,  33,  33,  34,  34,  35,  35,  35,  36,
+ 36,  37,  37,  37,  38,  38,  39,  39,  40,  40,  40,  41,  41,  42,  42,  42,
+ 43,  43,  44,  44,  45,  45,  45,  46,  46,  47,  47,  48,  48,  48,  49,  49,
+ 50,  50,  51,  51,  52,  52,  52,  53,  53,  54,  54,  55,  55,  56,  56,  56,
+ 57,  57,  58,  58,  59,  59,  60,  60,  61,  61,  62,  62,  62,  63,  63,  64,
+ 64,  65,  65,  66,  66,  67,  67,  68,  68,  69,  69,  70,  70,  71,  71,  72,
+ 72,  73,  73,  74,  74,  74,  75,  75,  76,  76,  77,  77,  78,  78,  79,  79,
+ 80,  80,  81,  81,  82,  82,  83,  84,  84,  85,  85,  86,  86,  87,  87,  88,
+ 88,  89,  89,  90,  90,  91,  91,  92,  92,  93,  93,  94,  94,  95,  95,  96,
+ 97,  97,  98,  98,  99,  99, 100, 100, 101, 101, 102, 102, 103, 103, 104, 105,
+105, 106, 106, 107, 107, 108, 108, 109, 109, 110, 111, 111, 112, 112, 113, 113,
+114, 114, 115, 116, 116, 117, 117, 118, 118, 119, 119, 120, 121, 121, 122, 122,
+123, 123, 124, 125, 125, 126, 126, 127, 127, 128, 129, 129, 130, 130, 131, 131,
+132, 133, 133, 134, 134, 135, 136, 136, 137, 137, 138, 139, 139, 140, 140, 141,
+141, 142, 143, 143, 144, 144, 145, 146, 146, 147, 147, 148, 149, 149, 150, 150,
+151, 152, 152, 153, 153, 154, 155, 155, 156, 156, 157, 158, 158, 159, 160, 160,
+161, 161, 162, 163, 163, 164, 164, 165, 166, 166, 167, 168, 168, 169, 169, 170,
+171, 171, 172, 173, 173, 174, 174, 175, 176, 176, 177, 178, 178, 179, 179, 180,
+181, 181, 182, 183, 183, 184, 185, 185, 186, 186, 187, 188, 188, 189, 190, 190,
+191, 192, 192, 193, 194, 194, 195, 195, 196, 197, 197, 198, 199, 199, 200, 201,
+201, 202, 203, 203, 204, 205, 205, 206, 207, 207, 208, 209, 209, 210, 211, 211,
+212, 213, 213, 214, 215, 215, 216, 217, 217, 218, 219, 219, 220, 221, 221, 222,
+223, 223, 224, 225, 225, 226, 227, 227, 228, 229, 229, 230, 231, 231, 232, 233,
+233, 234, 235, 235, 236, 237, 237, 238, 239, 240, 240, 241, 242, 242, 243, 244,
+244, 245, 246, 246, 247, 248, 249, 249, 250, 251, 251, 252, 253, 253, 254, 255};
+
 
 
 /* -------------------------------- CLASSES -------------------------------- */
@@ -79,6 +114,9 @@ class Color {
 };
 
 
+uint8_t applyGamma(float input);
+
+
 // TODO: Add more light effects
 // TODO: Add idle effect mode (like rainbow, when load & temp < threshold%)
 
@@ -114,7 +152,7 @@ class RingLights {
         float* ringFlameForce;
         Color ringFlameHotColor  = Color(RINGFLAME_HOT_COLOR);
         float ringBrightness = 1.0;
-        float idleBrightness = 0.667;
+        float idleBrightness = 0.5;
         bool idleDynamic = true;
         uint8_t dimSpeedup = 4;
 

diff --git a/utils/make_gamma_map.py b/utils/make_gamma_map.py
@@ -0,0 +1,12 @@
+def make_gamma_map(in_range, out_range, gamma):
+    return [int(out_range * (float(i) / in_range) ** gamma) for i in range(in_range)]
+
+
+def max_delta(vmap):
+    return max(v-vmap[i] for i, v in enumerate(vmap[1:]))
+
+
+def format_map(vmap, cols=16):
+    pad = len(str(max(vmap)))
+    return ',\n'.join(', '.join(('{:'+str(pad)+'d}').format(v) for v in row)
+                      for row in [vmap[i:i + cols] for i in range(0, len(vmap), cols)])