Incorporate new tmr and isr code

[rgblamp.git] / main.c

diff --git a/main.c b/main.c
index 9754ea06851d01160d1e7cf2ac45121d72e15fb4..65cff5565ab684b1d875cdc5e0667a5c10dab461 100644 (file)
--- a/main.c
+++ b/main.c
@@ -31,12 +31,18 @@
 #include "unused.h"
 #include "buttons.h"
 #include "rgb.h"
-#include "timer.h"
+#include "tmr.h"
 #include "adc_random.h"
 
-#define AUTO_OFF_COUNT          549316UL /* 5 hrs in 32.768 ms units */
+#if 0
+#define AUTO_OFF_COUNT          549316UL  /*  5 hrs in 32.768 ms units */
+#define AUTO_ON_COUNT           2087402UL /* 19 hrs in 32.768 ms units */
+#else
+#define AUTO_OFF_COUNT          1831 /* 1 minute in 32.768 ms units */
+#define AUTO_ON_COUNT           3662 /* 2 minutes in 32.768 ms units */
+#endif
 #define reset_steps()           do { incolor_steps = 1; fade_steps = 0; } \
-                                  while (0)
+                                    while (0)
 #define rand_u8()               (rand() & 0xff)
 #define rand_u16()              ((rand() << 8) + rand_u8())
 #define rand_incolor_steps(s)   (min_incolor_steps[s & 3] + \
@@ -44,19 +50,17 @@
 #define rand_fade_steps(s)      (min_fade_steps[s & 3] + \
                                     (rand() % range_fade_steps[s & 3]))
 #define leds_set(r,g,b,w)       rgb_set((r).value >> 7, \
-                                  (g).value >> 7, \
-                                  (b).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;
+                                    (g).value >> 7, \
+                                    (b).value >> 7, \
+                                    0)
+#define dbgpin_init()           do { \
+                                    /* Set RA2 as output low */ \
+                                    RA2 = 0; \
+                                    TRISA2 = 0; \
+                                } while (0)
+#define dbgpin_high() (RA2 = 1)
+#define dbgpin_low()  (RA2 = 0)
+#define dbgpin_toggle()  (RA2 = (LATA2 == 0) ? 1 : 0)
 
 typedef struct {
   int value;
@@ -93,7 +97,7 @@ int main(void)
     unused_init();
     buttons_init();
     rgb_init();
-    timer_init();
+    tmr_init();
     dbgpin_init();
 
     srand((adc_random() << 8) + adc_random());
@@ -102,13 +106,14 @@ int main(void)
       rgb_on();
 
     dbgpin_high();
+    tmr_startPeriodic(TMR_FADE, 1);  /* 32.768 msec */
     while (1) {
         unsigned char buttons = buttons_read();
 
         if ((buttons & IN_ROCKERB) && auto_off == 0)
-            auto_off = AUTO_OFF_COUNT;
+            tmr_startPeriodic(TMR_AUTO_OFFON, AUTO_OFF_COUNT);
 
-        if (((buttons & IN_ROCKERB) && auto_off && --auto_off == 0) ||
+        if ((buttons & IN_ROCKERB) && tmr_fired(TMR_AUTO_OFFON) ||
             (!(buttons & (IN_ROCKERA | IN_ROCKERB)))) {
             /* Sleep when auto-off time has expired or if rocker switch is
              * turned off.
@@ -148,7 +153,7 @@ int main(void)
               }
               leds_set(red, grn, blu, wht);
             } else if (--incolor_steps == 0) {
-              int newr, newg, newb, neww, tmp;
+              int newr, newg, newb, neww;
 
               /* Next led color.  All off is not a valid option.
                * RGB values are stored and processed as 15-bit non-negative
@@ -177,7 +182,7 @@ int main(void)
               wht.remainder = neww - (wht.value + wht.increment * fade_steps);
             }
             dbgpin_low();
-            timer_owait(); /* wait 32 ms since last return from last call() */
+            while (!tmr_fired(TMR_FADE));
             dbgpin_high();
         }
     }