Fading isn't working

[rgblamp.git] / main.c

diff --git a/main.c b/main.c
index 3e8a52d12cb75e375ce71b767fd62fe338a73ab0..4d11ee352810a4d6f5874eb9d69df1eaf4dfc951 100644 (file)
--- a/main.c
+++ b/main.c
@@ -4,113 +4,93 @@
  * Created on August 16, 2010, 12:09 PM
  */
 
-
-#include <htc.h>
-#include <pic16f1827.h>
-
 #define RUNAT32MHZ /* else 16 MHz */
-#define BRIGHT_STEP     16 /* starts at 0 */
-#define BRIGHT_STEPS    16 /* includes 0 */
-#define LEDBIT          0x01 /* PORTB.3 */
-
-#if defined(RUNAT32MHZ)
-__CONFIG(WDTE_OFF & FOSC_INTOSC);
-__CONFIG(LVP_OFF & PLLEN_ON);
-#else
-__CONFIG(WDTE_OFF);
-__CONFIG(LVP_OFF);
-#endif
-
-void pic_init()
-{
-#if defined(RUNAT32MHZ)
-    OSCCON = 0b11110000;
-#else /* 16 MHz */
-    OSCCON = 0b01111010;
-#endif
-
-    /* OSCSTAT.HFIOFL is set when oscillator is locked (accurate within 2%) */
-    while (!HFIOFL);
-}
-
-void pwm_init()
-{
-    /* Initialize PWM on PORTB.0
-     * - Fosc = 32MHz
-     * - Prescale = 16
-     * - PRx value = 0xff
-     * = f(pwm) = 1.95 kHz
-     */
-
-    /* Disable output on PORTB.0 */
-    TRISB |= 0x08;
-
-    /* Configure ECCP1 */
-    CCP1CON = 0b00001100;
-    CCPR1L = 0; /* Initial PWM value; only using 8 LSBs */
-
-    /* Configure Timer2 */
-    CCPTMRS = CCPTMRS & ~0x03; /* bits 1:0 denote CCP1 uses Timer 2 */
-    TMR2IF = 0;
-    PR2 = 0xff;
-    T2CON = 0b00000111;
-
-    /* Enable PWM output, PORTB.0 */
-    while (!TMR2IF); /* wait until timer overflow */
-    TRISB &= ~0x08;
-}
 
-void led_init()
-{
-    PORTB &= ~LEDBIT; /* Led is PORTB.3 */
-    TRISB &= ~LEDBIT;
-}
-
-void led_set(unsigned short led)
-{
-    if (led)
-        PORTB |= LEDBIT;
-    else
-        PORTB &= ~LEDBIT;
-}
-
-void pwm_set(unsigned short step)
-{
-    CCPR1L = step * BRIGHT_STEP;
-}
+#include <htc.h>
+#include <stdlib.h>
+#include "picinit.h"
+#include "buttons.h"
+#include "rgb.h"
 
-void delay()
-{
-    for (unsigned counter = 0; counter < 50000; counter++);
-}
+#define random_rgb()        rand()         /* ~ (0...255) << 7 */
+#define random_time()       (rand() >> 7)  /* 0...255 */
+#define min_incolor_time()  100
+#define min_fade_time()     100
 
 int main(void)
 {
-    unsigned short fwd = 1;
-    short int step = 0;
-    short int led = 0;
+    int red = 0, grn = 0, blu = 0; //, wht = 0;
+    int fadestep_red, fadestep_grn, fadestep_blu; //, fadestep_wht;
+    unsigned incolor_time = 0;
+    unsigned fade_time = 0;
+    unsigned char fast = 0;
 
     pic_init();
-    led_init();
-    pwm_init();
+    buttons_init();
+    rgb_init();
+    srand(27);
+
+    if (buttons_on())
+      rgb_on();
+
     while (1) {
-        led = 1 - led;
-        led_set(led);
-        pwm_set(step);
-        if (fwd == 0) {
-            step--;
-            if (step == -1) {
-                fwd = 1;
-                step++;
+        unsigned char buttons = buttons_read();
+
+        if ((buttons & (IN_ROCKERA | IN_ROCKERB))) {
+            if (buttons & IN_PUSHBTN) {
+              if (!fast) {
+                fast = 1;
+                incolor_time = 0;
+                fade_time = 0;
+              } else
+                fast = 0;
             }
-        } else /* fwd == 1 */ {
-            step++;
-            if (step == BRIGHT_STEPS) {
-                fwd = 0;
-                step--;
+
+            if (fade_time) {
+              red += fadestep_red;
+              grn += fadestep_grn;
+              blu += fadestep_blu;
+              //wht += fadestep_wht;
+              rgb_set(red >> 7, grn >> 7, blu >> 7, 0); // wht >> 7);
+              fade_time--;
+            } else if (incolor_time)
+              incolor_time--;
+            else /* fade_time == 0 && incolor_time == 0 */ {
+              int 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 (fast) {
+                incolor_time = 1 + incolor_time / 8;
+                fade_time = 1 + fade_time / 8;
+              }
+
+              fadestep_red = (newr - red) / fade_time;
+              fadestep_grn = (newg - red) / fade_time;
+              fadestep_blu = (newb - red) / fade_time;
+              //fadestep_wht = (neww - red) / fade_time;
             }
+            __delay_ms(50);
+        } else {
+            rgb_off();
+            buttons_sleep();
+            incolor_time = 0;
+            fade_time = 0;
+            rgb_on();
         }
-        delay(); delay();
     }
     return 0;
 }