moved candle mode to its own file, since it's kinda big

4 files changed, 194 insertions, 138 deletions

diff --git a/spaghetti-monster/anduril/candle-mode.c b/spaghetti-monster/anduril/candle-mode.c
new file mode 100644
index 0000000..d0a4eb2
--- /dev/null
+++ b/spaghetti-monster/anduril/candle-mode.c
@@ -0,0 +1,159 @@
+/*
+ * candle-mode.c: Candle mode for Anduril.
+ *
+ * Copyright (C) 2017 Selene ToyKeeper
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CANDLE_MODE_C
+#define CANDLE_MODE_C
+
+#include "candle-mode.h"
+
+uint8_t candle_mode_state(Event event, uint16_t arg) {
+    static int8_t ramp_direction = 1;
+    #define MAX_CANDLE_LEVEL (RAMP_LENGTH-CANDLE_AMPLITUDE-15)
+    static uint8_t candle_wave1 = 0;
+    static uint8_t candle_wave2 = 0;
+    static uint8_t candle_wave3 = 0;
+    static uint8_t candle_wave2_speed = 0;
+    // these should add up to 100
+    #define CANDLE_WAVE1_MAXDEPTH 30
+    #define CANDLE_WAVE2_MAXDEPTH 45
+    #define CANDLE_WAVE3_MAXDEPTH 25
+    static const uint8_t candle_wave1_depth = CANDLE_WAVE1_MAXDEPTH * CANDLE_AMPLITUDE / 100;
+    static uint8_t candle_wave2_depth       = CANDLE_WAVE2_MAXDEPTH * CANDLE_AMPLITUDE / 100;
+    static uint8_t candle_wave3_depth       = CANDLE_WAVE3_MAXDEPTH * CANDLE_AMPLITUDE / 100;
+    static uint8_t candle_mode_brightness = 24;
+    static uint8_t candle_mode_timer = 0;
+    #define TICKS_PER_CANDLE_MINUTE 4096 // about 65 seconds
+    #define MINUTES_PER_CANDLE_HALFHOUR 27 // ish
+
+    if (event == EV_enter_state) {
+        candle_mode_timer = 0;  // in case any time was left over from earlier
+        ramp_direction = 1;
+        return MISCHIEF_MANAGED;
+    }
+    // 2 clicks: cancel timer
+    else if (event == EV_2clicks) {
+        // parent state just rotated through strobe/flasher modes,
+        // so cancel timer...  in case any time was left over from earlier
+        candle_mode_timer = 0;
+        return MISCHIEF_MANAGED;
+    }
+    // hold: change brightness (brighter)
+    else if (event == EV_click1_hold) {
+        // ramp away from extremes
+        if (! arg) {
+            if (candle_mode_brightness >= MAX_CANDLE_LEVEL) { ramp_direction = -1; }
+            else if (candle_mode_brightness <= 1) { ramp_direction = 1; }
+        }
+        // change brightness, but not too far
+        candle_mode_brightness += ramp_direction;
+        if (candle_mode_brightness < 1) candle_mode_brightness = 1;
+        else if (candle_mode_brightness > MAX_CANDLE_LEVEL) candle_mode_brightness = MAX_CANDLE_LEVEL;
+        return MISCHIEF_MANAGED;
+    }
+    // reverse ramp direction on hold release
+    else if (event == EV_click1_hold_release) {
+        ramp_direction = -ramp_direction;
+        return MISCHIEF_MANAGED;
+    }
+    // click, hold: change brightness (dimmer)
+    else if (event == EV_click2_hold) {
+        ramp_direction = 1;
+        if (candle_mode_brightness > 1)
+            candle_mode_brightness --;
+        return MISCHIEF_MANAGED;
+    }
+    // 3 clicks: add 30m to candle timer
+    else if (event == EV_3clicks) {
+        if (candle_mode_timer < (255 - MINUTES_PER_CANDLE_HALFHOUR)) {
+            // add 30m to the timer
+            candle_mode_timer += MINUTES_PER_CANDLE_HALFHOUR;
+            // blink to confirm
+            set_level(actual_level + 32);
+            delay_4ms(2);
+        }
+        return MISCHIEF_MANAGED;
+    }
+    // clock tick: animate candle brightness
+    else if (event == EV_tick) {
+        // un-reverse after 1 second
+        if (arg == TICKS_PER_SECOND) ramp_direction = 1;
+
+        // self-timer dims the light during the final minute
+        uint8_t subtract = 0;
+        if (candle_mode_timer == 1) {
+            subtract = ((candle_mode_brightness+CANDLE_AMPLITUDE)
+                     * ((arg & (TICKS_PER_CANDLE_MINUTE-1)) >> 4))
+                     >> 8;
+        }
+        // we passed a minute mark, decrease timer if it's running
+        if ((arg & (TICKS_PER_CANDLE_MINUTE-1)) == (TICKS_PER_CANDLE_MINUTE - 1)) {
+            if (candle_mode_timer > 0) {
+                candle_mode_timer --;
+                //set_level(0);  delay_4ms(2);
+                // if the timer ran out, shut off
+                if (! candle_mode_timer) {
+                    set_state(off_state, 0);
+                }
+            }
+        }
+        // 3-oscillator synth for a relatively organic pattern
+        uint8_t add;
+        add = ((triangle_wave(candle_wave1) * candle_wave1_depth) >> 8)
+            + ((triangle_wave(candle_wave2) * candle_wave2_depth) >> 8)
+            + ((triangle_wave(candle_wave3) * candle_wave3_depth) >> 8);
+        int8_t brightness = candle_mode_brightness + add - subtract;
+        if (brightness < 0) { brightness = 0; }
+        set_level(brightness);
+
+        // wave1: slow random LFO
+        // TODO: make wave slower and more erratic?
+        if ((arg & 1) == 0) candle_wave1 += pseudo_rand() & 1;
+        // wave2: medium-speed erratic LFO
+        candle_wave2 += candle_wave2_speed;
+        // wave3: erratic fast wave
+        candle_wave3 += pseudo_rand() % 37;
+        // S&H on wave2 frequency to make it more erratic
+        if ((pseudo_rand() & 0b00111111) == 0)
+            candle_wave2_speed = pseudo_rand() % 13;
+        // downward sawtooth on wave2 depth to simulate stabilizing
+        if ((candle_wave2_depth > 0) && ((pseudo_rand() & 0b00111111) == 0))
+            candle_wave2_depth --;
+        // random sawtooth retrigger
+        if (pseudo_rand() == 0) {
+            // random amplitude
+            //candle_wave2_depth = 2 + (pseudo_rand() % ((CANDLE_WAVE2_MAXDEPTH * CANDLE_AMPLITUDE / 100) - 2));
+            candle_wave2_depth = pseudo_rand() % (CANDLE_WAVE2_MAXDEPTH * CANDLE_AMPLITUDE / 100);
+            //candle_wave3_depth = 5;
+            candle_wave2 = 0;
+        }
+        // downward sawtooth on wave3 depth to simulate stabilizing
+        if ((candle_wave3_depth > 2) && ((pseudo_rand() & 0b00011111) == 0))
+            candle_wave3_depth --;
+        if ((pseudo_rand() & 0b01111111) == 0)
+            // random amplitude
+            //candle_wave3_depth = 2 + (pseudo_rand() % ((CANDLE_WAVE3_MAXDEPTH * CANDLE_AMPLITUDE / 100) - 2));
+            candle_wave3_depth = pseudo_rand() % (CANDLE_WAVE3_MAXDEPTH * CANDLE_AMPLITUDE / 100);
+        return MISCHIEF_MANAGED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+
+
+#endif
+
diff --git a/spaghetti-monster/anduril/candle-mode.h b/spaghetti-monster/anduril/candle-mode.h
new file mode 100644
index 0000000..8859a9c
--- /dev/null
+++ b/spaghetti-monster/anduril/candle-mode.h
@@ -0,0 +1,32 @@
+/*
+ * candle-mode.h: Candle mode for Anduril.
+ *
+ * Copyright (C) 2017 Selene ToyKeeper
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CANDLE_MODE_H
+#define CANDLE_MODE_H
+
+#ifndef CANDLE_AMPLITUDE
+#define CANDLE_AMPLITUDE 25
+#endif
+
+uint8_t candle_mode_state(Event event, uint16_t arg);
+// moved to fsm-misc.c because it's also used for tint ramping power correction
+//uint8_t triangle_wave(uint8_t phase);
+
+
+#endif
diff --git a/spaghetti-monster/anduril/strobe-modes.c b/spaghetti-monster/anduril/strobe-modes.c
index 8c5f34d..7d046bf 100644
--- a/spaghetti-monster/anduril/strobe-modes.c
+++ b/spaghetti-monster/anduril/strobe-modes.c
@@ -284,138 +284,8 @@ inline void bike_flasher_iter() {
 #endif
 
 #ifdef USE_CANDLE_MODE
-uint8_t candle_mode_state(Event event, uint16_t arg) {
-    static int8_t ramp_direction = 1;
-    #define MAX_CANDLE_LEVEL (RAMP_LENGTH-CANDLE_AMPLITUDE-15)
-    static uint8_t candle_wave1 = 0;
-    static uint8_t candle_wave2 = 0;
-    static uint8_t candle_wave3 = 0;
-    static uint8_t candle_wave2_speed = 0;
-    // these should add up to 100
-    #define CANDLE_WAVE1_MAXDEPTH 30
-    #define CANDLE_WAVE2_MAXDEPTH 45
-    #define CANDLE_WAVE3_MAXDEPTH 25
-    static const uint8_t candle_wave1_depth = CANDLE_WAVE1_MAXDEPTH * CANDLE_AMPLITUDE / 100;
-    static uint8_t candle_wave2_depth       = CANDLE_WAVE2_MAXDEPTH * CANDLE_AMPLITUDE / 100;
-    static uint8_t candle_wave3_depth       = CANDLE_WAVE3_MAXDEPTH * CANDLE_AMPLITUDE / 100;
-    static uint8_t candle_mode_brightness = 24;
-    static uint8_t candle_mode_timer = 0;
-    #define TICKS_PER_CANDLE_MINUTE 4096 // about 65 seconds
-    #define MINUTES_PER_CANDLE_HALFHOUR 27 // ish
-
-    if (event == EV_enter_state) {
-        candle_mode_timer = 0;  // in case any time was left over from earlier
-        ramp_direction = 1;
-        return MISCHIEF_MANAGED;
-    }
-    // 2 clicks: cancel timer
-    else if (event == EV_2clicks) {
-        // parent state just rotated through strobe/flasher modes,
-        // so cancel timer...  in case any time was left over from earlier
-        candle_mode_timer = 0;
-        return MISCHIEF_MANAGED;
-    }
-    // hold: change brightness (brighter)
-    else if (event == EV_click1_hold) {
-        // ramp away from extremes
-        if (! arg) {
-            if (candle_mode_brightness >= MAX_CANDLE_LEVEL) { ramp_direction = -1; }
-            else if (candle_mode_brightness <= 1) { ramp_direction = 1; }
-        }
-        // change brightness, but not too far
-        candle_mode_brightness += ramp_direction;
-        if (candle_mode_brightness < 1) candle_mode_brightness = 1;
-        else if (candle_mode_brightness > MAX_CANDLE_LEVEL) candle_mode_brightness = MAX_CANDLE_LEVEL;
-        return MISCHIEF_MANAGED;
-    }
-    // reverse ramp direction on hold release
-    else if (event == EV_click1_hold_release) {
-        ramp_direction = -ramp_direction;
-        return MISCHIEF_MANAGED;
-    }
-    // click, hold: change brightness (dimmer)
-    else if (event == EV_click2_hold) {
-        ramp_direction = 1;
-        if (candle_mode_brightness > 1)
-            candle_mode_brightness --;
-        return MISCHIEF_MANAGED;
-    }
-    // 3 clicks: add 30m to candle timer
-    else if (event == EV_3clicks) {
-        if (candle_mode_timer < (255 - MINUTES_PER_CANDLE_HALFHOUR)) {
-            // add 30m to the timer
-            candle_mode_timer += MINUTES_PER_CANDLE_HALFHOUR;
-            // blink to confirm
-            set_level(actual_level + 32);
-            delay_4ms(2);
-        }
-        return MISCHIEF_MANAGED;
-    }
-    // clock tick: animate candle brightness
-    else if (event == EV_tick) {
-        // un-reverse after 1 second
-        if (arg == TICKS_PER_SECOND) ramp_direction = 1;
-
-        // self-timer dims the light during the final minute
-        uint8_t subtract = 0;
-        if (candle_mode_timer == 1) {
-            subtract = ((candle_mode_brightness+CANDLE_AMPLITUDE)
-                     * ((arg & (TICKS_PER_CANDLE_MINUTE-1)) >> 4))
-                     >> 8;
-        }
-        // we passed a minute mark, decrease timer if it's running
-        if ((arg & (TICKS_PER_CANDLE_MINUTE-1)) == (TICKS_PER_CANDLE_MINUTE - 1)) {
-            if (candle_mode_timer > 0) {
-                candle_mode_timer --;
-                //set_level(0);  delay_4ms(2);
-                // if the timer ran out, shut off
-                if (! candle_mode_timer) {
-                    set_state(off_state, 0);
-                }
-            }
-        }
-        // 3-oscillator synth for a relatively organic pattern
-        uint8_t add;
-        add = ((triangle_wave(candle_wave1) * candle_wave1_depth) >> 8)
-            + ((triangle_wave(candle_wave2) * candle_wave2_depth) >> 8)
-            + ((triangle_wave(candle_wave3) * candle_wave3_depth) >> 8);
-        int8_t brightness = candle_mode_brightness + add - subtract;
-        if (brightness < 0) { brightness = 0; }
-        set_level(brightness);
-
-        // wave1: slow random LFO
-        // TODO: make wave slower and more erratic?
-        if ((arg & 1) == 0) candle_wave1 += pseudo_rand() & 1;
-        // wave2: medium-speed erratic LFO
-        candle_wave2 += candle_wave2_speed;
-        // wave3: erratic fast wave
-        candle_wave3 += pseudo_rand() % 37;
-        // S&H on wave2 frequency to make it more erratic
-        if ((pseudo_rand() & 0b00111111) == 0)
-            candle_wave2_speed = pseudo_rand() % 13;
-        // downward sawtooth on wave2 depth to simulate stabilizing
-        if ((candle_wave2_depth > 0) && ((pseudo_rand() & 0b00111111) == 0))
-            candle_wave2_depth --;
-        // random sawtooth retrigger
-        if (pseudo_rand() == 0) {
-            // random amplitude
-            //candle_wave2_depth = 2 + (pseudo_rand() % ((CANDLE_WAVE2_MAXDEPTH * CANDLE_AMPLITUDE / 100) - 2));
-            candle_wave2_depth = pseudo_rand() % (CANDLE_WAVE2_MAXDEPTH * CANDLE_AMPLITUDE / 100);
-            //candle_wave3_depth = 5;
-            candle_wave2 = 0;
-        }
-        // downward sawtooth on wave3 depth to simulate stabilizing
-        if ((candle_wave3_depth > 2) && ((pseudo_rand() & 0b00011111) == 0))
-            candle_wave3_depth --;
-        if ((pseudo_rand() & 0b01111111) == 0)
-            // random amplitude
-            //candle_wave3_depth = 2 + (pseudo_rand() % ((CANDLE_WAVE3_MAXDEPTH * CANDLE_AMPLITUDE / 100) - 2));
-            candle_wave3_depth = pseudo_rand() % (CANDLE_WAVE3_MAXDEPTH * CANDLE_AMPLITUDE / 100);
-        return MISCHIEF_MANAGED;
-    }
-    return EVENT_NOT_HANDLED;
-}
-#endif  // #ifdef USE_CANDLE_MODE
+#include "candle-mode.c"
+#endif
 
 
 #ifdef USE_BORING_STROBE_STATE
diff --git a/spaghetti-monster/anduril/strobe-modes.h b/spaghetti-monster/anduril/strobe-modes.h
index e2711f2..d432eea 100644
--- a/spaghetti-monster/anduril/strobe-modes.h
+++ b/spaghetti-monster/anduril/strobe-modes.h
@@ -86,12 +86,7 @@ inline void bike_flasher_iter();
 #endif
 
 #ifdef USE_CANDLE_MODE
-uint8_t candle_mode_state(Event event, uint16_t arg);
-// moved to fsm-misc.c because tint ramping power correction
-//uint8_t triangle_wave(uint8_t phase);
-#ifndef CANDLE_AMPLITUDE
-#define CANDLE_AMPLITUDE 25
-#endif
+#include "candle-mode.h"
 #endif