Don't use % to rotate _task_bitno; too slow.

[rgblamp.git] / main.c

diff --git a/main.c b/main.c
index 331ec58c254491d20ffd1813510e93ddf63dcec4..e98dd0474b6a05b6e26f73c936899f3a82fc9728 100644 (file)
--- a/main.c
+++ b/main.c
@@ -125,11 +125,12 @@ 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();
 }
 
@@ -147,7 +148,8 @@ void pb_task()
 {
   if (btn_pb() == BTN_PB_UP) {
     speed = (speed + 1) & ~4;
-    fade_steps = 0;
+    tmr_stop(TMR_INCOLOR);
+    start_fade();
   }
   btn_pben();
 }
@@ -189,16 +191,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);
   }
 }
 
@@ -229,7 +231,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;
     }
   }