X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=rgb.h;h=7dc0da38f13e9742643bd88d5f1e6019900537e0;hb=85ef0849fb65a2e42d67789b23d042613d94f6cb;hp=663e1890f89f8d9a6f97c4ee1b0b784c60254b47;hpb=5c74e1a22c444b8769e0ce82975414f1c72b7b0e;p=rgblamp.git

diff --git a/rgb.h b/rgb.h
index 663e189..7dc0da3 100644
--- a/rgb.h
+++ b/rgb.h
@@ -8,21 +8,70 @@
 #ifndef _RGB_H
 #define _RGB_H
 
+#include "isr.h"
+
+/* Optional brightness compensation.  Pick zero or one */
+#define CEIL256
+#undef CEIL32
+
+#define MIN_PWM 4 /* PWM settings below this value do not illuminate the LED */
+
 /* Initialize the RGB LED assembly.  Outputs are zero, PWM is off. */
 void rgb_init();
 
 /* Turn on the rgb.  Outputs are zero, or last values set by rgb_set(). */
-#define rgb_on() do { TMR2ON = 1; } while (0)
+#define rgb_on() (TMR2ON = 1)
 
 /* Turn off the rgb, first setting outputs to zero. */
 void rgb_off();
 
 /* Set a PWM value for each color LED.  0=off, 255=full on. */
+#ifdef CEIL256
+extern const unsigned char pwm_table[];
+#define rgb_set(red, grn, blu, wht) do { \
+    unsigned char tmp; \
+    ndi(); /* FIXME: doesn't seem to fix flicker */ \
+    tmp = pwm_table[(red)]; \
+    CCPR3L = (tmp < MIN_PWM) ? MIN_PWM : tmp; \
+    tmp = pwm_table[(grn)]; \
+    CCPR2L = (tmp < MIN_PWM) ? MIN_PWM : tmp; \
+    tmp = pwm_table[(blu)]; \
+    CCPR4L = (tmp < MIN_PWM) ? MIN_PWM : tmp; \
+    tmp = pwm_table[(wht)]; \
+    CCPR1L = (tmp < MIN_PWM) ? MIN_PWM : tmp; \
+    nei(); \
+} while (0)
+#else
+#ifdef CEIL32
+extern const unsigned char pwm_table[];
 #define rgb_set(red, grn, blu, wht) do { \
-    CCPR1L = (red); \
-    CCPR2L = (grn); \
-    CCPR3L = (blu); \
-    CCPR4L = (wht); \
+    unsigned char tmp; \
+    ndi(); /* FIXME: doesn't seem to fix flicker */ \
+    tmp = pwm_table[(red)] >> 3; \
+    CCPR3L = (tmp < MIN_PWM) ? MIN_PWM : tmp; \
+    tmp = pwm_table[(grn)] >> 3; \
+    CCPR2L = (tmp < MIN_PWM) ? MIN_PWM : tmp; \
+    tmp = pwm_table[(blu)] >> 3; \
+    CCPR4L = (tmp < MIN_PWM) ? MIN_PWM : tmp; \
+    tmp = pwm_table[(wht)] >> 3; \
+    CCPR1L = (tmp < MIN_PWM) ? MIN_PWM : tmp; \
+    nei(); \
 } while (0)
+#else
+#define rgb_set(red, grn, blu, wht) do { \
+    unsigned char tmp; \
+    ndi(); /* FIXME: doesn't seem to fix flicker */ \
+    tmp = (red); \
+    CCPR3L = (tmp < MIN_PWM) ? MIN_PWM : tmp; \
+    tmp = (grn); \
+    CCPR2L = (tmp < MIN_PWM) ? MIN_PWM : tmp; \
+    tmp = (blu); \
+    CCPR4L = (tmp < MIN_PWM) ? MIN_PWM : tmp; \
+    tmp = (wht); \
+    CCPR1L = (tmp < MIN_PWM) ? MIN_PWM : tmp; \
+    nei(); \
+} while (0)
+#endif
+#endif
 
 #endif