Ensure proper behavior in timer_cwait

[rgblamp.git] / main.c

diff --git a/main.c b/main.c
index 4f36d146b1133f58aa7e32e07ddd4c05f9fc5831..9754ea06851d01160d1e7cf2ac45121d72e15fb4 100644 (file)
--- a/main.c
+++ b/main.c
@@ -15,8 +15,8 @@
  * - ( 9) RB3 - CCP1 PWM for red LED
  * - (10) RB4 - rocker switch position B (right)
  * - (11) RB5 - rocker switch position A (left)
- * - (12) RB6 - unused
- * - (13) RB7 - unused
+ * - (12) RB6 - unused (future crystal)
+ * - (13) RB7 - unused (future crystal)
  * - (14) Vdd
  * - (15) RA6 - unused
  * - (16) RA7 - CCP2 PWM for grn LED
@@ -28,11 +28,13 @@
 #include <htc.h>
 #include <stdlib.h>
 #include "picinit.h"
+#include "unused.h"
 #include "buttons.h"
 #include "rgb.h"
-#include "unused.h"
+#include "timer.h"
+#include "adc_random.h"
 
-#define STEP_SIZE               32 /* ms */
+#define AUTO_OFF_COUNT          549316UL /* 5 hrs in 32.768 ms units */
 #define reset_steps()           do { incolor_steps = 1; fade_steps = 0; } \
                                   while (0)
 #define rand_u8()               (rand() & 0xff)
@@ -44,12 +46,22 @@
 #define leds_set(r,g,b,w)       rgb_set((r).value >> 7, \
                                   (g).value >> 7, \
                                   (b).value >> 7, \
-                                  (w).value >> 7)
+                                  0)
+
+#define dbgpin_init() \
+do { \
+  /* Set RA2 as output low */ \
+  PORTA &= ~0x04; \
+  TRISA &= ~0x04; \
+} while (0)
+
+#define dbgpin_high() PORTA |= 0x04;
+#define dbgpin_low()  PORTA &= ~0x04;
 
 typedef struct {
   int value;
   int increment;
-  char remainder;
+  signed char remainder;
 } led_t;
 #define INIT_LED { 0, 0, 0 }
 
@@ -66,16 +78,6 @@ const static int min_fade_steps[4] =           { 64, 32, 16,  8 };
 const static int range_fade_steps[4] =         {  1,  1,  1,  1 };
 #endif
 
-#define dbgpin_init() \
-do { \
-  /* Set RA2 as output low */ \
-  PORTA &= ~0x04; \
-  TRISA &= ~0x04; \
-} while (0)
-
-#define dbgpin_high() PORTA |= 0x04;
-#define dbgpin_low()  PORTA &= ~0x04;
-
 int main(void)
 {
     led_t red = INIT_LED;
@@ -85,13 +87,16 @@ int main(void)
     unsigned char speed = 0;
     unsigned incolor_steps;
     int fade_steps;
+    unsigned long auto_off = 0;
 
     pic_init();
     unused_init();
     buttons_init();
     rgb_init();
+    timer_init();
     dbgpin_init();
 
+    srand((adc_random() << 8) + adc_random());
     reset_steps();
     if (buttons_on())
       rgb_on();
@@ -100,11 +105,30 @@ int main(void)
     while (1) {
         unsigned char buttons = buttons_read();
 
-        if ((buttons & (IN_ROCKERA | IN_ROCKERB))) {
+        if ((buttons & IN_ROCKERB) && auto_off == 0)
+            auto_off = AUTO_OFF_COUNT;
+
+        if (((buttons & IN_ROCKERB) && auto_off && --auto_off == 0) ||
+            (!(buttons & (IN_ROCKERA | IN_ROCKERB)))) {
+            /* Sleep when auto-off time has expired or if rocker switch is
+             * turned off.
+             */
+            rgb_off();
+            dbgpin_low();
+            auto_off = 0;
+            buttons_sleep();
+            dbgpin_high();
+            reset_steps();
+            rgb_on();
+            red.value = 0;
+            grn.value = 0;
+            blu.value = 0;
+            wht.value = 0;
+        } else {
             /* Crappy way to detect rising edges to change state of speed var */
-            if (!(speed & 4) && (buttons & IN_PUSHBTN)) {
+            if (!(speed & 4) && (buttons & IN_PUSHBTN))
                 speed |= 4;
-            } else if ((speed & 4) && !(buttons & IN_PUSHBTN)) {
+            else if ((speed & 4) && !(buttons & IN_PUSHBTN)) {
                 speed = (speed + 1) & ~4;
                 reset_steps();
             }
@@ -140,7 +164,7 @@ int main(void)
 
               /* Next incolor and fade steps */
               incolor_steps = rand_incolor_steps(speed);
-              fade_steps = (buttons & IN_ROCKERA) ? 1 : rand_fade_steps(speed);
+              fade_steps = rand_fade_steps(speed);
 
               /* Compute increment and remainder for each led */
               red.increment = (newr - red.value) / fade_steps;
@@ -153,19 +177,8 @@ int main(void)
               wht.remainder = neww - (wht.value + wht.increment * fade_steps);
             }
             dbgpin_low();
-            __delay_ms(STEP_SIZE); /* step should be start to start... */
+            timer_owait(); /* wait 32 ms since last return from last call() */
             dbgpin_high();
-        } else {
-            rgb_off();
-            dbgpin_low();
-            buttons_sleep();
-            dbgpin_high();
-            reset_steps();
-            rgb_on();
-            red.value = 0;
-            grn.value = 0;
-            blu.value = 0;
-            wht.value = 0;
         }
     }
     return 0;