Fixes to pushbutton handling in main.

[rgblamp.git] / main.c

diff --git a/main.c b/main.c
index 637879f2cab0c18349df39617866dc8eea61c4fe..9f910dfbe6841e0dd0d29fac0d01418fbd1ca450 100644 (file)
--- a/main.c
+++ b/main.c
@@ -32,8 +32,8 @@
 #include "btn.h"
 #include "rgb.h"
 #include "tmr.h"
-#include "adc_random.h"
 #include "task.h"
+#include "adc_random.h"
 
 #if 0
 #define AUTO_OFF_COUNT          549316UL  /*  5 hrs in 32.768 ms units */
@@ -118,6 +118,7 @@ void start_fade()
   wht.remainder = neww - (wht.value + wht.increment * fade_steps);
 
   /* Start the fade timer */
+  tmr_stop(TMR_INCOLOR);
   tmr_startPeriodic(TMR_FADE, 1);  /* 32.768 msec */
 }
 
@@ -125,12 +126,14 @@ void turnOn()
 {
   dbgpin_high();
   on = 1;
-  rgb_on();
   red.value = 0;
   grn.value = 0;
   blu.value = 0;
   wht.value = 0;
+  leds_set(red, grn, blu, wht);
+  rgb_on();
   start_fade();
+  btn_pben();
 }
 
 void turnOff()
@@ -145,11 +148,14 @@ void turnOff()
 
 void pb_task()
 {
-  if (btn_pb() == BTN_PB_UP) {
-    speed = (speed + 1) & ~4;
-    fade_steps = 0;
+  /* Is this task running nearly continuously? */
+  if (on) {
+    if (btn_pb() == BTN_PB_UP) {
+      speed = (speed + 1) & 3;
+      start_fade();
+    }
+    btn_pben();
   }
-  btn_pben();
 }
 
 void rs_task()
@@ -189,16 +195,16 @@ void fade_task()
   leds_set(red, grn, blu, wht);
 }
 
-void auto_onoff_task()
+void auto_offon_task()
 {
   if (on) {
     turnOff();
     if (btn_rs() == BTN_RS_RIGHT)
-      tmr_start(TMR_AUTO_OFFON, AUTO_OFF_COUNT);
+      tmr_start(TMR_AUTO_OFFON, AUTO_ON_COUNT);
   } else /* off */ {
     turnOn();
     if (btn_rs() == BTN_RS_RIGHT)
-      tmr_start(TMR_AUTO_OFFON, AUTO_ON_COUNT);
+      tmr_start(TMR_AUTO_OFFON, AUTO_OFF_COUNT);
   }
 }
 
@@ -206,7 +212,6 @@ void user_boot()
 {
   dbgpin_high();
   srand((adc_random() << 8) + adc_random());
-  pb_task();
   rs_task();
 }
 
@@ -214,7 +219,7 @@ void user_tasks(unsigned char block)
 {
   task_id_t tid;
 
-  while ((tid = task_get(block))) {
+  while ((tid = task_get(block)) >= 0) {
     switch (tid) {
       case TASK_BTN_PB:         /* pushbutton state change */
         pb_task();
@@ -229,7 +234,7 @@ void user_tasks(unsigned char block)
         start_fade();
         break;
       case TASK_AUTO_OFFON:     /* auto on/off timer has fired */
-        auto_onoff_task();
+        auto_offon_task();
         break;
     }
   }
@@ -237,6 +242,7 @@ void user_tasks(unsigned char block)
 
 int main(void)
 {
+  /* Platform initialization */
   pic_init();
   unused_init();
   btn_init();
@@ -264,5 +270,8 @@ int main(void)
 
   /* Process tasks forever */
   user_tasks(1);
+
+  /* Prevent return from main, which causes a device reset */
+  while (1);
 }