X-Git-Url: https://oss.titaniummirror.com/gitweb?a=blobdiff_plain;f=main.c;h=627c94a3158d84a8933fee0436c7e227eaab950e;hb=a0556afb8953ae458fb0fe7bcc68bde851f0e630;hp=64cf2f13f7d07c098ef28122194ec64e4f5ddd4d;hpb=c3567b7908dd3b08dd7a8c2d051991bf50670a42;p=rgblamp.git

diff --git a/main.c b/main.c
index 64cf2f1..627c94a 100644
--- a/main.c
+++ b/main.c
@@ -144,43 +144,37 @@ signed char bright = BRIGHT_INIT;
 bit bright_up;
 signed char pbHeldCount;
 
-/* Return the constrained brightness level for use in computing RGB values */
-unsigned char bright_get()
-{
-  if (bright > BRIGHT_MAX)
-    return BRIGHT_MAX;
-  else if (bright < BRIGHT_MIN)
-    return BRIGHT_MIN;
-  else
-    return bright;
-}
-
-/* RGB values will not illuminate the LED */
-unsigned char led_get(unsigned value)
+/* Combine LED color value and brightness level to generate an RGB value.
+ * bright will be BRIGHT_MIN...BRIGHT_MAX
+ *
+ * @param value 0...1023 (6 bit color, left shifted 4 bits, for 10 bits)
+ * @param b brightness value BRIGHT_MIN...BRIGHT_MAX
+ * @return An RGB drive value, 0...255
+ */
+unsigned char led_get(int value, signed char b)
 {
-  value = (value * bright_get()) >> 8;
-#ifdef CEIL256
-  if (value && value < 0x26)
-    return 0x26;
-#else
-  if (value && value < 4)
-    return 4;
-#endif
-  return value;
+  return (unsigned long)value * b / 4 / BRIGHT_MAX;
 }
 
-/* Set the LEDs using both color and brightness values. */
+/* Set the LEDs using color values and current brightness. */
 void leds_set()
 {
-  rgb_set(led_get((red).value), led_get((grn).value), led_get((blu).value),
-      led_get((wht).value));
+  signed char b;
+
+  if (bright > BRIGHT_MAX)
+    b = BRIGHT_MAX;
+  else if (bright < BRIGHT_MIN)
+    b = BRIGHT_MIN;
+  else
+    b = bright;
+  rgb_set(led_get((red).value, b), led_get((grn).value, b),
+      led_get((blu).value, b), led_get((wht).value, b));
 }
 
 void start_fade()
 {
-  /* RGB PWM values are 8 bits, but computations are done in 15
-   * (leaving room for a sign bit), so leds_set() uses >>7 to convert
-   * to PWM values.
+  /* RGB PWM values are 8 bits.  Color values are 12 bits.  See led_get()
+   * for the conversion of color values and brightness to RGB values.
    */
   int newr, newg, newb, neww;