Change MODE_FADE to MODE_CYCLE

[rgblamp.git] / main.c

diff --git a/main.c b/main.c
index aefd4349172fe20f8ac0c1abee8b74ed3895ced8..0f98b6aada831887f1b8be768b02c62071892a44 100644 (file)
--- a/main.c
+++ b/main.c
@@ -45,13 +45,16 @@
 #include "task.h"
 #include "adc_random.h"
 
-#if 1
-#define AUTO_OFF_COUNT   450  /* 15 mins on*/
-#define AUTO_ON_COUNT    1350 /* 45 mins off */
-#else
+//#define AUTO_OFF_COUNT   150  /* 5 mins on*/
+//#define AUTO_ON_COUNT    300  /* 10 mins off */
+//#define AUTO_OFF_COUNT   450  /* 15 mins on*/
+//#define AUTO_ON_COUNT    1350 /* 45 mins off */
+//#define AUTO_OFF_COUNT   600  /* 20 mins on*/
+//#define AUTO_ON_COUNT    1200 /* 40 mins off */
+//#define AUTO_OFF_COUNT   450  /* 2 hours on*/
+//#define AUTO_ON_COUNT    1350 /* 22 hours off */
 #define AUTO_OFF_COUNT   9000U  /*  5 hrs in 2 sec units */
 #define AUTO_ON_COUNT    34200U /* 19 hrs in 2 sec units */
-#endif
 #define dbgpin_init()    do { \
                              /* Set RA2 as output low */ \
                              RA2 = 0; \
@@ -65,7 +68,7 @@ enum {
   /* Operating modes */
   MODE_SOLID = 0,        /* Cycle through colors[][] before next mode */
   //MODE_CANDLE,
-  MODE_FADE,             /* Auto cycle through colors */
+  MODE_CYCLE,             /* Auto cycle through colors */
   MODE_PARTY,            /* Random yet fast incolor and fade */
   MODE_COUNT,
 
@@ -171,7 +174,7 @@ void start_fade()
   if (mode == MODE_PARTY) {
     color = rand() % COLOR_COUNT;
     fade_steps = PARTY_MIN + (rand() % PARTY_RANGE);
-  } else if (mode == MODE_FADE) {
+  } else if (mode == MODE_CYCLE) {
     if (++color == COLOR_COUNT)
       color = 0;
   }
@@ -317,7 +320,7 @@ void fade_task()
     blu.value += blu.remainder;
     wht.value += wht.remainder;
     tmr_stop(TMR_FADE);
-    if (mode == MODE_FADE)
+    if (mode == MODE_CYCLE)
       tmr_start(TMR_INCOLOR, STD_INCOLOR);
     else if (mode == MODE_PARTY)
       tmr_start(TMR_INCOLOR, PARTY_MIN + (rand() % PARTY_RANGE));