Fix fading

[rgblamp.git] / main.c

diff --git a/main.c b/main.c
index 21df3d73aff789b8ccd3d06e1e911c7d637059cc..4086fec6089657caf3c00edfee74840c35137053 100644 (file)
--- a/main.c
+++ b/main.c
@@ -12,23 +12,51 @@
 #include "buttons.h"
 #include "rgb.h"
 
-#define random_rgb()        (rand() >> 7)    /* 0...255 */
-#define random_time()       (rand() >> 5)  /* 0...1024 */
-#define min_incolor_time()  512
-#define min_fade_time()     512
+#define STEP_SIZE               32             /* ms */
+#if 0
+#define MIN_INCOLOR_STEPS       320
+#define MAX_INCOLOR_STEPS       57600
+#define MIN_FADE_STEPS          32
+#define MAX_FADE_STEPS          480
+#else
+#define MIN_INCOLOR_STEPS       32
+#define MAX_INCOLOR_STEPS       160
+#define MIN_FADE_STEPS          32
+#define MAX_FADE_STEPS          160
+#endif
+#define reset_steps()           do { incolor_steps = 1; fade_steps = 0; } while (0)
+#define rand_u8()               (rand() & 0xff)
+#define rand_u16()              ((rand() << 8) + (rand() & 0xff))
+#define rand_incolor_steps()    (MIN_INCOLOR_STEPS + rand_u16() % \
+                                    (MAX_INCOLOR_STEPS - MIN_INCOLOR_STEPS))
+#define rand_fade_steps()       (MIN_FADE_STEPS + rand() % \
+                                    (MAX_FADE_STEPS - MIN_FADE_STEPS))
+#define leds_set(r,g,b,w)       rgb_set((r).value >> 7, \
+                                    (g).value >> 7, \
+                                    (b).value >> 7, 0)
+//                                    (w).value >> 7)
+
+typedef struct {
+  int value;
+  int increment;
+  int remainder;
+} led_t;
+#define INIT_LED { 0, 0, 0 }
 
 int main(void)
 {
-    unsigned char red = 0, grn = 0, blu = 0; //, wht = 0;
-    char fadestep_red, fadestep_grn, fadestep_blu; //, fadestep_wht;
-    unsigned char incolor_time = 0;
-    unsigned char fade_time = 0;
+    led_t red = INIT_LED;
+    led_t grn = INIT_LED;
+    led_t blu = INIT_LED;
+    led_t wht = INIT_LED;
     unsigned char fast = 0;
+    unsigned incolor_steps;
+    int fade_steps;
 
     pic_init();
     buttons_init();
     rgb_init();
-    srand(27);
+    reset_steps();
 
     if (buttons_on())
       rgb_on();
@@ -39,57 +67,71 @@ int main(void)
         if ((buttons & (IN_ROCKERA | IN_ROCKERB))) {
             if (buttons & IN_PUSHBTN) {
               if (!fast) {
-                incolor_time = 0;
-                fade_time = 0;
                 fast = 1;
+                reset_steps();
               } else
                 fast = 0;
             }
 
-            if (fade_time) {
-              red += fadestep_red;
-              grn += fadestep_grn;
-              blu += fadestep_blu;
-              //wht += fadestep_wht;
-              rgb_set(red, grn, blu, 0); // wht);
-              fade_time--;
-            } else if (incolor_time)
-              incolor_time--;
-            else /* fade_time == 0 && incolor_time == 0 */ {
-              unsigned char newr, newg, newb, neww;
-
-              /* Determine next color state */
-              newr = random_rgb();
-              newg = random_rgb();
-              newb = random_rgb();
-              //neww = random_rgb();
-
-              /* Calculate new incolor_time and fade_time */
-              if (buttons & IN_ROCKERA) {
-                incolor_time = 1 + random_time();
-                fade_time = 1;
-              } else /* (buttons & IN_ROCKERB) */ {
-                incolor_time = min_incolor_time() + random_time() / 2;
-                fade_time = min_fade_time() + random_time() / 2;
+            if (fade_steps) {
+              fade_steps--;
+              /* Continue the in-progress fade */
+              red.value += red.increment;
+              grn.value += grn.increment;
+              blu.value += blu.increment;
+              wht.value += wht.increment;
+              if (fade_steps == 0) {
+                red.value += red.remainder;
+                grn.value += grn.remainder;
+                blu.value += blu.remainder;
+                wht.value += wht.remainder;
               }
+              leds_set(red, grn, blu, wht);
+            } else if (--incolor_steps == 0) {
+              int newr, newg, newb, neww, tmp;
+
+              /* Next led color.  All off is not a valid option. */
+              do {
+                /* RGB values are processed 15-bit values.  This allows for
+                 * signedness when fading to a lesser value.  The actual PWM
+                 * values are set from the most significant 8 bits, so
+                 * leds_set() does >> 7.
+                 */
+                newr = rand();
+                newg = rand();
+                newb = rand();
+                neww = rand();
+              } while (newr == 0 && newg == 0 && newb == 0 && neww == 0);
 
+              /* Next incolor and fade steps */
+              incolor_steps = rand_incolor_steps();
+              fade_steps = (buttons & IN_ROCKERA) ? 1 : rand_fade_steps();
               if (fast) {
-                incolor_time = 1 + incolor_time / 8;
-                fade_time = 1 + fade_time / 8;
+                incolor_steps = 1 + incolor_steps / 8;
+                if (buttons & IN_ROCKERB)
+                  fade_steps = 1 + fade_steps / 8;
               }
 
-              fadestep_red = ((int)newr - red) / fade_time;
-              fadestep_grn = ((int)newg - red) / fade_time;
-              fadestep_blu = ((int)newb - red) / fade_time;
-              //fadestep_wht = ((int)neww - red) / fade_time;
+              /* Compute increment and remainder for each led */
+              red.increment = (newr - red.value) / fade_steps;
+              red.remainder = newr - (red.value + red.increment * fade_steps);
+              grn.increment = (newg - grn.value) / fade_steps;
+              grn.remainder = newg - (grn.value + grn.increment * fade_steps);
+              blu.increment = (newb - blu.value) / fade_steps;
+              blu.remainder = newb - (blu.value + blu.increment * fade_steps);
+              wht.increment = (neww - wht.value) / fade_steps;
+              wht.remainder = neww - (wht.value + wht.increment * fade_steps);
             }
-            __delay_ms(10);
+            __delay_ms(STEP_SIZE); /* step should be start to start... */
         } else {
             rgb_off();
             buttons_sleep();
-            incolor_time = 0;
-            fade_time = 0;
+            reset_steps();
             rgb_on();
+            red.value = 0;
+            grn.value = 0;
+            blu.value = 0;
+            wht.value = 0;
         }
     }
     return 0;