From 8d2f442317fd3678213a14307f95d2f5b54c5623 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sat, 19 Aug 2017 12:17:58 -0600
Subject: Renamed from RoundTable to SpaghettiMonster (FSM).

---
 spaghetti-monster/fsm-ramping.h       |  26 ++
 spaghetti-monster/momentary.c         |  85 ++++
 spaghetti-monster/spaghetti-monster.h | 737 ++++++++++++++++++++++++++++++++++
 3 files changed, 848 insertions(+)
 create mode 100644 spaghetti-monster/fsm-ramping.h
 create mode 100644 spaghetti-monster/momentary.c
 create mode 100644 spaghetti-monster/spaghetti-monster.h

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/fsm-ramping.h b/spaghetti-monster/fsm-ramping.h
new file mode 100644
index 0000000..fd4d40b
--- /dev/null
+++ b/spaghetti-monster/fsm-ramping.h
@@ -0,0 +1,26 @@
+/*
+ * fsm-ramping.h: Ramping functions for SpaghettiMonster.
+ * Handles 1- to 4-channel smooth ramping on a single LED.
+ *
+ * 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/>.
+ */
+
+// TODO: ramp tables
+// TODO: RAMP_SIZE / MAX_LVL
+// TODO: actual_lvl
+// TODO: target_lvl
+// TODO: set_lvl
+// TODO: set_lvl_smooth
diff --git a/spaghetti-monster/momentary.c b/spaghetti-monster/momentary.c
new file mode 100644
index 0000000..bb74795
--- /dev/null
+++ b/spaghetti-monster/momentary.c
@@ -0,0 +1,85 @@
+/*
+ * Momentary: Very simple example UI for SpaghettiMonster.
+ * Is intended to be the simplest possible FSM e-switch UI.
+ * The light is on while the button is held; off otherwise.
+ *
+ * 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/>.
+ */
+
+#define FSM_EMISAR_D4_LAYOUT
+#define USE_LVP
+#define USE_DEBUG_BLINK
+#include "spaghetti-monster.h"
+
+volatile uint8_t brightness;
+volatile uint8_t on_now;
+
+void light_on() {
+    on_now = 1;
+    PWM1_LVL = brightness;
+    PWM2_LVL = 0;
+}
+
+void light_off() {
+    on_now = 0;
+    PWM1_LVL = 0;
+    PWM2_LVL = 0;
+}
+
+uint8_t momentary_state(EventPtr event, uint16_t arg) {
+
+    if (event == EV_click1_press) {
+        brightness = 255;
+        light_on();
+        // don't attempt to parse multiple clicks
+        empty_event_sequence();
+        return 0;
+    }
+
+    else if (event == EV_release) {
+        light_off();
+        // don't attempt to parse multiple clicks
+        empty_event_sequence();
+        return 0;
+    }
+
+    else if (event == EV_debug) {
+        //PWM1_LVL = arg&0xff;
+        DEBUG_FLASH;
+        return 0;
+    }
+
+    // event not handled
+    return 1;
+}
+
+// LVP / low-voltage protection
+void low_voltage() {
+    debug_blink(3);
+    if (brightness > 0) {
+        brightness >>= 1;
+        if (on_now) light_on();
+    } else {
+        light_off();
+        standby_mode();
+    }
+}
+
+void setup() {
+    debug_blink(2);
+
+    push_state(momentary_state);
+}
diff --git a/spaghetti-monster/spaghetti-monster.h b/spaghetti-monster/spaghetti-monster.h
new file mode 100644
index 0000000..af6d828
--- /dev/null
+++ b/spaghetti-monster/spaghetti-monster.h
@@ -0,0 +1,737 @@
+/*
+ * SpaghettiMonster: Generic foundation code for e-switch flashlights.
+ * Other possible names:
+ * - FSM
+ * - RoundTable
+ * - Mostly Harmless
+ * - ...
+ *
+ * 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/>.
+ */
+
+#include "tk-attiny.h"
+
+#include <avr/pgmspace.h>
+#include <avr/io.h>
+#include <avr/interrupt.h>
+#include <avr/wdt.h>
+#include <avr/eeprom.h>
+#include <avr/sleep.h>
+#include <util/delay_basic.h>
+
+// typedefs
+typedef PROGMEM const uint8_t Event;
+typedef Event * EventPtr;
+typedef uint8_t (*EventCallbackPtr)(EventPtr event, uint16_t arg);
+typedef uint8_t EventCallback(EventPtr event, uint16_t arg);
+typedef uint8_t State(EventPtr event, uint16_t arg);
+typedef State * StatePtr;
+typedef struct Emission {
+    EventPtr event;
+    uint16_t arg;
+} Emission;
+
+volatile StatePtr current_state;
+#define EV_MAX_LEN 16
+uint8_t current_event[EV_MAX_LEN];
+// at 0.016 ms per tick, 255 ticks = 4.08 s
+// TODO: 16 bits?
+static volatile uint8_t ticks_since_last_event = 0;
+
+#ifdef USE_LVP
+// volts * 10
+#define VOLTAGE_LOW 30
+// MCU sees voltage 0.X volts lower than actual, add X to readings
+#define VOLTAGE_FUDGE_FACTOR 2
+volatile uint8_t voltage;
+void low_voltage();
+#endif
+#ifdef USE_THERMAL_REGULATION
+volatile int16_t temperature;
+void low_temperature();
+void high_temperature();
+#endif
+
+#ifdef USE_DEBUG_BLINK
+#define OWN_DELAY
+#define USE_DELAY_4MS
+#include "tk-delay.h"
+#define DEBUG_FLASH PWM1_LVL = 64; delay_4ms(2); PWM1_LVL = 0;
+void debug_blink(uint8_t num) {
+    for(; num>0; num--) {
+        PWM1_LVL = 32;
+        delay_4ms(100/4);
+        PWM1_LVL = 0;
+        delay_4ms(100/4);
+    }
+}
+#endif
+
+#define A_ENTER_STATE     1
+#define A_LEAVE_STATE     2
+#define A_TICK            3
+#define A_PRESS           4
+#define A_HOLD_START      5
+#define A_HOLD_TICK       6
+#define A_RELEASE         7
+#define A_RELEASE_TIMEOUT 8
+// TODO: add events for over/under-heat conditions (with parameter for severity)
+#define A_OVERHEATING     9
+#define A_UNDERHEATING    10
+// TODO: add events for low voltage conditions
+#define A_VOLTAGE_LOW     11
+//#define A_VOLTAGE_CRITICAL 12
+#define A_DEBUG           255  // test event for debugging
+
+// TODO: maybe compare events by number instead of pointer?
+//       (number = index in event types array)
+//       (comparison would use full event content, but send off index to callbacks)
+//       (saves space by using uint8_t instead of a pointer)
+//       (also eliminates the need to duplicate single-entry events like for voltage or timer tick)
+
+// Event types
+Event EV_debug[] = {
+    A_DEBUG,
+    0 } ;
+Event EV_enter_state[] = {
+    A_ENTER_STATE,
+    0 } ;
+Event EV_leave_state[] = {
+    A_LEAVE_STATE,
+    0 } ;
+Event EV_tick[] = {
+    A_TICK,
+    0 } ;
+#ifdef USE_LVP
+Event EV_voltage_low[] = {
+    A_VOLTAGE_LOW,
+    0 } ;
+#endif
+#ifdef USE_THERMAL_REGULATION
+Event EV_temperature_high[] = {
+    A_OVERHEATING,
+    0 } ;
+Event EV_temperature_low[] = {
+    A_UNDERHEATING,
+    0 } ;
+#endif
+Event EV_click1_press[] = {
+    A_PRESS,
+    0 };
+// shouldn't normally happen, but UI might reset event while button is down
+// so a release with no recorded prior hold could be possible
+Event EV_release[] = {
+    A_RELEASE,
+    0 };
+Event EV_click1_release[] = {
+    A_PRESS,
+    A_RELEASE,
+    0 };
+#define EV_1click EV_click1_complete
+Event EV_click1_complete[] = {
+    A_PRESS,
+    A_RELEASE,
+    A_RELEASE_TIMEOUT,
+    0 };
+#define EV_hold EV_click1_hold
+// FIXME: Should holds use "start+tick" or just "tick" with a tick number?
+//        Or "start+tick" with a tick number?
+Event EV_click1_hold[] = {
+    A_PRESS,
+    A_HOLD_START,
+    0 };
+Event EV_click1_hold_release[] = {
+    A_PRESS,
+    A_HOLD_START,
+    A_RELEASE,
+    0 };
+Event EV_click2_press[] = {
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    0 };
+Event EV_click2_release[] = {
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    0 };
+#define EV_2clicks EV_click2_complete
+Event EV_click2_complete[] = {
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_RELEASE_TIMEOUT,
+    0 };
+Event EV_click3_press[] = {
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    0 };
+Event EV_click3_release[] = {
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    0 };
+#define EV_3clicks EV_click3_complete
+Event EV_click3_complete[] = {
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_RELEASE_TIMEOUT,
+    0 };
+// ... and so on
+
+// A list of event types for easy iteration
+EventPtr event_sequences[] = {
+    EV_click1_press,
+    EV_release,
+    EV_click1_release,
+    EV_click1_complete,
+    EV_click1_hold,
+    EV_click1_hold_release,
+    EV_click2_press,
+    EV_click2_release,
+    EV_click2_complete,
+    EV_click3_press,
+    EV_click3_release,
+    EV_click3_complete,
+    // ...
+};
+
+#define events_match(a,b) compare_event_sequences(a,b)
+// return 1 if (a == b), 0 otherwise
+uint8_t compare_event_sequences(uint8_t *a, const uint8_t *b) {
+    for(uint8_t i=0; (i<EV_MAX_LEN) && (a[i] == pgm_read_byte(b+i)); i++) {
+        // end of zero-terminated sequence
+        if (a[i] == 0) return 1;
+    }
+    // if we ever fall out, that means something was different
+    // (or the sequence is too long)
+    return 0;
+}
+
+void empty_event_sequence() {
+    for(uint8_t i=0; i<EV_MAX_LEN; i++) current_event[i] = 0;
+}
+
+void push_event(uint8_t ev_type) {
+    ticks_since_last_event = 0;  // something happened
+    uint8_t i;
+    for(i=0; current_event[i] && (i<EV_MAX_LEN); i++);
+    if (i < EV_MAX_LEN) {
+        current_event[i] = ev_type;
+    } else {
+        // TODO: ... something?
+    }
+}
+
+#define EMISSION_QUEUE_LEN 8
+// no comment about "volatile emissions"
+volatile Emission emissions[EMISSION_QUEUE_LEN];
+
+void append_emission(EventPtr event, uint16_t arg) {
+    uint8_t i;
+    // find last entry
+    for(i=0;
+        (i<EMISSION_QUEUE_LEN) && (emissions[i].event != NULL);
+        i++) { }
+    // add new entry
+    if (i < EMISSION_QUEUE_LEN) {
+        emissions[i].event = event;
+        emissions[i].arg = arg;
+    } else {
+        // TODO: if queue full, what should we do?
+    }
+}
+
+void delete_first_emission() {
+    uint8_t i;
+    for(i=0; i<EMISSION_QUEUE_LEN-1; i++) {
+        emissions[i].event = emissions[i+1].event;
+        emissions[i].arg = emissions[i+1].arg;
+    }
+    emissions[i].event = NULL;
+    emissions[i].arg = 0;
+}
+
+// TODO: stack for states, to allow shared utility states like "input a number"
+//       and such, which return to the previous state after finishing
+#define STATE_STACK_SIZE 8
+StatePtr state_stack[STATE_STACK_SIZE];
+uint8_t state_stack_len = 0;
+// TODO: if callback doesn't handle current event,
+//       pass event to next state on stack?
+//       Callback return values:
+//       0: event handled normally
+//       1: event not handled
+//       255: error (not sure what this would even mean though, or what difference it would make)
+// TODO: function to call stacked callbacks until one returns "handled"
+// Call stacked callbacks for the given event until one handles it.
+//#define emit_now emit
+uint8_t emit_now(EventPtr event, uint16_t arg) {
+    for(int8_t i=state_stack_len-1; i>=0; i--) {
+        uint8_t err = state_stack[i](event, arg);
+        if (! err) return 0;
+    }
+    return 1;  // event not handled
+}
+
+void emit(EventPtr event, uint16_t arg) {
+    // add this event to the queue for later,
+    // so we won't use too much time during an interrupt
+    append_emission(event, arg);
+}
+
+// Search the pre-defined event list for one matching what the user just did,
+// and emit it if one was found.
+void emit_current_event(uint16_t arg) {
+    //uint8_t err = 1;
+    for (uint8_t i=0; i<(sizeof(event_sequences)/sizeof(EventPtr)); i++) {
+        if (events_match(current_event, event_sequences[i])) {
+            //DEBUG_FLASH;
+            //err = emit(event_sequences[i], arg);
+            //return err;
+            emit(event_sequences[i], arg);
+            return;
+        }
+    }
+    //return err;
+}
+
+void _set_state(StatePtr new_state) {
+    // call old state-exit hook (don't use stack)
+    if (current_state != NULL) current_state(EV_leave_state, 0);
+    // set new state
+    current_state = new_state;
+    // call new state-enter hook (don't use stack)
+    if (new_state != NULL) current_state(EV_enter_state, 0);
+}
+
+int8_t push_state(StatePtr new_state) {
+    if (state_stack_len < STATE_STACK_SIZE) {
+        // TODO: call old state's exit hook?
+        //       new hook for non-exit recursion into child?
+        state_stack[state_stack_len] = new_state;
+        state_stack_len ++;
+        _set_state(new_state);
+        return state_stack_len;
+    } else {
+        // TODO: um...  how is a flashlight supposed to handle a recursion depth error?
+        return -1;
+    }
+}
+
+StatePtr pop_state() {
+    // TODO: how to handle pop from empty stack?
+    StatePtr old_state = NULL;
+    StatePtr new_state = NULL;
+    if (state_stack_len > 0) {
+        state_stack_len --;
+        old_state = state_stack[state_stack_len];
+    }
+    if (state_stack_len > 0) {
+        new_state = state_stack[state_stack_len-1];
+    }
+    _set_state(new_state);
+    return old_state;
+}
+
+uint8_t set_state(StatePtr new_state) {
+    // FIXME: this calls exit/enter hooks it shouldn't
+    pop_state();
+    return push_state(new_state);
+}
+
+// TODO? add events to a queue when inside an interrupt
+//       instead of calling the event functions directly?
+//       (then empty the queue in main loop?)
+
+// TODO? new delay() functions which handle queue consumption?
+// TODO? new interruptible delay() functions?
+
+
+//static volatile uint8_t button_was_pressed;
+#define BP_SAMPLES 16
+uint8_t button_is_pressed() {
+    // debounce a little
+    uint8_t highcount = 0;
+    // measure for 16/64ths of a ms
+    for(uint8_t i=0; i<BP_SAMPLES; i++) {
+        // check current value
+        uint8_t bit = ((PINB & (1<<SWITCH_PIN)) == 0);
+        highcount += bit;
+        // wait a moment
+        _delay_loop_2(BOGOMIPS/64);
+    }
+    // use most common value
+    uint8_t result = (highcount > (BP_SAMPLES/2));
+    //button_was_pressed = result;
+    return result;
+}
+
+//void button_change_interrupt() {
+ISR(PCINT0_vect) {
+
+    //DEBUG_FLASH;
+
+    // something happened
+    //ticks_since_last_event = 0;
+
+    // add event to current sequence
+    if (button_is_pressed()) {
+        push_event(A_PRESS);
+    } else {
+        push_event(A_RELEASE);
+    }
+
+    // check if sequence matches any defined sequences
+    // if so, send event to current state callback
+    emit_current_event(0);
+}
+
+// TODO: implement
+ISR(WDT_vect) {
+    /*
+    // TODO? safety net for PCINT, in case it misses a press or release
+    uint8_t bp = button_is_pressed();
+    if (bp != button_was_pressed) {
+        // TODO: handle missed button event
+        if (bp) {
+            push_event(A_PRESS);
+        } else {
+            push_event(A_RELEASE);
+        }
+        emit_current_event(0);
+    }
+    */
+
+    //timer ++;  // Is this needed at all?
+
+    /*
+    if (ticks_since_last_event & 0b00000111 ) {
+        DEBUG_FLASH;
+    }
+    */
+
+    //if (ticks_since_last_event < 0xff) ticks_since_last_event ++;
+    // increment, but loop from 255 back to 128
+    ticks_since_last_event = (ticks_since_last_event + 1) \
+                             | (ticks_since_last_event & 0x80);
+
+    //static uint8_t hold_ticks = 0;  // TODO: 16 bits?
+
+    // callback on each timer tick
+    emit(EV_tick, ticks_since_last_event);
+
+    // if time since last event exceeds timeout,
+    // append timeout to current event sequence, then
+    // send event to current state callback
+    // //hold_event(ticks)
+    // //emit(EV_press_hold, hold_ticks);
+    // emit_current_event(hold_ticks);
+    // or
+    // //release_timeout()
+    // //emit(EV_press_release_timeout, 0);
+    // emit_current_event(0);
+
+    #if defined(USE_LVP) || defined(USE_THERMAL_REGULATION)
+    // start a new ADC measurement every 4 ticks
+    static uint8_t adc_trigger = 0;
+    adc_trigger ++;
+    if (adc_trigger > 3) {
+        adc_trigger = 0;
+        ADCSRA |= (1 << ADSC) | (1 << ADIE);
+    }
+    #endif
+}
+
+// TODO: implement?  (or is it better done in main()?)
+ISR(ADC_vect) {
+    static uint8_t adc_step = 0;
+    #ifdef USE_LVP
+    #ifdef USE_LVP_AVG
+    #define NUM_VOLTAGE_VALUES 4
+    static int16_t voltage_values[NUM_VOLTAGE_VALUES];
+    #endif
+    static uint8_t lvp_timer = 0;
+    static uint8_t lvp_lowpass = 0;
+    #define LVP_TIMER_START 50  // ticks between LVP warnings
+    #define LVP_LOWPASS_STRENGTH 4
+    #endif
+
+    #ifdef USE_THERMAL_REGULATION
+    #define NUM_THERMAL_VALUES 4
+    #define ADC_STEPS 4
+    static int16_t temperature_values[NUM_THERMAL_VALUES];
+    #else
+    #define ADC_STEPS 2
+    #endif
+
+    uint16_t measurement = ADC;  // latest 10-bit ADC reading
+
+    adc_step = (adc_step + 1) & (ADC_STEPS-1);
+
+    #ifdef USE_LVP
+    // voltage
+    if (adc_step == 1) {
+        #ifdef USE_LVP_AVG
+        // prime on first execution
+        if (voltage == 0) {
+            for(uint8_t i=0; i<NUM_VOLTAGE_VALUES; i++)
+                voltage_values[i] = measurement;
+            voltage = 42;  // Life, the Universe, and Everything (*)
+        } else {
+            uint16_t total = 0;
+            uint8_t i;
+            for(i=0; i<NUM_VOLTAGE_VALUES-1; i++) {
+                voltage_values[i] = voltage_values[i+1];
+                total += voltage_values[i];
+            }
+            voltage_values[i] = measurement;
+            total += measurement;
+            total = total >> 2;
+
+            voltage = (uint16_t)(1.1*1024*10)/total + VOLTAGE_FUDGE_FACTOR;
+        }
+        #else  // no USE_LVP_AVG
+        // calculate actual voltage: volts * 10
+        // ADC = 1.1 * 1024 / volts
+        // volts = 1.1 * 1024 / ADC
+        voltage = (uint16_t)(1.1*1024*10)/measurement + VOLTAGE_FUDGE_FACTOR;
+        #endif
+        // if low, callback EV_voltage_low / EV_voltage_critical
+        //         (but only if it has been more than N ticks since last call)
+        if (lvp_timer) {
+            lvp_timer --;
+        } else {  // it has been long enough since the last warning
+            if (voltage < VOLTAGE_LOW) {
+                if (lvp_lowpass < LVP_LOWPASS_STRENGTH) {
+                    lvp_lowpass ++;
+                } else {
+                    // try to send out a warning
+                    //uint8_t err = emit(EV_voltage_low, 0);
+                    //uint8_t err = emit_now(EV_voltage_low, 0);
+                    emit(EV_voltage_low, 0);
+                    //if (!err) {
+                        // on successful warning, reset counters
+                        lvp_timer = LVP_TIMER_START;
+                        lvp_lowpass = 0;
+                    //}
+                }
+            } else {
+                // voltage not low?  reset count
+                lvp_lowpass = 0;
+            }
+        }
+    }
+    #endif  // ifdef USE_LVP
+
+    // TODO: temperature
+
+    // start another measurement for next time
+    #ifdef USE_THERMAL_REGULATION
+        #ifdef USE_LVP
+        if (adc_step < 2) ADMUX = ADMUX_VCC;
+        else ADMUX = ADMUX_THERM;
+        #else
+        ADMUX = ADMUX_THERM;
+        #endif
+    #else
+        #ifdef USE_LVP
+        ADMUX = ADMUX_VCC;
+        #endif
+    #endif
+}
+
+inline void ADC_on()
+{
+    // read voltage on VCC by default
+    // disable digital input on VCC pin to reduce power consumption
+    //DIDR0 |= (1 << ADC_DIDR);  // FIXME: unsure how to handle for VCC pin
+    // VCC / 1.1V reference
+    ADMUX = ADMUX_VCC;
+    // enable, start, prescale
+    ADCSRA = (1 << ADEN) | (1 << ADSC) | ADC_PRSCL;
+}
+
+inline void ADC_off() {
+    ADCSRA &= ~(1<<ADEN); //ADC off
+}
+
+inline void PCINT_on() {
+    // enable pin change interrupt for pin N
+    GIMSK |= (1 << PCIE);
+    // only pay attention to the e-switch pin
+    //PCMSK = (1 << SWITCH_PCINT);
+    // set bits 1:0 to 0b01 (interrupt on rising *and* falling edge) (default)
+    // MCUCR &= 0b11111101;  MCUCR |= 0b00000001;
+}
+
+inline void PCINT_off() {
+    // disable all pin-change interrupts
+    GIMSK &= ~(1 << PCIE);
+}
+
+void WDT_on()
+{
+    // interrupt every 16ms
+    //cli();                          // Disable interrupts
+    wdt_reset();                    // Reset the WDT
+    WDTCR |= (1<<WDCE) | (1<<WDE);  // Start timed sequence
+    WDTCR = (1<<WDIE);              // Enable interrupt every 16ms
+    //sei();                          // Enable interrupts
+}
+
+inline void WDT_off()
+{
+    //cli();                          // Disable interrupts
+    wdt_reset();                    // Reset the WDT
+    MCUSR &= ~(1<<WDRF);            // Clear Watchdog reset flag
+    WDTCR |= (1<<WDCE) | (1<<WDE);  // Start timed sequence
+    WDTCR = 0x00;                   // Disable WDT
+    //sei();                          // Enable interrupts
+}
+
+// low-power standby mode used while off but power still connected
+#define standby_mode sleep_until_eswitch_pressed
+void sleep_until_eswitch_pressed()
+{
+    WDT_off();
+    ADC_off();
+
+    // make sure switch isn't currently pressed
+    while (button_is_pressed()) {}
+
+    PCINT_on();  // wake on e-switch event
+
+    sleep_enable();
+    sleep_bod_disable();
+    sleep_cpu();  // wait here
+
+    // something happened; wake up
+    sleep_disable();
+    PCINT_on();
+    ADC_on();
+    WDT_on();
+}
+
+// last-called state on stack
+// handles default actions for LVP, thermal regulation, etc
+uint8_t default_state(EventPtr event, uint16_t arg) {
+    if (0) {}
+
+    #ifdef USE_LVP
+    else if (event == EV_voltage_low) {
+        low_voltage();
+        return 0;
+    }
+    #endif
+
+    #ifdef USE_THERMAL_REGULATION
+    else if (event == EV_temperature_high) {
+        high_temperature();
+        return 0;
+    }
+
+    else if (event == EV_temperature_low) {
+        low_temperature();
+        return 0;
+    }
+    #endif
+
+    // event not handled
+    return 1;
+}
+
+// boot-time tasks
+// Define this in your RoundTable recipe
+void setup();
+
+int main() {
+    // Don't allow interrupts while booting
+    cli();
+    //WDT_off();
+    //PCINT_off();
+
+    // configure PWM channels
+    #if PWM_CHANNELS >= 1
+    DDRB |= (1 << PWM1_PIN);
+    TCCR0B = 0x01; // pre-scaler for timer (1 => 1, 2 => 8, 3 => 64...)
+    TCCR0A = PHASE;
+    #elif PWM_CHANNELS >= 2
+    DDRB |= (1 << PWM2_PIN);
+    #elif PWM_CHANNELS >= 3
+    DDRB |= (1 << PWM3_PIN);
+    // Second PWM counter is ... weird
+    TCCR1 = _BV (CS10);
+    GTCCR = _BV (COM1B1) | _BV (PWM1B);
+    OCR1C = 255;  // Set ceiling value to maximum
+    #elif PWM_CHANNELS == 4
+    // FIXME: How exactly do we do PWM on channel 4?
+    DDRB |= (1 << PWM4_PIN);
+    #endif
+
+    // TODO: turn on ADC?
+    // configure e-switch
+    PORTB = (1 << SWITCH_PIN);  // e-switch is the only input
+    PCMSK = (1 << SWITCH_PIN);  // pin change interrupt uses this pin
+
+    // TODO: configure sleep mode
+    set_sleep_mode(SLEEP_MODE_PWR_DOWN);
+
+    // Read config values and saved state
+    // restore_state();  // TODO
+
+    // TODO: handle long press vs short press (or even medium press)?
+
+    #ifdef USE_DEBUG_BLINK
+    //debug_blink(1);
+    #endif
+
+    // all booted -- turn interrupts back on
+    PCINT_on();
+    WDT_on();
+    ADC_on();
+    sei();
+
+    // fallback for handling a few things
+    push_state(default_state);
+
+    // call recipe's setup
+    setup();
+
+    // main loop
+    while (1) {
+        // TODO: update e-switch press state?
+        // TODO: check voltage?
+        // TODO: check temperature?
+        // if event queue not empty, process and pop first item in queue?
+        if (emissions[0].event != NULL) {
+            emit_now(emissions[0].event, emissions[0].arg);
+            delete_first_emission();
+        }
+    }
+}
-- 
cgit v1.2.3


From 65167c016935885552035bf983f4a5b739048f61 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sat, 19 Aug 2017 14:56:39 -0600
Subject: Added unfinished UI similar to Olight Baton series. Fixed 2nd PWM
 channel init.  May have fixed 3rd and 4th too. Added handling for complete
 normal clicks, but it's kind of flaky so far. Added handling for sustained
 button holds. Added missing 'arg' to state change functions.

---
 spaghetti-monster/baton.c             | 157 ++++++++++++++++++++++++++++++++
 spaghetti-monster/spaghetti-monster.h | 162 +++++++++++++++++++++-------------
 2 files changed, 260 insertions(+), 59 deletions(-)
 create mode 100644 spaghetti-monster/baton.c

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/baton.c b/spaghetti-monster/baton.c
new file mode 100644
index 0000000..de63914
--- /dev/null
+++ b/spaghetti-monster/baton.c
@@ -0,0 +1,157 @@
+/*
+ * Baton: Olight Baton-like UI for SpaghettiMonster.
+ *
+ * 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/>.
+ */
+
+#define FSM_EMISAR_D4_LAYOUT
+#define USE_LVP
+#define USE_DEBUG_BLINK
+#define USE_DELAY_MS
+#include "spaghetti-monster.h"
+
+// ../../bin/level_calc.py 2 7 7135 3 0.25 150 FET 1 10 1500
+uint8_t pwm1_modes[] = { 3, 27, 130, 255, 255, 255,   0, };
+uint8_t pwm2_modes[] = { 0,  0,  0,   12,  62, 141, 255, };
+
+uint8_t off_state(EventPtr event, uint16_t arg);
+uint8_t steady_state(EventPtr event, uint16_t arg);
+uint8_t party_strobe_state(EventPtr event, uint16_t arg);
+
+uint8_t current_mode = 0;
+
+void set_mode(uint8_t mode) {
+    PWM1_LVL = pwm1_modes[mode];
+    PWM2_LVL = pwm2_modes[mode];
+}
+
+uint8_t off_state(EventPtr event, uint16_t arg) {
+    // turn emitter off when entering state
+    if (event == EV_enter_state) {
+        PWM1_LVL = 0;
+        PWM2_LVL = 0;
+        return 0;
+    }
+    // 1 click: regular mode
+    else if (event == EV_1click) {
+        set_state(steady_state, current_mode);
+        return 0;
+    }
+    // 1 click (before timeout): go to memorized level, but allow abort for double click
+    else if (event == EV_click1_release) {
+        set_mode(current_mode);
+    }
+    // 2 clicks: highest mode
+    else if (event == EV_2clicks) {
+        set_state(steady_state, sizeof(pwm1_modes)-1);
+        return 0;
+    }
+    // 3 clicks: strobe mode
+    else if (event == EV_3clicks) {
+        set_state(party_strobe_state, 0);
+        return 0;
+    }
+    // hold (initially): go to lowest level, but allow abort for regular click
+    else if (event == EV_click1_press) {
+        set_mode(0);
+    }
+    // hold: go to lowest level
+    else if (event == EV_click1_hold) {
+        set_state(steady_state, 0);
+    }
+    return 1;
+}
+
+uint8_t steady_state(EventPtr event, uint16_t arg) {
+    //static volatile uint8_t current_mode = 0;
+    // turn LED on when we first enter the mode
+    if (event == EV_enter_state) {
+        current_mode = arg;
+        set_mode(arg);
+        return 0;
+    }
+    // 1 click: off
+    else if (event == EV_1click) {
+        set_state(off_state, 0);
+        return 0;
+    }
+    // 2 clicks: go to strobe modes
+    else if (event == EV_2clicks) {
+        set_state(party_strobe_state, 2);
+        return 0;
+    }
+    // hold: change brightness
+    else if (event == EV_click1_hold) {
+        if ((arg % HOLD_TIMEOUT) == 0) {
+            current_mode = (current_mode+1) % sizeof(pwm1_modes);
+            set_mode(current_mode);
+        }
+        return 0;
+    }
+    return 1;
+}
+
+uint8_t party_strobe_state(EventPtr event, uint16_t arg) {
+    static volatile uint8_t frames = 0;
+    static volatile uint8_t between = 0;
+    if (event == EV_enter_state) {
+        between = arg;
+        frames = 0;
+        return 0;
+    }
+    // strobe the emitter
+    else if (event == EV_tick) {
+        if (frames == 0) {
+            PWM1_LVL = 255;
+            PWM2_LVL = 0;
+            delay_ms(1);
+            PWM1_LVL = 0;
+        }
+        //frames = (frames + 1) % between;
+        frames++;
+        if (frames > between) frames = 0;
+        return 0;
+    }
+    // 1 click: off
+    else if (event == EV_1click) {
+        set_state(off_state, 0);
+        return 0;
+    }
+    // 2 clicks: go back to regular modes
+    else if (event == EV_2clicks) {
+        set_state(steady_state, 1);
+        return 0;
+    }
+    // hold: change speed
+    else if (event == EV_click1_hold) {
+        if ((arg % HOLD_TIMEOUT) == 0) {
+            between = (between+1)%6;
+            frames = 0;
+        }
+        return 0;
+    }
+    return 1;
+}
+
+void low_voltage() {
+    // FIXME: do something
+}
+
+void setup() {
+    debug_blink(2);
+
+    push_state(off_state, 0);
+}
diff --git a/spaghetti-monster/spaghetti-monster.h b/spaghetti-monster/spaghetti-monster.h
index af6d828..e51416a 100644
--- a/spaghetti-monster/spaghetti-monster.h
+++ b/spaghetti-monster/spaghetti-monster.h
@@ -49,7 +49,7 @@ volatile StatePtr current_state;
 uint8_t current_event[EV_MAX_LEN];
 // at 0.016 ms per tick, 255 ticks = 4.08 s
 // TODO: 16 bits?
-static volatile uint8_t ticks_since_last_event = 0;
+static volatile uint16_t ticks_since_last_event = 0;
 
 #ifdef USE_LVP
 // volts * 10
@@ -80,20 +80,23 @@ void debug_blink(uint8_t num) {
 }
 #endif
 
+// timeout durations in ticks (each tick 1/60th s)
+#define HOLD_TIMEOUT 24
+#define RELEASE_TIMEOUT 24
+
 #define A_ENTER_STATE     1
 #define A_LEAVE_STATE     2
 #define A_TICK            3
 #define A_PRESS           4
-#define A_HOLD_START      5
-#define A_HOLD_TICK       6
-#define A_RELEASE         7
-#define A_RELEASE_TIMEOUT 8
+#define A_HOLD            5
+#define A_RELEASE         6
+#define A_RELEASE_TIMEOUT 7
 // TODO: add events for over/under-heat conditions (with parameter for severity)
-#define A_OVERHEATING     9
-#define A_UNDERHEATING    10
+#define A_OVERHEATING     8
+#define A_UNDERHEATING    9
 // TODO: add events for low voltage conditions
-#define A_VOLTAGE_LOW     11
-//#define A_VOLTAGE_CRITICAL 12
+#define A_VOLTAGE_LOW     10
+//#define A_VOLTAGE_CRITICAL 11
 #define A_DEBUG           255  // test event for debugging
 
 // TODO: maybe compare events by number instead of pointer?
@@ -151,11 +154,11 @@ Event EV_click1_complete[] = {
 //        Or "start+tick" with a tick number?
 Event EV_click1_hold[] = {
     A_PRESS,
-    A_HOLD_START,
+    A_HOLD,
     0 };
 Event EV_click1_hold_release[] = {
     A_PRESS,
-    A_HOLD_START,
+    A_HOLD,
     A_RELEASE,
     0 };
 Event EV_click2_press[] = {
@@ -248,7 +251,25 @@ void push_event(uint8_t ev_type) {
     }
 }
 
-#define EMISSION_QUEUE_LEN 8
+// find and return last action in the current event sequence
+/*
+uint8_t last_event(uint8_t offset) {
+    uint8_t i;
+    for(i=0; current_event[i] && (i<EV_MAX_LEN); i++);
+    if (i == EV_MAX_LEN) return current_event[EV_MAX_LEN-offset];
+    else if (i >= offset) return current_event[i-offset];
+    return 0;
+}
+*/
+
+inline uint8_t last_event_num() {
+    uint8_t i;
+    for(i=0; current_event[i] && (i<EV_MAX_LEN); i++);
+    return i;
+}
+
+
+#define EMISSION_QUEUE_LEN 16
 // no comment about "volatile emissions"
 volatile Emission emissions[EMISSION_QUEUE_LEN];
 
@@ -321,22 +342,22 @@ void emit_current_event(uint16_t arg) {
     //return err;
 }
 
-void _set_state(StatePtr new_state) {
+void _set_state(StatePtr new_state, uint16_t arg) {
     // call old state-exit hook (don't use stack)
-    if (current_state != NULL) current_state(EV_leave_state, 0);
+    if (current_state != NULL) current_state(EV_leave_state, arg);
     // set new state
     current_state = new_state;
     // call new state-enter hook (don't use stack)
-    if (new_state != NULL) current_state(EV_enter_state, 0);
+    if (new_state != NULL) current_state(EV_enter_state, arg);
 }
 
-int8_t push_state(StatePtr new_state) {
+int8_t push_state(StatePtr new_state, uint16_t arg) {
     if (state_stack_len < STATE_STACK_SIZE) {
         // TODO: call old state's exit hook?
         //       new hook for non-exit recursion into child?
         state_stack[state_stack_len] = new_state;
         state_stack_len ++;
-        _set_state(new_state);
+        _set_state(new_state, arg);
         return state_stack_len;
     } else {
         // TODO: um...  how is a flashlight supposed to handle a recursion depth error?
@@ -355,14 +376,16 @@ StatePtr pop_state() {
     if (state_stack_len > 0) {
         new_state = state_stack[state_stack_len-1];
     }
-    _set_state(new_state);
+    // FIXME: what should 'arg' be?
+    // FIXME: do we need a EV_reenter_state?
+    _set_state(new_state, 0);
     return old_state;
 }
 
-uint8_t set_state(StatePtr new_state) {
+uint8_t set_state(StatePtr new_state, uint16_t arg) {
     // FIXME: this calls exit/enter hooks it shouldn't
     pop_state();
-    return push_state(new_state);
+    return push_state(new_state, arg);
 }
 
 // TODO? add events to a queue when inside an interrupt
@@ -412,36 +435,12 @@ ISR(PCINT0_vect) {
     emit_current_event(0);
 }
 
-// TODO: implement
+// clock tick -- this runs every 16ms (62.5 fps)
 ISR(WDT_vect) {
-    /*
-    // TODO? safety net for PCINT, in case it misses a press or release
-    uint8_t bp = button_is_pressed();
-    if (bp != button_was_pressed) {
-        // TODO: handle missed button event
-        if (bp) {
-            push_event(A_PRESS);
-        } else {
-            push_event(A_RELEASE);
-        }
-        emit_current_event(0);
-    }
-    */
-
-    //timer ++;  // Is this needed at all?
-
-    /*
-    if (ticks_since_last_event & 0b00000111 ) {
-        DEBUG_FLASH;
-    }
-    */
-
     //if (ticks_since_last_event < 0xff) ticks_since_last_event ++;
-    // increment, but loop from 255 back to 128
+    // increment, but loop from max back to half
     ticks_since_last_event = (ticks_since_last_event + 1) \
-                             | (ticks_since_last_event & 0x80);
-
-    //static uint8_t hold_ticks = 0;  // TODO: 16 bits?
+                             | (ticks_since_last_event & 0x8000);
 
     // callback on each timer tick
     emit(EV_tick, ticks_since_last_event);
@@ -449,13 +448,42 @@ ISR(WDT_vect) {
     // if time since last event exceeds timeout,
     // append timeout to current event sequence, then
     // send event to current state callback
-    // //hold_event(ticks)
-    // //emit(EV_press_hold, hold_ticks);
-    // emit_current_event(hold_ticks);
-    // or
-    // //release_timeout()
-    // //emit(EV_press_release_timeout, 0);
-    // emit_current_event(0);
+
+    // preload recent events
+    uint8_t le_num = last_event_num();
+    uint8_t last_event = 0;
+    uint8_t prev_event = 0;
+    if (le_num >= 1) last_event = current_event[le_num-1];
+    if (le_num >= 2) prev_event = current_event[le_num-2];
+
+    // user held button long enough to count as a long click?
+    if (last_event == A_PRESS) {
+        if (ticks_since_last_event == HOLD_TIMEOUT) {
+            push_event(A_HOLD);
+            emit_current_event(0);
+        }
+    }
+
+    // user is still holding button, so tick
+    else if (last_event == A_HOLD) {
+        emit_current_event(ticks_since_last_event);
+    }
+
+    // detect completed button presses with expired timeout
+    else if (last_event == A_RELEASE) {
+        // no timeout required when releasing a long-press
+        // TODO? move this logic to PCINT() and simplify things here?
+        if (prev_event == A_HOLD) {
+            //emit_current_event(0);  // should have been emitted by PCINT
+            empty_event_sequence();
+        }
+        // end and clear event after release timeout
+        else if (ticks_since_last_event == RELEASE_TIMEOUT) {
+            push_event(A_RELEASE_TIMEOUT);
+            emit_current_event(0);
+            empty_event_sequence();
+        }
+    }
 
     #if defined(USE_LVP) || defined(USE_THERMAL_REGULATION)
     // start a new ADC measurement every 4 ticks
@@ -677,20 +705,36 @@ int main() {
     //PCINT_off();
 
     // configure PWM channels
-    #if PWM_CHANNELS >= 1
+    #if PWM_CHANNELS == 1
+    DDRB |= (1 << PWM1_PIN);
+    TCCR0B = 0x01; // pre-scaler for timer (1 => 1, 2 => 8, 3 => 64...)
+    TCCR0A = PHASE;
+    #elif PWM_CHANNELS == 2
     DDRB |= (1 << PWM1_PIN);
+    DDRB |= (1 << PWM2_PIN);
     TCCR0B = 0x01; // pre-scaler for timer (1 => 1, 2 => 8, 3 => 64...)
     TCCR0A = PHASE;
-    #elif PWM_CHANNELS >= 2
+    #elif PWM_CHANNELS == 3
+    DDRB |= (1 << PWM1_PIN);
     DDRB |= (1 << PWM2_PIN);
-    #elif PWM_CHANNELS >= 3
-    DDRB |= (1 << PWM3_PIN);
+    TCCR0B = 0x01; // pre-scaler for timer (1 => 1, 2 => 8, 3 => 64...)
+    TCCR0A = PHASE;
     // Second PWM counter is ... weird
+    DDRB |= (1 << PWM3_PIN);
     TCCR1 = _BV (CS10);
     GTCCR = _BV (COM1B1) | _BV (PWM1B);
     OCR1C = 255;  // Set ceiling value to maximum
     #elif PWM_CHANNELS == 4
+    DDRB |= (1 << PWM1_PIN);
+    DDRB |= (1 << PWM2_PIN);
+    TCCR0B = 0x01; // pre-scaler for timer (1 => 1, 2 => 8, 3 => 64...)
+    TCCR0A = PHASE;
+    // Second PWM counter is ... weird
+    DDRB |= (1 << PWM3_PIN);
     // FIXME: How exactly do we do PWM on channel 4?
+    TCCR1 = _BV (CS10);
+    GTCCR = _BV (COM1B1) | _BV (PWM1B);
+    OCR1C = 255;  // Set ceiling value to maximum
     DDRB |= (1 << PWM4_PIN);
     #endif
 
@@ -718,7 +762,7 @@ int main() {
     sei();
 
     // fallback for handling a few things
-    push_state(default_state);
+    push_state(default_state, 0);
 
     // call recipe's setup
     setup();
-- 
cgit v1.2.3


From ef05435261fac31790303dbff16bcc194e9e5cb5 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sat, 19 Aug 2017 15:33:33 -0600
Subject: Fixed unreliability of short-click detection. (it was doing stuff
 like "press, release, release, timeout" so it didn't match "press, release,
 timeout") (it may have also been missing the exact tick it needed, so I made
 it use >= instead of ==, but this is theoretical and harmless if I was wrong)
 Made baton mode memory work a bit better for both regular and strobe modes.
 Made baton fast strobe pulses shorter for better motion freezing. Added
 USE_DELAY_ZERO option as an alternate for USE_FINE_DELAY.

---
 spaghetti-monster/baton.c             | 17 +++++++++++------
 spaghetti-monster/spaghetti-monster.h | 17 +++++++++++++----
 2 files changed, 24 insertions(+), 10 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/baton.c b/spaghetti-monster/baton.c
index de63914..ed2b444 100644
--- a/spaghetti-monster/baton.c
+++ b/spaghetti-monster/baton.c
@@ -21,16 +21,19 @@
 #define USE_LVP
 #define USE_DEBUG_BLINK
 #define USE_DELAY_MS
+#define USE_DELAY_ZERO
 #include "spaghetti-monster.h"
 
 // ../../bin/level_calc.py 2 7 7135 3 0.25 150 FET 1 10 1500
 uint8_t pwm1_modes[] = { 3, 27, 130, 255, 255, 255,   0, };
 uint8_t pwm2_modes[] = { 0,  0,  0,   12,  62, 141, 255, };
 
+// FSM states
 uint8_t off_state(EventPtr event, uint16_t arg);
 uint8_t steady_state(EventPtr event, uint16_t arg);
 uint8_t party_strobe_state(EventPtr event, uint16_t arg);
 
+// brightness control
 uint8_t current_mode = 0;
 
 void set_mode(uint8_t mode) {
@@ -43,6 +46,7 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
     if (event == EV_enter_state) {
         PWM1_LVL = 0;
         PWM2_LVL = 0;
+        // TODO: standby_mode();
         return 0;
     }
     // 1 click: regular mode
@@ -90,7 +94,7 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
     }
     // 2 clicks: go to strobe modes
     else if (event == EV_2clicks) {
-        set_state(party_strobe_state, 2);
+        set_state(party_strobe_state, 0xff);
         return 0;
     }
     // hold: change brightness
@@ -106,18 +110,19 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
 
 uint8_t party_strobe_state(EventPtr event, uint16_t arg) {
     static volatile uint8_t frames = 0;
-    static volatile uint8_t between = 0;
+    static volatile uint8_t between = 2;
     if (event == EV_enter_state) {
-        between = arg;
+        if (arg < 64) between = arg;
         frames = 0;
         return 0;
     }
-    // strobe the emitter
+    // tick: strobe the emitter
     else if (event == EV_tick) {
         if (frames == 0) {
             PWM1_LVL = 255;
             PWM2_LVL = 0;
-            delay_ms(1);
+            if (between < 3) delay_zero();
+            else delay_ms(1);
             PWM1_LVL = 0;
         }
         //frames = (frames + 1) % between;
@@ -132,7 +137,7 @@ uint8_t party_strobe_state(EventPtr event, uint16_t arg) {
     }
     // 2 clicks: go back to regular modes
     else if (event == EV_2clicks) {
-        set_state(steady_state, 1);
+        set_state(steady_state, current_mode);
         return 0;
     }
     // hold: change speed
diff --git a/spaghetti-monster/spaghetti-monster.h b/spaghetti-monster/spaghetti-monster.h
index e51416a..cfabea8 100644
--- a/spaghetti-monster/spaghetti-monster.h
+++ b/spaghetti-monster/spaghetti-monster.h
@@ -243,8 +243,10 @@ void empty_event_sequence() {
 void push_event(uint8_t ev_type) {
     ticks_since_last_event = 0;  // something happened
     uint8_t i;
-    for(i=0; current_event[i] && (i<EV_MAX_LEN); i++);
-    if (i < EV_MAX_LEN) {
+    uint8_t prev_event = 0;  // never push the same event twice in a row
+    for(i=0; current_event[i] && (i<EV_MAX_LEN); i++)
+        prev_event = current_event[i];
+    if ((i < EV_MAX_LEN)  &&  (prev_event != ev_type)) {
         current_event[i] = ev_type;
     } else {
         // TODO: ... something?
@@ -418,6 +420,12 @@ uint8_t button_is_pressed() {
 //void button_change_interrupt() {
 ISR(PCINT0_vect) {
 
+    // this interrupt should not be re-entrant
+    //static volatile uint8_t lockout = 0;
+
+    //if (lockout) return;
+    //lockout = 1;
+
     //DEBUG_FLASH;
 
     // something happened
@@ -433,6 +441,7 @@ ISR(PCINT0_vect) {
     // check if sequence matches any defined sequences
     // if so, send event to current state callback
     emit_current_event(0);
+    //lockout = 0;
 }
 
 // clock tick -- this runs every 16ms (62.5 fps)
@@ -458,7 +467,7 @@ ISR(WDT_vect) {
 
     // user held button long enough to count as a long click?
     if (last_event == A_PRESS) {
-        if (ticks_since_last_event == HOLD_TIMEOUT) {
+        if (ticks_since_last_event >= HOLD_TIMEOUT) {
             push_event(A_HOLD);
             emit_current_event(0);
         }
@@ -478,7 +487,7 @@ ISR(WDT_vect) {
             empty_event_sequence();
         }
         // end and clear event after release timeout
-        else if (ticks_since_last_event == RELEASE_TIMEOUT) {
+        else if (ticks_since_last_event >= RELEASE_TIMEOUT) {
             push_event(A_RELEASE_TIMEOUT);
             emit_current_event(0);
             empty_event_sequence();
-- 
cgit v1.2.3


From ed98882eace49e6482c78c6723fbcda9daca1510 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sat, 19 Aug 2017 15:57:10 -0600
Subject: Improved memory handling in FSM Baton. Improved brightness ramp. 
 (lower low) Added double-click to/from turbo in steady modes. Moved strobes
 to triple-click.

---
 spaghetti-monster/baton.c | 58 +++++++++++++++++++++++++++++------------------
 1 file changed, 36 insertions(+), 22 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/baton.c b/spaghetti-monster/baton.c
index ed2b444..ea8d49f 100644
--- a/spaghetti-monster/baton.c
+++ b/spaghetti-monster/baton.c
@@ -24,9 +24,9 @@
 #define USE_DELAY_ZERO
 #include "spaghetti-monster.h"
 
-// ../../bin/level_calc.py 2 7 7135 3 0.25 150 FET 1 10 1500
-uint8_t pwm1_modes[] = { 3, 27, 130, 255, 255, 255,   0, };
-uint8_t pwm2_modes[] = { 0,  0,  0,   12,  62, 141, 255, };
+// moon + ../../bin/level_calc.py 2 6 7135 18 10 150 FET 1 10 1500
+uint8_t pwm1_modes[] = { 3, 18, 110, 255, 255, 255,   0, };
+uint8_t pwm2_modes[] = { 0,  0,   0,   9,  58, 138, 255, };
 
 // FSM states
 uint8_t off_state(EventPtr event, uint16_t arg);
@@ -34,11 +34,13 @@ uint8_t steady_state(EventPtr event, uint16_t arg);
 uint8_t party_strobe_state(EventPtr event, uint16_t arg);
 
 // brightness control
-uint8_t current_mode = 0;
+uint8_t memorized_level = 0;
+uint8_t actual_level = 0;
 
-void set_mode(uint8_t mode) {
-    PWM1_LVL = pwm1_modes[mode];
-    PWM2_LVL = pwm2_modes[mode];
+void set_mode(uint8_t lvl) {
+    actual_level = lvl;
+    PWM1_LVL = pwm1_modes[lvl];
+    PWM2_LVL = pwm2_modes[lvl];
 }
 
 uint8_t off_state(EventPtr event, uint16_t arg) {
@@ -49,14 +51,18 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
         // TODO: standby_mode();
         return 0;
     }
-    // 1 click: regular mode
-    else if (event == EV_1click) {
-        set_state(steady_state, current_mode);
-        return 0;
+    // hold (initially): go to lowest level, but allow abort for regular click
+    else if (event == EV_click1_press) {
+        set_mode(0);
     }
     // 1 click (before timeout): go to memorized level, but allow abort for double click
     else if (event == EV_click1_release) {
-        set_mode(current_mode);
+        set_mode(memorized_level);
+    }
+    // 1 click: regular mode
+    else if (event == EV_1click) {
+        set_state(steady_state, memorized_level);
+        return 0;
     }
     // 2 clicks: highest mode
     else if (event == EV_2clicks) {
@@ -68,10 +74,6 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
         set_state(party_strobe_state, 0);
         return 0;
     }
-    // hold (initially): go to lowest level, but allow abort for regular click
-    else if (event == EV_click1_press) {
-        set_mode(0);
-    }
     // hold: go to lowest level
     else if (event == EV_click1_hold) {
         set_state(steady_state, 0);
@@ -80,10 +82,12 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
 }
 
 uint8_t steady_state(EventPtr event, uint16_t arg) {
-    //static volatile uint8_t current_mode = 0;
     // turn LED on when we first enter the mode
     if (event == EV_enter_state) {
-        current_mode = arg;
+        // remember this level, unless it's moon or turbo
+        if ((arg > 0) && (arg < sizeof(pwm1_modes)-1))
+            memorized_level = arg;
+        // use the requested level even if not memorized
         set_mode(arg);
         return 0;
     }
@@ -92,16 +96,26 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         set_state(off_state, 0);
         return 0;
     }
-    // 2 clicks: go to strobe modes
+    // 2 clicks: go to/from highest level
     else if (event == EV_2clicks) {
+        if (actual_level < sizeof(pwm1_modes)-1) {
+            memorized_level = actual_level;  // in case we're on moon
+            set_mode(sizeof(pwm1_modes)-1);
+        }
+        else
+            set_mode(memorized_level);
+        return 0;
+    }
+    // 3 clicks: go to strobe modes
+    else if (event == EV_3clicks) {
         set_state(party_strobe_state, 0xff);
         return 0;
     }
     // hold: change brightness
     else if (event == EV_click1_hold) {
         if ((arg % HOLD_TIMEOUT) == 0) {
-            current_mode = (current_mode+1) % sizeof(pwm1_modes);
-            set_mode(current_mode);
+            memorized_level = (memorized_level+1) % sizeof(pwm1_modes);
+            set_mode(memorized_level);
         }
         return 0;
     }
@@ -137,7 +151,7 @@ uint8_t party_strobe_state(EventPtr event, uint16_t arg) {
     }
     // 2 clicks: go back to regular modes
     else if (event == EV_2clicks) {
-        set_state(steady_state, current_mode);
+        set_state(steady_state, memorized_level);
         return 0;
     }
     // hold: change speed
-- 
cgit v1.2.3


From c4e97f9c0b7f66f539e73983146c21e1c30311ac Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sat, 19 Aug 2017 16:00:29 -0600
Subject: Fixed momentary UI (API changed a little).

---
 spaghetti-monster/momentary.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/momentary.c b/spaghetti-monster/momentary.c
index bb74795..a585152 100644
--- a/spaghetti-monster/momentary.c
+++ b/spaghetti-monster/momentary.c
@@ -81,5 +81,5 @@ void low_voltage() {
 void setup() {
     debug_blink(2);
 
-    push_state(momentary_state);
+    push_state(momentary_state, 0);
 }
-- 
cgit v1.2.3


From 9a6965d62578bc7260c7ba1d4860152721c12ea9 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sat, 19 Aug 2017 16:25:39 -0600
Subject: Extra debouncing in PCINT (don't emit event if push was rejected).
 Fixed memory error in Baton -- long-press from off didn't restart at moon.
 Made Momentary and Baton go to sleep while light is off.

---
 spaghetti-monster/baton.c             |  6 ++++--
 spaghetti-monster/momentary.c         | 20 ++++++--------------
 spaghetti-monster/spaghetti-monster.h | 20 +++++++-------------
 3 files changed, 17 insertions(+), 29 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/baton.c b/spaghetti-monster/baton.c
index ea8d49f..02b7c00 100644
--- a/spaghetti-monster/baton.c
+++ b/spaghetti-monster/baton.c
@@ -48,7 +48,9 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
     if (event == EV_enter_state) {
         PWM1_LVL = 0;
         PWM2_LVL = 0;
-        // TODO: standby_mode();
+        // sleep while off  (lower power use)
+        //empty_event_sequence();  // just in case (but shouldn't be needed)
+        standby_mode();
         return 0;
     }
     // hold (initially): go to lowest level, but allow abort for regular click
@@ -114,7 +116,7 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
     // hold: change brightness
     else if (event == EV_click1_hold) {
         if ((arg % HOLD_TIMEOUT) == 0) {
-            memorized_level = (memorized_level+1) % sizeof(pwm1_modes);
+            memorized_level = (actual_level+1) % sizeof(pwm1_modes);
             set_mode(memorized_level);
         }
         return 0;
diff --git a/spaghetti-monster/momentary.c b/spaghetti-monster/momentary.c
index a585152..23cc359 100644
--- a/spaghetti-monster/momentary.c
+++ b/spaghetti-monster/momentary.c
@@ -44,35 +44,28 @@ uint8_t momentary_state(EventPtr event, uint16_t arg) {
     if (event == EV_click1_press) {
         brightness = 255;
         light_on();
-        // don't attempt to parse multiple clicks
-        empty_event_sequence();
+        empty_event_sequence();  // don't attempt to parse multiple clicks
         return 0;
     }
 
     else if (event == EV_release) {
         light_off();
-        // don't attempt to parse multiple clicks
-        empty_event_sequence();
+        empty_event_sequence();  // don't attempt to parse multiple clicks
+        standby_mode();  // sleep while light is off
         return 0;
     }
 
-    else if (event == EV_debug) {
-        //PWM1_LVL = arg&0xff;
-        DEBUG_FLASH;
-        return 0;
-    }
-
-    // event not handled
-    return 1;
+    return 1;  // event not handled
 }
 
 // LVP / low-voltage protection
 void low_voltage() {
-    debug_blink(3);
     if (brightness > 0) {
+        debug_blink(3);
         brightness >>= 1;
         if (on_now) light_on();
     } else {
+        debug_blink(8);
         light_off();
         standby_mode();
     }
@@ -80,6 +73,5 @@ void low_voltage() {
 
 void setup() {
     debug_blink(2);
-
     push_state(momentary_state, 0);
 }
diff --git a/spaghetti-monster/spaghetti-monster.h b/spaghetti-monster/spaghetti-monster.h
index cfabea8..fe5e939 100644
--- a/spaghetti-monster/spaghetti-monster.h
+++ b/spaghetti-monster/spaghetti-monster.h
@@ -240,7 +240,7 @@ void empty_event_sequence() {
     for(uint8_t i=0; i<EV_MAX_LEN; i++) current_event[i] = 0;
 }
 
-void push_event(uint8_t ev_type) {
+uint8_t push_event(uint8_t ev_type) {
     ticks_since_last_event = 0;  // something happened
     uint8_t i;
     uint8_t prev_event = 0;  // never push the same event twice in a row
@@ -248,9 +248,11 @@ void push_event(uint8_t ev_type) {
         prev_event = current_event[i];
     if ((i < EV_MAX_LEN)  &&  (prev_event != ev_type)) {
         current_event[i] = ev_type;
+        return 1;  // event pushed
     } else {
         // TODO: ... something?
     }
+    return 0;  // no event pushed
 }
 
 // find and return last action in the current event sequence
@@ -420,28 +422,20 @@ uint8_t button_is_pressed() {
 //void button_change_interrupt() {
 ISR(PCINT0_vect) {
 
-    // this interrupt should not be re-entrant
-    //static volatile uint8_t lockout = 0;
-
-    //if (lockout) return;
-    //lockout = 1;
-
     //DEBUG_FLASH;
 
-    // something happened
-    //ticks_since_last_event = 0;
+    uint8_t pushed;
 
     // add event to current sequence
     if (button_is_pressed()) {
-        push_event(A_PRESS);
+        pushed = push_event(A_PRESS);
     } else {
-        push_event(A_RELEASE);
+        pushed = push_event(A_RELEASE);
     }
 
     // check if sequence matches any defined sequences
     // if so, send event to current state callback
-    emit_current_event(0);
-    //lockout = 0;
+    if (pushed) emit_current_event(0);
 }
 
 // clock tick -- this runs every 16ms (62.5 fps)
-- 
cgit v1.2.3


From 73a5a6974a98aa73ab392272b4d69d285c85dee5 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sat, 19 Aug 2017 17:20:46 -0600
Subject: Completely reorganized SpaghettiMonster code into smaller logical
 pieces: fsm-*.c and fsm-*.h.

---
 spaghetti-monster/fsm-adc.c           | 136 ++++++
 spaghetti-monster/fsm-adc.h           |  40 ++
 spaghetti-monster/fsm-events.c        | 137 +++++++
 spaghetti-monster/fsm-events.h        | 197 +++++++++
 spaghetti-monster/fsm-main.c          | 107 +++++
 spaghetti-monster/fsm-main.h          |  25 ++
 spaghetti-monster/fsm-pcint.c         |  76 ++++
 spaghetti-monster/fsm-pcint.h         |  29 ++
 spaghetti-monster/fsm-standby.c       |  53 +++
 spaghetti-monster/fsm-standby.h       |  26 ++
 spaghetti-monster/fsm-states.c        | 108 +++++
 spaghetti-monster/fsm-states.h        |  44 ++
 spaghetti-monster/fsm-wdt.c           | 107 +++++
 spaghetti-monster/fsm-wdt.h           |  26 ++
 spaghetti-monster/spaghetti-monster.h | 751 +---------------------------------
 15 files changed, 1128 insertions(+), 734 deletions(-)
 create mode 100644 spaghetti-monster/fsm-adc.c
 create mode 100644 spaghetti-monster/fsm-adc.h
 create mode 100644 spaghetti-monster/fsm-events.c
 create mode 100644 spaghetti-monster/fsm-events.h
 create mode 100644 spaghetti-monster/fsm-main.c
 create mode 100644 spaghetti-monster/fsm-main.h
 create mode 100644 spaghetti-monster/fsm-pcint.c
 create mode 100644 spaghetti-monster/fsm-pcint.h
 create mode 100644 spaghetti-monster/fsm-standby.c
 create mode 100644 spaghetti-monster/fsm-standby.h
 create mode 100644 spaghetti-monster/fsm-states.c
 create mode 100644 spaghetti-monster/fsm-states.h
 create mode 100644 spaghetti-monster/fsm-wdt.c
 create mode 100644 spaghetti-monster/fsm-wdt.h

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/fsm-adc.c b/spaghetti-monster/fsm-adc.c
new file mode 100644
index 0000000..11468b9
--- /dev/null
+++ b/spaghetti-monster/fsm-adc.c
@@ -0,0 +1,136 @@
+/*
+ * fsm-adc.c: ADC (voltage, temperature) functions for SpaghettiMonster.
+ *
+ * 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 FSM_ADC_C
+#define FSM_ADC_C
+
+inline void ADC_on()
+{
+    // read voltage on VCC by default
+    // disable digital input on VCC pin to reduce power consumption
+    //DIDR0 |= (1 << ADC_DIDR);  // FIXME: unsure how to handle for VCC pin
+    // VCC / 1.1V reference
+    ADMUX = ADMUX_VCC;
+    // enable, start, prescale
+    ADCSRA = (1 << ADEN) | (1 << ADSC) | ADC_PRSCL;
+}
+
+inline void ADC_off() {
+    ADCSRA &= ~(1<<ADEN); //ADC off
+}
+
+// TODO: is this better done in main() or WDT()?
+ISR(ADC_vect) {
+    static uint8_t adc_step = 0;
+    #ifdef USE_LVP
+    #ifdef USE_LVP_AVG
+    #define NUM_VOLTAGE_VALUES 4
+    static int16_t voltage_values[NUM_VOLTAGE_VALUES];
+    #endif
+    static uint8_t lvp_timer = 0;
+    static uint8_t lvp_lowpass = 0;
+    #define LVP_TIMER_START 50  // ticks between LVP warnings
+    #define LVP_LOWPASS_STRENGTH 4
+    #endif
+
+    #ifdef USE_THERMAL_REGULATION
+    #define NUM_THERMAL_VALUES 4
+    #define ADC_STEPS 4
+    static int16_t temperature_values[NUM_THERMAL_VALUES];
+    #else
+    #define ADC_STEPS 2
+    #endif
+
+    uint16_t measurement = ADC;  // latest 10-bit ADC reading
+
+    adc_step = (adc_step + 1) & (ADC_STEPS-1);
+
+    #ifdef USE_LVP
+    // voltage
+    if (adc_step == 1) {
+        #ifdef USE_LVP_AVG
+        // prime on first execution
+        if (voltage == 0) {
+            for(uint8_t i=0; i<NUM_VOLTAGE_VALUES; i++)
+                voltage_values[i] = measurement;
+            voltage = 42;  // Life, the Universe, and Everything (*)
+        } else {
+            uint16_t total = 0;
+            uint8_t i;
+            for(i=0; i<NUM_VOLTAGE_VALUES-1; i++) {
+                voltage_values[i] = voltage_values[i+1];
+                total += voltage_values[i];
+            }
+            voltage_values[i] = measurement;
+            total += measurement;
+            total = total >> 2;
+
+            voltage = (uint16_t)(1.1*1024*10)/total + VOLTAGE_FUDGE_FACTOR;
+        }
+        #else  // no USE_LVP_AVG
+        // calculate actual voltage: volts * 10
+        // ADC = 1.1 * 1024 / volts
+        // volts = 1.1 * 1024 / ADC
+        voltage = (uint16_t)(1.1*1024*10)/measurement + VOLTAGE_FUDGE_FACTOR;
+        #endif
+        // if low, callback EV_voltage_low / EV_voltage_critical
+        //         (but only if it has been more than N ticks since last call)
+        if (lvp_timer) {
+            lvp_timer --;
+        } else {  // it has been long enough since the last warning
+            if (voltage < VOLTAGE_LOW) {
+                if (lvp_lowpass < LVP_LOWPASS_STRENGTH) {
+                    lvp_lowpass ++;
+                } else {
+                    // try to send out a warning
+                    //uint8_t err = emit(EV_voltage_low, 0);
+                    //uint8_t err = emit_now(EV_voltage_low, 0);
+                    emit(EV_voltage_low, 0);
+                    //if (!err) {
+                        // on successful warning, reset counters
+                        lvp_timer = LVP_TIMER_START;
+                        lvp_lowpass = 0;
+                    //}
+                }
+            } else {
+                // voltage not low?  reset count
+                lvp_lowpass = 0;
+            }
+        }
+    }
+    #endif  // ifdef USE_LVP
+
+    // TODO: temperature
+
+    // start another measurement for next time
+    #ifdef USE_THERMAL_REGULATION
+        #ifdef USE_LVP
+        if (adc_step < 2) ADMUX = ADMUX_VCC;
+        else ADMUX = ADMUX_THERM;
+        #else
+        ADMUX = ADMUX_THERM;
+        #endif
+    #else
+        #ifdef USE_LVP
+        ADMUX = ADMUX_VCC;
+        #endif
+    #endif
+}
+
+#endif
diff --git a/spaghetti-monster/fsm-adc.h b/spaghetti-monster/fsm-adc.h
new file mode 100644
index 0000000..ac42333
--- /dev/null
+++ b/spaghetti-monster/fsm-adc.h
@@ -0,0 +1,40 @@
+/*
+ * fsm-adc.h: ADC (voltage, temperature) functions for SpaghettiMonster.
+ *
+ * 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 FSM_ADC_H
+#define FSM_ADC_H
+
+#ifdef USE_LVP
+// volts * 10
+#define VOLTAGE_LOW 30
+// MCU sees voltage 0.X volts lower than actual, add X to readings
+#define VOLTAGE_FUDGE_FACTOR 2
+volatile uint8_t voltage;
+void low_voltage();
+#endif
+#ifdef USE_THERMAL_REGULATION
+volatile int16_t temperature;
+void low_temperature();
+void high_temperature();
+#endif
+
+inline void ADC_on();
+inline void ADC_off();
+
+#endif
diff --git a/spaghetti-monster/fsm-events.c b/spaghetti-monster/fsm-events.c
new file mode 100644
index 0000000..6dda236
--- /dev/null
+++ b/spaghetti-monster/fsm-events.c
@@ -0,0 +1,137 @@
+/*
+ * fsm-events.c: Event-handling functions for SpaghettiMonster.
+ *
+ * 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 FSM_EVENTS_C
+#define FSM_EVENTS_C
+
+// TODO: maybe compare events by number instead of pointer?
+//       (number = index in event types array)
+//       (comparison would use full event content, but send off index to callbacks)
+//       (saves space by using uint8_t instead of a pointer)
+//       (also eliminates the need to duplicate single-entry events like for voltage or timer tick)
+
+// return 1 if (a == b), 0 otherwise
+uint8_t compare_event_sequences(uint8_t *a, const uint8_t *b) {
+    for(uint8_t i=0; (i<EV_MAX_LEN) && (a[i] == pgm_read_byte(b+i)); i++) {
+        // end of zero-terminated sequence
+        if (a[i] == 0) return 1;
+    }
+    // if we ever fall out, that means something was different
+    // (or the sequence is too long)
+    return 0;
+}
+
+void empty_event_sequence() {
+    for(uint8_t i=0; i<EV_MAX_LEN; i++) current_event[i] = 0;
+}
+
+uint8_t push_event(uint8_t ev_type) {
+    ticks_since_last_event = 0;  // something happened
+    uint8_t i;
+    uint8_t prev_event = 0;  // never push the same event twice in a row
+    for(i=0; current_event[i] && (i<EV_MAX_LEN); i++)
+        prev_event = current_event[i];
+    if ((i < EV_MAX_LEN)  &&  (prev_event != ev_type)) {
+        current_event[i] = ev_type;
+        return 1;  // event pushed
+    } else {
+        // TODO: ... something?
+    }
+    return 0;  // no event pushed
+}
+
+// find and return last action in the current event sequence
+/*
+uint8_t last_event(uint8_t offset) {
+    uint8_t i;
+    for(i=0; current_event[i] && (i<EV_MAX_LEN); i++);
+    if (i == EV_MAX_LEN) return current_event[EV_MAX_LEN-offset];
+    else if (i >= offset) return current_event[i-offset];
+    return 0;
+}
+*/
+
+inline uint8_t last_event_num() {
+    uint8_t i;
+    for(i=0; current_event[i] && (i<EV_MAX_LEN); i++);
+    return i;
+}
+
+
+void append_emission(EventPtr event, uint16_t arg) {
+    uint8_t i;
+    // find last entry
+    for(i=0;
+        (i<EMISSION_QUEUE_LEN) && (emissions[i].event != NULL);
+        i++) { }
+    // add new entry
+    if (i < EMISSION_QUEUE_LEN) {
+        emissions[i].event = event;
+        emissions[i].arg = arg;
+    } else {
+        // TODO: if queue full, what should we do?
+    }
+}
+
+void delete_first_emission() {
+    uint8_t i;
+    for(i=0; i<EMISSION_QUEUE_LEN-1; i++) {
+        emissions[i].event = emissions[i+1].event;
+        emissions[i].arg = emissions[i+1].arg;
+    }
+    emissions[i].event = NULL;
+    emissions[i].arg = 0;
+}
+
+// Call stacked callbacks for the given event until one handles it.
+uint8_t emit_now(EventPtr event, uint16_t arg) {
+    for(int8_t i=state_stack_len-1; i>=0; i--) {
+        uint8_t err = state_stack[i](event, arg);
+        if (! err) return 0;
+    }
+    return 1;  // event not handled
+}
+
+void emit(EventPtr event, uint16_t arg) {
+    // add this event to the queue for later,
+    // so we won't use too much time during an interrupt
+    append_emission(event, arg);
+}
+
+// Search the pre-defined event list for one matching what the user just did,
+// and emit it if one was found.
+void emit_current_event(uint16_t arg) {
+    //uint8_t err = 1;
+    for (uint8_t i=0; i<(sizeof(event_sequences)/sizeof(EventPtr)); i++) {
+        if (events_match(current_event, event_sequences[i])) {
+            //DEBUG_FLASH;
+            //err = emit(event_sequences[i], arg);
+            //return err;
+            emit(event_sequences[i], arg);
+            return;
+        }
+    }
+    //return err;
+}
+
+// TODO? add events to a queue when inside an interrupt
+//       instead of calling the event functions directly?
+//       (then empty the queue in main loop?)
+
+#endif
diff --git a/spaghetti-monster/fsm-events.h b/spaghetti-monster/fsm-events.h
new file mode 100644
index 0000000..434fa10
--- /dev/null
+++ b/spaghetti-monster/fsm-events.h
@@ -0,0 +1,197 @@
+/*
+ * fsm-events.h: Event-handling functions for SpaghettiMonster.
+ *
+ * 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 FSM_EVENTS_H
+#define FSM_EVENTS_H
+
+#include <avr/pgmspace.h>
+
+// typedefs
+typedef PROGMEM const uint8_t Event;
+typedef Event * EventPtr;
+typedef struct Emission {
+    EventPtr event;
+    uint16_t arg;
+} Emission;
+
+#define EV_MAX_LEN 16
+uint8_t current_event[EV_MAX_LEN];
+// at 0.016 ms per tick, 255 ticks = 4.08 s
+// TODO: 16 bits?
+static volatile uint16_t ticks_since_last_event = 0;
+
+// timeout durations in ticks (each tick 1/60th s)
+#define HOLD_TIMEOUT 24
+#define RELEASE_TIMEOUT 24
+
+#define A_ENTER_STATE     1
+#define A_LEAVE_STATE     2
+#define A_TICK            3
+#define A_PRESS           4
+#define A_HOLD            5
+#define A_RELEASE         6
+#define A_RELEASE_TIMEOUT 7
+// TODO: add events for over/under-heat conditions (with parameter for severity)
+#define A_OVERHEATING     8
+#define A_UNDERHEATING    9
+// TODO: add events for low voltage conditions
+#define A_VOLTAGE_LOW     10
+//#define A_VOLTAGE_CRITICAL 11
+#define A_DEBUG           255  // test event for debugging
+
+// Event types
+Event EV_debug[] = {
+    A_DEBUG,
+    0 } ;
+Event EV_enter_state[] = {
+    A_ENTER_STATE,
+    0 } ;
+Event EV_leave_state[] = {
+    A_LEAVE_STATE,
+    0 } ;
+Event EV_tick[] = {
+    A_TICK,
+    0 } ;
+#ifdef USE_LVP
+Event EV_voltage_low[] = {
+    A_VOLTAGE_LOW,
+    0 } ;
+#endif
+#ifdef USE_THERMAL_REGULATION
+Event EV_temperature_high[] = {
+    A_OVERHEATING,
+    0 } ;
+Event EV_temperature_low[] = {
+    A_UNDERHEATING,
+    0 } ;
+#endif
+Event EV_click1_press[] = {
+    A_PRESS,
+    0 };
+// shouldn't normally happen, but UI might reset event while button is down
+// so a release with no recorded prior hold could be possible
+Event EV_release[] = {
+    A_RELEASE,
+    0 };
+Event EV_click1_release[] = {
+    A_PRESS,
+    A_RELEASE,
+    0 };
+#define EV_1click EV_click1_complete
+Event EV_click1_complete[] = {
+    A_PRESS,
+    A_RELEASE,
+    A_RELEASE_TIMEOUT,
+    0 };
+#define EV_hold EV_click1_hold
+// FIXME: Should holds use "start+tick" or just "tick" with a tick number?
+//        Or "start+tick" with a tick number?
+Event EV_click1_hold[] = {
+    A_PRESS,
+    A_HOLD,
+    0 };
+Event EV_click1_hold_release[] = {
+    A_PRESS,
+    A_HOLD,
+    A_RELEASE,
+    0 };
+Event EV_click2_press[] = {
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    0 };
+Event EV_click2_release[] = {
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    0 };
+#define EV_2clicks EV_click2_complete
+Event EV_click2_complete[] = {
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_RELEASE_TIMEOUT,
+    0 };
+Event EV_click3_press[] = {
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    0 };
+Event EV_click3_release[] = {
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    0 };
+#define EV_3clicks EV_click3_complete
+Event EV_click3_complete[] = {
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_RELEASE_TIMEOUT,
+    0 };
+// ... and so on
+
+// A list of button event types for easy iteration
+EventPtr event_sequences[] = {
+    EV_click1_press,
+    EV_release,
+    EV_click1_release,
+    EV_click1_complete,
+    EV_click1_hold,
+    EV_click1_hold_release,
+    EV_click2_press,
+    EV_click2_release,
+    EV_click2_complete,
+    EV_click3_press,
+    EV_click3_release,
+    EV_click3_complete,
+    // ...
+};
+
+#define events_match(a,b) compare_event_sequences(a,b)
+// return 1 if (a == b), 0 otherwise
+uint8_t compare_event_sequences(uint8_t *a, const uint8_t *b);
+void empty_event_sequence();
+uint8_t push_event(uint8_t ev_type);
+// uint8_t last_event(uint8_t offset);
+inline uint8_t last_event_num();
+
+
+#define EMISSION_QUEUE_LEN 16
+// no comment about "volatile emissions"
+volatile Emission emissions[EMISSION_QUEUE_LEN];
+
+void append_emission(EventPtr event, uint16_t arg);
+void delete_first_emission();
+//#define emit_now emit
+uint8_t emit_now(EventPtr event, uint16_t arg);
+void emit(EventPtr event, uint16_t arg);
+void emit_current_event(uint16_t arg);
+
+#endif
diff --git a/spaghetti-monster/fsm-main.c b/spaghetti-monster/fsm-main.c
new file mode 100644
index 0000000..2faaeda
--- /dev/null
+++ b/spaghetti-monster/fsm-main.c
@@ -0,0 +1,107 @@
+/*
+ * fsm-main.c: main() function for SpaghettiMonster.
+ *
+ * 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 FSM_MAIN_C
+#define FSM_MAIN_C
+
+#include "fsm-main.h"
+
+int main() {
+    // Don't allow interrupts while booting
+    cli();
+    //WDT_off();
+    //PCINT_off();
+
+    // configure PWM channels
+    #if PWM_CHANNELS == 1
+    DDRB |= (1 << PWM1_PIN);
+    TCCR0B = 0x01; // pre-scaler for timer (1 => 1, 2 => 8, 3 => 64...)
+    TCCR0A = PHASE;
+    #elif PWM_CHANNELS == 2
+    DDRB |= (1 << PWM1_PIN);
+    DDRB |= (1 << PWM2_PIN);
+    TCCR0B = 0x01; // pre-scaler for timer (1 => 1, 2 => 8, 3 => 64...)
+    TCCR0A = PHASE;
+    #elif PWM_CHANNELS == 3
+    DDRB |= (1 << PWM1_PIN);
+    DDRB |= (1 << PWM2_PIN);
+    TCCR0B = 0x01; // pre-scaler for timer (1 => 1, 2 => 8, 3 => 64...)
+    TCCR0A = PHASE;
+    // Second PWM counter is ... weird
+    DDRB |= (1 << PWM3_PIN);
+    TCCR1 = _BV (CS10);
+    GTCCR = _BV (COM1B1) | _BV (PWM1B);
+    OCR1C = 255;  // Set ceiling value to maximum
+    #elif PWM_CHANNELS == 4
+    DDRB |= (1 << PWM1_PIN);
+    DDRB |= (1 << PWM2_PIN);
+    TCCR0B = 0x01; // pre-scaler for timer (1 => 1, 2 => 8, 3 => 64...)
+    TCCR0A = PHASE;
+    // Second PWM counter is ... weird
+    DDRB |= (1 << PWM3_PIN);
+    // FIXME: How exactly do we do PWM on channel 4?
+    TCCR1 = _BV (CS10);
+    GTCCR = _BV (COM1B1) | _BV (PWM1B);
+    OCR1C = 255;  // Set ceiling value to maximum
+    DDRB |= (1 << PWM4_PIN);
+    #endif
+
+    // TODO: turn on ADC?
+    // configure e-switch
+    PORTB = (1 << SWITCH_PIN);  // e-switch is the only input
+    PCMSK = (1 << SWITCH_PIN);  // pin change interrupt uses this pin
+
+    // TODO: configure sleep mode
+    set_sleep_mode(SLEEP_MODE_PWR_DOWN);
+
+    // Read config values and saved state
+    // restore_state();  // TODO
+
+    // TODO: handle long press vs short press (or even medium press)?
+
+    #ifdef USE_DEBUG_BLINK
+    //debug_blink(1);
+    #endif
+
+    // all booted -- turn interrupts back on
+    PCINT_on();
+    WDT_on();
+    ADC_on();
+    sei();
+
+    // fallback for handling a few things
+    push_state(default_state, 0);
+
+    // call recipe's setup
+    setup();
+
+    // main loop
+    while (1) {
+        // TODO: update e-switch press state?
+        // TODO: check voltage?
+        // TODO: check temperature?
+        // if event queue not empty, process and pop first item in queue?
+        if (emissions[0].event != NULL) {
+            emit_now(emissions[0].event, emissions[0].arg);
+            delete_first_emission();
+        }
+    }
+}
+
+#endif
diff --git a/spaghetti-monster/fsm-main.h b/spaghetti-monster/fsm-main.h
new file mode 100644
index 0000000..cc469d7
--- /dev/null
+++ b/spaghetti-monster/fsm-main.h
@@ -0,0 +1,25 @@
+/*
+ * fsm-main.h: main() function for SpaghettiMonster.
+ *
+ * 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 FSM_MAIN_H
+#define FSM_MAIN_H
+
+int main();
+
+#endif
diff --git a/spaghetti-monster/fsm-pcint.c b/spaghetti-monster/fsm-pcint.c
new file mode 100644
index 0000000..763c1fe
--- /dev/null
+++ b/spaghetti-monster/fsm-pcint.c
@@ -0,0 +1,76 @@
+/*
+ * fsm-pcint.c: PCINT (Pin Change Interrupt) functions for SpaghettiMonster.
+ *
+ * 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 FSM_PCINT_C
+#define FSM_PCINT_C
+
+#include <avr/interrupt.h>
+#include <util/delay_basic.h>
+
+uint8_t button_is_pressed() {
+    // debounce a little
+    uint8_t highcount = 0;
+    // measure for 16/64ths of a ms
+    for(uint8_t i=0; i<BP_SAMPLES; i++) {
+        // check current value
+        uint8_t bit = ((PINB & (1<<SWITCH_PIN)) == 0);
+        highcount += bit;
+        // wait a moment
+        _delay_loop_2(BOGOMIPS/64);
+    }
+    // use most common value
+    uint8_t result = (highcount > (BP_SAMPLES/2));
+    //button_was_pressed = result;
+    return result;
+}
+
+inline void PCINT_on() {
+    // enable pin change interrupt for pin N
+    GIMSK |= (1 << PCIE);
+    // only pay attention to the e-switch pin
+    //PCMSK = (1 << SWITCH_PCINT);
+    // set bits 1:0 to 0b01 (interrupt on rising *and* falling edge) (default)
+    // MCUCR &= 0b11111101;  MCUCR |= 0b00000001;
+}
+
+inline void PCINT_off() {
+    // disable all pin-change interrupts
+    GIMSK &= ~(1 << PCIE);
+}
+
+//void button_change_interrupt() {
+ISR(PCINT0_vect) {
+
+    //DEBUG_FLASH;
+
+    uint8_t pushed;
+
+    // add event to current sequence
+    if (button_is_pressed()) {
+        pushed = push_event(A_PRESS);
+    } else {
+        pushed = push_event(A_RELEASE);
+    }
+
+    // check if sequence matches any defined sequences
+    // if so, send event to current state callback
+    if (pushed) emit_current_event(0);
+}
+
+#endif
diff --git a/spaghetti-monster/fsm-pcint.h b/spaghetti-monster/fsm-pcint.h
new file mode 100644
index 0000000..cda5ad7
--- /dev/null
+++ b/spaghetti-monster/fsm-pcint.h
@@ -0,0 +1,29 @@
+/*
+ * fsm-pcint.h: PCINT (Pin Change Interrupt) functions for SpaghettiMonster.
+ *
+ * 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 FSM_PCINT_H
+#define FSM_PCINT_H
+
+//static volatile uint8_t button_was_pressed;
+#define BP_SAMPLES 16
+uint8_t button_is_pressed();
+inline void PCINT_on();
+inline void PCINT_off();
+
+#endif
diff --git a/spaghetti-monster/fsm-standby.c b/spaghetti-monster/fsm-standby.c
new file mode 100644
index 0000000..bef0533
--- /dev/null
+++ b/spaghetti-monster/fsm-standby.c
@@ -0,0 +1,53 @@
+/*
+ * fsm-standby.c: standby mode functions for SpaghettiMonster.
+ *
+ * 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 FSM_STANDBY_C
+#define FSM_STANDBY_C
+
+#include <avr/interrupt.h>
+#include <avr/sleep.h>
+
+#include "fsm-adc.h"
+#include "fsm-wdt.h"
+#include "fsm-pcint.h"
+
+// low-power standby mode used while off but power still connected
+#define standby_mode sleep_until_eswitch_pressed
+void sleep_until_eswitch_pressed()
+{
+    WDT_off();
+    ADC_off();
+
+    // make sure switch isn't currently pressed
+    while (button_is_pressed()) {}
+
+    PCINT_on();  // wake on e-switch event
+
+    sleep_enable();
+    sleep_bod_disable();
+    sleep_cpu();  // wait here
+
+    // something happened; wake up
+    sleep_disable();
+    PCINT_on();
+    ADC_on();
+    WDT_on();
+}
+
+#endif
diff --git a/spaghetti-monster/fsm-standby.h b/spaghetti-monster/fsm-standby.h
new file mode 100644
index 0000000..baeb6af
--- /dev/null
+++ b/spaghetti-monster/fsm-standby.h
@@ -0,0 +1,26 @@
+/*
+ * fsm-standby.h: standby mode functions for SpaghettiMonster.
+ *
+ * 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 FSM_STANDBY_H
+#define FSM_STANDBY_H
+
+#define standby_mode sleep_until_eswitch_pressed
+void sleep_until_eswitch_pressed();
+
+#endif
diff --git a/spaghetti-monster/fsm-states.c b/spaghetti-monster/fsm-states.c
new file mode 100644
index 0000000..652a9f2
--- /dev/null
+++ b/spaghetti-monster/fsm-states.c
@@ -0,0 +1,108 @@
+/*
+ * fsm-states.c: State-handling functions for SpaghettiMonster.
+ *
+ * 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 FSM_STATES_C
+#define FSM_STATES_C
+
+#include "fsm-states.h"
+#include "fsm-adc.h"
+
+// TODO: if callback doesn't handle current event,
+//       pass event to next state on stack?
+//       Callback return values:
+//       0: event handled normally
+//       1: event not handled
+//       255: error (not sure what this would even mean though, or what difference it would make)
+// TODO: function to call stacked callbacks until one returns "handled"
+
+void _set_state(StatePtr new_state, uint16_t arg) {
+    // call old state-exit hook (don't use stack)
+    if (current_state != NULL) current_state(EV_leave_state, arg);
+    // set new state
+    current_state = new_state;
+    // call new state-enter hook (don't use stack)
+    if (new_state != NULL) current_state(EV_enter_state, arg);
+}
+
+int8_t push_state(StatePtr new_state, uint16_t arg) {
+    if (state_stack_len < STATE_STACK_SIZE) {
+        // TODO: call old state's exit hook?
+        //       new hook for non-exit recursion into child?
+        state_stack[state_stack_len] = new_state;
+        state_stack_len ++;
+        _set_state(new_state, arg);
+        return state_stack_len;
+    } else {
+        // TODO: um...  how is a flashlight supposed to handle a recursion depth error?
+        return -1;
+    }
+}
+
+StatePtr pop_state() {
+    // TODO: how to handle pop from empty stack?
+    StatePtr old_state = NULL;
+    StatePtr new_state = NULL;
+    if (state_stack_len > 0) {
+        state_stack_len --;
+        old_state = state_stack[state_stack_len];
+    }
+    if (state_stack_len > 0) {
+        new_state = state_stack[state_stack_len-1];
+    }
+    // FIXME: what should 'arg' be?
+    // FIXME: do we need a EV_reenter_state?
+    _set_state(new_state, 0);
+    return old_state;
+}
+
+uint8_t set_state(StatePtr new_state, uint16_t arg) {
+    // FIXME: this calls exit/enter hooks it shouldn't
+    pop_state();
+    return push_state(new_state, arg);
+}
+
+// bottom state on stack
+// handles default actions for LVP, thermal regulation, etc
+uint8_t default_state(EventPtr event, uint16_t arg) {
+    if (0) {}
+
+    #ifdef USE_LVP
+    else if (event == EV_voltage_low) {
+        low_voltage();
+        return 0;
+    }
+    #endif
+
+    #ifdef USE_THERMAL_REGULATION
+    else if (event == EV_temperature_high) {
+        high_temperature();
+        return 0;
+    }
+
+    else if (event == EV_temperature_low) {
+        low_temperature();
+        return 0;
+    }
+    #endif
+
+    // event not handled
+    return 1;
+}
+
+#endif
diff --git a/spaghetti-monster/fsm-states.h b/spaghetti-monster/fsm-states.h
new file mode 100644
index 0000000..0daf915
--- /dev/null
+++ b/spaghetti-monster/fsm-states.h
@@ -0,0 +1,44 @@
+/*
+ * fsm-states.h: State-handling functions for SpaghettiMonster.
+ *
+ * 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 FSM_STATES_H
+#define FSM_STATES_H
+
+#include "fsm-adc.h"
+
+// typedefs
+typedef uint8_t State(EventPtr event, uint16_t arg);
+typedef State * StatePtr;
+
+// top of the stack
+volatile StatePtr current_state;
+
+// stack for states, to allow shared utility states like "input a number"
+// and such, which return to the previous state after finishing
+#define STATE_STACK_SIZE 8
+StatePtr state_stack[STATE_STACK_SIZE];
+uint8_t state_stack_len = 0;
+
+void _set_state(StatePtr new_state, uint16_t arg);
+int8_t push_state(StatePtr new_state, uint16_t arg);
+StatePtr pop_state();
+uint8_t set_state(StatePtr new_state, uint16_t arg);
+uint8_t default_state(EventPtr event, uint16_t arg);
+
+#endif
diff --git a/spaghetti-monster/fsm-wdt.c b/spaghetti-monster/fsm-wdt.c
new file mode 100644
index 0000000..afcf467
--- /dev/null
+++ b/spaghetti-monster/fsm-wdt.c
@@ -0,0 +1,107 @@
+/*
+ * fsm-wdt.c: WDT (Watch Dog Timer) functions for SpaghettiMonster.
+ *
+ * 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 FSM_WDT_C
+#define FSM_WDT_C
+
+#include <avr/interrupt.h>
+#include <avr/wdt.h>
+
+void WDT_on()
+{
+    // interrupt every 16ms
+    //cli();                          // Disable interrupts
+    wdt_reset();                    // Reset the WDT
+    WDTCR |= (1<<WDCE) | (1<<WDE);  // Start timed sequence
+    WDTCR = (1<<WDIE);              // Enable interrupt every 16ms
+    //sei();                          // Enable interrupts
+}
+
+inline void WDT_off()
+{
+    //cli();                          // Disable interrupts
+    wdt_reset();                    // Reset the WDT
+    MCUSR &= ~(1<<WDRF);            // Clear Watchdog reset flag
+    WDTCR |= (1<<WDCE) | (1<<WDE);  // Start timed sequence
+    WDTCR = 0x00;                   // Disable WDT
+    //sei();                          // Enable interrupts
+}
+
+// clock tick -- this runs every 16ms (62.5 fps)
+ISR(WDT_vect) {
+    //if (ticks_since_last_event < 0xff) ticks_since_last_event ++;
+    // increment, but loop from max back to half
+    ticks_since_last_event = (ticks_since_last_event + 1) \
+                             | (ticks_since_last_event & 0x8000);
+
+    // callback on each timer tick
+    emit(EV_tick, ticks_since_last_event);
+
+    // if time since last event exceeds timeout,
+    // append timeout to current event sequence, then
+    // send event to current state callback
+
+    // preload recent events
+    uint8_t le_num = last_event_num();
+    uint8_t last_event = 0;
+    uint8_t prev_event = 0;
+    if (le_num >= 1) last_event = current_event[le_num-1];
+    if (le_num >= 2) prev_event = current_event[le_num-2];
+
+    // user held button long enough to count as a long click?
+    if (last_event == A_PRESS) {
+        if (ticks_since_last_event >= HOLD_TIMEOUT) {
+            push_event(A_HOLD);
+            emit_current_event(0);
+        }
+    }
+
+    // user is still holding button, so tick
+    else if (last_event == A_HOLD) {
+        emit_current_event(ticks_since_last_event);
+    }
+
+    // detect completed button presses with expired timeout
+    else if (last_event == A_RELEASE) {
+        // no timeout required when releasing a long-press
+        // TODO? move this logic to PCINT() and simplify things here?
+        if (prev_event == A_HOLD) {
+            //emit_current_event(0);  // should have been emitted by PCINT
+            empty_event_sequence();
+        }
+        // end and clear event after release timeout
+        else if (ticks_since_last_event >= RELEASE_TIMEOUT) {
+            push_event(A_RELEASE_TIMEOUT);
+            emit_current_event(0);
+            empty_event_sequence();
+        }
+    }
+
+    #if defined(USE_LVP) || defined(USE_THERMAL_REGULATION)
+    // start a new ADC measurement every 4 ticks
+    static uint8_t adc_trigger = 0;
+    adc_trigger ++;
+    if (adc_trigger > 3) {
+        adc_trigger = 0;
+        ADCSRA |= (1 << ADSC) | (1 << ADIE);
+    }
+    #endif
+}
+
+#endif
diff --git a/spaghetti-monster/fsm-wdt.h b/spaghetti-monster/fsm-wdt.h
new file mode 100644
index 0000000..d7c64f5
--- /dev/null
+++ b/spaghetti-monster/fsm-wdt.h
@@ -0,0 +1,26 @@
+/*
+ * fsm-wdt.h: WDT (Watch Dog Timer) functions for SpaghettiMonster.
+ *
+ * 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 FSM_WDT_H
+#define FSM_WDT_H
+
+void WDT_on();
+inline void WDT_off();
+
+#endif
diff --git a/spaghetti-monster/spaghetti-monster.h b/spaghetti-monster/spaghetti-monster.h
index fe5e939..4eeb7de 100644
--- a/spaghetti-monster/spaghetti-monster.h
+++ b/spaghetti-monster/spaghetti-monster.h
@@ -24,46 +24,16 @@
 
 #include "tk-attiny.h"
 
-#include <avr/pgmspace.h>
-#include <avr/io.h>
-#include <avr/interrupt.h>
-#include <avr/wdt.h>
 #include <avr/eeprom.h>
-#include <avr/sleep.h>
-#include <util/delay_basic.h>
 
-// typedefs
-typedef PROGMEM const uint8_t Event;
-typedef Event * EventPtr;
-typedef uint8_t (*EventCallbackPtr)(EventPtr event, uint16_t arg);
-typedef uint8_t EventCallback(EventPtr event, uint16_t arg);
-typedef uint8_t State(EventPtr event, uint16_t arg);
-typedef State * StatePtr;
-typedef struct Emission {
-    EventPtr event;
-    uint16_t arg;
-} Emission;
-
-volatile StatePtr current_state;
-#define EV_MAX_LEN 16
-uint8_t current_event[EV_MAX_LEN];
-// at 0.016 ms per tick, 255 ticks = 4.08 s
-// TODO: 16 bits?
-static volatile uint16_t ticks_since_last_event = 0;
-
-#ifdef USE_LVP
-// volts * 10
-#define VOLTAGE_LOW 30
-// MCU sees voltage 0.X volts lower than actual, add X to readings
-#define VOLTAGE_FUDGE_FACTOR 2
-volatile uint8_t voltage;
-void low_voltage();
-#endif
-#ifdef USE_THERMAL_REGULATION
-volatile int16_t temperature;
-void low_temperature();
-void high_temperature();
-#endif
+// include project definitions to help with recognizing symbols
+#include "fsm-events.h"
+#include "fsm-states.h"
+#include "fsm-adc.h"
+#include "fsm-wdt.h"
+#include "fsm-pcint.h"
+#include "fsm-standby.h"
+#include "fsm-main.h"
 
 #ifdef USE_DEBUG_BLINK
 #define OWN_DELAY
@@ -80,705 +50,18 @@ void debug_blink(uint8_t num) {
 }
 #endif
 
-// timeout durations in ticks (each tick 1/60th s)
-#define HOLD_TIMEOUT 24
-#define RELEASE_TIMEOUT 24
-
-#define A_ENTER_STATE     1
-#define A_LEAVE_STATE     2
-#define A_TICK            3
-#define A_PRESS           4
-#define A_HOLD            5
-#define A_RELEASE         6
-#define A_RELEASE_TIMEOUT 7
-// TODO: add events for over/under-heat conditions (with parameter for severity)
-#define A_OVERHEATING     8
-#define A_UNDERHEATING    9
-// TODO: add events for low voltage conditions
-#define A_VOLTAGE_LOW     10
-//#define A_VOLTAGE_CRITICAL 11
-#define A_DEBUG           255  // test event for debugging
-
-// TODO: maybe compare events by number instead of pointer?
-//       (number = index in event types array)
-//       (comparison would use full event content, but send off index to callbacks)
-//       (saves space by using uint8_t instead of a pointer)
-//       (also eliminates the need to duplicate single-entry events like for voltage or timer tick)
-
-// Event types
-Event EV_debug[] = {
-    A_DEBUG,
-    0 } ;
-Event EV_enter_state[] = {
-    A_ENTER_STATE,
-    0 } ;
-Event EV_leave_state[] = {
-    A_LEAVE_STATE,
-    0 } ;
-Event EV_tick[] = {
-    A_TICK,
-    0 } ;
-#ifdef USE_LVP
-Event EV_voltage_low[] = {
-    A_VOLTAGE_LOW,
-    0 } ;
-#endif
-#ifdef USE_THERMAL_REGULATION
-Event EV_temperature_high[] = {
-    A_OVERHEATING,
-    0 } ;
-Event EV_temperature_low[] = {
-    A_UNDERHEATING,
-    0 } ;
-#endif
-Event EV_click1_press[] = {
-    A_PRESS,
-    0 };
-// shouldn't normally happen, but UI might reset event while button is down
-// so a release with no recorded prior hold could be possible
-Event EV_release[] = {
-    A_RELEASE,
-    0 };
-Event EV_click1_release[] = {
-    A_PRESS,
-    A_RELEASE,
-    0 };
-#define EV_1click EV_click1_complete
-Event EV_click1_complete[] = {
-    A_PRESS,
-    A_RELEASE,
-    A_RELEASE_TIMEOUT,
-    0 };
-#define EV_hold EV_click1_hold
-// FIXME: Should holds use "start+tick" or just "tick" with a tick number?
-//        Or "start+tick" with a tick number?
-Event EV_click1_hold[] = {
-    A_PRESS,
-    A_HOLD,
-    0 };
-Event EV_click1_hold_release[] = {
-    A_PRESS,
-    A_HOLD,
-    A_RELEASE,
-    0 };
-Event EV_click2_press[] = {
-    A_PRESS,
-    A_RELEASE,
-    A_PRESS,
-    0 };
-Event EV_click2_release[] = {
-    A_PRESS,
-    A_RELEASE,
-    A_PRESS,
-    A_RELEASE,
-    0 };
-#define EV_2clicks EV_click2_complete
-Event EV_click2_complete[] = {
-    A_PRESS,
-    A_RELEASE,
-    A_PRESS,
-    A_RELEASE,
-    A_RELEASE_TIMEOUT,
-    0 };
-Event EV_click3_press[] = {
-    A_PRESS,
-    A_RELEASE,
-    A_PRESS,
-    A_RELEASE,
-    A_PRESS,
-    0 };
-Event EV_click3_release[] = {
-    A_PRESS,
-    A_RELEASE,
-    A_PRESS,
-    A_RELEASE,
-    A_PRESS,
-    A_RELEASE,
-    0 };
-#define EV_3clicks EV_click3_complete
-Event EV_click3_complete[] = {
-    A_PRESS,
-    A_RELEASE,
-    A_PRESS,
-    A_RELEASE,
-    A_PRESS,
-    A_RELEASE,
-    A_RELEASE_TIMEOUT,
-    0 };
-// ... and so on
-
-// A list of event types for easy iteration
-EventPtr event_sequences[] = {
-    EV_click1_press,
-    EV_release,
-    EV_click1_release,
-    EV_click1_complete,
-    EV_click1_hold,
-    EV_click1_hold_release,
-    EV_click2_press,
-    EV_click2_release,
-    EV_click2_complete,
-    EV_click3_press,
-    EV_click3_release,
-    EV_click3_complete,
-    // ...
-};
-
-#define events_match(a,b) compare_event_sequences(a,b)
-// return 1 if (a == b), 0 otherwise
-uint8_t compare_event_sequences(uint8_t *a, const uint8_t *b) {
-    for(uint8_t i=0; (i<EV_MAX_LEN) && (a[i] == pgm_read_byte(b+i)); i++) {
-        // end of zero-terminated sequence
-        if (a[i] == 0) return 1;
-    }
-    // if we ever fall out, that means something was different
-    // (or the sequence is too long)
-    return 0;
-}
-
-void empty_event_sequence() {
-    for(uint8_t i=0; i<EV_MAX_LEN; i++) current_event[i] = 0;
-}
-
-uint8_t push_event(uint8_t ev_type) {
-    ticks_since_last_event = 0;  // something happened
-    uint8_t i;
-    uint8_t prev_event = 0;  // never push the same event twice in a row
-    for(i=0; current_event[i] && (i<EV_MAX_LEN); i++)
-        prev_event = current_event[i];
-    if ((i < EV_MAX_LEN)  &&  (prev_event != ev_type)) {
-        current_event[i] = ev_type;
-        return 1;  // event pushed
-    } else {
-        // TODO: ... something?
-    }
-    return 0;  // no event pushed
-}
-
-// find and return last action in the current event sequence
-/*
-uint8_t last_event(uint8_t offset) {
-    uint8_t i;
-    for(i=0; current_event[i] && (i<EV_MAX_LEN); i++);
-    if (i == EV_MAX_LEN) return current_event[EV_MAX_LEN-offset];
-    else if (i >= offset) return current_event[i-offset];
-    return 0;
-}
-*/
-
-inline uint8_t last_event_num() {
-    uint8_t i;
-    for(i=0; current_event[i] && (i<EV_MAX_LEN); i++);
-    return i;
-}
-
-
-#define EMISSION_QUEUE_LEN 16
-// no comment about "volatile emissions"
-volatile Emission emissions[EMISSION_QUEUE_LEN];
-
-void append_emission(EventPtr event, uint16_t arg) {
-    uint8_t i;
-    // find last entry
-    for(i=0;
-        (i<EMISSION_QUEUE_LEN) && (emissions[i].event != NULL);
-        i++) { }
-    // add new entry
-    if (i < EMISSION_QUEUE_LEN) {
-        emissions[i].event = event;
-        emissions[i].arg = arg;
-    } else {
-        // TODO: if queue full, what should we do?
-    }
-}
-
-void delete_first_emission() {
-    uint8_t i;
-    for(i=0; i<EMISSION_QUEUE_LEN-1; i++) {
-        emissions[i].event = emissions[i+1].event;
-        emissions[i].arg = emissions[i+1].arg;
-    }
-    emissions[i].event = NULL;
-    emissions[i].arg = 0;
-}
-
-// TODO: stack for states, to allow shared utility states like "input a number"
-//       and such, which return to the previous state after finishing
-#define STATE_STACK_SIZE 8
-StatePtr state_stack[STATE_STACK_SIZE];
-uint8_t state_stack_len = 0;
-// TODO: if callback doesn't handle current event,
-//       pass event to next state on stack?
-//       Callback return values:
-//       0: event handled normally
-//       1: event not handled
-//       255: error (not sure what this would even mean though, or what difference it would make)
-// TODO: function to call stacked callbacks until one returns "handled"
-// Call stacked callbacks for the given event until one handles it.
-//#define emit_now emit
-uint8_t emit_now(EventPtr event, uint16_t arg) {
-    for(int8_t i=state_stack_len-1; i>=0; i--) {
-        uint8_t err = state_stack[i](event, arg);
-        if (! err) return 0;
-    }
-    return 1;  // event not handled
-}
-
-void emit(EventPtr event, uint16_t arg) {
-    // add this event to the queue for later,
-    // so we won't use too much time during an interrupt
-    append_emission(event, arg);
-}
-
-// Search the pre-defined event list for one matching what the user just did,
-// and emit it if one was found.
-void emit_current_event(uint16_t arg) {
-    //uint8_t err = 1;
-    for (uint8_t i=0; i<(sizeof(event_sequences)/sizeof(EventPtr)); i++) {
-        if (events_match(current_event, event_sequences[i])) {
-            //DEBUG_FLASH;
-            //err = emit(event_sequences[i], arg);
-            //return err;
-            emit(event_sequences[i], arg);
-            return;
-        }
-    }
-    //return err;
-}
-
-void _set_state(StatePtr new_state, uint16_t arg) {
-    // call old state-exit hook (don't use stack)
-    if (current_state != NULL) current_state(EV_leave_state, arg);
-    // set new state
-    current_state = new_state;
-    // call new state-enter hook (don't use stack)
-    if (new_state != NULL) current_state(EV_enter_state, arg);
-}
-
-int8_t push_state(StatePtr new_state, uint16_t arg) {
-    if (state_stack_len < STATE_STACK_SIZE) {
-        // TODO: call old state's exit hook?
-        //       new hook for non-exit recursion into child?
-        state_stack[state_stack_len] = new_state;
-        state_stack_len ++;
-        _set_state(new_state, arg);
-        return state_stack_len;
-    } else {
-        // TODO: um...  how is a flashlight supposed to handle a recursion depth error?
-        return -1;
-    }
-}
-
-StatePtr pop_state() {
-    // TODO: how to handle pop from empty stack?
-    StatePtr old_state = NULL;
-    StatePtr new_state = NULL;
-    if (state_stack_len > 0) {
-        state_stack_len --;
-        old_state = state_stack[state_stack_len];
-    }
-    if (state_stack_len > 0) {
-        new_state = state_stack[state_stack_len-1];
-    }
-    // FIXME: what should 'arg' be?
-    // FIXME: do we need a EV_reenter_state?
-    _set_state(new_state, 0);
-    return old_state;
-}
-
-uint8_t set_state(StatePtr new_state, uint16_t arg) {
-    // FIXME: this calls exit/enter hooks it shouldn't
-    pop_state();
-    return push_state(new_state, arg);
-}
-
-// TODO? add events to a queue when inside an interrupt
-//       instead of calling the event functions directly?
-//       (then empty the queue in main loop?)
-
 // TODO? new delay() functions which handle queue consumption?
 // TODO? new interruptible delay() functions?
 
-
-//static volatile uint8_t button_was_pressed;
-#define BP_SAMPLES 16
-uint8_t button_is_pressed() {
-    // debounce a little
-    uint8_t highcount = 0;
-    // measure for 16/64ths of a ms
-    for(uint8_t i=0; i<BP_SAMPLES; i++) {
-        // check current value
-        uint8_t bit = ((PINB & (1<<SWITCH_PIN)) == 0);
-        highcount += bit;
-        // wait a moment
-        _delay_loop_2(BOGOMIPS/64);
-    }
-    // use most common value
-    uint8_t result = (highcount > (BP_SAMPLES/2));
-    //button_was_pressed = result;
-    return result;
-}
-
-//void button_change_interrupt() {
-ISR(PCINT0_vect) {
-
-    //DEBUG_FLASH;
-
-    uint8_t pushed;
-
-    // add event to current sequence
-    if (button_is_pressed()) {
-        pushed = push_event(A_PRESS);
-    } else {
-        pushed = push_event(A_RELEASE);
-    }
-
-    // check if sequence matches any defined sequences
-    // if so, send event to current state callback
-    if (pushed) emit_current_event(0);
-}
-
-// clock tick -- this runs every 16ms (62.5 fps)
-ISR(WDT_vect) {
-    //if (ticks_since_last_event < 0xff) ticks_since_last_event ++;
-    // increment, but loop from max back to half
-    ticks_since_last_event = (ticks_since_last_event + 1) \
-                             | (ticks_since_last_event & 0x8000);
-
-    // callback on each timer tick
-    emit(EV_tick, ticks_since_last_event);
-
-    // if time since last event exceeds timeout,
-    // append timeout to current event sequence, then
-    // send event to current state callback
-
-    // preload recent events
-    uint8_t le_num = last_event_num();
-    uint8_t last_event = 0;
-    uint8_t prev_event = 0;
-    if (le_num >= 1) last_event = current_event[le_num-1];
-    if (le_num >= 2) prev_event = current_event[le_num-2];
-
-    // user held button long enough to count as a long click?
-    if (last_event == A_PRESS) {
-        if (ticks_since_last_event >= HOLD_TIMEOUT) {
-            push_event(A_HOLD);
-            emit_current_event(0);
-        }
-    }
-
-    // user is still holding button, so tick
-    else if (last_event == A_HOLD) {
-        emit_current_event(ticks_since_last_event);
-    }
-
-    // detect completed button presses with expired timeout
-    else if (last_event == A_RELEASE) {
-        // no timeout required when releasing a long-press
-        // TODO? move this logic to PCINT() and simplify things here?
-        if (prev_event == A_HOLD) {
-            //emit_current_event(0);  // should have been emitted by PCINT
-            empty_event_sequence();
-        }
-        // end and clear event after release timeout
-        else if (ticks_since_last_event >= RELEASE_TIMEOUT) {
-            push_event(A_RELEASE_TIMEOUT);
-            emit_current_event(0);
-            empty_event_sequence();
-        }
-    }
-
-    #if defined(USE_LVP) || defined(USE_THERMAL_REGULATION)
-    // start a new ADC measurement every 4 ticks
-    static uint8_t adc_trigger = 0;
-    adc_trigger ++;
-    if (adc_trigger > 3) {
-        adc_trigger = 0;
-        ADCSRA |= (1 << ADSC) | (1 << ADIE);
-    }
-    #endif
-}
-
-// TODO: implement?  (or is it better done in main()?)
-ISR(ADC_vect) {
-    static uint8_t adc_step = 0;
-    #ifdef USE_LVP
-    #ifdef USE_LVP_AVG
-    #define NUM_VOLTAGE_VALUES 4
-    static int16_t voltage_values[NUM_VOLTAGE_VALUES];
-    #endif
-    static uint8_t lvp_timer = 0;
-    static uint8_t lvp_lowpass = 0;
-    #define LVP_TIMER_START 50  // ticks between LVP warnings
-    #define LVP_LOWPASS_STRENGTH 4
-    #endif
-
-    #ifdef USE_THERMAL_REGULATION
-    #define NUM_THERMAL_VALUES 4
-    #define ADC_STEPS 4
-    static int16_t temperature_values[NUM_THERMAL_VALUES];
-    #else
-    #define ADC_STEPS 2
-    #endif
-
-    uint16_t measurement = ADC;  // latest 10-bit ADC reading
-
-    adc_step = (adc_step + 1) & (ADC_STEPS-1);
-
-    #ifdef USE_LVP
-    // voltage
-    if (adc_step == 1) {
-        #ifdef USE_LVP_AVG
-        // prime on first execution
-        if (voltage == 0) {
-            for(uint8_t i=0; i<NUM_VOLTAGE_VALUES; i++)
-                voltage_values[i] = measurement;
-            voltage = 42;  // Life, the Universe, and Everything (*)
-        } else {
-            uint16_t total = 0;
-            uint8_t i;
-            for(i=0; i<NUM_VOLTAGE_VALUES-1; i++) {
-                voltage_values[i] = voltage_values[i+1];
-                total += voltage_values[i];
-            }
-            voltage_values[i] = measurement;
-            total += measurement;
-            total = total >> 2;
-
-            voltage = (uint16_t)(1.1*1024*10)/total + VOLTAGE_FUDGE_FACTOR;
-        }
-        #else  // no USE_LVP_AVG
-        // calculate actual voltage: volts * 10
-        // ADC = 1.1 * 1024 / volts
-        // volts = 1.1 * 1024 / ADC
-        voltage = (uint16_t)(1.1*1024*10)/measurement + VOLTAGE_FUDGE_FACTOR;
-        #endif
-        // if low, callback EV_voltage_low / EV_voltage_critical
-        //         (but only if it has been more than N ticks since last call)
-        if (lvp_timer) {
-            lvp_timer --;
-        } else {  // it has been long enough since the last warning
-            if (voltage < VOLTAGE_LOW) {
-                if (lvp_lowpass < LVP_LOWPASS_STRENGTH) {
-                    lvp_lowpass ++;
-                } else {
-                    // try to send out a warning
-                    //uint8_t err = emit(EV_voltage_low, 0);
-                    //uint8_t err = emit_now(EV_voltage_low, 0);
-                    emit(EV_voltage_low, 0);
-                    //if (!err) {
-                        // on successful warning, reset counters
-                        lvp_timer = LVP_TIMER_START;
-                        lvp_lowpass = 0;
-                    //}
-                }
-            } else {
-                // voltage not low?  reset count
-                lvp_lowpass = 0;
-            }
-        }
-    }
-    #endif  // ifdef USE_LVP
-
-    // TODO: temperature
-
-    // start another measurement for next time
-    #ifdef USE_THERMAL_REGULATION
-        #ifdef USE_LVP
-        if (adc_step < 2) ADMUX = ADMUX_VCC;
-        else ADMUX = ADMUX_THERM;
-        #else
-        ADMUX = ADMUX_THERM;
-        #endif
-    #else
-        #ifdef USE_LVP
-        ADMUX = ADMUX_VCC;
-        #endif
-    #endif
-}
-
-inline void ADC_on()
-{
-    // read voltage on VCC by default
-    // disable digital input on VCC pin to reduce power consumption
-    //DIDR0 |= (1 << ADC_DIDR);  // FIXME: unsure how to handle for VCC pin
-    // VCC / 1.1V reference
-    ADMUX = ADMUX_VCC;
-    // enable, start, prescale
-    ADCSRA = (1 << ADEN) | (1 << ADSC) | ADC_PRSCL;
-}
-
-inline void ADC_off() {
-    ADCSRA &= ~(1<<ADEN); //ADC off
-}
-
-inline void PCINT_on() {
-    // enable pin change interrupt for pin N
-    GIMSK |= (1 << PCIE);
-    // only pay attention to the e-switch pin
-    //PCMSK = (1 << SWITCH_PCINT);
-    // set bits 1:0 to 0b01 (interrupt on rising *and* falling edge) (default)
-    // MCUCR &= 0b11111101;  MCUCR |= 0b00000001;
-}
-
-inline void PCINT_off() {
-    // disable all pin-change interrupts
-    GIMSK &= ~(1 << PCIE);
-}
-
-void WDT_on()
-{
-    // interrupt every 16ms
-    //cli();                          // Disable interrupts
-    wdt_reset();                    // Reset the WDT
-    WDTCR |= (1<<WDCE) | (1<<WDE);  // Start timed sequence
-    WDTCR = (1<<WDIE);              // Enable interrupt every 16ms
-    //sei();                          // Enable interrupts
-}
-
-inline void WDT_off()
-{
-    //cli();                          // Disable interrupts
-    wdt_reset();                    // Reset the WDT
-    MCUSR &= ~(1<<WDRF);            // Clear Watchdog reset flag
-    WDTCR |= (1<<WDCE) | (1<<WDE);  // Start timed sequence
-    WDTCR = 0x00;                   // Disable WDT
-    //sei();                          // Enable interrupts
-}
-
-// low-power standby mode used while off but power still connected
-#define standby_mode sleep_until_eswitch_pressed
-void sleep_until_eswitch_pressed()
-{
-    WDT_off();
-    ADC_off();
-
-    // make sure switch isn't currently pressed
-    while (button_is_pressed()) {}
-
-    PCINT_on();  // wake on e-switch event
-
-    sleep_enable();
-    sleep_bod_disable();
-    sleep_cpu();  // wait here
-
-    // something happened; wake up
-    sleep_disable();
-    PCINT_on();
-    ADC_on();
-    WDT_on();
-}
-
-// last-called state on stack
-// handles default actions for LVP, thermal regulation, etc
-uint8_t default_state(EventPtr event, uint16_t arg) {
-    if (0) {}
-
-    #ifdef USE_LVP
-    else if (event == EV_voltage_low) {
-        low_voltage();
-        return 0;
-    }
-    #endif
-
-    #ifdef USE_THERMAL_REGULATION
-    else if (event == EV_temperature_high) {
-        high_temperature();
-        return 0;
-    }
-
-    else if (event == EV_temperature_low) {
-        low_temperature();
-        return 0;
-    }
-    #endif
-
-    // event not handled
-    return 1;
-}
-
 // boot-time tasks
-// Define this in your RoundTable recipe
+// Define this in your SpaghettiMonster recipe
 void setup();
 
-int main() {
-    // Don't allow interrupts while booting
-    cli();
-    //WDT_off();
-    //PCINT_off();
-
-    // configure PWM channels
-    #if PWM_CHANNELS == 1
-    DDRB |= (1 << PWM1_PIN);
-    TCCR0B = 0x01; // pre-scaler for timer (1 => 1, 2 => 8, 3 => 64...)
-    TCCR0A = PHASE;
-    #elif PWM_CHANNELS == 2
-    DDRB |= (1 << PWM1_PIN);
-    DDRB |= (1 << PWM2_PIN);
-    TCCR0B = 0x01; // pre-scaler for timer (1 => 1, 2 => 8, 3 => 64...)
-    TCCR0A = PHASE;
-    #elif PWM_CHANNELS == 3
-    DDRB |= (1 << PWM1_PIN);
-    DDRB |= (1 << PWM2_PIN);
-    TCCR0B = 0x01; // pre-scaler for timer (1 => 1, 2 => 8, 3 => 64...)
-    TCCR0A = PHASE;
-    // Second PWM counter is ... weird
-    DDRB |= (1 << PWM3_PIN);
-    TCCR1 = _BV (CS10);
-    GTCCR = _BV (COM1B1) | _BV (PWM1B);
-    OCR1C = 255;  // Set ceiling value to maximum
-    #elif PWM_CHANNELS == 4
-    DDRB |= (1 << PWM1_PIN);
-    DDRB |= (1 << PWM2_PIN);
-    TCCR0B = 0x01; // pre-scaler for timer (1 => 1, 2 => 8, 3 => 64...)
-    TCCR0A = PHASE;
-    // Second PWM counter is ... weird
-    DDRB |= (1 << PWM3_PIN);
-    // FIXME: How exactly do we do PWM on channel 4?
-    TCCR1 = _BV (CS10);
-    GTCCR = _BV (COM1B1) | _BV (PWM1B);
-    OCR1C = 255;  // Set ceiling value to maximum
-    DDRB |= (1 << PWM4_PIN);
-    #endif
-
-    // TODO: turn on ADC?
-    // configure e-switch
-    PORTB = (1 << SWITCH_PIN);  // e-switch is the only input
-    PCMSK = (1 << SWITCH_PIN);  // pin change interrupt uses this pin
-
-    // TODO: configure sleep mode
-    set_sleep_mode(SLEEP_MODE_PWR_DOWN);
-
-    // Read config values and saved state
-    // restore_state();  // TODO
-
-    // TODO: handle long press vs short press (or even medium press)?
-
-    #ifdef USE_DEBUG_BLINK
-    //debug_blink(1);
-    #endif
-
-    // all booted -- turn interrupts back on
-    PCINT_on();
-    WDT_on();
-    ADC_on();
-    sei();
-
-    // fallback for handling a few things
-    push_state(default_state, 0);
-
-    // call recipe's setup
-    setup();
-
-    // main loop
-    while (1) {
-        // TODO: update e-switch press state?
-        // TODO: check voltage?
-        // TODO: check temperature?
-        // if event queue not empty, process and pop first item in queue?
-        if (emissions[0].event != NULL) {
-            emit_now(emissions[0].event, emissions[0].arg);
-            delete_first_emission();
-        }
-    }
-}
+// include executable functions too, for easier compiling
+#include "fsm-states.c"
+#include "fsm-events.c"
+#include "fsm-adc.c"
+#include "fsm-wdt.c"
+#include "fsm-pcint.c"
+#include "fsm-standby.c"
+#include "fsm-main.c"
-- 
cgit v1.2.3


From 5ebd512ef3d91cd26e147e1dd7a44f6f227498dd Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sat, 19 Aug 2017 17:30:00 -0600
Subject: Baton: Strobe should be full-power.

---
 spaghetti-monster/baton.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/baton.c b/spaghetti-monster/baton.c
index 02b7c00..67ca3b9 100644
--- a/spaghetti-monster/baton.c
+++ b/spaghetti-monster/baton.c
@@ -135,11 +135,11 @@ uint8_t party_strobe_state(EventPtr event, uint16_t arg) {
     // tick: strobe the emitter
     else if (event == EV_tick) {
         if (frames == 0) {
-            PWM1_LVL = 255;
-            PWM2_LVL = 0;
+            PWM1_LVL = 0;
+            PWM2_LVL = 255;
             if (between < 3) delay_zero();
             else delay_ms(1);
-            PWM1_LVL = 0;
+            PWM2_LVL = 0;
         }
         //frames = (frames + 1) % between;
         frames++;
-- 
cgit v1.2.3


From f1476a7b8e010dd27eb413c5f8ede19aa6f45b49 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sat, 19 Aug 2017 18:05:08 -0600
Subject: Added missing returns, made strobe-from-off use memorized strobe
 speed, set initial brightness to ~10lm after battery change.

---
 spaghetti-monster/baton.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/baton.c b/spaghetti-monster/baton.c
index 67ca3b9..194dbec 100644
--- a/spaghetti-monster/baton.c
+++ b/spaghetti-monster/baton.c
@@ -34,7 +34,7 @@ uint8_t steady_state(EventPtr event, uint16_t arg);
 uint8_t party_strobe_state(EventPtr event, uint16_t arg);
 
 // brightness control
-uint8_t memorized_level = 0;
+uint8_t memorized_level = 1;
 uint8_t actual_level = 0;
 
 void set_mode(uint8_t lvl) {
@@ -56,10 +56,12 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
     // hold (initially): go to lowest level, but allow abort for regular click
     else if (event == EV_click1_press) {
         set_mode(0);
+        return 0;
     }
     // 1 click (before timeout): go to memorized level, but allow abort for double click
     else if (event == EV_click1_release) {
         set_mode(memorized_level);
+        return 0;
     }
     // 1 click: regular mode
     else if (event == EV_1click) {
@@ -73,12 +75,13 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
     }
     // 3 clicks: strobe mode
     else if (event == EV_3clicks) {
-        set_state(party_strobe_state, 0);
+        set_state(party_strobe_state, 255);
         return 0;
     }
     // hold: go to lowest level
     else if (event == EV_click1_hold) {
         set_state(steady_state, 0);
+        return 0;
     }
     return 1;
 }
-- 
cgit v1.2.3


From eabfc98408e6541c2e2bcce29e2cef4214d63a56 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Wed, 23 Aug 2017 17:11:50 -0600
Subject: Added LVP to Baton UI.  Was super easy.

---
 spaghetti-monster/baton.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/baton.c b/spaghetti-monster/baton.c
index 194dbec..559eb48 100644
--- a/spaghetti-monster/baton.c
+++ b/spaghetti-monster/baton.c
@@ -171,7 +171,19 @@ uint8_t party_strobe_state(EventPtr event, uint16_t arg) {
 }
 
 void low_voltage() {
-    // FIXME: do something
+    // "step down" from strobe to level 2
+    if (current_state == party_strobe_state) {
+        set_state(steady_state, 1);
+    }
+    // in normal mode, step down by one level or turn off
+    else if (current_state == steady_state) {
+        if (actual_level > 0) {
+            set_mode(actual_level - 1);
+        }
+        else {
+            set_state(off_state, 0);
+        }
+    }
 }
 
 void setup() {
-- 
cgit v1.2.3


From e765199a20e14ca6226a33062ea14182df896dfc Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Wed, 23 Aug 2017 17:14:57 -0600
Subject: Made Baton a little easier to read: Renamed set_mode() to
 set_level(). Replaced sizeof() thingy with a MAX_LEVEL define.

---
 spaghetti-monster/baton.c | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/baton.c b/spaghetti-monster/baton.c
index 559eb48..5ab35be 100644
--- a/spaghetti-monster/baton.c
+++ b/spaghetti-monster/baton.c
@@ -27,6 +27,7 @@
 // moon + ../../bin/level_calc.py 2 6 7135 18 10 150 FET 1 10 1500
 uint8_t pwm1_modes[] = { 3, 18, 110, 255, 255, 255,   0, };
 uint8_t pwm2_modes[] = { 0,  0,   0,   9,  58, 138, 255, };
+#define MAX_LEVEL (sizeof(pwm1_modes)-1)
 
 // FSM states
 uint8_t off_state(EventPtr event, uint16_t arg);
@@ -37,7 +38,7 @@ uint8_t party_strobe_state(EventPtr event, uint16_t arg);
 uint8_t memorized_level = 1;
 uint8_t actual_level = 0;
 
-void set_mode(uint8_t lvl) {
+void set_level(uint8_t lvl) {
     actual_level = lvl;
     PWM1_LVL = pwm1_modes[lvl];
     PWM2_LVL = pwm2_modes[lvl];
@@ -55,12 +56,12 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
     }
     // hold (initially): go to lowest level, but allow abort for regular click
     else if (event == EV_click1_press) {
-        set_mode(0);
+        set_level(0);
         return 0;
     }
     // 1 click (before timeout): go to memorized level, but allow abort for double click
     else if (event == EV_click1_release) {
-        set_mode(memorized_level);
+        set_level(memorized_level);
         return 0;
     }
     // 1 click: regular mode
@@ -70,7 +71,7 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
     }
     // 2 clicks: highest mode
     else if (event == EV_2clicks) {
-        set_state(steady_state, sizeof(pwm1_modes)-1);
+        set_state(steady_state, MAX_LEVEL);
         return 0;
     }
     // 3 clicks: strobe mode
@@ -90,10 +91,10 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
     // turn LED on when we first enter the mode
     if (event == EV_enter_state) {
         // remember this level, unless it's moon or turbo
-        if ((arg > 0) && (arg < sizeof(pwm1_modes)-1))
+        if ((arg > 0) && (arg < MAX_LEVEL))
             memorized_level = arg;
         // use the requested level even if not memorized
-        set_mode(arg);
+        set_level(arg);
         return 0;
     }
     // 1 click: off
@@ -103,12 +104,12 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
     }
     // 2 clicks: go to/from highest level
     else if (event == EV_2clicks) {
-        if (actual_level < sizeof(pwm1_modes)-1) {
+        if (actual_level < MAX_LEVEL) {
             memorized_level = actual_level;  // in case we're on moon
-            set_mode(sizeof(pwm1_modes)-1);
+            set_level(MAX_LEVEL);
         }
         else
-            set_mode(memorized_level);
+            set_level(memorized_level);
         return 0;
     }
     // 3 clicks: go to strobe modes
@@ -119,8 +120,8 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
     // hold: change brightness
     else if (event == EV_click1_hold) {
         if ((arg % HOLD_TIMEOUT) == 0) {
-            memorized_level = (actual_level+1) % sizeof(pwm1_modes);
-            set_mode(memorized_level);
+            memorized_level = (actual_level+1) % (MAX_LEVEL+1);
+            set_level(memorized_level);
         }
         return 0;
     }
@@ -178,7 +179,7 @@ void low_voltage() {
     // in normal mode, step down by one level or turn off
     else if (current_state == steady_state) {
         if (actual_level > 0) {
-            set_mode(actual_level - 1);
+            set_level(actual_level - 1);
         }
         else {
             set_state(off_state, 0);
-- 
cgit v1.2.3


From 5631564b329d0445fb282e5e387217ba4e4ff191 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Wed, 23 Aug 2017 19:22:22 -0600
Subject: Added thermal regulation to SpaghettiMonster / Baton. Made some LVP
 values configurable. Removed high_temperature() / low_temperature() shortcuts
 for now.

---
 spaghetti-monster/baton.c      |  36 ++++++++++-
 spaghetti-monster/fsm-adc.c    | 136 +++++++++++++++++++++++++++++++++++++++--
 spaghetti-monster/fsm-adc.h    |  41 +++++++++++--
 spaghetti-monster/fsm-states.c |   2 +
 4 files changed, 206 insertions(+), 9 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/baton.c b/spaghetti-monster/baton.c
index 5ab35be..6b694e4 100644
--- a/spaghetti-monster/baton.c
+++ b/spaghetti-monster/baton.c
@@ -19,6 +19,8 @@
 
 #define FSM_EMISAR_D4_LAYOUT
 #define USE_LVP
+#define USE_THERMAL_REGULATION
+#define DEFAULT_THERM_CEIL 45
 #define USE_DEBUG_BLINK
 #define USE_DELAY_MS
 #define USE_DELAY_ZERO
@@ -37,6 +39,9 @@ uint8_t party_strobe_state(EventPtr event, uint16_t arg);
 // brightness control
 uint8_t memorized_level = 1;
 uint8_t actual_level = 0;
+#ifdef USE_THERMAL_REGULATION
+uint8_t target_level = 0;
+#endif
 
 void set_level(uint8_t lvl) {
     actual_level = lvl;
@@ -94,6 +99,9 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         if ((arg > 0) && (arg < MAX_LEVEL))
             memorized_level = arg;
         // use the requested level even if not memorized
+        #ifdef USE_THERMAL_REGULATION
+        target_level = arg;
+        #endif
         set_level(arg);
         return 0;
     }
@@ -106,10 +114,17 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
     else if (event == EV_2clicks) {
         if (actual_level < MAX_LEVEL) {
             memorized_level = actual_level;  // in case we're on moon
+            #ifdef USE_THERMAL_REGULATION
+            target_level = MAX_LEVEL;
+            #endif
             set_level(MAX_LEVEL);
         }
-        else
+        else {
+            #ifdef USE_THERMAL_REGULATION
+            target_level = memorized_level;
+            #endif
             set_level(memorized_level);
+        }
         return 0;
     }
     // 3 clicks: go to strobe modes
@@ -121,10 +136,29 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
     else if (event == EV_click1_hold) {
         if ((arg % HOLD_TIMEOUT) == 0) {
             memorized_level = (actual_level+1) % (MAX_LEVEL+1);
+            #ifdef USE_THERMAL_REGULATION
+            target_level = memorized_level;
+            #endif
             set_level(memorized_level);
         }
         return 0;
     }
+    #ifdef USE_THERMAL_REGULATION
+    // overheating: drop by 1 level
+    else if (event == EV_temperature_high) {
+        if (actual_level > 1) {
+            set_level(actual_level - 1);
+        }
+        return 0;
+    }
+    // underheating: increase by 1 level if we're lower than the target
+    else if (event == EV_temperature_low) {
+        if (actual_level < target_level) {
+            set_level(actual_level + 1);
+        }
+        return 0;
+    }
+    #endif
     return 1;
 }
 
diff --git a/spaghetti-monster/fsm-adc.c b/spaghetti-monster/fsm-adc.c
index 11468b9..8af3487 100644
--- a/spaghetti-monster/fsm-adc.c
+++ b/spaghetti-monster/fsm-adc.c
@@ -35,9 +35,18 @@ inline void ADC_off() {
     ADCSRA &= ~(1<<ADEN); //ADC off
 }
 
+// Each full cycle runs 7.8X per second with just voltage enabled,
+// or 3.9X per second with voltage and temperature.
+#if defined(USE_LVP) && defined(USE_THERMAL_REGULATION)
+#define ADC_CYCLES_PER_SECOND 4
+#else
+#define ADC_CYCLES_PER_SECOND 8
+#endif
 // TODO: is this better done in main() or WDT()?
 ISR(ADC_vect) {
     static uint8_t adc_step = 0;
+
+    // LVP declarations
     #ifdef USE_LVP
     #ifdef USE_LVP_AVG
     #define NUM_VOLTAGE_VALUES 4
@@ -45,14 +54,24 @@ ISR(ADC_vect) {
     #endif
     static uint8_t lvp_timer = 0;
     static uint8_t lvp_lowpass = 0;
-    #define LVP_TIMER_START 50  // ticks between LVP warnings
-    #define LVP_LOWPASS_STRENGTH 4
+    #define LVP_TIMER_START (VOLTAGE_WARNING_SECONDS*ADC_CYCLES_PER_SECOND)  // N seconds between LVP warnings
+    #define LVP_LOWPASS_STRENGTH ADC_CYCLES_PER_SECOND  // lowpass for one second
     #endif
 
+    // thermal declarations
     #ifdef USE_THERMAL_REGULATION
     #define NUM_THERMAL_VALUES 4
+    #define NUM_THERMAL_VALUES_HISTORY 16
     #define ADC_STEPS 4
-    static int16_t temperature_values[NUM_THERMAL_VALUES];
+    static uint8_t first_temp_reading = 1;
+    static int16_t temperature_values[NUM_THERMAL_VALUES];  // last few readings in C
+    static int16_t temperature_history[NUM_THERMAL_VALUES_HISTORY];  // 13.2 fixed-point
+    static uint8_t temperature_timer = 0;
+    static uint8_t overheat_lowpass = 0;
+    static uint8_t underheat_lowpass = 0;
+    #define TEMPERATURE_TIMER_START (THERMAL_WARNING_SECONDS*ADC_CYCLES_PER_SECOND)  // N seconds between thermal regulation events
+    #define OVERHEAT_LOWPASS_STRENGTH ADC_CYCLES_PER_SECOND  // lowpass for one second
+    #define UNDERHEAT_LOWPASS_STRENGTH ADC_CYCLES_PER_SECOND  // lowpass for one second
     #else
     #define ADC_STEPS 2
     #endif
@@ -116,7 +135,116 @@ ISR(ADC_vect) {
     }
     #endif  // ifdef USE_LVP
 
-    // TODO: temperature
+
+    #ifdef USE_THERMAL_REGULATION
+    // temperature
+    else if (adc_step == 3) {
+        // Convert ADC units to Celsius (ish)
+        int16_t temp = measurement - 275 + THERM_CAL_OFFSET;
+
+        // prime on first execution
+        if (first_temp_reading) {
+            first_temp_reading = 0;
+            for(uint8_t i=0; i<NUM_THERMAL_VALUES; i++)
+                temperature_values[i] = temp;
+            for(uint8_t i=0; i<NUM_THERMAL_VALUES_HISTORY; i++)
+                temperature_history[i] = temp;
+            temperature = temp;
+        } else {  // update our current temperature estimate
+            uint8_t i;
+            int16_t total=0;
+
+            // rotate array
+            for(i=0; i<NUM_THERMAL_VALUES-1; i++) {
+                temperature_values[i] = temperature_values[i+1];
+                total += temperature_values[i];
+            }
+            temperature_values[i] = temp;
+            total += temp;
+
+            // Divide back to original range:
+            //temperature = total >> 2;
+            // More precise method: use noise as extra precision
+            // (values are now basically fixed-point, signed 13.2)
+            temperature = total;
+        }
+
+        // guess what the temperature will be in a few seconds
+        {
+            uint8_t i;
+            int16_t diff;
+
+            // algorithm tweaking; not really intended to be modified
+            // how far ahead should we predict?
+            #define THERM_PREDICTION_STRENGTH 4
+            // how proportional should the adjustments be?
+            #define THERM_DIFF_ATTENUATION 4
+            // acceptable temperature window size in C
+            #define THERM_WINDOW_SIZE 8
+            // highest temperature allowed
+            // (convert configured value to 13.2 fixed-point)
+            #define THERM_CEIL (therm_ceil<<2)
+            // bottom of target temperature window (13.2 fixed-point)
+            #define THERM_FLOOR (THERM_CEIL - (THERM_WINDOW_SIZE<<2))
+
+            // rotate measurements and add a new one
+            for (i=0; i<NUM_THERMAL_VALUES_HISTORY-1; i++) {
+                temperature_history[i] = temperature_history[i+1];
+            }
+            temperature_history[NUM_THERMAL_VALUES_HISTORY-1] = temperature;
+
+            // guess what the temp will be several seconds in the future
+            diff = temperature_history[NUM_THERMAL_VALUES_HISTORY-1] - temperature_history[0];
+            projected_temperature = temperature_history[NUM_THERMAL_VALUES_HISTORY-1] + (diff<<THERM_PREDICTION_STRENGTH);
+
+        }
+
+        // cancel counters if necessary
+        if (projected_temperature > THERM_FLOOR) {
+            underheat_lowpass = 0;  // we're definitely not too cold
+        } else if (projected_temperature < THERM_CEIL) {
+            overheat_lowpass = 0;  // we're definitely not too hot
+        }
+
+        if (temperature_timer) {
+            temperature_timer --;
+        } else {  // it has been long enough since the last warning
+
+            // Too hot?
+            if (projected_temperature > THERM_CEIL) {
+                if (overheat_lowpass < OVERHEAT_LOWPASS_STRENGTH) {
+                    overheat_lowpass ++;
+                } else {
+                    // how far above the ceiling?
+                    int16_t howmuch = (projected_temperature - THERM_CEIL) >> THERM_DIFF_ATTENUATION;
+                    if (howmuch < 1) howmuch = 1;
+                    // try to send out a warning
+                    emit(EV_temperature_high, howmuch);
+                    // reset counters
+                    temperature_timer = TEMPERATURE_TIMER_START;
+                    overheat_lowpass = 0;
+                }
+            }
+
+            // Too cold?
+            else if (projected_temperature < THERM_FLOOR) {
+                if (underheat_lowpass < UNDERHEAT_LOWPASS_STRENGTH) {
+                    underheat_lowpass ++;
+                } else {
+                    // how far below the floor?
+                    int16_t howmuch = (THERM_FLOOR - projected_temperature) >> THERM_DIFF_ATTENUATION;
+                    if (howmuch < 1) howmuch = 1;
+                    // try to send out a warning
+                    emit(EV_temperature_low, howmuch);
+                    // reset counters
+                    temperature_timer = TEMPERATURE_TIMER_START;
+                    underheat_lowpass = 0;
+                }
+            }
+        }
+    }
+    #endif  // ifdef USE_THERMAL_REGULATION
+
 
     // start another measurement for next time
     #ifdef USE_THERMAL_REGULATION
diff --git a/spaghetti-monster/fsm-adc.h b/spaghetti-monster/fsm-adc.h
index ac42333..43d52a6 100644
--- a/spaghetti-monster/fsm-adc.h
+++ b/spaghetti-monster/fsm-adc.h
@@ -20,21 +20,54 @@
 #ifndef FSM_ADC_H
 #define FSM_ADC_H
 
+
 #ifdef USE_LVP
-// volts * 10
-#define VOLTAGE_LOW 30
+// default 5 seconds between low-voltage warning events
+#ifndef VOLTAGE_WARNING_SECONDS
+#define VOLTAGE_WARNING_SECONDS 5
+#endif
+// low-battery threshold in volts * 10
+#ifndef VOLTAGE_LOW
+#define VOLTAGE_LOW 29
+#endif
 // MCU sees voltage 0.X volts lower than actual, add X to readings
+#ifndef VOLTAGE_FUDGE_FACTOR
 #define VOLTAGE_FUDGE_FACTOR 2
+#endif
 volatile uint8_t voltage;
 void low_voltage();
 #endif
+
+
 #ifdef USE_THERMAL_REGULATION
+// default 5 seconds between thermal regulation events
+#ifndef THERMAL_WARNING_SECONDS
+#define THERMAL_WARNING_SECONDS 5
+#endif
+// try to keep temperature below 45 C
+#ifndef DEFAULT_THERM_CEIL
+#define DEFAULT_THERM_CEIL 45
+#endif
+// don't allow user to set ceiling above 70 C
+#ifndef MAX_THERM_CEIL
+#define MAX_THERM_CEIL 70
+#endif
+// Local per-MCU calibration value
+#ifndef THERM_CAL_OFFSET
+#define THERM_CAL_OFFSET 0
+#endif
+// temperature now, in C (ish)
 volatile int16_t temperature;
-void low_temperature();
-void high_temperature();
+// temperature in a few seconds, in C (ish) * 4  (13.2 fixed-point)
+volatile int16_t projected_temperature;  // Fight the future!
+uint8_t therm_ceil = DEFAULT_THERM_CEIL;
+//void low_temperature();
+//void high_temperature();
 #endif
 
+
 inline void ADC_on();
 inline void ADC_off();
 
+
 #endif
diff --git a/spaghetti-monster/fsm-states.c b/spaghetti-monster/fsm-states.c
index 652a9f2..ec24dc8 100644
--- a/spaghetti-monster/fsm-states.c
+++ b/spaghetti-monster/fsm-states.c
@@ -89,6 +89,7 @@ uint8_t default_state(EventPtr event, uint16_t arg) {
     }
     #endif
 
+    #if 0
     #ifdef USE_THERMAL_REGULATION
     else if (event == EV_temperature_high) {
         high_temperature();
@@ -100,6 +101,7 @@ uint8_t default_state(EventPtr event, uint16_t arg) {
         return 0;
     }
     #endif
+    #endif
 
     // event not handled
     return 1;
-- 
cgit v1.2.3


From badf37072988156a4cee753b922306195ee45916 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Thu, 24 Aug 2017 02:09:33 -0600
Subject: Added a ramping UI example. Added ramping support in general.

---
 spaghetti-monster/fsm-adc.c           |   2 +
 spaghetti-monster/fsm-events.h        |   7 +
 spaghetti-monster/fsm-ramping.c       |  62 +++++++++
 spaghetti-monster/fsm-ramping.h       |  85 +++++++++++-
 spaghetti-monster/ramping-ui.c        | 252 ++++++++++++++++++++++++++++++++++
 spaghetti-monster/spaghetti-monster.h |   2 +
 6 files changed, 404 insertions(+), 6 deletions(-)
 create mode 100644 spaghetti-monster/fsm-ramping.c
 create mode 100644 spaghetti-monster/ramping-ui.c

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/fsm-adc.c b/spaghetti-monster/fsm-adc.c
index 8af3487..b3ae4e9 100644
--- a/spaghetti-monster/fsm-adc.c
+++ b/spaghetti-monster/fsm-adc.c
@@ -231,6 +231,8 @@ ISR(ADC_vect) {
                 if (underheat_lowpass < UNDERHEAT_LOWPASS_STRENGTH) {
                     underheat_lowpass ++;
                 } else {
+                    // FIXME: don't warn about underheating when voltage is low
+                    //        (LVP and underheat warnings fight each other)
                     // how far below the floor?
                     int16_t howmuch = (THERM_FLOOR - projected_temperature) >> THERM_DIFF_ATTENUATION;
                     if (howmuch < 1) howmuch = 1;
diff --git a/spaghetti-monster/fsm-events.h b/spaghetti-monster/fsm-events.h
index 434fa10..420baf1 100644
--- a/spaghetti-monster/fsm-events.h
+++ b/spaghetti-monster/fsm-events.h
@@ -116,6 +116,12 @@ Event EV_click2_press[] = {
     A_RELEASE,
     A_PRESS,
     0 };
+Event EV_click2_hold[] = {
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_HOLD,
+    0 };
 Event EV_click2_release[] = {
     A_PRESS,
     A_RELEASE,
@@ -166,6 +172,7 @@ EventPtr event_sequences[] = {
     EV_click1_hold,
     EV_click1_hold_release,
     EV_click2_press,
+    EV_click2_hold,
     EV_click2_release,
     EV_click2_complete,
     EV_click3_press,
diff --git a/spaghetti-monster/fsm-ramping.c b/spaghetti-monster/fsm-ramping.c
new file mode 100644
index 0000000..ab7bd3c
--- /dev/null
+++ b/spaghetti-monster/fsm-ramping.c
@@ -0,0 +1,62 @@
+/*
+ * fsm-ramping.c: Ramping functions for SpaghettiMonster.
+ * Handles 1- to 4-channel smooth ramping on a single LED.
+ *
+ * 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 FSM_RAMPING_C
+#define FSM_RAMPING_C
+
+#ifdef USE_RAMPING
+
+void set_level(uint8_t level) {
+    actual_level = level;
+    //TCCR0A = PHASE;
+    if (level == 0) {
+        #if PWM_CHANNELS >= 1
+        PWM1_LVL = 0;
+        #endif
+        #if PWM_CHANNELS >= 2
+        PWM2_LVL = 0;
+        #endif
+        #if PWM_CHANNELS >= 3
+        PWM3_LVL = 0;
+        #endif
+        #if PWM_CHANNELS >= 4
+        PWM4_LVL = 0;
+        #endif
+    } else {
+        level --;
+        #if PWM_CHANNELS >= 1
+        PWM1_LVL = pgm_read_byte(pwm1_levels + level);
+        #endif
+        #if PWM_CHANNELS >= 2
+        PWM2_LVL = pgm_read_byte(pwm2_levels + level);
+        #endif
+        #if PWM_CHANNELS >= 3
+        PWM3_LVL = pgm_read_byte(pwm3_levels + level);
+        #endif
+        #if PWM_CHANNELS >= 4
+        PWM4_LVL = pgm_read_byte(pwm4_levels + level);
+        #endif
+    }
+}
+
+// TODO: set_lvl_smooth?
+
+#endif  // ifdef USE_RAMPING
+#endif
diff --git a/spaghetti-monster/fsm-ramping.h b/spaghetti-monster/fsm-ramping.h
index fd4d40b..a25ff8b 100644
--- a/spaghetti-monster/fsm-ramping.h
+++ b/spaghetti-monster/fsm-ramping.h
@@ -18,9 +18,82 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-// TODO: ramp tables
-// TODO: RAMP_SIZE / MAX_LVL
-// TODO: actual_lvl
-// TODO: target_lvl
-// TODO: set_lvl
-// TODO: set_lvl_smooth
+#ifndef FSM_RAMPING_H
+#define FSM_RAMPING_H
+
+#ifdef USE_RAMPING
+
+// actual_level: last ramp level set by set_level()
+volatile uint8_t actual_level = 0;
+
+// ramp tables
+#if PWM_CHANNELS == 1
+  #if RAMP_LENGTH == 50
+    // FIXME: These values are just an example
+    // ../../bin/level_calc.py 1 50 7135 3 0.25 980
+    PROGMEM const uint8_t pwm1_levels[] = { 3,3,3,3,4,4,4,5,5,6,7,8,9,11,12,14,16,18,20,23,25,28,32,35,39,43,47,52,57,62,68,74,80,87,94,102,110,118,127,136,146,156,167,178,189,201,214,227,241,255 };
+  #elif RAMP_LENGTH == 75
+    // FIXME: These values are just an example
+    // ../../bin/level_calc.py 1 75 7135 3 0.25 980
+    PROGMEM const uint8_t pwm1_levels[] = { 3,3,3,3,3,3,4,4,4,4,5,5,5,6,6,7,8,8,9,10,11,12,13,14,15,17,18,20,21,23,25,27,29,31,33,36,38,41,44,47,50,53,56,59,63,67,71,75,79,83,88,93,98,103,108,113,119,125,131,137,143,150,157,164,171,178,186,194,202,210,219,227,236,246,255 };
+  #elif RAMP_LENGTH == 150
+    // FIXME: These values are just an example
+    // ../../bin/level_calc.py 1 150 7135 3 0.25 980
+    PROGMEM const uint8_t pwm1_levels[] = { 3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,5,5,5,5,5,6,6,6,6,7,7,7,8,8,8,9,9,9,10,10,11,11,12,12,13,13,14,15,15,16,17,17,18,19,19,20,21,22,23,24,24,25,26,27,28,29,31,32,33,34,35,36,38,39,40,42,43,44,46,47,49,50,52,53,55,57,58,60,62,64,66,68,70,72,74,76,78,80,82,84,86,89,91,93,96,98,101,103,106,109,111,114,117,120,123,125,128,131,134,138,141,144,147,151,154,157,161,164,168,171,175,179,183,186,190,194,198,202,206,210,215,219,223,228,232,236,241,246,250,255 };
+  #endif
+#elif PWM_CHANNELS == 2
+  #if RAMP_LENGTH == 50
+    // ../../bin/level_calc.py 2 50 7135 4 0.33 150 FET 1 10 1500
+    PROGMEM const uint8_t pwm1_levels[] = { 4,5,6,8,10,13,17,22,28,35,44,54,65,78,93,109,128,149,171,197,224,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0 };
+    PROGMEM const uint8_t pwm2_levels[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,7,11,15,20,26,31,37,44,51,58,65,73,82,91,100,110,121,132,143,155,168,181,194,209,224,239,255 };
+    #define MAX_1x7135 22
+  #elif RAMP_LENGTH == 75
+    // ../../bin/level_calc.py 2 75 7135 4 0.33 150 FET 1 10 1500
+    PROGMEM const uint8_t pwm1_levels[] = { 4,4,5,6,7,8,10,12,14,17,20,24,28,32,37,43,49,56,64,72,82,91,102,114,126,139,153,168,184,202,220,239,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0 };
+    PROGMEM const uint8_t pwm2_levels[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,5,7,10,13,16,19,23,26,30,34,38,42,47,51,56,61,66,72,77,83,89,95,101,108,115,122,129,136,144,152,160,168,177,186,195,204,214,224,234,244,255 };
+    #define MAX_1x7135 33
+  #elif RAMP_LENGTH == 150
+    // ../../bin/level_calc.py 2 150 7135 4 0.33 150 FET 1 10 1500
+    PROGMEM const uint8_t pwm1_levels[] = { 4,4,4,5,5,5,6,6,7,7,8,9,10,11,12,13,14,15,17,18,20,21,23,25,27,30,32,34,37,40,43,46,49,52,56,59,63,67,71,76,80,85,90,95,100,106,112,118,124,130,137,144,151,158,166,173,181,190,198,207,216,225,235,245,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0 };
+    PROGMEM const uint8_t pwm2_levels[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,3,4,5,7,8,9,11,12,14,15,17,19,20,22,24,25,27,29,31,33,35,37,39,41,43,45,48,50,52,55,57,59,62,64,67,70,72,75,78,81,84,87,90,93,96,99,102,105,109,112,115,119,122,126,129,133,137,141,144,148,152,156,160,165,169,173,177,182,186,191,195,200,205,209,214,219,224,229,234,239,244,250,255 };
+    #define MAX_1x7135 65
+  #endif
+#elif PWM_CHANNELS == 3
+  #if RAMP_LENGTH == 50
+    // FIXME: These values aren't tweaked or tested at all
+    // ../../bin/level_calc.py 3 50 7135 4 0.33 150 7135 4 1 840 FET 1 10 2000
+    PROGMEM const uint8_t pwm1_levels[] = { 4,5,6,8,11,15,20,26,34,43,54,67,82,99,118,140,165,192,221,254,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0 };
+    PROGMEM const uint8_t pwm2_levels[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,17,25,33,42,52,62,73,85,97,111,125,140,157,174,192,210,230,251,255,255,255,255,255,255,255,255,255,255,0 };
+    PROGMEM const uint8_t pwm3_levels[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,14,34,54,76,98,122,146,172,198,226,255 };
+    #define MAX_1x7135 20
+    #define MAX_Nx7135 39
+  #elif RAMP_LENGTH == 75
+    // FIXME: These values aren't tweaked or tested at all
+    // ../../bin/level_calc.py 3 75 7135 4 0.33 150 7135 4 1 840 FET 1 10 2000
+    PROGMEM const uint8_t pwm1_levels[] = { 4,4,5,6,7,9,11,14,16,20,24,28,34,40,46,54,62,71,81,92,104,117,130,146,162,179,198,218,239,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0 };
+    PROGMEM const uint8_t pwm2_levels[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,9,14,18,23,29,34,40,47,53,60,67,75,83,91,99,108,117,127,137,148,158,170,181,193,206,219,232,246,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0 };
+    PROGMEM const uint8_t pwm3_levels[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,15,28,42,55,70,84,99,115,131,147,164,181,199,217,236,255 };
+    #define MAX_1x7135 30
+    #define MAX_Nx7135 59
+  #elif RAMP_LENGTH == 150
+    // FIXME: These values aren't tweaked or tested at all
+    // ../../bin/level_calc.py 3 150 7135 4 0.33 150 7135 4 1 840 FET 1 10 2000
+    PROGMEM const uint8_t pwm1_levels[] = { 4,4,4,5,5,6,6,7,7,8,9,10,11,12,13,15,16,18,20,22,24,26,28,31,33,36,39,42,46,49,53,57,61,65,70,75,80,85,90,96,102,108,115,121,128,136,143,151,159,167,176,185,194,204,214,224,235,246,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0 };
+    PROGMEM const uint8_t pwm2_levels[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,6,8,10,13,15,17,20,22,25,28,30,33,36,39,42,45,48,51,55,58,62,65,69,73,76,80,84,88,92,97,101,105,110,115,119,124,129,134,139,144,149,155,160,166,171,177,183,189,195,201,207,214,220,227,234,241,248,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0 };
+    PROGMEM const uint8_t pwm3_levels[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,10,17,23,30,36,43,50,57,64,71,78,85,93,100,108,115,123,131,139,148,156,164,173,182,190,199,208,217,227,236,245,255 };
+    #define MAX_1x7135 59
+    #define MAX_Nx7135 117
+  #endif
+#elif PWM_CHANNELS == 4
+  4-channel PWM not really supported yet, sorry.
+#endif
+
+// RAMP_SIZE / MAX_LVL
+#define RAMP_SIZE sizeof(pwm1_levels)
+#define MAX_LEVEL RAMP_SIZE
+
+void set_level(uint8_t level);
+//void set_level_smooth(uint8_t level);
+
+#endif  // ifdef USE_RAMPING
+#endif
diff --git a/spaghetti-monster/ramping-ui.c b/spaghetti-monster/ramping-ui.c
new file mode 100644
index 0000000..b51d2f4
--- /dev/null
+++ b/spaghetti-monster/ramping-ui.c
@@ -0,0 +1,252 @@
+/*
+ * Ramping-UI: Ramping UI for SpaghettiMonster.
+ *
+ * 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/>.
+ */
+
+#define FSM_EMISAR_D4_LAYOUT
+#define USE_LVP
+#define USE_THERMAL_REGULATION
+#define DEFAULT_THERM_CEIL 32
+#define USE_DEBUG_BLINK
+#define USE_DELAY_MS
+#define USE_DELAY_ZERO
+#define USE_RAMPING
+#define RAMP_LENGTH 150
+#include "spaghetti-monster.h"
+
+// FSM states
+uint8_t off_state(EventPtr event, uint16_t arg);
+uint8_t steady_state(EventPtr event, uint16_t arg);
+uint8_t party_strobe_state(EventPtr event, uint16_t arg);
+
+// brightness control
+uint8_t memorized_level = 1;
+#ifdef USE_THERMAL_REGULATION
+uint8_t target_level = 0;
+#endif
+
+uint8_t off_state(EventPtr event, uint16_t arg) {
+    // turn emitter off when entering state
+    if (event == EV_enter_state) {
+        set_level(0);
+        // sleep while off  (lower power use)
+        //empty_event_sequence();  // just in case (but shouldn't be needed)
+        standby_mode();
+        return 0;
+    }
+    // hold (initially): go to lowest level, but allow abort for regular click
+    else if (event == EV_click1_press) {
+        set_level(1);
+        return 0;
+    }
+    // 1 click (before timeout): go to memorized level, but allow abort for double click
+    else if (event == EV_click1_release) {
+        set_level(memorized_level);
+        return 0;
+    }
+    // 1 click: regular mode
+    else if (event == EV_1click) {
+        set_state(steady_state, memorized_level);
+        return 0;
+    }
+    // 2 clicks: highest mode
+    else if (event == EV_2clicks) {
+        set_state(steady_state, MAX_LEVEL);
+        return 0;
+    }
+    // 3 clicks: strobe mode
+    else if (event == EV_3clicks) {
+        set_state(party_strobe_state, 255);
+        return 0;
+    }
+    // hold: go to lowest level
+    else if (event == EV_click1_hold) {
+        // don't start ramping immediately;
+        // give the user time to release at moon level
+        if (arg >= HOLD_TIMEOUT)
+            set_state(steady_state, 1);
+        return 0;
+    }
+    // hold, release quickly: go to lowest level
+    else if (event == EV_click1_hold_release) {
+        set_state(steady_state, 1);
+        return 0;
+    }
+    // click-release-hold: go to highest level (for ramping down)
+    else if (event == EV_click2_hold) {
+        set_state(steady_state, MAX_LEVEL);
+        return 0;
+    }
+    return 1;
+}
+
+uint8_t steady_state(EventPtr event, uint16_t arg) {
+    // turn LED on when we first enter the mode
+    if (event == EV_enter_state) {
+        // remember this level, unless it's moon or turbo
+        if ((arg > 1) && (arg < MAX_LEVEL))
+            memorized_level = arg;
+        // use the requested level even if not memorized
+        #ifdef USE_THERMAL_REGULATION
+        target_level = arg;
+        #endif
+        set_level(arg);
+        return 0;
+    }
+    // 1 click: off
+    else if (event == EV_1click) {
+        set_state(off_state, 0);
+        return 0;
+    }
+    // 2 clicks: go to/from highest level
+    else if (event == EV_2clicks) {
+        if (actual_level < MAX_LEVEL) {
+            memorized_level = actual_level;  // in case we're on moon
+            #ifdef USE_THERMAL_REGULATION
+            target_level = MAX_LEVEL;
+            #endif
+            set_level(MAX_LEVEL);
+        }
+        else {
+            #ifdef USE_THERMAL_REGULATION
+            target_level = memorized_level;
+            #endif
+            set_level(memorized_level);
+        }
+        return 0;
+    }
+    // 3 clicks: go to strobe modes
+    else if (event == EV_3clicks) {
+        set_state(party_strobe_state, 0xff);
+        return 0;
+    }
+    // hold: change brightness (brighter)
+    else if (event == EV_click1_hold) {
+        // FIXME: make it ramp down instead, if already at max
+        if (actual_level < MAX_LEVEL)
+            memorized_level = (actual_level+1);
+        #ifdef USE_THERMAL_REGULATION
+        target_level = memorized_level;
+        #endif
+        // FIXME: only blink once
+        if ((memorized_level == MAX_1x7135) || (memorized_level == MAX_LEVEL)) {
+            set_level(0);
+            delay_ms(7);
+        }
+        set_level(memorized_level);
+        return 0;
+    }
+    // click-release-hold: change brightness (dimmer)
+    else if (event == EV_click2_hold) {
+        // FIXME: make it ramp up instead, if already at min
+        if (actual_level > 1)
+            memorized_level = (actual_level-1);
+        #ifdef USE_THERMAL_REGULATION
+        target_level = memorized_level;
+        #endif
+        // FIXME: only blink once
+        if ((memorized_level == MAX_1x7135) || (memorized_level == 1)) {
+            set_level(0);
+            delay_ms(7);
+        }
+        set_level(memorized_level);
+        return 0;
+    }
+    #ifdef USE_THERMAL_REGULATION
+    // FIXME: make thermal regulation work with ramping
+    // overheating: drop by 1 level
+    else if (event == EV_temperature_high) {
+        if (actual_level > 1) {
+            set_level(actual_level - 1);
+        }
+        return 0;
+    }
+    // underheating: increase by 1 level if we're lower than the target
+    else if (event == EV_temperature_low) {
+        if (actual_level < target_level) {
+            set_level(actual_level + 1);
+        }
+        return 0;
+    }
+    #endif
+    return 1;
+}
+
+uint8_t party_strobe_state(EventPtr event, uint16_t arg) {
+    static volatile uint8_t frames = 0;
+    static volatile uint8_t between = 2;
+    if (event == EV_enter_state) {
+        if (arg < 64) between = arg;
+        frames = 0;
+        return 0;
+    }
+    // tick: strobe the emitter
+    else if (event == EV_tick) {
+        if (frames == 0) {
+            PWM1_LVL = 0;
+            PWM2_LVL = 255;
+            if (between < 3) delay_zero();
+            else delay_ms(1);
+            PWM2_LVL = 0;
+        }
+        //frames = (frames + 1) % between;
+        frames++;
+        if (frames > between) frames = 0;
+        return 0;
+    }
+    // 1 click: off
+    else if (event == EV_1click) {
+        set_state(off_state, 0);
+        return 0;
+    }
+    // 2 clicks: go back to regular modes
+    else if (event == EV_2clicks) {
+        set_state(steady_state, memorized_level);
+        return 0;
+    }
+    // hold: change speed
+    else if (event == EV_click1_hold) {
+        if ((arg % HOLD_TIMEOUT) == 0) {
+            between = (between+1)%6;
+            frames = 0;
+        }
+        return 0;
+    }
+    return 1;
+}
+
+void low_voltage() {
+    // "step down" from strobe to something low
+    if (current_state == party_strobe_state) {
+        set_state(steady_state, RAMP_SIZE/6);
+    }
+    // in normal mode, step down by half or turn off
+    else if (current_state == steady_state) {
+        if (actual_level > 1) {
+            set_level(actual_level >> 1);
+        }
+        else {
+            set_state(off_state, 0);
+        }
+    }
+}
+
+void setup() {
+    debug_blink(2);
+
+    push_state(off_state, 0);
+}
diff --git a/spaghetti-monster/spaghetti-monster.h b/spaghetti-monster/spaghetti-monster.h
index 4eeb7de..2ba3208 100644
--- a/spaghetti-monster/spaghetti-monster.h
+++ b/spaghetti-monster/spaghetti-monster.h
@@ -33,6 +33,7 @@
 #include "fsm-wdt.h"
 #include "fsm-pcint.h"
 #include "fsm-standby.h"
+#include "fsm-ramping.h"
 #include "fsm-main.h"
 
 #ifdef USE_DEBUG_BLINK
@@ -64,4 +65,5 @@ void setup();
 #include "fsm-wdt.c"
 #include "fsm-pcint.c"
 #include "fsm-standby.c"
+#include "fsm-ramping.c"
 #include "fsm-main.c"
-- 
cgit v1.2.3


From 939a13fe9949c576e21914939e1d847641f215c9 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Thu, 24 Aug 2017 02:25:58 -0600
Subject: Made ramping UI able to toggle between smooth and discrete ramping
 with 4 clicks.

---
 spaghetti-monster/fsm-events.h | 13 +++++++++++++
 spaghetti-monster/ramping-ui.c | 32 +++++++++++++++++++++++++++-----
 2 files changed, 40 insertions(+), 5 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/fsm-events.h b/spaghetti-monster/fsm-events.h
index 420baf1..246a4ee 100644
--- a/spaghetti-monster/fsm-events.h
+++ b/spaghetti-monster/fsm-events.h
@@ -161,6 +161,18 @@ Event EV_click3_complete[] = {
     A_RELEASE,
     A_RELEASE_TIMEOUT,
     0 };
+#define EV_4clicks EV_click4_complete
+Event EV_click4_complete[] = {
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_RELEASE_TIMEOUT,
+    0 };
 // ... and so on
 
 // A list of button event types for easy iteration
@@ -178,6 +190,7 @@ EventPtr event_sequences[] = {
     EV_click3_press,
     EV_click3_release,
     EV_click3_complete,
+    EV_click4_complete,
     // ...
 };
 
diff --git a/spaghetti-monster/ramping-ui.c b/spaghetti-monster/ramping-ui.c
index b51d2f4..bd5a016 100644
--- a/spaghetti-monster/ramping-ui.c
+++ b/spaghetti-monster/ramping-ui.c
@@ -19,7 +19,7 @@
 
 #define FSM_EMISAR_D4_LAYOUT
 #define USE_LVP
-#define USE_THERMAL_REGULATION
+//#define USE_THERMAL_REGULATION
 #define DEFAULT_THERM_CEIL 32
 #define USE_DEBUG_BLINK
 #define USE_DELAY_MS
@@ -35,7 +35,11 @@ uint8_t party_strobe_state(EventPtr event, uint16_t arg);
 
 // brightness control
 uint8_t memorized_level = 1;
+// smooth vs discrete ramping
+uint8_t ramp_step_size = 1;
+
 #ifdef USE_THERMAL_REGULATION
+// brightness before thermal step-down
 uint8_t target_level = 0;
 #endif
 
@@ -134,11 +138,24 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         set_state(party_strobe_state, 0xff);
         return 0;
     }
+    // 4 clicks: toggle smooth vs discrete ramping
+    else if (event == EV_4clicks) {
+        if (ramp_step_size == 1) ramp_step_size = MAX_LEVEL/6;
+        else ramp_step_size = 1;
+        set_level(0);
+        delay_ms(20);
+        set_level(memorized_level);
+        return 0;
+    }
     // hold: change brightness (brighter)
     else if (event == EV_click1_hold) {
+        if (arg % ramp_step_size != 0) {
+            return 0;
+        }
         // FIXME: make it ramp down instead, if already at max
-        if (actual_level < MAX_LEVEL)
-            memorized_level = (actual_level+1);
+        if (actual_level + ramp_step_size < MAX_LEVEL)
+            memorized_level = actual_level + ramp_step_size;
+        else memorized_level = MAX_LEVEL;
         #ifdef USE_THERMAL_REGULATION
         target_level = memorized_level;
         #endif
@@ -152,9 +169,14 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
     }
     // click-release-hold: change brightness (dimmer)
     else if (event == EV_click2_hold) {
+        if (arg % ramp_step_size != 0) {
+            return 0;
+        }
         // FIXME: make it ramp up instead, if already at min
-        if (actual_level > 1)
-            memorized_level = (actual_level-1);
+        if (actual_level > ramp_step_size)
+            memorized_level = (actual_level-ramp_step_size);
+        else
+            memorized_level = 1;
         #ifdef USE_THERMAL_REGULATION
         target_level = memorized_level;
         #endif
-- 
cgit v1.2.3


From 5f20a52bfa35903ece415486423ccc020200ac8c Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Thu, 24 Aug 2017 02:55:14 -0600
Subject: Set default brightness to max 7135 level. Made thermal regulation
 adjust proportional to how far above/below the target range the light is.
 Replaced turn-on blinks with single shorter/dimmer blip.

---
 spaghetti-monster/ramping-ui.c | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/ramping-ui.c b/spaghetti-monster/ramping-ui.c
index bd5a016..c85804d 100644
--- a/spaghetti-monster/ramping-ui.c
+++ b/spaghetti-monster/ramping-ui.c
@@ -19,7 +19,7 @@
 
 #define FSM_EMISAR_D4_LAYOUT
 #define USE_LVP
-//#define USE_THERMAL_REGULATION
+#define USE_THERMAL_REGULATION
 #define DEFAULT_THERM_CEIL 32
 #define USE_DEBUG_BLINK
 #define USE_DELAY_MS
@@ -34,7 +34,7 @@ uint8_t steady_state(EventPtr event, uint16_t arg);
 uint8_t party_strobe_state(EventPtr event, uint16_t arg);
 
 // brightness control
-uint8_t memorized_level = 1;
+uint8_t memorized_level = MAX_1x7135;
 // smooth vs discrete ramping
 uint8_t ramp_step_size = 1;
 
@@ -189,18 +189,23 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         return 0;
     }
     #ifdef USE_THERMAL_REGULATION
-    // FIXME: make thermal regulation work with ramping
-    // overheating: drop by 1 level
+    // TODO: test this on a real light
+    // overheating: drop by an amount proportional to how far we are above the ceiling
     else if (event == EV_temperature_high) {
-        if (actual_level > 1) {
-            set_level(actual_level - 1);
+        if (actual_level > MAX_LEVEL/4) {
+            uint8_t stepdown = actual_level - arg;
+            if (stepdown < MAX_LEVEL/4) stepdown = MAX_LEVEL/4;
+            set_level(stepdown);
         }
         return 0;
     }
-    // underheating: increase by 1 level if we're lower than the target
+    // underheating: increase slowly if we're lower than the target
+    //               (proportional to how low we are)
     else if (event == EV_temperature_low) {
         if (actual_level < target_level) {
-            set_level(actual_level + 1);
+            uint8_t stepup = actual_level + (arg>>1);
+            if (stepup > target_level) stepup = target_level;
+            set_level(stepup);
         }
         return 0;
     }
@@ -268,7 +273,9 @@ void low_voltage() {
 }
 
 void setup() {
-    debug_blink(2);
+    set_level(RAMP_SIZE/8);
+    delay_4ms(3);
+    set_level(0);
 
     push_state(off_state, 0);
 }
-- 
cgit v1.2.3


From 2249f9913058c534fba51fbc6285e49c67bce726 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Thu, 24 Aug 2017 03:03:55 -0600
Subject: Don't send underheat warnings when LVP is active.  The signals
 conflict. Also, avoid immediate thermal step-down after battery change. 
 (init array with correctly-scaled values)

---
 spaghetti-monster/fsm-adc.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/fsm-adc.c b/spaghetti-monster/fsm-adc.c
index b3ae4e9..9a6e2e7 100644
--- a/spaghetti-monster/fsm-adc.c
+++ b/spaghetti-monster/fsm-adc.c
@@ -148,7 +148,7 @@ ISR(ADC_vect) {
             for(uint8_t i=0; i<NUM_THERMAL_VALUES; i++)
                 temperature_values[i] = temp;
             for(uint8_t i=0; i<NUM_THERMAL_VALUES_HISTORY; i++)
-                temperature_history[i] = temp;
+                temperature_history[i] = temp<<2;
             temperature = temp;
         } else {  // update our current temperature estimate
             uint8_t i;
@@ -231,13 +231,13 @@ ISR(ADC_vect) {
                 if (underheat_lowpass < UNDERHEAT_LOWPASS_STRENGTH) {
                     underheat_lowpass ++;
                 } else {
-                    // FIXME: don't warn about underheating when voltage is low
-                    //        (LVP and underheat warnings fight each other)
                     // how far below the floor?
                     int16_t howmuch = (THERM_FLOOR - projected_temperature) >> THERM_DIFF_ATTENUATION;
                     if (howmuch < 1) howmuch = 1;
-                    // try to send out a warning
-                    emit(EV_temperature_low, howmuch);
+                    // try to send out a warning (unless voltage is low)
+                    // (LVP and underheat warnings fight each other)
+                    if (voltage > VOLTAGE_LOW)
+                        emit(EV_temperature_low, howmuch);
                     // reset counters
                     temperature_timer = TEMPERATURE_TIMER_START;
                     underheat_lowpass = 0;
-- 
cgit v1.2.3


From aa7e15ca8e13867b4edcbb1cbde2bca496fc764f Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Thu, 24 Aug 2017 03:20:06 -0600
Subject: Fixed repeating blinks at ends of ramp -- only blinks once now.

---
 spaghetti-monster/ramping-ui.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/ramping-ui.c b/spaghetti-monster/ramping-ui.c
index c85804d..6eeb3b0 100644
--- a/spaghetti-monster/ramping-ui.c
+++ b/spaghetti-monster/ramping-ui.c
@@ -149,6 +149,7 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
     }
     // hold: change brightness (brighter)
     else if (event == EV_click1_hold) {
+        // ramp slower in discrete mode
         if (arg % ramp_step_size != 0) {
             return 0;
         }
@@ -159,8 +160,10 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         #ifdef USE_THERMAL_REGULATION
         target_level = memorized_level;
         #endif
-        // FIXME: only blink once
-        if ((memorized_level == MAX_1x7135) || (memorized_level == MAX_LEVEL)) {
+        // only blink once for each threshold
+        if ((memorized_level != actual_level)
+                && ((memorized_level == MAX_1x7135)
+                    || (memorized_level == MAX_LEVEL))) {
             set_level(0);
             delay_ms(7);
         }
@@ -169,6 +172,7 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
     }
     // click-release-hold: change brightness (dimmer)
     else if (event == EV_click2_hold) {
+        // ramp slower in discrete mode
         if (arg % ramp_step_size != 0) {
             return 0;
         }
@@ -180,8 +184,10 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         #ifdef USE_THERMAL_REGULATION
         target_level = memorized_level;
         #endif
-        // FIXME: only blink once
-        if ((memorized_level == MAX_1x7135) || (memorized_level == 1)) {
+        // only blink once for each threshold
+        if ((memorized_level != actual_level)
+                && ((memorized_level == MAX_1x7135)
+                    || (memorized_level == 1))) {
             set_level(0);
             delay_ms(7);
         }
-- 
cgit v1.2.3


From 32eaeddee34c76dda5456ed960be6278ed68e48d Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Thu, 24 Aug 2017 16:21:45 -0600
Subject: Added loop() to API, executes constantly. Added nice_delay_ms() to
 process events while waiting, and abort on state change. Converted ramping-ui
 strobe to smoothly variable with party and tactical modes.

---
 spaghetti-monster/baton.c             |  2 +
 spaghetti-monster/fsm-events.c        | 23 +++++++++++
 spaghetti-monster/fsm-events.h        |  3 ++
 spaghetti-monster/fsm-main.c          |  7 ++--
 spaghetti-monster/momentary.c         |  3 ++
 spaghetti-monster/ramping-ui.c        | 77 +++++++++++++++++++++--------------
 spaghetti-monster/spaghetti-monster.h |  4 +-
 7 files changed, 84 insertions(+), 35 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/baton.c b/spaghetti-monster/baton.c
index 6b694e4..2489f4e 100644
--- a/spaghetti-monster/baton.c
+++ b/spaghetti-monster/baton.c
@@ -226,3 +226,5 @@ void setup() {
 
     push_state(off_state, 0);
 }
+
+void loop() { }
diff --git a/spaghetti-monster/fsm-events.c b/spaghetti-monster/fsm-events.c
index 6dda236..4831df6 100644
--- a/spaghetti-monster/fsm-events.c
+++ b/spaghetti-monster/fsm-events.c
@@ -99,6 +99,29 @@ void delete_first_emission() {
     emissions[i].arg = 0;
 }
 
+void process_emissions() {
+    while (emissions[0].event != NULL) {
+        emit_now(emissions[0].event, emissions[0].arg);
+        delete_first_emission();
+    }
+}
+
+// like delay_ms, except it aborts on state change
+// return value:
+//   0: state changed
+//   1: normal completion
+uint8_t nice_delay_ms(uint16_t ms) {
+    StatePtr old_state = current_state;
+    while(ms-- > 0) {
+        _delay_loop_2(BOGOMIPS*98/100);
+        process_emissions();
+        if (old_state != current_state) {
+            return 0;  // state changed; abort
+        }
+    }
+    return 1;
+}
+
 // Call stacked callbacks for the given event until one handles it.
 uint8_t emit_now(EventPtr event, uint16_t arg) {
     for(int8_t i=state_stack_len-1; i>=0; i--) {
diff --git a/spaghetti-monster/fsm-events.h b/spaghetti-monster/fsm-events.h
index 246a4ee..a14d7aa 100644
--- a/spaghetti-monster/fsm-events.h
+++ b/spaghetti-monster/fsm-events.h
@@ -209,9 +209,12 @@ volatile Emission emissions[EMISSION_QUEUE_LEN];
 
 void append_emission(EventPtr event, uint16_t arg);
 void delete_first_emission();
+void process_emissions();
 //#define emit_now emit
 uint8_t emit_now(EventPtr event, uint16_t arg);
 void emit(EventPtr event, uint16_t arg);
 void emit_current_event(uint16_t arg);
 
+uint8_t nice_delay_ms(uint16_t ms);
+
 #endif
diff --git a/spaghetti-monster/fsm-main.c b/spaghetti-monster/fsm-main.c
index 2faaeda..1a0c425 100644
--- a/spaghetti-monster/fsm-main.c
+++ b/spaghetti-monster/fsm-main.c
@@ -97,10 +97,9 @@ int main() {
         // TODO: check voltage?
         // TODO: check temperature?
         // if event queue not empty, process and pop first item in queue?
-        if (emissions[0].event != NULL) {
-            emit_now(emissions[0].event, emissions[0].arg);
-            delete_first_emission();
-        }
+        process_emissions();
+
+        loop();
     }
 }
 
diff --git a/spaghetti-monster/momentary.c b/spaghetti-monster/momentary.c
index 23cc359..fc26db3 100644
--- a/spaghetti-monster/momentary.c
+++ b/spaghetti-monster/momentary.c
@@ -75,3 +75,6 @@ void setup() {
     debug_blink(2);
     push_state(momentary_state, 0);
 }
+
+void loop() { }
+
diff --git a/spaghetti-monster/ramping-ui.c b/spaghetti-monster/ramping-ui.c
index 6eeb3b0..256c4cf 100644
--- a/spaghetti-monster/ramping-ui.c
+++ b/spaghetti-monster/ramping-ui.c
@@ -31,7 +31,7 @@
 // FSM states
 uint8_t off_state(EventPtr event, uint16_t arg);
 uint8_t steady_state(EventPtr event, uint16_t arg);
-uint8_t party_strobe_state(EventPtr event, uint16_t arg);
+uint8_t strobe_state(EventPtr event, uint16_t arg);
 
 // brightness control
 uint8_t memorized_level = MAX_1x7135;
@@ -43,6 +43,11 @@ uint8_t ramp_step_size = 1;
 uint8_t target_level = 0;
 #endif
 
+// strobe timing
+volatile uint8_t strobe_delay = 67;
+volatile uint8_t strobe_type = 0;  // 0 == party strobe, 1 == tactical strobe
+
+
 uint8_t off_state(EventPtr event, uint16_t arg) {
     // turn emitter off when entering state
     if (event == EV_enter_state) {
@@ -74,7 +79,7 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
     }
     // 3 clicks: strobe mode
     else if (event == EV_3clicks) {
-        set_state(party_strobe_state, 255);
+        set_state(strobe_state, 0);
         return 0;
     }
     // hold: go to lowest level
@@ -90,7 +95,7 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
         set_state(steady_state, 1);
         return 0;
     }
-    // click-release-hold: go to highest level (for ramping down)
+    // click, hold: go to highest level (for ramping down)
     else if (event == EV_click2_hold) {
         set_state(steady_state, MAX_LEVEL);
         return 0;
@@ -98,6 +103,7 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
     return 1;
 }
 
+
 uint8_t steady_state(EventPtr event, uint16_t arg) {
     // turn LED on when we first enter the mode
     if (event == EV_enter_state) {
@@ -135,7 +141,7 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
     }
     // 3 clicks: go to strobe modes
     else if (event == EV_3clicks) {
-        set_state(party_strobe_state, 0xff);
+        set_state(strobe_state, 0);
         return 0;
     }
     // 4 clicks: toggle smooth vs discrete ramping
@@ -170,7 +176,7 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         set_level(memorized_level);
         return 0;
     }
-    // click-release-hold: change brightness (dimmer)
+    // click, hold: change brightness (dimmer)
     else if (event == EV_click2_hold) {
         // ramp slower in discrete mode
         if (arg % ramp_step_size != 0) {
@@ -219,26 +225,9 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
     return 1;
 }
 
-uint8_t party_strobe_state(EventPtr event, uint16_t arg) {
-    static volatile uint8_t frames = 0;
-    static volatile uint8_t between = 2;
+
+uint8_t strobe_state(EventPtr event, uint16_t arg) {
     if (event == EV_enter_state) {
-        if (arg < 64) between = arg;
-        frames = 0;
-        return 0;
-    }
-    // tick: strobe the emitter
-    else if (event == EV_tick) {
-        if (frames == 0) {
-            PWM1_LVL = 0;
-            PWM2_LVL = 255;
-            if (between < 3) delay_zero();
-            else delay_ms(1);
-            PWM2_LVL = 0;
-        }
-        //frames = (frames + 1) % between;
-        frames++;
-        if (frames > between) frames = 0;
         return 0;
     }
     // 1 click: off
@@ -246,25 +235,37 @@ uint8_t party_strobe_state(EventPtr event, uint16_t arg) {
         set_state(off_state, 0);
         return 0;
     }
-    // 2 clicks: go back to regular modes
+    // 2 clicks: toggle party strobe vs tactical strobe
     else if (event == EV_2clicks) {
+        strobe_type ^= 1;
+        return 0;
+    }
+    // 3 clicks: go back to regular modes
+    else if (event == EV_3clicks) {
         set_state(steady_state, memorized_level);
         return 0;
     }
-    // hold: change speed
+    // hold: change speed (go faster)
     else if (event == EV_click1_hold) {
-        if ((arg % HOLD_TIMEOUT) == 0) {
-            between = (between+1)%6;
-            frames = 0;
+        if ((arg & 1) == 0) {
+            if (strobe_delay > 8) strobe_delay --;
+        }
+        return 0;
+    }
+    // click, hold: change speed (go slower)
+    else if (event == EV_click2_hold) {
+        if ((arg & 1) == 0) {
+            if (strobe_delay < 255) strobe_delay ++;
         }
         return 0;
     }
     return 1;
 }
 
+
 void low_voltage() {
     // "step down" from strobe to something low
-    if (current_state == party_strobe_state) {
+    if (current_state == strobe_state) {
         set_state(steady_state, RAMP_SIZE/6);
     }
     // in normal mode, step down by half or turn off
@@ -278,6 +279,7 @@ void low_voltage() {
     }
 }
 
+
 void setup() {
     set_level(RAMP_SIZE/8);
     delay_4ms(3);
@@ -285,3 +287,18 @@ void setup() {
 
     push_state(off_state, 0);
 }
+
+
+void loop() {
+    if (current_state == strobe_state) {
+        set_level(MAX_LEVEL);
+        if (strobe_type == 0) {  // party strobe
+            if (strobe_delay < 30) delay_zero();
+            else delay_ms(1);
+        } else {  //tactical strobe
+            nice_delay_ms(strobe_delay >> 1);
+        }
+        set_level(0);
+        nice_delay_ms(strobe_delay);
+    }
+}
diff --git a/spaghetti-monster/spaghetti-monster.h b/spaghetti-monster/spaghetti-monster.h
index 2ba3208..7d26390 100644
--- a/spaghetti-monster/spaghetti-monster.h
+++ b/spaghetti-monster/spaghetti-monster.h
@@ -54,9 +54,11 @@ void debug_blink(uint8_t num) {
 // TODO? new delay() functions which handle queue consumption?
 // TODO? new interruptible delay() functions?
 
+// Define these in your SpaghettiMonster recipe
 // boot-time tasks
-// Define this in your SpaghettiMonster recipe
 void setup();
+// single loop iteration, runs continuously
+void loop();
 
 // include executable functions too, for easier compiling
 #include "fsm-states.c"
-- 
cgit v1.2.3


From 5184aad41fdb501f05ff7b0d7131011657ed8275 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Thu, 24 Aug 2017 19:22:10 -0600
Subject: Started on some documentation, spaghetti-monster.txt. Added #defines
 for State return values: EVENT_HANDLED, EVENT_NOT_HANDLED Improved handling
 of delay includes. Managed mischief.

---
 spaghetti-monster/fsm-events.h          |   5 +
 spaghetti-monster/ramping-ui.c          |  60 ++++----
 spaghetti-monster/spaghetti-monster.h   |   6 +-
 spaghetti-monster/spaghetti-monster.txt | 246 ++++++++++++++++++++++++++++++++
 4 files changed, 285 insertions(+), 32 deletions(-)
 create mode 100644 spaghetti-monster/spaghetti-monster.txt

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/fsm-events.h b/spaghetti-monster/fsm-events.h
index a14d7aa..a3ef130 100644
--- a/spaghetti-monster/fsm-events.h
+++ b/spaghetti-monster/fsm-events.h
@@ -30,6 +30,11 @@ typedef struct Emission {
     uint16_t arg;
 } Emission;
 
+#define EVENT_HANDLED 0
+#define EVENT_NOT_HANDLED 1
+#define MISCHIEF_MANAGED EVENT_HANDLED
+#define MISCHIEF_NOT_MANAGED EVENT_NOT_HANDLED
+
 #define EV_MAX_LEN 16
 uint8_t current_event[EV_MAX_LEN];
 // at 0.016 ms per tick, 255 ticks = 4.08 s
diff --git a/spaghetti-monster/ramping-ui.c b/spaghetti-monster/ramping-ui.c
index 256c4cf..562cd1b 100644
--- a/spaghetti-monster/ramping-ui.c
+++ b/spaghetti-monster/ramping-ui.c
@@ -21,8 +21,8 @@
 #define USE_LVP
 #define USE_THERMAL_REGULATION
 #define DEFAULT_THERM_CEIL 32
-#define USE_DEBUG_BLINK
 #define USE_DELAY_MS
+#define USE_DELAY_4MS
 #define USE_DELAY_ZERO
 #define USE_RAMPING
 #define RAMP_LENGTH 150
@@ -55,32 +55,32 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
         // sleep while off  (lower power use)
         //empty_event_sequence();  // just in case (but shouldn't be needed)
         standby_mode();
-        return 0;
+        return MISCHIEF_MANAGED;
     }
     // hold (initially): go to lowest level, but allow abort for regular click
     else if (event == EV_click1_press) {
         set_level(1);
-        return 0;
+        return MISCHIEF_MANAGED;
     }
     // 1 click (before timeout): go to memorized level, but allow abort for double click
     else if (event == EV_click1_release) {
         set_level(memorized_level);
-        return 0;
+        return MISCHIEF_MANAGED;
     }
     // 1 click: regular mode
     else if (event == EV_1click) {
         set_state(steady_state, memorized_level);
-        return 0;
+        return MISCHIEF_MANAGED;
     }
     // 2 clicks: highest mode
     else if (event == EV_2clicks) {
         set_state(steady_state, MAX_LEVEL);
-        return 0;
+        return MISCHIEF_MANAGED;
     }
     // 3 clicks: strobe mode
     else if (event == EV_3clicks) {
         set_state(strobe_state, 0);
-        return 0;
+        return MISCHIEF_MANAGED;
     }
     // hold: go to lowest level
     else if (event == EV_click1_hold) {
@@ -88,19 +88,19 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
         // give the user time to release at moon level
         if (arg >= HOLD_TIMEOUT)
             set_state(steady_state, 1);
-        return 0;
+        return MISCHIEF_MANAGED;
     }
     // hold, release quickly: go to lowest level
     else if (event == EV_click1_hold_release) {
         set_state(steady_state, 1);
-        return 0;
+        return MISCHIEF_MANAGED;
     }
     // click, hold: go to highest level (for ramping down)
     else if (event == EV_click2_hold) {
         set_state(steady_state, MAX_LEVEL);
-        return 0;
+        return MISCHIEF_MANAGED;
     }
-    return 1;
+    return EVENT_NOT_HANDLED;
 }
 
 
@@ -115,12 +115,12 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         target_level = arg;
         #endif
         set_level(arg);
-        return 0;
+        return MISCHIEF_MANAGED;
     }
     // 1 click: off
     else if (event == EV_1click) {
         set_state(off_state, 0);
-        return 0;
+        return MISCHIEF_MANAGED;
     }
     // 2 clicks: go to/from highest level
     else if (event == EV_2clicks) {
@@ -137,12 +137,12 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
             #endif
             set_level(memorized_level);
         }
-        return 0;
+        return MISCHIEF_MANAGED;
     }
     // 3 clicks: go to strobe modes
     else if (event == EV_3clicks) {
         set_state(strobe_state, 0);
-        return 0;
+        return MISCHIEF_MANAGED;
     }
     // 4 clicks: toggle smooth vs discrete ramping
     else if (event == EV_4clicks) {
@@ -151,13 +151,13 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         set_level(0);
         delay_ms(20);
         set_level(memorized_level);
-        return 0;
+        return MISCHIEF_MANAGED;
     }
     // hold: change brightness (brighter)
     else if (event == EV_click1_hold) {
         // ramp slower in discrete mode
         if (arg % ramp_step_size != 0) {
-            return 0;
+            return MISCHIEF_MANAGED;
         }
         // FIXME: make it ramp down instead, if already at max
         if (actual_level + ramp_step_size < MAX_LEVEL)
@@ -174,13 +174,13 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
             delay_ms(7);
         }
         set_level(memorized_level);
-        return 0;
+        return MISCHIEF_MANAGED;
     }
     // click, hold: change brightness (dimmer)
     else if (event == EV_click2_hold) {
         // ramp slower in discrete mode
         if (arg % ramp_step_size != 0) {
-            return 0;
+            return MISCHIEF_MANAGED;
         }
         // FIXME: make it ramp up instead, if already at min
         if (actual_level > ramp_step_size)
@@ -198,7 +198,7 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
             delay_ms(7);
         }
         set_level(memorized_level);
-        return 0;
+        return MISCHIEF_MANAGED;
     }
     #ifdef USE_THERMAL_REGULATION
     // TODO: test this on a real light
@@ -209,7 +209,7 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
             if (stepdown < MAX_LEVEL/4) stepdown = MAX_LEVEL/4;
             set_level(stepdown);
         }
-        return 0;
+        return MISCHIEF_MANAGED;
     }
     // underheating: increase slowly if we're lower than the target
     //               (proportional to how low we are)
@@ -219,47 +219,47 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
             if (stepup > target_level) stepup = target_level;
             set_level(stepup);
         }
-        return 0;
+        return MISCHIEF_MANAGED;
     }
     #endif
-    return 1;
+    return EVENT_NOT_HANDLED;
 }
 
 
 uint8_t strobe_state(EventPtr event, uint16_t arg) {
     if (event == EV_enter_state) {
-        return 0;
+        return MISCHIEF_MANAGED;
     }
     // 1 click: off
     else if (event == EV_1click) {
         set_state(off_state, 0);
-        return 0;
+        return MISCHIEF_MANAGED;
     }
     // 2 clicks: toggle party strobe vs tactical strobe
     else if (event == EV_2clicks) {
         strobe_type ^= 1;
-        return 0;
+        return MISCHIEF_MANAGED;
     }
     // 3 clicks: go back to regular modes
     else if (event == EV_3clicks) {
         set_state(steady_state, memorized_level);
-        return 0;
+        return MISCHIEF_MANAGED;
     }
     // hold: change speed (go faster)
     else if (event == EV_click1_hold) {
         if ((arg & 1) == 0) {
             if (strobe_delay > 8) strobe_delay --;
         }
-        return 0;
+        return MISCHIEF_MANAGED;
     }
     // click, hold: change speed (go slower)
     else if (event == EV_click2_hold) {
         if ((arg & 1) == 0) {
             if (strobe_delay < 255) strobe_delay ++;
         }
-        return 0;
+        return MISCHIEF_MANAGED;
     }
-    return 1;
+    return EVENT_NOT_HANDLED;
 }
 
 
diff --git a/spaghetti-monster/spaghetti-monster.h b/spaghetti-monster/spaghetti-monster.h
index 7d26390..56d03a3 100644
--- a/spaghetti-monster/spaghetti-monster.h
+++ b/spaghetti-monster/spaghetti-monster.h
@@ -36,10 +36,12 @@
 #include "fsm-ramping.h"
 #include "fsm-main.h"
 
-#ifdef USE_DEBUG_BLINK
+#if defined(USE_DELAY_MS) || defined(USE_DELAY_4MS) || defined(USE_DELAY_ZERO) || defined(USE_DEBUG_BLINK)
 #define OWN_DELAY
-#define USE_DELAY_4MS
 #include "tk-delay.h"
+#endif
+
+#ifdef USE_DEBUG_BLINK
 #define DEBUG_FLASH PWM1_LVL = 64; delay_4ms(2); PWM1_LVL = 0;
 void debug_blink(uint8_t num) {
     for(; num>0; num--) {
diff --git a/spaghetti-monster/spaghetti-monster.txt b/spaghetti-monster/spaghetti-monster.txt
new file mode 100644
index 0000000..8393652
--- /dev/null
+++ b/spaghetti-monster/spaghetti-monster.txt
@@ -0,0 +1,246 @@
+Spaghetti Monster: A UI toolkit library for flashlights
+-------------------------------------------------------
+
+This toolkit takes care of most of the obnoxious parts of dealing with 
+tiny embedded chips and flashlight hardware, leaving you to focus on the 
+interface and user-visible features.
+
+For a quick start, look at the example UIs provided to see how things 
+are done.  They are probably the most useful reference.  However, other 
+details can be found here or in the FSM source code.
+
+
+Why is it called Spaghetti Monster?
+
+  This toolkit is a finite state machine, or FSM.  Another thing FSM 
+  stands for is Flying Spaghetti Monster.  Source code tends to weave 
+  into intricate knots like spaghetti, called spaghetti code, 
+  particularly when the code isn't using appropriate abstractions for 
+  the task it implements.
+
+  Prior e-switch light code had a tendency to get pretty spaghetti-like, 
+  and it made the code difficult to write, understand, and modify.  So I 
+  started from scratch and logically separated the hardware details from 
+  the UI.  This effectively put the spaghetti monster in a box, put it 
+  on a leash, to make it behave and stay out of the way while we focus 
+  on the user interface.
+
+  Also, it's just kind of a fun name.  :)
+
+
+General concept:
+
+  Spaghetti Monster (FSM) implements a stack-based finite state machine 
+  with an event-handling system.
+
+  Each FSM program should have a setup() function, a loop() function, 
+  and at least one State:
+
+    - The setup() function runs once each time power is connected.
+
+    - The loop() function is called repeatedly whenever the system is 
+      otherwise idle.  Put your long-running tasks here, preferably with 
+      consideration taken to allow for cooperative multitasking.
+
+    - The States on the stack will be called whenever an event happens.  
+      States are called in top-to-bottom order until a state returns an 
+      "EVENT_HANDLED" signal.  Only do quick tasks here.
+
+
+Finite State Machine:
+
+  Each "State" is simply a callback function which handles events.  It 
+  should return EVENT_HANDLED for each event type it does something 
+  with, or EVENT_NOT_HANDLED otherwise.
+
+  Transitions between states typically involve mapping an Event to a new 
+  State, such as this:
+
+    // 3 clicks: go to strobe modes
+    else if (event == EV_3clicks) {
+        set_state(strobe_state, 0);
+        return EVENT_HANDLED;
+    }
+
+  It is strongly recommended that your State functions never do anything 
+  which takes more than a few milliseconds...  and certainly not longer 
+  than 16ms.  If you do this, the pending events may pile up to the 
+  point where new events get thrown away.  So, do only quick tasks in 
+  the event handler, and do your longer-running tasks in the loop() 
+  function instead.  Preferably with precautions taken to allow for 
+  cooperative multitasking.
+
+  Several state management functions are provided:
+
+    - set_state(new_state, arg): Replace the current state on the stack.  
+      Send 'arg' to the new state for its init event.
+
+    - push_state(new_state, arg): Add a new state to the stack, leaving 
+      the current state below it.  Send 'arg' to the new state for its 
+      init event.
+
+    - pop_state(): Get rid of (and return) the top-most state.  Re-enter 
+      the state below.
+
+Event types:
+
+  Event types are defined in fsm-events.h.  You may want to adjust these 
+  to fit your program, but the defaults are:
+
+    State transitions:
+
+      - EV_enter_state: Sent to each new State once when it goes onto 
+        the stack.  The 'arg' is whatever you define it to be.
+
+      - EV_leave_state: Sent to a state immediately before it is removed 
+        from the stack.
+
+    Time passing:
+
+      - EV_tick: This happens once per clock tick, which is 16ms or 
+        62.5Hz by default.  The 'arg' is the number of ticks since 
+        entering the state.  When 'arg' exceeds 65535, it wraps around 
+        to 32768.
+
+    LVP and thermal regulation:
+
+      - EV_voltage_low: Sent whenever the input power drops below the 
+        VOLTAGE_LOW threshold.  Minimum of VOLTAGE_WARNING_SECONDS 
+        between events.
+
+      - EV_temperature_high: Sent whenever the MCU's projected temperature 
+        is higher than therm_ceil.  Minimum of THERMAL_WARNING_SECONDS 
+        between events.  The 'arg' indicates how far the temperature 
+        exceeds the limit.
+
+      - EV_temperature_low: Sent whenever the MCU's projected temperature 
+        is lower than (therm_ceil - THERMAL_WINDOW_SIZE).  Minimum of 
+        THERMAL_WARNING_SECONDS between events.  The 'arg' indicates how 
+        far the temperature exceeds the limit.
+
+    Button presses:
+
+      - EV_1click: The user clicked the e-switch, released it, and 
+        enough time passed that no more clicks were detected.
+
+      - EV_2clicks: The user clicked and released the e-switch twice, then 
+        enough time passed that no more clicks were detected.
+
+      - EV_3clicks: The user clicked and released the e-switch three 
+        times, then enough time passed that no more clicks were detected.
+
+      - EV_4clicks: The user clicked and released the e-switch four times, 
+        then enough time passed that no more clicks were detected.
+
+      - EV_click1_hold: The user pressed the button and is still holding 
+        it.  The 'arg' indicates how many clock ticks since the "hold" 
+        state started.
+
+      - EV_click1_hold_release: The user pressed the button, held it for a 
+        while, and then released it.  No timeout is attempted after this.
+
+      - EV_click2_hold: The user clicked once, then pressed the button and 
+        is still holding it.  The 'arg' indicates how many clock ticks 
+        since the "hold" state started.
+
+      - EV_click2_hold_release: The user clicked once, then pressed the 
+        button, held it for a while, and released it.  No timeout is 
+        attempted after this.
+
+      - EV_click1_press: The user pressed the button and it's still down.  
+        No time has yet passed.
+
+      - EV_click1_release: The user quickly pressed and released the 
+        button.  The click timeout has not yet expired, so they might 
+        still click again.
+
+      - EV_click2_press: The user pressed the button, released it, pressed 
+        again, and it's still down.  No time has yet passed since then.
+
+      - EV_click2_release: The quickly pressed and released the button 
+        twice.  The click timeout has not yet expired, so they might still 
+        click again.
+
+  In theory, you could also define your own arbitrary event types, and 
+  emit() them as necessary, and handle them in State functions the same 
+  as any other event.
+
+
+Cooperative multitasking:
+
+  Since we don't have true preemptive multitasking, the best we can do 
+  is cooperative multitasking.  In practice, this means:
+
+    - Declare global variables as volatile if they can be changed by an 
+      event handler.  This keeps the compiler from caching the value and 
+      causing incorrect behavior.
+
+    - Don't put long-running tasks into State functions.  Each State 
+      will get called at least once every 16ms for a clock tick, so they 
+      should not run for longer than 16ms.
+
+    - Put long-running tasks into loop() instead.
+
+    - For long delay() calls, use nice_delay_ms().  This allows the MCU 
+      to process events while we wait.  It also automatically aborts if 
+      it detects a state change, and returns a different value.
+
+      In many cases, it shouldn't be necessary to do anything more than 
+      this, but sometimes it will also be a good idea to check the 
+      return value and abort the current task:
+
+          if (! nice_delay_ms(mydelay)) break;
+
+    - In general, try to do small amounts of work and then return 
+      control to other parts of the program.  Keep doing small amounts 
+      and yielding until a task is done, instead of trying to do it all 
+      at once.
+
+
+Useful #defines:
+
+  A variety of things can be #defined before including 
+  spaghetti-monster.h in your program.  This allows you to tweak the 
+  behavior and set options to fit your needs:
+
+    - FSM_something_LAYOUT: Select a driver type from tk-attiny.h.  This 
+      controls how many power channels there are, which pins they're on, 
+      and what other driver features are available.
+
+    - USE_LVP: Enable low-voltage protection.
+
+      - VOLTAGE_LOW: What voltage should LVP trigger at?  Defaults to 29 (2.9V).
+
+      - VOLTAGE_FUDGE_FACTOR: Add this much to the voltage measurements, 
+        to compensate for voltage drop across the reverse-polarity 
+        diode.
+
+      - VOLTAGE_WARNING_SECONDS: How long to wait between LVP events.
+
+    - USE_THERMAL_REGULATION: Enable thermal regulation
+
+      - DEFAULT_THERM_CEIL: Set the temperature limit to use by default 
+        when the user hasn't configured anything.
+
+      - THERMAL_WARNING_SECONDS: How long to wait between temperature 
+        events.
+
+    - USE_RAMPING: Enable smooth ramping helpers.
+
+      - RAMP_LENGTH: Pick a pre-defined ramp by length.  Defined sizes 
+        are 50, 75, and 150 levels.
+
+    - USE_DELAY_4MS, USE_DELAY_MS, USE_DELAY_ZERO: Enable the delay_4ms, 
+      delay_ms(), and delay_zero() functions.  Useful for timing-related 
+      activities.
+
+    - HOLD_TIMEOUT: How many clock ticks before a "press" event becomes 
+      a "hold" event?
+
+    - RELEASE_TIMEOUT: How many clock ticks before a "release" event 
+      becomes a "click" event?  Basically, the maximum time between 
+      clicks in a double-click or triple-click.
+
+    - ... and many others.  Will try to document them over time, but 
+      they can be found by searching for pretty much anything in 
+      all-caps in the fsm-*.[ch] files.
-- 
cgit v1.2.3


From 39b30b41f92978a3e05a8de0a416279fb35b35b1 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Fri, 25 Aug 2017 02:14:31 -0600
Subject: Added battcheck mode to ramping-ui.  It's bigger than I had hoped. 
 :( Added fsm-misc.*, which currently only has interruptible blink functions
 in it.   (for blinking out numbers and such)

---
 spaghetti-monster/fsm-adc.c           | 24 +++++++++
 spaghetti-monster/fsm-adc.h           |  6 +++
 spaghetti-monster/fsm-events.c        | 12 +++++
 spaghetti-monster/fsm-events.h        |  2 +
 spaghetti-monster/fsm-misc.c          | 91 +++++++++++++++++++++++++++++++++++
 spaghetti-monster/fsm-misc.h          | 35 ++++++++++++++
 spaghetti-monster/ramping-ui.c        | 40 +++++++++++++--
 spaghetti-monster/spaghetti-monster.h |  2 +
 8 files changed, 209 insertions(+), 3 deletions(-)
 create mode 100644 spaghetti-monster/fsm-misc.c
 create mode 100644 spaghetti-monster/fsm-misc.h

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/fsm-adc.c b/spaghetti-monster/fsm-adc.c
index 9a6e2e7..70e3bb3 100644
--- a/spaghetti-monster/fsm-adc.c
+++ b/spaghetti-monster/fsm-adc.c
@@ -263,4 +263,28 @@ ISR(ADC_vect) {
     #endif
 }
 
+#ifdef USE_BATTCHECK
+#ifdef BATTCHECK_4bars
+PROGMEM const uint8_t voltage_blinks[] = {
+    30, 35, 38, 40, 42, 99,
+};
+#endif
+#ifdef BATTCHECK_8bars
+PROGMEM const uint8_t voltage_blinks[] = {
+    30, 33, 35, 37, 38, 39 40, 41, 42, 99,
+};
+#endif
+void battcheck() {
+    #ifdef BATTCHECK_VpT
+    blink_num(voltage);
+    #else
+    uint8_t i;
+    for(i=0;
+        voltage >= pgm_read_byte(voltage_blinks + i);
+        i++) {}
+    blink_num(i);
+    #endif
+}
+#endif
+
 #endif
diff --git a/spaghetti-monster/fsm-adc.h b/spaghetti-monster/fsm-adc.h
index 43d52a6..f1b4477 100644
--- a/spaghetti-monster/fsm-adc.h
+++ b/spaghetti-monster/fsm-adc.h
@@ -36,6 +36,12 @@
 #endif
 volatile uint8_t voltage;
 void low_voltage();
+#ifdef USE_BATTCHECK
+void battcheck();
+#ifdef BATTCHECK_VpT
+#define USE_BLINK_NUM
+#endif
+#endif
 #endif
 
 
diff --git a/spaghetti-monster/fsm-events.c b/spaghetti-monster/fsm-events.c
index 4831df6..29ef415 100644
--- a/spaghetti-monster/fsm-events.c
+++ b/spaghetti-monster/fsm-events.c
@@ -122,6 +122,18 @@ uint8_t nice_delay_ms(uint16_t ms) {
     return 1;
 }
 
+/*
+uint8_t nice_delay_4ms(uint8_t ms) {
+    return nice_delay_ms((uint16_t)ms << 2);
+}
+*/
+
+/*
+uint8_t nice_delay_s() {
+    return nice_delay_4ms(250);
+}
+*/
+
 // Call stacked callbacks for the given event until one handles it.
 uint8_t emit_now(EventPtr event, uint16_t arg) {
     for(int8_t i=state_stack_len-1; i>=0; i--) {
diff --git a/spaghetti-monster/fsm-events.h b/spaghetti-monster/fsm-events.h
index a3ef130..141a0dc 100644
--- a/spaghetti-monster/fsm-events.h
+++ b/spaghetti-monster/fsm-events.h
@@ -221,5 +221,7 @@ void emit(EventPtr event, uint16_t arg);
 void emit_current_event(uint16_t arg);
 
 uint8_t nice_delay_ms(uint16_t ms);
+//uint8_t nice_delay_4ms(uint8_t ms);
+//uint8_t nice_delay_s();
 
 #endif
diff --git a/spaghetti-monster/fsm-misc.c b/spaghetti-monster/fsm-misc.c
new file mode 100644
index 0000000..46325ef
--- /dev/null
+++ b/spaghetti-monster/fsm-misc.c
@@ -0,0 +1,91 @@
+/*
+ * fsm-misc.c: Miscellaneous function for SpaghettiMonster.
+ *
+ * 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 FSM_MISC_C
+#define FSM_MISC_C
+
+#ifdef USE_BLINK_NUM
+uint8_t blink_digit(uint8_t num) {
+    //StatePtr old_state = current_state;
+
+    // "zero" digit gets a single short blink
+    uint8_t ontime = 200;
+    if (!num) { ontime = 8; num ++; }
+
+    for (; num>0; num--) {
+        set_level(BLINK_BRIGHTNESS);
+        if (! nice_delay_ms(ontime)) { set_level(0); return 0; }
+        set_level(0);
+        //if (current_state != old_state) return 0;
+        if (! nice_delay_ms(400)) return 0;
+        //if (current_state != old_state) return 0;
+    }
+    return nice_delay_ms(600);
+}
+
+uint8_t blink_num(uint8_t num) {
+    //StatePtr old_state = current_state;
+    #if 0
+    uint8_t hundreds = num / 100;
+    num = num % 100;
+    uint8_t tens = num / 10;
+    num = num % 10;
+    #else  // 8 bytes smaller
+    uint8_t hundreds = 0;
+    uint8_t tens = 0;
+    for(; num >= 100; hundreds ++, num -= 100);
+    for(; num >= 10; tens ++, num -= 10);
+    #endif
+
+    #if 0
+    // wait a moment in the dark before starting
+    set_level(0);
+    if (! nice_delay_ms(200)) return 0;
+    #endif
+
+    #if 0
+    if (hundreds) {
+        if (! blink_digit(hundreds)) return 0;
+        if (! blink_digit(tens)) return 0;
+    }
+    else if (tens) {
+        if (! blink_digit(tens)) return 0;
+    }
+    if (! blink_digit(num)) return 0;
+    return nice_delay_ms(1000);
+    #else // same size :(
+    if (hundreds) if (! blink_digit(hundreds)) return 0;
+    if (hundreds || tens) if (! blink_digit(tens)) return 0;
+    if (! blink_digit(num)) return 0;
+    return nice_delay_ms(1000);
+    #endif
+
+    /*
+    uint8_t volts, tenths;
+    volts = voltage / 10;
+    tenths = voltage % 10;
+    if (! blink(volts)) return;
+    if (! nice_delay_ms(200)) return;
+    if (! blink(tenths)) return;
+    nice_delay_ms(200);
+    */
+}
+#endif
+
+#endif
diff --git a/spaghetti-monster/fsm-misc.h b/spaghetti-monster/fsm-misc.h
new file mode 100644
index 0000000..7533849
--- /dev/null
+++ b/spaghetti-monster/fsm-misc.h
@@ -0,0 +1,35 @@
+/*
+ * fsm-misc.h: Miscellaneous function for SpaghettiMonster.
+ *
+ * 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 FSM_MISC_H
+#define FSM_MISC_H
+
+#ifdef USE_BLINK_NUM
+#define USE_BLINK
+#ifndef BLINK_BRIGHTNESS
+#define BLINK_BRIGHTNESS (MAX_LEVEL/6)
+#endif
+uint8_t blink_num(uint8_t num);
+#endif
+
+#ifdef USE_BLINK
+uint8_t blink(uint8_t num, uint8_t speed);
+#endif
+
+#endif
diff --git a/spaghetti-monster/ramping-ui.c b/spaghetti-monster/ramping-ui.c
index 562cd1b..0b5bbda 100644
--- a/spaghetti-monster/ramping-ui.c
+++ b/spaghetti-monster/ramping-ui.c
@@ -25,6 +25,8 @@
 #define USE_DELAY_4MS
 #define USE_DELAY_ZERO
 #define USE_RAMPING
+#define USE_BATTCHECK
+#define BATTCHECK_VpT
 #define RAMP_LENGTH 150
 #include "spaghetti-monster.h"
 
@@ -32,6 +34,9 @@
 uint8_t off_state(EventPtr event, uint16_t arg);
 uint8_t steady_state(EventPtr event, uint16_t arg);
 uint8_t strobe_state(EventPtr event, uint16_t arg);
+#ifdef USE_BATTCHECK
+uint8_t battcheck_state(EventPtr event, uint16_t arg);
+#endif
 
 // brightness control
 uint8_t memorized_level = MAX_1x7135;
@@ -72,6 +77,11 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
         set_state(steady_state, memorized_level);
         return MISCHIEF_MANAGED;
     }
+    // 2 clicks (initial press): off, to prep for later events
+    else if (event == EV_click2_press) {
+        set_level(0);
+        return MISCHIEF_MANAGED;
+    }
     // 2 clicks: highest mode
     else if (event == EV_2clicks) {
         set_state(steady_state, MAX_LEVEL);
@@ -82,6 +92,13 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
         set_state(strobe_state, 0);
         return MISCHIEF_MANAGED;
     }
+    #ifdef USE_BATTCHECK
+    // 4 clicks: battcheck mode
+    else if (event == EV_4clicks) {
+        set_state(battcheck_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    #endif
     // hold: go to lowest level
     else if (event == EV_click1_hold) {
         // don't start ramping immediately;
@@ -149,7 +166,7 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         if (ramp_step_size == 1) ramp_step_size = MAX_LEVEL/6;
         else ramp_step_size = 1;
         set_level(0);
-        delay_ms(20);
+        delay_4ms(20/4);
         set_level(memorized_level);
         return MISCHIEF_MANAGED;
     }
@@ -171,7 +188,7 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
                 && ((memorized_level == MAX_1x7135)
                     || (memorized_level == MAX_LEVEL))) {
             set_level(0);
-            delay_ms(7);
+            delay_4ms(8/4);
         }
         set_level(memorized_level);
         return MISCHIEF_MANAGED;
@@ -195,7 +212,7 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
                 && ((memorized_level == MAX_1x7135)
                     || (memorized_level == 1))) {
             set_level(0);
-            delay_ms(7);
+            delay_4ms(8/4);
         }
         set_level(memorized_level);
         return MISCHIEF_MANAGED;
@@ -263,6 +280,18 @@ uint8_t strobe_state(EventPtr event, uint16_t arg) {
 }
 
 
+#ifdef USE_BATTCHECK
+uint8_t battcheck_state(EventPtr event, uint16_t arg) {
+    // 1 click: off
+    if (event == EV_1click) {
+        set_state(off_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+#endif
+
+
 void low_voltage() {
     // "step down" from strobe to something low
     if (current_state == strobe_state) {
@@ -301,4 +330,9 @@ void loop() {
         set_level(0);
         nice_delay_ms(strobe_delay);
     }
+    #ifdef USE_BATTCHECK
+    else if (current_state == battcheck_state) {
+        battcheck();
+    }
+    #endif
 }
diff --git a/spaghetti-monster/spaghetti-monster.h b/spaghetti-monster/spaghetti-monster.h
index 56d03a3..3727930 100644
--- a/spaghetti-monster/spaghetti-monster.h
+++ b/spaghetti-monster/spaghetti-monster.h
@@ -34,6 +34,7 @@
 #include "fsm-pcint.h"
 #include "fsm-standby.h"
 #include "fsm-ramping.h"
+#include "fsm-misc.h"
 #include "fsm-main.h"
 
 #if defined(USE_DELAY_MS) || defined(USE_DELAY_4MS) || defined(USE_DELAY_ZERO) || defined(USE_DEBUG_BLINK)
@@ -70,4 +71,5 @@ void loop();
 #include "fsm-pcint.c"
 #include "fsm-standby.c"
 #include "fsm-ramping.c"
+#include "fsm-misc.c"
 #include "fsm-main.c"
-- 
cgit v1.2.3


From 4052efbf6d7993c6b846105e870b1fcbcdb761e7 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Fri, 25 Aug 2017 02:32:43 -0600
Subject: Made 4bar and 8bar battcheck styles work. Added LVP handling for
 other modes, including battcheck.

---
 spaghetti-monster/fsm-adc.c    |  5 +++--
 spaghetti-monster/fsm-adc.h    |  3 +++
 spaghetti-monster/fsm-misc.c   |  4 +++-
 spaghetti-monster/fsm-misc.h   | 10 ++++++++--
 spaghetti-monster/ramping-ui.c |  4 ++++
 5 files changed, 21 insertions(+), 5 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/fsm-adc.c b/spaghetti-monster/fsm-adc.c
index 70e3bb3..622ef0f 100644
--- a/spaghetti-monster/fsm-adc.c
+++ b/spaghetti-monster/fsm-adc.c
@@ -271,7 +271,7 @@ PROGMEM const uint8_t voltage_blinks[] = {
 #endif
 #ifdef BATTCHECK_8bars
 PROGMEM const uint8_t voltage_blinks[] = {
-    30, 33, 35, 37, 38, 39 40, 41, 42, 99,
+    30, 33, 35, 37, 38, 39, 40, 41, 42, 99,
 };
 #endif
 void battcheck() {
@@ -282,7 +282,8 @@ void battcheck() {
     for(i=0;
         voltage >= pgm_read_byte(voltage_blinks + i);
         i++) {}
-    blink_num(i);
+    if (blink_digit(i))
+        nice_delay_ms(1000);
     #endif
 }
 #endif
diff --git a/spaghetti-monster/fsm-adc.h b/spaghetti-monster/fsm-adc.h
index f1b4477..c12405c 100644
--- a/spaghetti-monster/fsm-adc.h
+++ b/spaghetti-monster/fsm-adc.h
@@ -41,6 +41,9 @@ void battcheck();
 #ifdef BATTCHECK_VpT
 #define USE_BLINK_NUM
 #endif
+#if defined(BATTCHECK_8bars) || defined(BATTCHECK_4bars)
+#define USE_BLINK_DIGIT
+#endif
 #endif
 #endif
 
diff --git a/spaghetti-monster/fsm-misc.c b/spaghetti-monster/fsm-misc.c
index 46325ef..7322a59 100644
--- a/spaghetti-monster/fsm-misc.c
+++ b/spaghetti-monster/fsm-misc.c
@@ -20,7 +20,7 @@
 #ifndef FSM_MISC_C
 #define FSM_MISC_C
 
-#ifdef USE_BLINK_NUM
+#if defined(USE_BLINK_NUM) || defined(USE_BLINK_DIGIT)
 uint8_t blink_digit(uint8_t num) {
     //StatePtr old_state = current_state;
 
@@ -38,7 +38,9 @@ uint8_t blink_digit(uint8_t num) {
     }
     return nice_delay_ms(600);
 }
+#endif
 
+#ifdef USE_BLINK_NUM
 uint8_t blink_num(uint8_t num) {
     //StatePtr old_state = current_state;
     #if 0
diff --git a/spaghetti-monster/fsm-misc.h b/spaghetti-monster/fsm-misc.h
index 7533849..58667a1 100644
--- a/spaghetti-monster/fsm-misc.h
+++ b/spaghetti-monster/fsm-misc.h
@@ -20,16 +20,22 @@
 #ifndef FSM_MISC_H
 #define FSM_MISC_H
 
-#ifdef USE_BLINK_NUM
-#define USE_BLINK
+#if defined(USE_BLINK_NUM) || defined(USE_BLINK_DIGIT)
 #ifndef BLINK_BRIGHTNESS
 #define BLINK_BRIGHTNESS (MAX_LEVEL/6)
 #endif
+uint8_t blink_digit(uint8_t num);
+#endif
+
+#ifdef USE_BLINK_NUM
+//#define USE_BLINK
 uint8_t blink_num(uint8_t num);
 #endif
 
+/*
 #ifdef USE_BLINK
 uint8_t blink(uint8_t num, uint8_t speed);
 #endif
+*/
 
 #endif
diff --git a/spaghetti-monster/ramping-ui.c b/spaghetti-monster/ramping-ui.c
index 0b5bbda..003f3de 100644
--- a/spaghetti-monster/ramping-ui.c
+++ b/spaghetti-monster/ramping-ui.c
@@ -306,6 +306,10 @@ void low_voltage() {
             set_state(off_state, 0);
         }
     }
+    // all other modes, just turn off when voltage is low
+    else {
+        set_state(off_state, 0);
+    }
 }
 
 
-- 
cgit v1.2.3


From 0fe75816cb002c442be774a420bc0563344dd4c6 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sat, 26 Aug 2017 02:36:10 -0600
Subject: Added a temperature check mode to ramping-ui, mostly for testing
 purposes.

---
 spaghetti-monster/ramping-ui.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/ramping-ui.c b/spaghetti-monster/ramping-ui.c
index 003f3de..2369686 100644
--- a/spaghetti-monster/ramping-ui.c
+++ b/spaghetti-monster/ramping-ui.c
@@ -36,6 +36,7 @@ uint8_t steady_state(EventPtr event, uint16_t arg);
 uint8_t strobe_state(EventPtr event, uint16_t arg);
 #ifdef USE_BATTCHECK
 uint8_t battcheck_state(EventPtr event, uint16_t arg);
+uint8_t tempcheck_state(EventPtr event, uint16_t arg);
 #endif
 
 // brightness control
@@ -282,6 +283,20 @@ uint8_t strobe_state(EventPtr event, uint16_t arg) {
 
 #ifdef USE_BATTCHECK
 uint8_t battcheck_state(EventPtr event, uint16_t arg) {
+    // 1 click: off
+    if (event == EV_1click) {
+        set_state(off_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    // 2 clicks: tempcheck mode
+    else if (event == EV_2clicks) {
+        set_state(tempcheck_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+
+uint8_t tempcheck_state(EventPtr event, uint16_t arg) {
     // 1 click: off
     if (event == EV_1click) {
         set_state(off_state, 0);
@@ -338,5 +353,9 @@ void loop() {
     else if (current_state == battcheck_state) {
         battcheck();
     }
+    else if (current_state == tempcheck_state) {
+        blink_num(projected_temperature>>2);
+        nice_delay_ms(1000);
+    }
     #endif
 }
-- 
cgit v1.2.3


From 5bd3a4edd1e0b324118c9d875b33994bfc85c0dc Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sat, 26 Aug 2017 02:37:33 -0600
Subject: Added DarkHorse, a clone of the ZebraLight UI. Still needs strobe,
 beacon, and memory which lasts across battery changes.

---
 spaghetti-monster/darkhorse.c | 290 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 290 insertions(+)
 create mode 100644 spaghetti-monster/darkhorse.c

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/darkhorse.c b/spaghetti-monster/darkhorse.c
new file mode 100644
index 0000000..b77f541
--- /dev/null
+++ b/spaghetti-monster/darkhorse.c
@@ -0,0 +1,290 @@
+/*
+ * DarkHorse: Improved ZebraLight clone UI for SpaghettiMonster.
+ *
+ * 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/>.
+ */
+
+#define FSM_EMISAR_D4_LAYOUT
+#define USE_LVP
+#define USE_THERMAL_REGULATION
+#define DEFAULT_THERM_CEIL 45
+#define USE_DELAY_4MS
+#define USE_RAMPING
+#define RAMP_LENGTH 150
+#define USE_BATTCHECK
+#define BATTCHECK_4bars
+#include "spaghetti-monster.h"
+
+// FSM states
+uint8_t off_state(EventPtr event, uint16_t arg);
+uint8_t low_mode_state(EventPtr event, uint16_t arg);
+uint8_t med_mode_state(EventPtr event, uint16_t arg);
+uint8_t hi_mode_state(EventPtr event, uint16_t arg);
+//uint8_t strobe_state(EventPtr event, uint16_t arg);
+//uint8_t beacon_state(EventPtr event, uint16_t arg);
+#ifdef USE_BATTCHECK
+uint8_t battcheck_state(EventPtr event, uint16_t arg);
+#endif
+// Not a FSM state, just handles stuff common to all low/med/hi states
+uint8_t any_mode_state(EventPtr event, uint16_t arg, uint8_t *primary, uint8_t *secondary, uint8_t *modes);
+
+// toggle between L1/L2, M1/M2, H1/H2
+uint8_t L1 = 1;
+uint8_t M1 = 1;
+uint8_t H1 = 1;
+// brightness for L2, M2, H2  (valid range 1 to 3 inclusive)
+uint8_t L2 = 1;
+uint8_t M2 = 1;
+uint8_t H2 = 1;
+// mode groups, ish
+uint8_t low_modes[] = {12, 1, 4, 9};  // 3.3 lm, 2.0 lm, 0.8 lm, 0.3 lm
+uint8_t med_modes[] = {56, 21, 29, 37};  // 101 lm, 35 lm, 20 lm, 10 lm
+uint8_t hi_modes[] = {MAX_LEVEL, 81, 96, 113};  // 1500 lm, 678 lm, 430 lm, 270 lm
+
+#ifdef USE_THERMAL_REGULATION
+// brightness before thermal step-down
+uint8_t target_level = 0;
+#endif
+
+void set_any_mode(uint8_t primary, uint8_t secondary, uint8_t *modes) {
+    // primary (H1/M1/L1)
+    if (primary) {
+        set_level(modes[0]);
+    }
+    // secondary (H2/M2/L2)
+    else {
+        set_level(modes[secondary]);
+    }
+    target_level = actual_level;
+}
+
+inline void set_low_mode() { set_any_mode(L1, L2, low_modes); }
+inline void set_med_mode() { set_any_mode(M1, M2, med_modes); }
+inline void set_hi_mode()  { set_any_mode(H1, H2, hi_modes); }
+
+
+uint8_t off_state(EventPtr event, uint16_t arg) {
+    // turn emitter off when entering state
+    if (event == EV_enter_state) {
+        set_level(0);
+        // sleep while off  (lower power use)
+        standby_mode();
+        return 0;
+    }
+    // hold (initially): go to lowest level, but allow abort for regular click
+    else if (event == EV_click1_press) {
+        set_low_mode();
+        return 0;
+    }
+    // 1 click (before timeout): go to high level, but allow abort for double click
+    else if (event == EV_click1_release) {
+        set_hi_mode();
+        return 0;
+    }
+    // 1 click: high mode
+    else if (event == EV_1click) {
+        set_state(hi_mode_state, 0);
+        return 0;
+    }
+    // click, hold (initially): go to medium mode, but allow abort
+    else if (event == EV_click2_press) {
+        set_med_mode();
+        return 0;
+    }
+    // 2 clicks: medium mode
+    else if (event == EV_2clicks) {
+        set_state(med_mode_state, 0);
+        return 0;
+    }
+    // click, click, hold (initially): light off, prep for blinkies
+    else if (event == EV_click3_press) {
+        set_level(0);
+        return 0;
+    }
+    // 3 clicks: strobe mode
+    /* TODO: implement
+    else if (event == EV_3clicks) {
+        set_state(party_strobe_state, 255);
+        return 0;
+    }
+    */
+    #ifdef USE_BATTCHECK
+    // 4 clicks: battcheck mode
+    else if (event == EV_4clicks) {
+        set_state(battcheck_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    #endif
+    // hold: go to low mode, but allow ramping up
+    else if (event == EV_click1_hold) {
+        // don't start ramping immediately;
+        // give the user time to release at low mode
+        if (arg >= HOLD_TIMEOUT)
+            set_state(low_mode_state, 0);
+        return 0;
+    }
+    // hold, release quickly: go to low mode
+    else if (event == EV_click1_hold_release) {
+        set_state(low_mode_state, 0);
+        return 0;
+    }
+    /* TODO: implement
+    // click-release-hold: discrete ramp through all levels
+    else if (event == EV_click2_hold) {
+        set_state(steady_state, MAX_LEVEL);
+        return 0;
+    }
+    */
+    return 1;
+}
+
+
+uint8_t any_mode_state(EventPtr event, uint16_t arg, uint8_t *primary, uint8_t *secondary, uint8_t *modes) {
+    // turn on LED when entering the mode
+    if (event == EV_enter_state) {
+        set_any_mode(*primary, *secondary, modes);
+        return MISCHIEF_MANAGED;
+    }
+    // 1 click: off
+    else if (event == EV_1click) {
+        set_state(off_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    // 2 clicks: toggle primary/secondary level
+    else if (event == EV_2clicks) {
+        *primary ^= 1;
+        set_any_mode(*primary, *secondary, modes);
+        return MISCHIEF_MANAGED;
+    }
+    // click-release-hold: change secondary level
+    if (event == EV_click2_hold) {
+        if (arg % HOLD_TIMEOUT == 0) {
+            *secondary = (*secondary + 1) & 3;
+            if (! *secondary) *secondary = 1;
+            *primary = 0;
+            set_any_mode(*primary, *secondary, modes);
+        }
+        return MISCHIEF_MANAGED;
+    }
+    #ifdef USE_THERMAL_REGULATION
+    // TODO: test this on a real light
+    // overheating: drop by an amount proportional to how far we are above the ceiling
+    else if (event == EV_temperature_high) {
+        if (actual_level > MAX_LEVEL/4) {
+            uint8_t stepdown = actual_level - arg;
+            if (stepdown < MAX_LEVEL/4) stepdown = MAX_LEVEL/4;
+            set_level(stepdown);
+        }
+        return 0;
+    }
+    // underheating: increase slowly if we're lower than the target
+    //               (proportional to how low we are)
+    else if (event == EV_temperature_low) {
+        if (actual_level < target_level) {
+            uint8_t stepup = actual_level + (arg>>1);
+            if (stepup > target_level) stepup = target_level;
+            set_level(stepup);
+        }
+        return 0;
+    }
+    #endif
+    return EVENT_NOT_HANDLED;
+}
+
+uint8_t low_mode_state(EventPtr event, uint16_t arg) {
+    // hold: change brightness (brighter)
+    if (event == EV_click1_hold) {
+        if (arg % HOLD_TIMEOUT == 0) {
+            set_state(med_mode_state, 0);
+        }
+        return MISCHIEF_MANAGED;
+    }
+    else return any_mode_state(event, arg, &L1, &L2, low_modes);
+}
+
+uint8_t med_mode_state(EventPtr event, uint16_t arg) {
+    // hold: change brightness (brighter)
+    if (event == EV_click1_hold) {
+        if (arg % HOLD_TIMEOUT == 0) {
+            set_state(hi_mode_state, 0);
+        }
+        return MISCHIEF_MANAGED;
+    }
+    else return any_mode_state(event, arg, &M1, &M2, med_modes);
+}
+
+uint8_t hi_mode_state(EventPtr event, uint16_t arg) {
+    // hold: change brightness (brighter)
+    if (event == EV_click1_hold) {
+        if (arg % HOLD_TIMEOUT == 0) {
+            set_state(low_mode_state, 0);
+        }
+        return MISCHIEF_MANAGED;
+    }
+    else return any_mode_state(event, arg, &H1, &H2, hi_modes);
+}
+
+
+#ifdef USE_BATTCHECK
+uint8_t battcheck_state(EventPtr event, uint16_t arg) {
+    // 1 click: off
+    if (event == EV_1click) {
+        set_state(off_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+#endif
+
+
+void low_voltage() {
+    // TODO: rewrite this
+    /*
+    // "step down" from strobe to something low
+    if (current_state == party_strobe_state) {
+        set_state(steady_state, RAMP_SIZE/6);
+    }
+    */
+    if (current_state == hi_mode_state) {
+        set_state(med_mode_state, 0);
+    }
+    else if (current_state == med_mode_state) {
+        set_state(low_mode_state, 0);
+    }
+    else if (current_state == low_mode_state) {
+        set_state(off_state, 0);
+    }
+}
+
+void setup() {
+    set_level(RAMP_SIZE/8);
+    delay_4ms(3);
+    set_level(0);
+
+    push_state(off_state, 0);
+}
+
+void loop() {
+    #ifdef USE_BATTCHECK
+    if (current_state == battcheck_state) {
+        nice_delay_ms(500);  // wait a moment to measure voltage
+        battcheck();
+        set_state(off_state, 0);
+    }
+    #endif
+}
+
+
-- 
cgit v1.2.3


From 2a13e91628ab830aa9ce67ece69a177544085a18 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sat, 26 Aug 2017 02:46:34 -0600
Subject: Forgot to wrap one line for making thermal regulation optional.

---
 spaghetti-monster/darkhorse.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/darkhorse.c b/spaghetti-monster/darkhorse.c
index b77f541..2bfa2e9 100644
--- a/spaghetti-monster/darkhorse.c
+++ b/spaghetti-monster/darkhorse.c
@@ -68,7 +68,9 @@ void set_any_mode(uint8_t primary, uint8_t secondary, uint8_t *modes) {
     else {
         set_level(modes[secondary]);
     }
+    #ifdef USE_THERMAL_REGULATION
     target_level = actual_level;
+    #endif
 }
 
 inline void set_low_mode() { set_any_mode(L1, L2, low_modes); }
-- 
cgit v1.2.3


From 674259407ace91bef354059c842b4114e95eb23c Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sat, 26 Aug 2017 03:06:12 -0600
Subject: Added beacons/strobes to DarkHorse. Added a way to explicitly cancel
 the current "nice" delay without changing state.

---
 spaghetti-monster/darkhorse.c  | 63 ++++++++++++++++++++++++++++++++++++++----
 spaghetti-monster/fsm-events.c |  7 ++++-
 spaghetti-monster/fsm-events.h |  1 +
 3 files changed, 64 insertions(+), 7 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/darkhorse.c b/spaghetti-monster/darkhorse.c
index 2bfa2e9..5a522a4 100644
--- a/spaghetti-monster/darkhorse.c
+++ b/spaghetti-monster/darkhorse.c
@@ -33,8 +33,7 @@ uint8_t off_state(EventPtr event, uint16_t arg);
 uint8_t low_mode_state(EventPtr event, uint16_t arg);
 uint8_t med_mode_state(EventPtr event, uint16_t arg);
 uint8_t hi_mode_state(EventPtr event, uint16_t arg);
-//uint8_t strobe_state(EventPtr event, uint16_t arg);
-//uint8_t beacon_state(EventPtr event, uint16_t arg);
+uint8_t strobe_beacon_state(EventPtr event, uint16_t arg);
 #ifdef USE_BATTCHECK
 uint8_t battcheck_state(EventPtr event, uint16_t arg);
 #endif
@@ -53,6 +52,12 @@ uint8_t H2 = 1;
 uint8_t low_modes[] = {12, 1, 4, 9};  // 3.3 lm, 2.0 lm, 0.8 lm, 0.3 lm
 uint8_t med_modes[] = {56, 21, 29, 37};  // 101 lm, 35 lm, 20 lm, 10 lm
 uint8_t hi_modes[] = {MAX_LEVEL, 81, 96, 113};  // 1500 lm, 678 lm, 430 lm, 270 lm
+// strobe/beacon modes:
+// 0: 0.2 Hz beacon at L1
+// 1: 0.2 Hz beacon at H1
+// 2: 4 Hz strobe at H1
+// 3: 19 Hz strobe at H1
+uint8_t strobe_beacon_mode = 0;
 
 #ifdef USE_THERMAL_REGULATION
 // brightness before thermal step-down
@@ -117,12 +122,10 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
         return 0;
     }
     // 3 clicks: strobe mode
-    /* TODO: implement
     else if (event == EV_3clicks) {
-        set_state(party_strobe_state, 255);
+        set_state(strobe_beacon_state, 0);
         return 0;
     }
-    */
     #ifdef USE_BATTCHECK
     // 4 clicks: battcheck mode
     else if (event == EV_4clicks) {
@@ -252,6 +255,22 @@ uint8_t battcheck_state(EventPtr event, uint16_t arg) {
 #endif
 
 
+uint8_t strobe_beacon_state(EventPtr event, uint16_t arg) {
+    // 1 click: off
+    if (event == EV_1click) {
+        set_state(off_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    // 2 clicks: rotate through blinky modes
+    else if (event == EV_2clicks) {
+        strobe_beacon_mode = (strobe_beacon_mode + 1) & 3;
+        interrupt_nice_delays();
+        return MISCHIEF_MANAGED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+
+
 void low_voltage() {
     // TODO: rewrite this
     /*
@@ -280,8 +299,40 @@ void setup() {
 }
 
 void loop() {
+    if (current_state == strobe_beacon_state) {
+        switch(strobe_beacon_mode) {
+            // 0.2 Hz beacon at L1
+            case 0:
+                set_level(low_modes[0]);
+                nice_delay_ms(500);
+                set_level(0);
+                nice_delay_ms(4500);
+                break;
+            // 0.2 Hz beacon at H1
+            case 1:
+                set_level(hi_modes[0]);
+                nice_delay_ms(500);
+                set_level(0);
+                nice_delay_ms(4500);
+                break;
+            // 4 Hz tactical strobe at H1
+            case 2:
+                set_level(hi_modes[0]);
+                nice_delay_ms(83);
+                set_level(0);
+                nice_delay_ms(167);
+                break;
+            // 19 Hz tactical strobe at H1
+            case 3:
+                set_level(hi_modes[0]);
+                nice_delay_ms(17);
+                set_level(0);
+                nice_delay_ms(35);
+                break;
+        }
+    }
     #ifdef USE_BATTCHECK
-    if (current_state == battcheck_state) {
+    else if (current_state == battcheck_state) {
         nice_delay_ms(500);  // wait a moment to measure voltage
         battcheck();
         set_state(off_state, 0);
diff --git a/spaghetti-monster/fsm-events.c b/spaghetti-monster/fsm-events.c
index 29ef415..90d0ffa 100644
--- a/spaghetti-monster/fsm-events.c
+++ b/spaghetti-monster/fsm-events.c
@@ -106,6 +106,10 @@ void process_emissions() {
     }
 }
 
+// explicitly interrupt these "nice" delays
+volatile uint8_t nice_delay_interrupt = 0;
+inline void interrupt_nice_delays() { nice_delay_interrupt = 1; }
+
 // like delay_ms, except it aborts on state change
 // return value:
 //   0: state changed
@@ -115,7 +119,8 @@ uint8_t nice_delay_ms(uint16_t ms) {
     while(ms-- > 0) {
         _delay_loop_2(BOGOMIPS*98/100);
         process_emissions();
-        if (old_state != current_state) {
+        if ((nice_delay_interrupt) || (old_state != current_state)) {
+            nice_delay_interrupt = 0;
             return 0;  // state changed; abort
         }
     }
diff --git a/spaghetti-monster/fsm-events.h b/spaghetti-monster/fsm-events.h
index 141a0dc..f2a0181 100644
--- a/spaghetti-monster/fsm-events.h
+++ b/spaghetti-monster/fsm-events.h
@@ -223,5 +223,6 @@ void emit_current_event(uint16_t arg);
 uint8_t nice_delay_ms(uint16_t ms);
 //uint8_t nice_delay_4ms(uint8_t ms);
 //uint8_t nice_delay_s();
+inline void interrupt_nice_delays();
 
 #endif
-- 
cgit v1.2.3


From 530ce37a5aeb29a9c31f8f37d0ce5e561e80995c Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sat, 26 Aug 2017 03:37:52 -0600
Subject: Forgot to handle beacon/strobe in LVP earlier.

---
 spaghetti-monster/darkhorse.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/darkhorse.c b/spaghetti-monster/darkhorse.c
index 5a522a4..03cd5e7 100644
--- a/spaghetti-monster/darkhorse.c
+++ b/spaghetti-monster/darkhorse.c
@@ -272,13 +272,6 @@ uint8_t strobe_beacon_state(EventPtr event, uint16_t arg) {
 
 
 void low_voltage() {
-    // TODO: rewrite this
-    /*
-    // "step down" from strobe to something low
-    if (current_state == party_strobe_state) {
-        set_state(steady_state, RAMP_SIZE/6);
-    }
-    */
     if (current_state == hi_mode_state) {
         set_state(med_mode_state, 0);
     }
@@ -288,6 +281,10 @@ void low_voltage() {
     else if (current_state == low_mode_state) {
         set_state(off_state, 0);
     }
+    // "step down" from blinkies to low
+    else if (current_state == strobe_beacon_state) {
+        set_state(low_mode_state, 0);
+    }
 }
 
 void setup() {
-- 
cgit v1.2.3


From 4b8fef64d036336e329b8b7871a42440cdc38766 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sat, 26 Aug 2017 03:47:44 -0600
Subject: Made DarkHorse always start at low when holding the button, like a
 real ZebraLight does. (previously ramped up one mode instead of resetting to
 low each time)

---
 spaghetti-monster/darkhorse.c | 43 +++++++++++++++++++------------------------
 1 file changed, 19 insertions(+), 24 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/darkhorse.c b/spaghetti-monster/darkhorse.c
index 03cd5e7..1244864 100644
--- a/spaghetti-monster/darkhorse.c
+++ b/spaghetti-monster/darkhorse.c
@@ -168,6 +168,22 @@ uint8_t any_mode_state(EventPtr event, uint16_t arg, uint8_t *primary, uint8_t *
         set_state(off_state, 0);
         return MISCHIEF_MANAGED;
     }
+    // hold: change brightness (low, med, hi, always starting at low)
+    else if (event == EV_click1_hold) {
+        uint8_t which = arg % (HOLD_TIMEOUT * 3) / HOLD_TIMEOUT;
+        switch(which) {
+            case 0:
+                set_state(low_mode_state, 0);
+                break;
+            case 1:
+                set_state(med_mode_state, 0);
+                break;
+            case 2:
+                set_state(hi_mode_state, 0);
+                break;
+        }
+        return MISCHIEF_MANAGED;
+    }
     // 2 clicks: toggle primary/secondary level
     else if (event == EV_2clicks) {
         *primary ^= 1;
@@ -210,36 +226,15 @@ uint8_t any_mode_state(EventPtr event, uint16_t arg, uint8_t *primary, uint8_t *
 }
 
 uint8_t low_mode_state(EventPtr event, uint16_t arg) {
-    // hold: change brightness (brighter)
-    if (event == EV_click1_hold) {
-        if (arg % HOLD_TIMEOUT == 0) {
-            set_state(med_mode_state, 0);
-        }
-        return MISCHIEF_MANAGED;
-    }
-    else return any_mode_state(event, arg, &L1, &L2, low_modes);
+    return any_mode_state(event, arg, &L1, &L2, low_modes);
 }
 
 uint8_t med_mode_state(EventPtr event, uint16_t arg) {
-    // hold: change brightness (brighter)
-    if (event == EV_click1_hold) {
-        if (arg % HOLD_TIMEOUT == 0) {
-            set_state(hi_mode_state, 0);
-        }
-        return MISCHIEF_MANAGED;
-    }
-    else return any_mode_state(event, arg, &M1, &M2, med_modes);
+    return any_mode_state(event, arg, &M1, &M2, med_modes);
 }
 
 uint8_t hi_mode_state(EventPtr event, uint16_t arg) {
-    // hold: change brightness (brighter)
-    if (event == EV_click1_hold) {
-        if (arg % HOLD_TIMEOUT == 0) {
-            set_state(low_mode_state, 0);
-        }
-        return MISCHIEF_MANAGED;
-    }
-    else return any_mode_state(event, arg, &H1, &H2, hi_modes);
+    return any_mode_state(event, arg, &H1, &H2, hi_modes);
 }
 
 
-- 
cgit v1.2.3


From 02d371e769585b2e9cebdb9346b2f11fc4c0a40e Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sat, 26 Aug 2017 04:57:37 -0600
Subject: Fixed bug: strobes could interfere with hold-from-off next time light
 was used.   (because it'd enter standby mode during the strobe pulse,    then
 continue the flow at next activation by turning the light off) Replaced bare
 return values with ones defined in the FSM library.

---
 spaghetti-monster/darkhorse.c | 44 +++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/darkhorse.c b/spaghetti-monster/darkhorse.c
index 1244864..6a17943 100644
--- a/spaghetti-monster/darkhorse.c
+++ b/spaghetti-monster/darkhorse.c
@@ -87,50 +87,51 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
     // turn emitter off when entering state
     if (event == EV_enter_state) {
         set_level(0);
+        empty_event_sequence();
         // sleep while off  (lower power use)
         standby_mode();
-        return 0;
+        return EVENT_HANDLED;
     }
     // hold (initially): go to lowest level, but allow abort for regular click
     else if (event == EV_click1_press) {
         set_low_mode();
-        return 0;
+        return EVENT_HANDLED;
     }
     // 1 click (before timeout): go to high level, but allow abort for double click
     else if (event == EV_click1_release) {
         set_hi_mode();
-        return 0;
+        return EVENT_HANDLED;
     }
     // 1 click: high mode
     else if (event == EV_1click) {
         set_state(hi_mode_state, 0);
-        return 0;
+        return EVENT_HANDLED;
     }
     // click, hold (initially): go to medium mode, but allow abort
     else if (event == EV_click2_press) {
         set_med_mode();
-        return 0;
+        return EVENT_HANDLED;
     }
     // 2 clicks: medium mode
     else if (event == EV_2clicks) {
         set_state(med_mode_state, 0);
-        return 0;
+        return EVENT_HANDLED;
     }
     // click, click, hold (initially): light off, prep for blinkies
     else if (event == EV_click3_press) {
         set_level(0);
-        return 0;
+        return EVENT_HANDLED;
     }
     // 3 clicks: strobe mode
     else if (event == EV_3clicks) {
         set_state(strobe_beacon_state, 0);
-        return 0;
+        return EVENT_HANDLED;
     }
     #ifdef USE_BATTCHECK
     // 4 clicks: battcheck mode
     else if (event == EV_4clicks) {
         set_state(battcheck_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     // hold: go to low mode, but allow ramping up
@@ -139,21 +140,21 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
         // give the user time to release at low mode
         if (arg >= HOLD_TIMEOUT)
             set_state(low_mode_state, 0);
-        return 0;
+        return EVENT_HANDLED;
     }
     // hold, release quickly: go to low mode
     else if (event == EV_click1_hold_release) {
         set_state(low_mode_state, 0);
-        return 0;
+        return EVENT_HANDLED;
     }
     /* TODO: implement
     // click-release-hold: discrete ramp through all levels
     else if (event == EV_click2_hold) {
         set_state(steady_state, MAX_LEVEL);
-        return 0;
+        return EVENT_HANDLED;
     }
     */
-    return 1;
+    return EVENT_NOT_HANDLED;
 }
 
 
@@ -209,7 +210,7 @@ uint8_t any_mode_state(EventPtr event, uint16_t arg, uint8_t *primary, uint8_t *
             if (stepdown < MAX_LEVEL/4) stepdown = MAX_LEVEL/4;
             set_level(stepdown);
         }
-        return 0;
+        return EVENT_HANDLED;
     }
     // underheating: increase slowly if we're lower than the target
     //               (proportional to how low we are)
@@ -219,7 +220,7 @@ uint8_t any_mode_state(EventPtr event, uint16_t arg, uint8_t *primary, uint8_t *
             if (stepup > target_level) stepup = target_level;
             set_level(stepup);
         }
-        return 0;
+        return EVENT_HANDLED;
     }
     #endif
     return EVENT_NOT_HANDLED;
@@ -240,11 +241,6 @@ uint8_t hi_mode_state(EventPtr event, uint16_t arg) {
 
 #ifdef USE_BATTCHECK
 uint8_t battcheck_state(EventPtr event, uint16_t arg) {
-    // 1 click: off
-    if (event == EV_1click) {
-        set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
-    }
     return EVENT_NOT_HANDLED;
 }
 #endif
@@ -253,9 +249,16 @@ uint8_t battcheck_state(EventPtr event, uint16_t arg) {
 uint8_t strobe_beacon_state(EventPtr event, uint16_t arg) {
     // 1 click: off
     if (event == EV_1click) {
+        interrupt_nice_delays();
         set_state(off_state, 0);
         return MISCHIEF_MANAGED;
     }
+    // 1 click (initially): cancel current blink
+    if (event == EV_click1_release) {
+        // only cancel if the light is actually on
+        if (actual_level) interrupt_nice_delays();
+        return MISCHIEF_MANAGED;
+    }
     // 2 clicks: rotate through blinky modes
     else if (event == EV_2clicks) {
         strobe_beacon_mode = (strobe_beacon_mode + 1) & 3;
@@ -327,6 +330,7 @@ void loop() {
     else if (current_state == battcheck_state) {
         nice_delay_ms(500);  // wait a moment to measure voltage
         battcheck();
+        empty_event_sequence();
         set_state(off_state, 0);
     }
     #endif
-- 
cgit v1.2.3


From d32ae87d50e92cb59fdc28cf58622b32aede2f3e Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sat, 26 Aug 2017 13:52:52 -0600
Subject: Avoid suspending at weird times by deferring the call to standby
 mode. Turned strobe into a function to avoid repeating code, and made it
 tolerate interruption better. Got rid of delay after battcheck, since it
 caused problems if the user didn't wait long enough before trying to turn the
 light back on.

---
 spaghetti-monster/darkhorse.c | 52 +++++++++++++++++++++++--------------------
 spaghetti-monster/fsm-adc.c   |  4 ++++
 2 files changed, 32 insertions(+), 24 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/darkhorse.c b/spaghetti-monster/darkhorse.c
index 6a17943..a7937e6 100644
--- a/spaghetti-monster/darkhorse.c
+++ b/spaghetti-monster/darkhorse.c
@@ -26,6 +26,7 @@
 #define RAMP_LENGTH 150
 #define USE_BATTCHECK
 #define BATTCHECK_4bars
+#define DONT_DELAY_AFTER_BATTCHECK
 #include "spaghetti-monster.h"
 
 // FSM states
@@ -59,6 +60,9 @@ uint8_t hi_modes[] = {MAX_LEVEL, 81, 96, 113};  // 1500 lm, 678 lm, 430 lm, 270
 // 3: 19 Hz strobe at H1
 uint8_t strobe_beacon_mode = 0;
 
+// deferred "off" so we won't suspend in a weird state
+volatile uint8_t go_to_standby = 0;
+
 #ifdef USE_THERMAL_REGULATION
 // brightness before thermal step-down
 uint8_t target_level = 0;
@@ -87,9 +91,8 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
     // turn emitter off when entering state
     if (event == EV_enter_state) {
         set_level(0);
-        empty_event_sequence();
         // sleep while off  (lower power use)
-        standby_mode();
+        go_to_standby = 1;
         return EVENT_HANDLED;
     }
     // hold (initially): go to lowest level, but allow abort for regular click
@@ -107,7 +110,7 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
         set_state(hi_mode_state, 0);
         return EVENT_HANDLED;
     }
-    // click, hold (initially): go to medium mode, but allow abort
+    // click, press (initially): go to medium mode, but allow abort
     else if (event == EV_click2_press) {
         set_med_mode();
         return EVENT_HANDLED;
@@ -117,7 +120,7 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
         set_state(med_mode_state, 0);
         return EVENT_HANDLED;
     }
-    // click, click, hold (initially): light off, prep for blinkies
+    // click, click, press (initially): light off, prep for blinkies
     else if (event == EV_click3_press) {
         set_level(0);
         return EVENT_HANDLED;
@@ -249,14 +252,12 @@ uint8_t battcheck_state(EventPtr event, uint16_t arg) {
 uint8_t strobe_beacon_state(EventPtr event, uint16_t arg) {
     // 1 click: off
     if (event == EV_1click) {
-        interrupt_nice_delays();
         set_state(off_state, 0);
         return MISCHIEF_MANAGED;
     }
     // 1 click (initially): cancel current blink
     if (event == EV_click1_release) {
-        // only cancel if the light is actually on
-        if (actual_level) interrupt_nice_delays();
+        interrupt_nice_delays();
         return MISCHIEF_MANAGED;
     }
     // 2 clicks: rotate through blinky modes
@@ -285,6 +286,13 @@ void low_voltage() {
     }
 }
 
+void strobe(uint8_t level, uint16_t ontime, uint16_t offtime) {
+    set_level(level);
+    if (! nice_delay_ms(ontime)) return;
+    set_level(0);
+    nice_delay_ms(offtime);
+}
+
 void setup() {
     set_level(RAMP_SIZE/8);
     delay_4ms(3);
@@ -294,43 +302,39 @@ void setup() {
 }
 
 void loop() {
+    // deferred "off" so we won't suspend in a weird state
+    // (like...  during the middle of a strobe pulse)
+    if (go_to_standby) {
+        go_to_standby = 0;
+        set_level(0);
+        standby_mode();
+    }
+
     if (current_state == strobe_beacon_state) {
         switch(strobe_beacon_mode) {
             // 0.2 Hz beacon at L1
             case 0:
-                set_level(low_modes[0]);
-                nice_delay_ms(500);
-                set_level(0);
-                nice_delay_ms(4500);
+                strobe(low_modes[0], 500, 4500);
                 break;
             // 0.2 Hz beacon at H1
             case 1:
-                set_level(hi_modes[0]);
-                nice_delay_ms(500);
-                set_level(0);
-                nice_delay_ms(4500);
+                strobe(hi_modes[0], 500, 4500);
                 break;
             // 4 Hz tactical strobe at H1
             case 2:
-                set_level(hi_modes[0]);
-                nice_delay_ms(83);
-                set_level(0);
-                nice_delay_ms(167);
+                strobe(hi_modes[0], 83, 167);
                 break;
             // 19 Hz tactical strobe at H1
             case 3:
-                set_level(hi_modes[0]);
-                nice_delay_ms(17);
-                set_level(0);
-                nice_delay_ms(35);
+                strobe(hi_modes[0], 17, 35);
                 break;
         }
     }
+
     #ifdef USE_BATTCHECK
     else if (current_state == battcheck_state) {
         nice_delay_ms(500);  // wait a moment to measure voltage
         battcheck();
-        empty_event_sequence();
         set_state(off_state, 0);
     }
     #endif
diff --git a/spaghetti-monster/fsm-adc.c b/spaghetti-monster/fsm-adc.c
index 622ef0f..541f9a4 100644
--- a/spaghetti-monster/fsm-adc.c
+++ b/spaghetti-monster/fsm-adc.c
@@ -282,9 +282,13 @@ void battcheck() {
     for(i=0;
         voltage >= pgm_read_byte(voltage_blinks + i);
         i++) {}
+    #ifdef DONT_DELAY_AFTER_BATTCHECK
+    blink_digit(i);
+    #else
     if (blink_digit(i))
         nice_delay_ms(1000);
     #endif
+    #endif
 }
 #endif
 
-- 
cgit v1.2.3


From 6d9ceae8eab62ba33011a82c8fad8e55d37fe7ba Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sat, 26 Aug 2017 16:48:25 -0600
Subject: Added eeprom load/save API (no wear levelling yet), verified it works
 in DarkHorse.

---
 spaghetti-monster/darkhorse.c         | 37 +++++++++++++++++-
 spaghetti-monster/fsm-eeprom.c        | 71 +++++++++++++++++++++++++++++++++++
 spaghetti-monster/fsm-eeprom.h        | 58 ++++++++++++++++++++++++++++
 spaghetti-monster/fsm-events.h        |  8 ++++
 spaghetti-monster/spaghetti-monster.h |  6 +++
 5 files changed, 179 insertions(+), 1 deletion(-)
 create mode 100644 spaghetti-monster/fsm-eeprom.c
 create mode 100644 spaghetti-monster/fsm-eeprom.h

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/darkhorse.c b/spaghetti-monster/darkhorse.c
index a7937e6..2aa1b7b 100644
--- a/spaghetti-monster/darkhorse.c
+++ b/spaghetti-monster/darkhorse.c
@@ -27,6 +27,8 @@
 #define USE_BATTCHECK
 #define BATTCHECK_4bars
 #define DONT_DELAY_AFTER_BATTCHECK
+#define USE_EEPROM
+#define EEPROM_BYTES 5
 #include "spaghetti-monster.h"
 
 // FSM states
@@ -41,6 +43,9 @@ uint8_t battcheck_state(EventPtr event, uint16_t arg);
 // Not a FSM state, just handles stuff common to all low/med/hi states
 uint8_t any_mode_state(EventPtr event, uint16_t arg, uint8_t *primary, uint8_t *secondary, uint8_t *modes);
 
+void load_config();
+void save_config();
+
 // toggle between L1/L2, M1/M2, H1/H2
 uint8_t L1 = 1;
 uint8_t M1 = 1;
@@ -192,10 +197,11 @@ uint8_t any_mode_state(EventPtr event, uint16_t arg, uint8_t *primary, uint8_t *
     else if (event == EV_2clicks) {
         *primary ^= 1;
         set_any_mode(*primary, *secondary, modes);
+        save_config();
         return MISCHIEF_MANAGED;
     }
     // click-release-hold: change secondary level
-    if (event == EV_click2_hold) {
+    else if (event == EV_click2_hold) {
         if (arg % HOLD_TIMEOUT == 0) {
             *secondary = (*secondary + 1) & 3;
             if (! *secondary) *secondary = 1;
@@ -204,6 +210,10 @@ uint8_t any_mode_state(EventPtr event, uint16_t arg, uint8_t *primary, uint8_t *
         }
         return MISCHIEF_MANAGED;
     }
+    // click, hold, release: save secondary level
+    else if (event == EV_click2_hold_release) {
+        save_config();
+    }
     #ifdef USE_THERMAL_REGULATION
     // TODO: test this on a real light
     // overheating: drop by an amount proportional to how far we are above the ceiling
@@ -263,6 +273,7 @@ uint8_t strobe_beacon_state(EventPtr event, uint16_t arg) {
     // 2 clicks: rotate through blinky modes
     else if (event == EV_2clicks) {
         strobe_beacon_mode = (strobe_beacon_mode + 1) & 3;
+        save_config();
         interrupt_nice_delays();
         return MISCHIEF_MANAGED;
     }
@@ -293,11 +304,35 @@ void strobe(uint8_t level, uint16_t ontime, uint16_t offtime) {
     nice_delay_ms(offtime);
 }
 
+void load_config() {
+    if (load_eeprom()) {
+        H1 = !(!(eeprom[0] & 0b00000100));
+        M1 = !(!(eeprom[0] & 0b00000010));
+        L1 = !(!(eeprom[0] & 0b00000001));
+        H2 = eeprom[1];
+        M2 = eeprom[2];
+        L2 = eeprom[3];
+        strobe_beacon_mode = eeprom[4];
+    }
+}
+
+void save_config() {
+    eeprom[0] = (H1<<2) | (M1<<1) | (L1);
+    eeprom[1] = H2;
+    eeprom[2] = M2;
+    eeprom[3] = L2;
+    eeprom[4] = strobe_beacon_mode;
+
+    save_eeprom();
+}
+
 void setup() {
     set_level(RAMP_SIZE/8);
     delay_4ms(3);
     set_level(0);
 
+    load_config();
+
     push_state(off_state, 0);
 }
 
diff --git a/spaghetti-monster/fsm-eeprom.c b/spaghetti-monster/fsm-eeprom.c
new file mode 100644
index 0000000..5451baf
--- /dev/null
+++ b/spaghetti-monster/fsm-eeprom.c
@@ -0,0 +1,71 @@
+/*
+ * fsm-eeprom.c: EEPROM API for SpaghettiMonster.
+ *
+ * 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 FSM_EEPROM_C
+#define FSM_EEPROM_C
+
+#include "fsm-eeprom.h"
+
+#if EEPROM_BYTES > 0
+#if EEPROM_BYTES >= (EEPSIZE/2)
+#error Requested EEPROM_BYTES too big.
+#endif
+uint8_t eeprom[EEPROM_BYTES];
+
+uint8_t load_eeprom() {
+    cli();
+    // check if eeprom has been initialized; abort if it hasn't
+    uint8_t marker = eeprom_read_byte((uint8_t *)EEP_START);
+    if (marker != EEP_MARKER) { sei(); return 0; }
+
+    // load the actual data
+    for(uint8_t i=0; i<EEPROM_BYTES; i++) {
+        eeprom[i] = eeprom_read_byte((uint8_t *)(EEP_START+1+i));
+    }
+    sei();
+    return 1;
+}
+
+void save_eeprom() {
+    cli();
+    eeprom_update_byte((uint8_t *)EEP_START, EEP_MARKER);
+
+    // save the actual data
+    for(uint8_t i=0; i<EEPROM_BYTES; i++) {
+        eeprom_update_byte((uint8_t *)(EEP_START+1+i), eeprom[i]);
+    }
+    sei();
+}
+#endif
+
+#if EEPROM_WL_BYTES > 0
+#if EEPROM_WL_BYTES >= (EEPSIZE/4)
+#error Requested EEPROM_WL_BYTES too big.
+#endif
+uint8_t eeprom_wl[EEPROM_WL_BYTES];
+
+uint8_t load_wl_eeprom() {
+}
+
+void save_wl_eeprom() {
+}
+#endif
+
+
+#endif
diff --git a/spaghetti-monster/fsm-eeprom.h b/spaghetti-monster/fsm-eeprom.h
new file mode 100644
index 0000000..3d34f23
--- /dev/null
+++ b/spaghetti-monster/fsm-eeprom.h
@@ -0,0 +1,58 @@
+/*
+ * fsm-eeprom.h: EEPROM API for SpaghettiMonster.
+ *
+ * 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 FSM_EEPROM_H
+#define FSM_EEPROM_H
+
+#include <avr/eeprom.h>
+
+// set this higher to enable normal eeprom functions
+#ifndef EEPROM_BYTES
+#define EEPROM_BYTES 0
+#endif
+
+// set this higher to enable wear-levelled eeprom functions
+#ifndef EEPROM_WL_BYTES
+#define EEPROM_WL_BYTES 0
+#endif
+
+#if EEPROM_BYTES > 0
+uint8_t eeprom[EEPROM_BYTES];
+uint8_t load_eeprom();  // returns 1 for success, 0 for no data found
+void save_eeprom();
+#define EEP_START (EEPSIZE/2)
+#endif
+
+#if EEPROM_WL_BYTES > 0
+uint8_t eeprom_wl[EEPROM_WL_BYTES];
+uint8_t load_wl_eeprom();  // returns 1 for success, 0 for no data found
+void save_wl_eeprom();
+#define EEP_WL_SIZE (EEPSIZE/2)
+#endif
+
+#if EEPSIZE > 256
+#define EEP_OFFSET_T uint16_t
+#else
+#define EEP_OFFSET_T uint8_t
+#endif
+
+// if this marker isn't found, the eeprom is assumed to be blank
+#define EEP_MARKER 0b10100101
+
+#endif
diff --git a/spaghetti-monster/fsm-events.h b/spaghetti-monster/fsm-events.h
index f2a0181..90dcbd6 100644
--- a/spaghetti-monster/fsm-events.h
+++ b/spaghetti-monster/fsm-events.h
@@ -127,6 +127,13 @@ Event EV_click2_hold[] = {
     A_PRESS,
     A_HOLD,
     0 };
+Event EV_click2_hold_release[] = {
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_HOLD,
+    A_RELEASE,
+    0 };
 Event EV_click2_release[] = {
     A_PRESS,
     A_RELEASE,
@@ -190,6 +197,7 @@ EventPtr event_sequences[] = {
     EV_click1_hold_release,
     EV_click2_press,
     EV_click2_hold,
+    EV_click2_hold_release,
     EV_click2_release,
     EV_click2_complete,
     EV_click3_press,
diff --git a/spaghetti-monster/spaghetti-monster.h b/spaghetti-monster/spaghetti-monster.h
index 3727930..82800b4 100644
--- a/spaghetti-monster/spaghetti-monster.h
+++ b/spaghetti-monster/spaghetti-monster.h
@@ -34,6 +34,9 @@
 #include "fsm-pcint.h"
 #include "fsm-standby.h"
 #include "fsm-ramping.h"
+#ifdef USE_EEPROM
+#include "fsm-eeprom.h"
+#endif
 #include "fsm-misc.h"
 #include "fsm-main.h"
 
@@ -71,5 +74,8 @@ void loop();
 #include "fsm-pcint.c"
 #include "fsm-standby.c"
 #include "fsm-ramping.c"
+#ifdef USE_EEPROM
+#include "fsm-eeprom.c"
+#endif
 #include "fsm-misc.c"
 #include "fsm-main.c"
-- 
cgit v1.2.3


From 2370e0a3ce0a3ab928ac19af074a3ef67d533ca6 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sat, 26 Aug 2017 17:12:31 -0600
Subject: Made wear-levelling work.  Takes a bunch of extra ROM though. Also,
 I've only tested it a tiny amount.

---
 spaghetti-monster/darkhorse.c  | 30 +++++++++++++-------------
 spaghetti-monster/fsm-eeprom.c | 48 ++++++++++++++++++++++++++++++++++++------
 spaghetti-monster/fsm-eeprom.h |  6 ++++++
 3 files changed, 63 insertions(+), 21 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/darkhorse.c b/spaghetti-monster/darkhorse.c
index 2aa1b7b..0d02481 100644
--- a/spaghetti-monster/darkhorse.c
+++ b/spaghetti-monster/darkhorse.c
@@ -28,7 +28,7 @@
 #define BATTCHECK_4bars
 #define DONT_DELAY_AFTER_BATTCHECK
 #define USE_EEPROM
-#define EEPROM_BYTES 5
+#define EEPROM_WL_BYTES 5
 #include "spaghetti-monster.h"
 
 // FSM states
@@ -305,25 +305,25 @@ void strobe(uint8_t level, uint16_t ontime, uint16_t offtime) {
 }
 
 void load_config() {
-    if (load_eeprom()) {
-        H1 = !(!(eeprom[0] & 0b00000100));
-        M1 = !(!(eeprom[0] & 0b00000010));
-        L1 = !(!(eeprom[0] & 0b00000001));
-        H2 = eeprom[1];
-        M2 = eeprom[2];
-        L2 = eeprom[3];
-        strobe_beacon_mode = eeprom[4];
+    if (load_wl_eeprom()) {
+        H1 = !(!(eeprom_wl[0] & 0b00000100));
+        M1 = !(!(eeprom_wl[0] & 0b00000010));
+        L1 = !(!(eeprom_wl[0] & 0b00000001));
+        H2 = eeprom_wl[1];
+        M2 = eeprom_wl[2];
+        L2 = eeprom_wl[3];
+        strobe_beacon_mode = eeprom_wl[4];
     }
 }
 
 void save_config() {
-    eeprom[0] = (H1<<2) | (M1<<1) | (L1);
-    eeprom[1] = H2;
-    eeprom[2] = M2;
-    eeprom[3] = L2;
-    eeprom[4] = strobe_beacon_mode;
+    eeprom_wl[0] = (H1<<2) | (M1<<1) | (L1);
+    eeprom_wl[1] = H2;
+    eeprom_wl[2] = M2;
+    eeprom_wl[3] = L2;
+    eeprom_wl[4] = strobe_beacon_mode;
 
-    save_eeprom();
+    save_wl_eeprom();
 }
 
 void setup() {
diff --git a/spaghetti-monster/fsm-eeprom.c b/spaghetti-monster/fsm-eeprom.c
index 5451baf..e464785 100644
--- a/spaghetti-monster/fsm-eeprom.c
+++ b/spaghetti-monster/fsm-eeprom.c
@@ -23,9 +23,6 @@
 #include "fsm-eeprom.h"
 
 #if EEPROM_BYTES > 0
-#if EEPROM_BYTES >= (EEPSIZE/2)
-#error Requested EEPROM_BYTES too big.
-#endif
 uint8_t eeprom[EEPROM_BYTES];
 
 uint8_t load_eeprom() {
@@ -55,15 +52,54 @@ void save_eeprom() {
 #endif
 
 #if EEPROM_WL_BYTES > 0
-#if EEPROM_WL_BYTES >= (EEPSIZE/4)
-#error Requested EEPROM_WL_BYTES too big.
-#endif
 uint8_t eeprom_wl[EEPROM_WL_BYTES];
+EEP_OFFSET_T eep_wl_prev_offset;
 
 uint8_t load_wl_eeprom() {
+    cli();
+    // check if eeprom has been initialized; abort if it hasn't
+    uint8_t found = 0;
+    EEP_OFFSET_T offset;
+    for(offset = 0;
+        offset < EEP_WL_SIZE - EEPROM_WL_BYTES - 1;
+        offset += (EEPROM_WL_BYTES + 1)) {
+        if (eeprom_read_byte((uint8_t *)offset) == EEP_MARKER) {
+            found = 1;
+            eep_wl_prev_offset = offset;
+            break;
+        }
+    }
+
+    if (found) {
+        // load the actual data
+        for(uint8_t i=0; i<EEPROM_WL_BYTES; i++) {
+            eeprom_wl[i] = eeprom_read_byte((uint8_t *)(offset+1+i));
+        }
+    }
+    sei();
+    return found;
 }
 
 void save_wl_eeprom() {
+    cli();
+    // erase old state
+    EEP_OFFSET_T offset = eep_wl_prev_offset;
+    for (uint8_t i = 0; i < EEPROM_WL_BYTES+1; i ++) {
+        eeprom_update_byte((uint8_t *)offset+i, 0xFF);
+    }
+
+    // save new state
+    offset += EEPROM_WL_BYTES+1;
+    if (offset > EEP_WL_SIZE-EEPROM_WL_BYTES-1) offset = 0;
+    eep_wl_prev_offset = offset;
+    // marker byte
+    eeprom_update_byte((uint8_t *)offset, EEP_MARKER);
+    offset ++;
+    // user data
+    for(uint8_t i=0; i<EEPROM_WL_BYTES; i++, offset++) {
+        eeprom_update_byte((uint8_t *)(offset), eeprom_wl[i]);
+    }
+    sei();
 }
 #endif
 
diff --git a/spaghetti-monster/fsm-eeprom.h b/spaghetti-monster/fsm-eeprom.h
index 3d34f23..c35c822 100644
--- a/spaghetti-monster/fsm-eeprom.h
+++ b/spaghetti-monster/fsm-eeprom.h
@@ -33,6 +33,9 @@
 #endif
 
 #if EEPROM_BYTES > 0
+#if EEPROM_BYTES >= (EEPSIZE/2)
+#error Requested EEPROM_BYTES too big.
+#endif
 uint8_t eeprom[EEPROM_BYTES];
 uint8_t load_eeprom();  // returns 1 for success, 0 for no data found
 void save_eeprom();
@@ -40,6 +43,9 @@ void save_eeprom();
 #endif
 
 #if EEPROM_WL_BYTES > 0
+#if EEPROM_WL_BYTES >= (EEPSIZE/4)
+#error Requested EEPROM_WL_BYTES too big.
+#endif
 uint8_t eeprom_wl[EEPROM_WL_BYTES];
 uint8_t load_wl_eeprom();  // returns 1 for success, 0 for no data found
 void save_wl_eeprom();
-- 
cgit v1.2.3


From eba8d84cfb29f5c7209e2a162497d965bea2ff23 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sat, 26 Aug 2017 17:15:28 -0600
Subject: Revert DarkHorse back to no wear-levelling. It's smaller, and WL is
 probably not needed for this UI. I only converted it as a test, and it
 worked, so ... woot.

---
 spaghetti-monster/darkhorse.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/darkhorse.c b/spaghetti-monster/darkhorse.c
index 0d02481..2aa1b7b 100644
--- a/spaghetti-monster/darkhorse.c
+++ b/spaghetti-monster/darkhorse.c
@@ -28,7 +28,7 @@
 #define BATTCHECK_4bars
 #define DONT_DELAY_AFTER_BATTCHECK
 #define USE_EEPROM
-#define EEPROM_WL_BYTES 5
+#define EEPROM_BYTES 5
 #include "spaghetti-monster.h"
 
 // FSM states
@@ -305,25 +305,25 @@ void strobe(uint8_t level, uint16_t ontime, uint16_t offtime) {
 }
 
 void load_config() {
-    if (load_wl_eeprom()) {
-        H1 = !(!(eeprom_wl[0] & 0b00000100));
-        M1 = !(!(eeprom_wl[0] & 0b00000010));
-        L1 = !(!(eeprom_wl[0] & 0b00000001));
-        H2 = eeprom_wl[1];
-        M2 = eeprom_wl[2];
-        L2 = eeprom_wl[3];
-        strobe_beacon_mode = eeprom_wl[4];
+    if (load_eeprom()) {
+        H1 = !(!(eeprom[0] & 0b00000100));
+        M1 = !(!(eeprom[0] & 0b00000010));
+        L1 = !(!(eeprom[0] & 0b00000001));
+        H2 = eeprom[1];
+        M2 = eeprom[2];
+        L2 = eeprom[3];
+        strobe_beacon_mode = eeprom[4];
     }
 }
 
 void save_config() {
-    eeprom_wl[0] = (H1<<2) | (M1<<1) | (L1);
-    eeprom_wl[1] = H2;
-    eeprom_wl[2] = M2;
-    eeprom_wl[3] = L2;
-    eeprom_wl[4] = strobe_beacon_mode;
+    eeprom[0] = (H1<<2) | (M1<<1) | (L1);
+    eeprom[1] = H2;
+    eeprom[2] = M2;
+    eeprom[3] = L2;
+    eeprom[4] = strobe_beacon_mode;
 
-    save_wl_eeprom();
+    save_eeprom();
 }
 
 void setup() {
-- 
cgit v1.2.3


From c2b995167d2f523f13187d5ca39c9343cf62a702 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sun, 27 Aug 2017 01:58:07 -0600
Subject: Made it easier to configure the maximum number of clicks it'll try to
 count in one sequence. (use #define MAX_CLICKS 5, for example) Keeps data
 sizes from being excessively large without having to edit FSM sources per UI.

---
 spaghetti-monster/fsm-events.h | 58 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 57 insertions(+), 1 deletion(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/fsm-events.h b/spaghetti-monster/fsm-events.h
index 90dcbd6..114ccc4 100644
--- a/spaghetti-monster/fsm-events.h
+++ b/spaghetti-monster/fsm-events.h
@@ -35,7 +35,11 @@ typedef struct Emission {
 #define MISCHIEF_MANAGED EVENT_HANDLED
 #define MISCHIEF_NOT_MANAGED EVENT_NOT_HANDLED
 
-#define EV_MAX_LEN 16
+#ifndef MAX_CLICKS
+#define MAX_CLICKS 4
+#endif
+
+#define EV_MAX_LEN ((MAX_CLICKS*2)+3)
 uint8_t current_event[EV_MAX_LEN];
 // at 0.016 ms per tick, 255 ticks = 4.08 s
 // TODO: 16 bits?
@@ -116,6 +120,7 @@ Event EV_click1_hold_release[] = {
     A_HOLD,
     A_RELEASE,
     0 };
+#if MAX_CLICKS >= 2
 Event EV_click2_press[] = {
     A_PRESS,
     A_RELEASE,
@@ -148,6 +153,8 @@ Event EV_click2_complete[] = {
     A_RELEASE,
     A_RELEASE_TIMEOUT,
     0 };
+#endif  // MAX_CLICKS >= 2
+#if MAX_CLICKS >= 3
 Event EV_click3_press[] = {
     A_PRESS,
     A_RELEASE,
@@ -173,6 +180,8 @@ Event EV_click3_complete[] = {
     A_RELEASE,
     A_RELEASE_TIMEOUT,
     0 };
+#endif  // MAX_CLICKS >= 3
+#if MAX_CLICKS >= 4
 #define EV_4clicks EV_click4_complete
 Event EV_click4_complete[] = {
     A_PRESS,
@@ -185,6 +194,41 @@ Event EV_click4_complete[] = {
     A_RELEASE,
     A_RELEASE_TIMEOUT,
     0 };
+#endif
+#if MAX_CLICKS >= 5
+#define EV_5clicks EV_click5_complete
+Event EV_click5_complete[] = {
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_RELEASE_TIMEOUT,
+    0 };
+#endif
+#if MAX_CLICKS >= 6
+#define EV_6clicks EV_click6_complete
+Event EV_click6_complete[] = {
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_RELEASE_TIMEOUT,
+    0 };
+#endif
 // ... and so on
 
 // A list of button event types for easy iteration
@@ -195,15 +239,27 @@ EventPtr event_sequences[] = {
     EV_click1_complete,
     EV_click1_hold,
     EV_click1_hold_release,
+    #if MAX_CLICKS >= 2
     EV_click2_press,
     EV_click2_hold,
     EV_click2_hold_release,
     EV_click2_release,
     EV_click2_complete,
+    #endif
+    #if MAX_CLICKS >= 3
     EV_click3_press,
     EV_click3_release,
     EV_click3_complete,
+    #endif
+    #if MAX_CLICKS >= 4
     EV_click4_complete,
+    #endif
+    #if MAX_CLICKS >= 5
+    EV_click5_complete,
+    #endif
+    #if MAX_CLICKS >= 6
+    EV_click6_complete,
+    #endif
     // ...
 };
 
-- 
cgit v1.2.3


From 904f94d70c77aa4f66f53870c08d0672c278ed29 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sun, 27 Aug 2017 01:58:53 -0600
Subject: Started on Anduril, a Narsil-inspired UI.

---
 spaghetti-monster/anduril.c   | 465 ++++++++++++++++++++++++++++++++++++++++++
 spaghetti-monster/anduril.txt |  67 ++++++
 2 files changed, 532 insertions(+)
 create mode 100644 spaghetti-monster/anduril.c
 create mode 100644 spaghetti-monster/anduril.txt

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril.c b/spaghetti-monster/anduril.c
new file mode 100644
index 0000000..96e45db
--- /dev/null
+++ b/spaghetti-monster/anduril.c
@@ -0,0 +1,465 @@
+/*
+ * Anduril: Narsil-inspired UI for SpaghettiMonster.
+ * (Anduril is Aragorn's sword, the blade Narsil reforged)
+ *
+ * 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/>.
+ */
+
+#define FSM_EMISAR_D4_LAYOUT
+#define USE_LVP
+#define USE_THERMAL_REGULATION
+#define DEFAULT_THERM_CEIL 32
+#define USE_DELAY_MS
+#define USE_DELAY_4MS
+#define USE_DELAY_ZERO
+#define USE_RAMPING
+#define USE_BATTCHECK
+#define BATTCHECK_VpT
+#define RAMP_LENGTH 150
+#define MAX_CLICKS 5
+#include "spaghetti-monster.h"
+
+// FSM states
+uint8_t off_state(EventPtr event, uint16_t arg);
+uint8_t steady_state(EventPtr event, uint16_t arg);
+uint8_t strobe_state(EventPtr event, uint16_t arg);
+#ifdef USE_BATTCHECK
+uint8_t battcheck_state(EventPtr event, uint16_t arg);
+uint8_t tempcheck_state(EventPtr event, uint16_t arg);
+#endif
+uint8_t lockout_state(EventPtr event, uint16_t arg);
+
+void blink_confirm(uint8_t num);
+
+// brightness control
+uint8_t memorized_level = MAX_1x7135;
+// smooth vs discrete ramping
+uint8_t ramp_style = 0;  // 0 = smooth, 1 = discrete
+uint8_t ramp_smooth_floor = 1;
+uint8_t ramp_smooth_ceil = MAX_LEVEL;
+uint8_t ramp_discrete_floor = 20;
+uint8_t ramp_discrete_ceil = MAX_LEVEL-50;
+uint8_t ramp_discrete_steps = 7;
+uint8_t ramp_discrete_step_size;
+
+#ifdef USE_THERMAL_REGULATION
+// brightness before thermal step-down
+uint8_t target_level = 0;
+#endif
+
+// strobe timing
+volatile uint8_t strobe_delay = 67;
+volatile uint8_t strobe_type = 0;  // 0 == party strobe, 1 == tactical strobe
+
+// deferred "off" so we won't suspend in a weird state
+volatile uint8_t go_to_standby = 0;
+
+
+uint8_t off_state(EventPtr event, uint16_t arg) {
+    // turn emitter off when entering state
+    if (event == EV_enter_state) {
+        set_level(0);
+        // sleep while off  (lower power use)
+        go_to_standby = 1;
+        return MISCHIEF_MANAGED;
+    }
+    // hold (initially): go to lowest level, but allow abort for regular click
+    else if (event == EV_click1_press) {
+        if (ramp_style == 0) {
+            set_level(ramp_smooth_floor);
+        } else {
+            set_level(ramp_discrete_floor);
+        }
+        return MISCHIEF_MANAGED;
+    }
+    // 1 click (before timeout): go to memorized level, but allow abort for double click
+    else if (event == EV_click1_release) {
+        set_level(memorized_level);
+        return MISCHIEF_MANAGED;
+    }
+    // 1 click: regular mode
+    else if (event == EV_1click) {
+        set_state(steady_state, memorized_level);
+        return MISCHIEF_MANAGED;
+    }
+    // 2 clicks (initial press): off, to prep for later events
+    else if (event == EV_click2_press) {
+        set_level(0);
+        return MISCHIEF_MANAGED;
+    }
+    // 2 clicks: highest mode
+    else if (event == EV_2clicks) {
+        if (ramp_style == 0) {
+            set_state(steady_state, ramp_smooth_ceil);
+        } else {
+            set_state(steady_state, ramp_discrete_ceil);
+        }
+        return MISCHIEF_MANAGED;
+    }
+    // 3 clicks: strobe mode
+    else if (event == EV_3clicks) {
+        set_state(strobe_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    #ifdef USE_BATTCHECK
+    // 4 clicks: battcheck mode
+    else if (event == EV_4clicks) {
+        set_state(battcheck_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    #endif
+    // 5 clicks: soft lockout
+    else if (event == EV_5clicks) {
+        blink_confirm(5);
+        set_state(lockout_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    // hold: go to lowest level
+    else if (event == EV_click1_hold) {
+        // don't start ramping immediately;
+        // give the user time to release at moon level
+        if (arg >= HOLD_TIMEOUT) {
+            if (ramp_style == 0) {
+                set_state(steady_state, ramp_smooth_floor);
+            } else {
+                set_state(steady_state, ramp_discrete_floor);
+            }
+        }
+        return MISCHIEF_MANAGED;
+    }
+    // hold, release quickly: go to lowest level
+    else if (event == EV_click1_hold_release) {
+        if (ramp_style == 0) {
+            set_state(steady_state, ramp_smooth_floor);
+        } else {
+            set_state(steady_state, ramp_discrete_floor);
+        }
+        return MISCHIEF_MANAGED;
+    }
+    // click, hold: go to highest level (for ramping down)
+    else if (event == EV_click2_hold) {
+        if (ramp_style == 0) {
+            set_state(steady_state, ramp_smooth_ceil);
+        } else {
+            set_state(steady_state, ramp_discrete_ceil);
+        }
+        return MISCHIEF_MANAGED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+
+
+uint8_t steady_state(EventPtr event, uint16_t arg) {
+    uint8_t mode_min = ramp_smooth_floor;
+    uint8_t mode_max = ramp_smooth_ceil;
+    uint8_t ramp_step_size = 1;
+    if (ramp_style) {
+        mode_min = ramp_discrete_floor;
+        mode_max = ramp_discrete_ceil;
+        // TODO: Fixed-point for better precision
+        //ramp_step_size = ((1 + mode_max - mode_min)<<4) / (ramp_discrete_steps-1);
+        ramp_step_size = (1 + mode_max - mode_min) / (ramp_discrete_steps-1);
+    }
+
+    // turn LED on when we first enter the mode
+    if (event == EV_enter_state) {
+        // remember this level, unless it's moon or turbo
+        if ((arg > mode_min) && (arg < mode_max))
+            memorized_level = arg;
+        // use the requested level even if not memorized
+        #ifdef USE_THERMAL_REGULATION
+        target_level = arg;
+        #endif
+        set_level(arg);
+        return MISCHIEF_MANAGED;
+    }
+    // 1 click: off
+    else if (event == EV_1click) {
+        set_state(off_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    // 2 clicks: go to/from highest level
+    else if (event == EV_2clicks) {
+        if (actual_level < MAX_LEVEL) {
+            memorized_level = actual_level;  // in case we're on moon
+            #ifdef USE_THERMAL_REGULATION
+            target_level = MAX_LEVEL;
+            #endif
+            // true turbo, not the mode-specific ceiling
+            set_level(MAX_LEVEL);
+        }
+        else {
+            #ifdef USE_THERMAL_REGULATION
+            target_level = memorized_level;
+            #endif
+            set_level(memorized_level);
+        }
+        return MISCHIEF_MANAGED;
+    }
+    // 3 clicks: toggle smooth vs discrete ramping
+    else if (event == EV_3clicks) {
+        ramp_style ^= 1;
+        if (ramp_style) {
+            mode_min = ramp_discrete_floor;
+            mode_max = ramp_discrete_ceil;
+        } else {
+            mode_min = ramp_smooth_floor;
+            mode_max = ramp_smooth_ceil;
+        }
+        if (memorized_level < mode_min) memorized_level = mode_min;
+        if (memorized_level > mode_max) memorized_level = mode_max;
+        //save_config();
+        set_level(0);
+        delay_4ms(20/4);
+        set_level(memorized_level);
+        return MISCHIEF_MANAGED;
+    }
+    // 4 clicks: configure this ramp mode
+    else if (event == EV_4clicks) {
+        // TODO: implement this
+        return MISCHIEF_MANAGED;
+    }
+    // hold: change brightness (brighter)
+    else if (event == EV_click1_hold) {
+        // ramp slower in discrete mode
+        if (ramp_style  &&  (arg % HOLD_TIMEOUT != 0)) {
+            return MISCHIEF_MANAGED;
+        }
+        // TODO: make it ramp down instead, if already at max?
+        if (actual_level + ramp_step_size < mode_max)
+            memorized_level = actual_level + ramp_step_size;
+        else memorized_level = mode_max;
+        #ifdef USE_THERMAL_REGULATION
+        target_level = memorized_level;
+        #endif
+        // only blink once for each threshold
+        if ((memorized_level != actual_level)
+                && ((memorized_level == MAX_1x7135)
+                    || (memorized_level == mode_max))) {
+            set_level(0);
+            delay_4ms(8/4);
+        }
+        set_level(memorized_level);
+        return MISCHIEF_MANAGED;
+    }
+    // click, hold: change brightness (dimmer)
+    else if (event == EV_click2_hold) {
+        // ramp slower in discrete mode
+        if (ramp_style  &&  (arg % HOLD_TIMEOUT != 0)) {
+            return MISCHIEF_MANAGED;
+        }
+        // TODO: make it ramp up instead, if already at min?
+        // TODO: test what happens if I go to moon, switch to discrete mode
+        //       (with min configured for like 10), then try to ramp down
+        if (actual_level - mode_min > ramp_step_size)
+            memorized_level = (actual_level-ramp_step_size);
+        else
+            memorized_level = mode_min;
+        #ifdef USE_THERMAL_REGULATION
+        target_level = memorized_level;
+        #endif
+        // only blink once for each threshold
+        if ((memorized_level != actual_level)
+                && ((memorized_level == MAX_1x7135)
+                    || (memorized_level == mode_min))) {
+            set_level(0);
+            delay_4ms(8/4);
+        }
+        set_level(memorized_level);
+        return MISCHIEF_MANAGED;
+    }
+    #ifdef USE_THERMAL_REGULATION
+    // TODO: test this on a real light
+    // overheating: drop by an amount proportional to how far we are above the ceiling
+    else if (event == EV_temperature_high) {
+        if (actual_level > MAX_LEVEL/4) {
+            uint8_t stepdown = actual_level - arg;
+            if (stepdown < MAX_LEVEL/4) stepdown = MAX_LEVEL/4;
+            set_level(stepdown);
+        }
+        return MISCHIEF_MANAGED;
+    }
+    // underheating: increase slowly if we're lower than the target
+    //               (proportional to how low we are)
+    else if (event == EV_temperature_low) {
+        if (actual_level < target_level) {
+            uint8_t stepup = actual_level + (arg>>1);
+            if (stepup > target_level) stepup = target_level;
+            set_level(stepup);
+        }
+        return MISCHIEF_MANAGED;
+    }
+    #endif
+    return EVENT_NOT_HANDLED;
+}
+
+
+uint8_t strobe_state(EventPtr event, uint16_t arg) {
+    if (event == EV_enter_state) {
+        return MISCHIEF_MANAGED;
+    }
+    // 1 click: off
+    else if (event == EV_1click) {
+        set_state(off_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    // 2 clicks: toggle party strobe vs tactical strobe
+    else if (event == EV_2clicks) {
+        strobe_type ^= 1;
+        return MISCHIEF_MANAGED;
+    }
+    // 3 clicks: go back to regular modes
+    else if (event == EV_3clicks) {
+        set_state(steady_state, memorized_level);
+        return MISCHIEF_MANAGED;
+    }
+    // hold: change speed (go faster)
+    else if (event == EV_click1_hold) {
+        if ((arg & 1) == 0) {
+            if (strobe_delay > 8) strobe_delay --;
+        }
+        return MISCHIEF_MANAGED;
+    }
+    // click, hold: change speed (go slower)
+    else if (event == EV_click2_hold) {
+        if ((arg & 1) == 0) {
+            if (strobe_delay < 255) strobe_delay ++;
+        }
+        return MISCHIEF_MANAGED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+
+
+#ifdef USE_BATTCHECK
+uint8_t battcheck_state(EventPtr event, uint16_t arg) {
+    // 1 click: off
+    if (event == EV_1click) {
+        set_state(off_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    // 2 clicks: tempcheck mode
+    else if (event == EV_2clicks) {
+        set_state(tempcheck_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+
+uint8_t tempcheck_state(EventPtr event, uint16_t arg) {
+    // 1 click: off
+    if (event == EV_1click) {
+        set_state(off_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+#endif
+
+uint8_t lockout_state(EventPtr event, uint16_t arg) {
+    // conserve power while locked out
+    // (allow staying awake long enough to exit, but otherwise
+    //  be persistent about going back to sleep every few seconds
+    //  even if the user keeps pressing the button)
+    if (event == EV_tick) {
+        static uint8_t ticks_spent_awake = 0;
+        ticks_spent_awake ++;
+        if (ticks_spent_awake > 180) {
+            ticks_spent_awake = 0;
+            go_to_standby = 1;
+        }
+        return MISCHIEF_MANAGED;
+    }
+    // 5 clicks: exit
+    else if (event == EV_5clicks) {
+        blink_confirm(2);
+        set_state(off_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+
+
+void blink_confirm(uint8_t num) {
+    for (; num>0; num--) {
+        set_level(MAX_LEVEL/4);
+        delay_4ms(10/4);
+        set_level(0);
+        delay_4ms(100/4);
+    }
+}
+
+
+void low_voltage() {
+    // "step down" from strobe to something low
+    if (current_state == strobe_state) {
+        set_state(steady_state, RAMP_SIZE/6);
+    }
+    // in normal mode, step down by half or turn off
+    else if (current_state == steady_state) {
+        if (actual_level > 1) {
+            set_level(actual_level >> 1);
+        }
+        else {
+            set_state(off_state, 0);
+        }
+    }
+    // all other modes, just turn off when voltage is low
+    else {
+        set_state(off_state, 0);
+    }
+}
+
+
+void setup() {
+    set_level(RAMP_SIZE/8);
+    delay_4ms(3);
+    set_level(0);
+
+    push_state(off_state, 0);
+}
+
+
+void loop() {
+    // deferred "off" so we won't suspend in a weird state
+    // (like...  during the middle of a strobe pulse)
+    if (go_to_standby) {
+        go_to_standby = 0;
+        set_level(0);
+        standby_mode();
+    }
+
+    if (current_state == strobe_state) {
+        set_level(MAX_LEVEL);
+        if (strobe_type == 0) {  // party strobe
+            if (strobe_delay < 30) delay_zero();
+            else delay_ms(1);
+        } else {  //tactical strobe
+            nice_delay_ms(strobe_delay >> 1);
+        }
+        set_level(0);
+        nice_delay_ms(strobe_delay);
+    }
+    #ifdef USE_BATTCHECK
+    else if (current_state == battcheck_state) {
+        battcheck();
+    }
+    else if (current_state == tempcheck_state) {
+        blink_num(projected_temperature>>2);
+        nice_delay_ms(1000);
+    }
+    #endif
+}
diff --git a/spaghetti-monster/anduril.txt b/spaghetti-monster/anduril.txt
new file mode 100644
index 0000000..b046034
--- /dev/null
+++ b/spaghetti-monster/anduril.txt
@@ -0,0 +1,67 @@
+From off:
+  * 1 click: memorized level
+  * Hold: Lowest level then ramp up
+  * 2 clicks: turbo
+  * Click, hold: highest level then ramp down
+  * 3 clicks: strobe mode
+  * 4 clicks: battcheck mode
+  * 5 clicks: lock-out
+
+In steady mode:
+  * 1 click: off
+  * Hold: ramp up
+  * Click, hold: ramp down
+  * 2 clicks: to/from turbo
+  * 3 clicks: toggle smooth vs discrete ramping
+  - 4 clicks: configure current ramp
+
+Smooth ramp config mode:
+  - Setting 1: memory on/off
+  - Setting 2: low end
+  - Setting 3: high end
+
+Discrete ramp config mode:
+  - Setting 1: memory on/off
+  - Setting 2: low end
+  - Setting 3: high end
+  - Setting 4: number of levels
+
+Strobe mode:
+  * 1 click: off
+  * Hold: change speed (faster)
+  * Click, hold: change speed (slower)
+  + 2 clicks: next strobe mode
+    (party strobe, tactical strobe, random/police strobe?, bike flasher)
+
+Bike flasher:
+  - 1 click: off
+  - 2 clicks: party strobe
+  - Hold: brighter
+  - Click, hold: dimmer
+
+Battcheck mode:
+  * 1 click: off
+  * 2 clicks: tempcheck mode
+
+Tempcheck mode:
+  * 1 click: off
+  - 2 clicks: beacon mode
+  - Hold: thermal calibration
+
+Beacon mode:
+  - 1 click: off
+  - 2 clicks: battcheck mode
+  - Hold: brighter
+  - Click, hold: dimmer
+  - 3 clicks: configure time between pulses
+
+TODO:
+  - save settings in eeprom
+  - make memory toggle-able (discrete ramping)
+  - make lowest level configurable (smooth ramping)
+  - make highest level configurable (smooth ramping)
+  - make memory toggle-able (discrete ramping)
+  - make lowest level configurable (discrete ramping)
+  - make highest level configurable (discrete ramping)
+  - a way to blink out the firmware version?
+  - a way to configure indicator LED behavior?
-- 
cgit v1.2.3


From 6b77dc4fd594b174a578654ab1b3861953f47eb5 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sun, 27 Aug 2017 17:54:56 -0600
Subject: Added TICKS_PER_SECOND because it's handy to avoid hardcoding the WDT
 speed in UI code.

---
 spaghetti-monster/fsm-wdt.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/fsm-wdt.h b/spaghetti-monster/fsm-wdt.h
index d7c64f5..74851af 100644
--- a/spaghetti-monster/fsm-wdt.h
+++ b/spaghetti-monster/fsm-wdt.h
@@ -20,6 +20,8 @@
 #ifndef FSM_WDT_H
 #define FSM_WDT_H
 
+#define TICKS_PER_SECOND 62
+
 void WDT_on();
 inline void WDT_off();
 
-- 
cgit v1.2.3


From 827c580b82d6bd6652ca9a1a839bc8bd0b6ece91 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sun, 27 Aug 2017 17:58:06 -0600
Subject: Made discrete ramping to work significantly better. Added momentary
 mode.  Can only be exited by disconnecting power. Rearranged some mappings
 from off to other states.

---
 spaghetti-monster/anduril.c   | 99 ++++++++++++++++++++++++++++++++++---------
 spaghetti-monster/anduril.txt | 12 ++++--
 2 files changed, 89 insertions(+), 22 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril.c b/spaghetti-monster/anduril.c
index 96e45db..48cd3d9 100644
--- a/spaghetti-monster/anduril.c
+++ b/spaghetti-monster/anduril.c
@@ -29,7 +29,7 @@
 #define USE_BATTCHECK
 #define BATTCHECK_VpT
 #define RAMP_LENGTH 150
-#define MAX_CLICKS 5
+#define MAX_CLICKS 6
 #include "spaghetti-monster.h"
 
 // FSM states
@@ -41,6 +41,7 @@ uint8_t battcheck_state(EventPtr event, uint16_t arg);
 uint8_t tempcheck_state(EventPtr event, uint16_t arg);
 #endif
 uint8_t lockout_state(EventPtr event, uint16_t arg);
+uint8_t momentary_state(EventPtr event, uint16_t arg);
 
 void blink_confirm(uint8_t num);
 
@@ -51,9 +52,14 @@ uint8_t ramp_style = 0;  // 0 = smooth, 1 = discrete
 uint8_t ramp_smooth_floor = 1;
 uint8_t ramp_smooth_ceil = MAX_LEVEL;
 uint8_t ramp_discrete_floor = 20;
-uint8_t ramp_discrete_ceil = MAX_LEVEL-50;
+uint8_t ramp_discrete_ceil = MAX_LEVEL - 50;
 uint8_t ramp_discrete_steps = 7;
-uint8_t ramp_discrete_step_size;
+uint8_t ramp_discrete_step_size;  // don't set this
+
+// calculate the nearest ramp level which would be valid at the moment
+// (is a no-op for smooth ramp, but limits discrete ramp to only the
+// correct levels for the user's config)
+uint8_t nearest_level(uint8_t target);
 
 #ifdef USE_THERMAL_REGULATION
 // brightness before thermal step-down
@@ -109,24 +115,30 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
         }
         return MISCHIEF_MANAGED;
     }
-    // 3 clicks: strobe mode
-    else if (event == EV_3clicks) {
-        set_state(strobe_state, 0);
-        return MISCHIEF_MANAGED;
-    }
     #ifdef USE_BATTCHECK
-    // 4 clicks: battcheck mode
-    else if (event == EV_4clicks) {
+    // 3 clicks: battcheck mode
+    else if (event == EV_3clicks) {
         set_state(battcheck_state, 0);
         return MISCHIEF_MANAGED;
     }
     #endif
-    // 5 clicks: soft lockout
-    else if (event == EV_5clicks) {
+    // 4 clicks: soft lockout
+    else if (event == EV_4clicks) {
         blink_confirm(5);
         set_state(lockout_state, 0);
         return MISCHIEF_MANAGED;
     }
+    // 5 clicks: strobe mode
+    else if (event == EV_5clicks) {
+        set_state(strobe_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    // 6 clicks: momentary mode
+    else if (event == EV_6clicks) {
+        blink_confirm(1);
+        set_state(momentary_state, 0);
+        return MISCHIEF_MANAGED;
+    }
     // hold: go to lowest level
     else if (event == EV_click1_hold) {
         // don't start ramping immediately;
@@ -169,9 +181,7 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
     if (ramp_style) {
         mode_min = ramp_discrete_floor;
         mode_max = ramp_discrete_ceil;
-        // TODO: Fixed-point for better precision
-        //ramp_step_size = ((1 + mode_max - mode_min)<<4) / (ramp_discrete_steps-1);
-        ramp_step_size = (1 + mode_max - mode_min) / (ramp_discrete_steps-1);
+        ramp_step_size = ramp_discrete_step_size;
     }
 
     // turn LED on when we first enter the mode
@@ -183,7 +193,7 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         #ifdef USE_THERMAL_REGULATION
         target_level = arg;
         #endif
-        set_level(arg);
+        set_level(nearest_level(arg));
         return MISCHIEF_MANAGED;
     }
     // 1 click: off
@@ -224,7 +234,7 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         //save_config();
         set_level(0);
         delay_4ms(20/4);
-        set_level(memorized_level);
+        set_level(nearest_level(memorized_level));
         return MISCHIEF_MANAGED;
     }
     // 4 clicks: configure this ramp mode
@@ -242,6 +252,7 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         if (actual_level + ramp_step_size < mode_max)
             memorized_level = actual_level + ramp_step_size;
         else memorized_level = mode_max;
+        memorized_level = nearest_level(memorized_level);
         #ifdef USE_THERMAL_REGULATION
         target_level = memorized_level;
         #endif
@@ -268,6 +279,7 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
             memorized_level = (actual_level-ramp_step_size);
         else
             memorized_level = mode_min;
+        memorized_level = nearest_level(memorized_level);
         #ifdef USE_THERMAL_REGULATION
         target_level = memorized_level;
         #endif
@@ -383,8 +395,8 @@ uint8_t lockout_state(EventPtr event, uint16_t arg) {
         }
         return MISCHIEF_MANAGED;
     }
-    // 5 clicks: exit
-    else if (event == EV_5clicks) {
+    // 4 clicks: exit
+    else if (event == EV_4clicks) {
         blink_confirm(2);
         set_state(off_state, 0);
         return MISCHIEF_MANAGED;
@@ -393,6 +405,55 @@ uint8_t lockout_state(EventPtr event, uint16_t arg) {
 }
 
 
+uint8_t momentary_state(EventPtr event, uint16_t arg) {
+    if (event == EV_click1_press) {
+        set_level(memorized_level);
+        empty_event_sequence();  // don't attempt to parse multiple clicks
+        return MISCHIEF_MANAGED;
+    }
+
+    else if (event == EV_release) {
+        set_level(0);
+        empty_event_sequence();  // don't attempt to parse multiple clicks
+        //go_to_standby = 1;  // sleep while light is off
+        return MISCHIEF_MANAGED;
+    }
+
+    // Sleep, dammit!  (but wait a few seconds first)
+    // (because standby mode uses such little power that it can interfere
+    //  with exiting via tailcap loosen+tighten unless you leave power
+    //  disconnected for several seconds, so we want to be awake when that
+    //  happens to speed up the process)
+    else if ((event == EV_tick)  &&  (actual_level == 0)) {
+        if (arg > TICKS_PER_SECOND*15) {  // sleep after 15 seconds
+            go_to_standby = 1;  // sleep while light is off
+        }
+        return MISCHIEF_MANAGED;
+    }
+
+    return EVENT_NOT_HANDLED;
+}
+
+
+uint8_t nearest_level(uint8_t target) {
+    if (! ramp_style) return target;
+    if (target < ramp_discrete_floor) return ramp_discrete_floor;
+
+    uint8_t ramp_range = ramp_discrete_ceil - ramp_discrete_floor;
+    ramp_discrete_step_size = ramp_range / (ramp_discrete_steps-1);
+    uint8_t this_level = ramp_discrete_floor;
+
+    for(uint8_t i=0; i<ramp_discrete_steps; i++) {
+        this_level = ramp_discrete_floor + (i * (uint16_t)ramp_range / (ramp_discrete_steps-1));
+        int8_t diff = target - this_level;
+        if (diff < 0) diff = -diff;
+        if (diff <= (ramp_discrete_step_size>>1))
+            return this_level;
+    }
+    return this_level;
+}
+
+
 void blink_confirm(uint8_t num) {
     for (; num>0; num--) {
         set_level(MAX_LEVEL/4);
diff --git a/spaghetti-monster/anduril.txt b/spaghetti-monster/anduril.txt
index b046034..c391691 100644
--- a/spaghetti-monster/anduril.txt
+++ b/spaghetti-monster/anduril.txt
@@ -3,9 +3,10 @@ From off:
   * Hold: Lowest level then ramp up
   * 2 clicks: turbo
   * Click, hold: highest level then ramp down
-  * 3 clicks: strobe mode
-  * 4 clicks: battcheck mode
-  * 5 clicks: lock-out
+  * 3 clicks: battcheck mode
+  * 4 clicks: lock-out
+  * 5 clicks: strobe mode
+  + 6 clicks: momentary mode (disconnect power to exit)
 
 In steady mode:
   * 1 click: off
@@ -55,6 +56,11 @@ Beacon mode:
   - Click, hold: dimmer
   - 3 clicks: configure time between pulses
 
+Momentary mode:
+  * Press button: Light on (at memorized level).
+  * Release button: Light off.
+  * To exit, disconnect power.  (loosen/tighten the tailcap)
+
 TODO:
   - save settings in eeprom
   - make memory toggle-able (discrete ramping)
-- 
cgit v1.2.3


From 58c7c6d1f490d6a8934e50130d791e692866b07c Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sun, 27 Aug 2017 18:22:28 -0600
Subject: Reduced ROM size, simplified logic, made sure discrete ramp won't
 overflow outside uint8_t range.

---
 spaghetti-monster/anduril.c | 80 +++++++++++++++------------------------------
 1 file changed, 27 insertions(+), 53 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril.c b/spaghetti-monster/anduril.c
index 48cd3d9..94b3139 100644
--- a/spaghetti-monster/anduril.c
+++ b/spaghetti-monster/anduril.c
@@ -53,13 +53,13 @@ uint8_t ramp_smooth_floor = 1;
 uint8_t ramp_smooth_ceil = MAX_LEVEL;
 uint8_t ramp_discrete_floor = 20;
 uint8_t ramp_discrete_ceil = MAX_LEVEL - 50;
-uint8_t ramp_discrete_steps = 7;
+uint8_t ramp_discrete_steps = 3;
 uint8_t ramp_discrete_step_size;  // don't set this
 
 // calculate the nearest ramp level which would be valid at the moment
 // (is a no-op for smooth ramp, but limits discrete ramp to only the
 // correct levels for the user's config)
-uint8_t nearest_level(uint8_t target);
+uint8_t nearest_level(int16_t target);
 
 #ifdef USE_THERMAL_REGULATION
 // brightness before thermal step-down
@@ -84,16 +84,12 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
     }
     // hold (initially): go to lowest level, but allow abort for regular click
     else if (event == EV_click1_press) {
-        if (ramp_style == 0) {
-            set_level(ramp_smooth_floor);
-        } else {
-            set_level(ramp_discrete_floor);
-        }
+        set_level(nearest_level(1));
         return MISCHIEF_MANAGED;
     }
     // 1 click (before timeout): go to memorized level, but allow abort for double click
     else if (event == EV_click1_release) {
-        set_level(memorized_level);
+        set_level(nearest_level(memorized_level));
         return MISCHIEF_MANAGED;
     }
     // 1 click: regular mode
@@ -108,11 +104,7 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
     }
     // 2 clicks: highest mode
     else if (event == EV_2clicks) {
-        if (ramp_style == 0) {
-            set_state(steady_state, ramp_smooth_ceil);
-        } else {
-            set_state(steady_state, ramp_discrete_ceil);
-        }
+        set_level(nearest_level(MAX_LEVEL));
         return MISCHIEF_MANAGED;
     }
     #ifdef USE_BATTCHECK
@@ -144,30 +136,18 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
         // don't start ramping immediately;
         // give the user time to release at moon level
         if (arg >= HOLD_TIMEOUT) {
-            if (ramp_style == 0) {
-                set_state(steady_state, ramp_smooth_floor);
-            } else {
-                set_state(steady_state, ramp_discrete_floor);
-            }
+            set_state(steady_state, 1);
         }
         return MISCHIEF_MANAGED;
     }
     // hold, release quickly: go to lowest level
     else if (event == EV_click1_hold_release) {
-        if (ramp_style == 0) {
-            set_state(steady_state, ramp_smooth_floor);
-        } else {
-            set_state(steady_state, ramp_discrete_floor);
-        }
+        set_state(steady_state, 1);
         return MISCHIEF_MANAGED;
     }
     // click, hold: go to highest level (for ramping down)
     else if (event == EV_click2_hold) {
-        if (ramp_style == 0) {
-            set_state(steady_state, ramp_smooth_ceil);
-        } else {
-            set_state(steady_state, ramp_discrete_ceil);
-        }
+        set_state(steady_state, MAX_LEVEL);
         return MISCHIEF_MANAGED;
     }
     return EVENT_NOT_HANDLED;
@@ -222,19 +202,11 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
     // 3 clicks: toggle smooth vs discrete ramping
     else if (event == EV_3clicks) {
         ramp_style ^= 1;
-        if (ramp_style) {
-            mode_min = ramp_discrete_floor;
-            mode_max = ramp_discrete_ceil;
-        } else {
-            mode_min = ramp_smooth_floor;
-            mode_max = ramp_smooth_ceil;
-        }
-        if (memorized_level < mode_min) memorized_level = mode_min;
-        if (memorized_level > mode_max) memorized_level = mode_max;
+        memorized_level = nearest_level(memorized_level);
         //save_config();
         set_level(0);
         delay_4ms(20/4);
-        set_level(nearest_level(memorized_level));
+        set_level(memorized_level);
         return MISCHIEF_MANAGED;
     }
     // 4 clicks: configure this ramp mode
@@ -248,11 +220,8 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         if (ramp_style  &&  (arg % HOLD_TIMEOUT != 0)) {
             return MISCHIEF_MANAGED;
         }
-        // TODO: make it ramp down instead, if already at max?
-        if (actual_level + ramp_step_size < mode_max)
-            memorized_level = actual_level + ramp_step_size;
-        else memorized_level = mode_max;
-        memorized_level = nearest_level(memorized_level);
+        // TODO? make it ramp down instead, if already at max?
+        memorized_level = nearest_level((int16_t)actual_level + ramp_step_size);
         #ifdef USE_THERMAL_REGULATION
         target_level = memorized_level;
         #endif
@@ -272,14 +241,8 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         if (ramp_style  &&  (arg % HOLD_TIMEOUT != 0)) {
             return MISCHIEF_MANAGED;
         }
-        // TODO: make it ramp up instead, if already at min?
-        // TODO: test what happens if I go to moon, switch to discrete mode
-        //       (with min configured for like 10), then try to ramp down
-        if (actual_level - mode_min > ramp_step_size)
-            memorized_level = (actual_level-ramp_step_size);
-        else
-            memorized_level = mode_min;
-        memorized_level = nearest_level(memorized_level);
+        // TODO? make it ramp up instead, if already at min?
+        memorized_level = nearest_level((int16_t)actual_level - ramp_step_size);
         #ifdef USE_THERMAL_REGULATION
         target_level = memorized_level;
         #endif
@@ -435,9 +398,20 @@ uint8_t momentary_state(EventPtr event, uint16_t arg) {
 }
 
 
-uint8_t nearest_level(uint8_t target) {
+uint8_t nearest_level(int16_t target) {
+    // bounds check
+    // using int16_t here saves us a bunch of logic elsewhere,
+    // by allowing us to correct for numbers < 0 or > 255 in one central place
+    uint8_t mode_min = ramp_smooth_floor;
+    uint8_t mode_max = ramp_smooth_ceil;
+    if (ramp_style) {
+        mode_min = ramp_discrete_floor;
+        mode_max = ramp_discrete_ceil;
+    }
+    if (target < mode_min) return mode_min;
+    if (target > mode_max) return mode_max;
+    // the rest isn't relevant for smooth ramping
     if (! ramp_style) return target;
-    if (target < ramp_discrete_floor) return ramp_discrete_floor;
 
     uint8_t ramp_range = ramp_discrete_ceil - ramp_discrete_floor;
     ramp_discrete_step_size = ramp_range / (ramp_discrete_steps-1);
-- 
cgit v1.2.3


From dce497bf15799133bf336ab46c3e39d7b0d92839 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sun, 27 Aug 2017 19:40:40 -0600
Subject: Ramp config mode actually works now... Added EV_reenter_state event
 to indicate an obscuring state was popped off the stack and the underlying
 one is now on top again.

---
 spaghetti-monster/anduril.c    | 181 +++++++++++++++++++++++++++++++++++++++--
 spaghetti-monster/fsm-events.h |  22 +++--
 spaghetti-monster/fsm-states.c |  13 +--
 spaghetti-monster/fsm-states.h |   3 +-
 4 files changed, 196 insertions(+), 23 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril.c b/spaghetti-monster/anduril.c
index 94b3139..0123ce0 100644
--- a/spaghetti-monster/anduril.c
+++ b/spaghetti-monster/anduril.c
@@ -42,18 +42,23 @@ uint8_t tempcheck_state(EventPtr event, uint16_t arg);
 #endif
 uint8_t lockout_state(EventPtr event, uint16_t arg);
 uint8_t momentary_state(EventPtr event, uint16_t arg);
+uint8_t ramp_config_mode(EventPtr event, uint16_t arg);
+uint8_t number_entry_state(EventPtr event, uint16_t arg);
+
+// return value from number_entry_state()
+volatile uint8_t number_entry_value;
 
 void blink_confirm(uint8_t num);
 
 // brightness control
 uint8_t memorized_level = MAX_1x7135;
 // smooth vs discrete ramping
-uint8_t ramp_style = 0;  // 0 = smooth, 1 = discrete
-uint8_t ramp_smooth_floor = 1;
-uint8_t ramp_smooth_ceil = MAX_LEVEL;
-uint8_t ramp_discrete_floor = 20;
-uint8_t ramp_discrete_ceil = MAX_LEVEL - 50;
-uint8_t ramp_discrete_steps = 3;
+volatile uint8_t ramp_style = 0;  // 0 = smooth, 1 = discrete
+volatile uint8_t ramp_smooth_floor = 1;
+volatile uint8_t ramp_smooth_ceil = MAX_LEVEL;
+volatile uint8_t ramp_discrete_floor = 20;
+volatile uint8_t ramp_discrete_ceil = MAX_LEVEL - 50;
+volatile uint8_t ramp_discrete_steps = 3;
 uint8_t ramp_discrete_step_size;  // don't set this
 
 // calculate the nearest ramp level which would be valid at the moment
@@ -211,7 +216,7 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
     }
     // 4 clicks: configure this ramp mode
     else if (event == EV_4clicks) {
-        // TODO: implement this
+        set_state(ramp_config_mode, 0);
         return MISCHIEF_MANAGED;
     }
     // hold: change brightness (brighter)
@@ -398,6 +403,168 @@ uint8_t momentary_state(EventPtr event, uint16_t arg) {
 }
 
 
+uint8_t ramp_config_mode(EventPtr event, uint16_t arg) {
+    //static uint8_t new_floor;
+    //static uint8_t new_ceil;
+    //static uint8_t new_num_steps;
+    static uint8_t config_step;
+    static uint8_t num_config_steps;
+    if (event == EV_enter_state) {
+        config_step = 0;
+        if (ramp_style) {
+            //new_floor = ramp_discrete_floor;
+            //new_ceil = ramp_discrete_ceil;
+            //new_num_steps = ramp_discrete_steps;
+            num_config_steps = 3;
+        }
+        else {
+            //new_floor = ramp_smooth_floor;
+            //new_ceil = ramp_smooth_ceil;
+            num_config_steps = 2;
+        }
+        return MISCHIEF_MANAGED;
+    }
+    // advance forward through config steps
+    else if (event == EV_tick) {
+        if (config_step < num_config_steps) {
+            //config_step ++;
+            push_state(number_entry_state, config_step + 1);
+            /*
+            switch (config_step) {
+                // set the floor value
+                case 0:
+                    push_state(number_entry_state, 1);
+                    break;
+                // set the ceiling value
+                case 1:
+                    push_state(number_entry_state, 2);
+                    break;
+                // set the number of steps (discrete ramp only)
+                case 2:
+                    push_state(number_entry_state, 3);
+                    break;
+            }
+            */
+        }
+        else {
+            // TODO: save_config();
+            // TODO: blink out some sort of success pattern
+            // return to steady mode
+            set_state(steady_state, memorized_level);
+        }
+        return MISCHIEF_MANAGED;
+    }
+    // an option was set (return from number_entry_state)
+    else if (event == EV_reenter_state) {
+        #if 0
+        // FIXME? this is a kludge which relies on the vars being consecutive
+        // in RAM and in the same order as declared
+        // ... and it doesn't work; it seems they're not consecutive  :(
+        volatile uint8_t *dest;
+        if (ramp_style) dest = (&ramp_discrete_floor) + config_step;
+        else dest = (&ramp_smooth_floor) + config_step;
+        if (number_entry_value)
+            *dest = number_entry_value;
+        #else
+        switch (config_step) {
+            case 0:
+                if (number_entry_value) {
+                    if (ramp_style) ramp_discrete_floor = number_entry_value;
+                    else ramp_smooth_floor = number_entry_value;
+                }
+                break;
+            case 1:
+                if (number_entry_value) {
+                    if (ramp_style) ramp_discrete_ceil = MAX_LEVEL + 1 - number_entry_value;
+                    else ramp_smooth_ceil = MAX_LEVEL + 1 - number_entry_value;
+                }
+                break;
+            case 2:
+                if (number_entry_value)
+                    ramp_discrete_steps = number_entry_value;
+                break;
+        }
+        #endif
+        config_step ++;
+        /* handled at next EV_tick
+        if (config_step > num_config_steps) {
+            // TODO: save_config();
+            // exit config mode
+            set_state(steady_state, memorized_level);
+        }
+        */
+        return MISCHIEF_MANAGED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+
+
+uint8_t number_entry_state(EventPtr event, uint16_t arg) {
+    static uint8_t value;
+    static uint8_t blinks_left;
+    static uint8_t init_completed;
+    static uint16_t wait_ticks;
+    if (event == EV_enter_state) {
+        value = 0;
+        blinks_left = arg;
+        init_completed = 0;
+        wait_ticks = 0;
+        // TODO: blink out the 'arg' to show which option this is
+        return MISCHIEF_MANAGED;
+    }
+    else if (event == EV_tick) {
+        // blink out the option number
+        if (! init_completed) {
+            if (blinks_left) {
+                if ((arg & 31) == 10) {
+                    set_level(RAMP_SIZE/4);
+                }
+                else if ((arg & 31) == 20) {
+                    set_level(0);
+                }
+                else if ((arg & 31) == 31) {
+                    blinks_left --;
+                }
+            }
+            else {
+                init_completed = 1;
+                wait_ticks = 0;
+            }
+        }
+        else {  // buzz while waiting for a number to be entered
+            wait_ticks ++;
+            // buzz for N seconds after last event
+            if ((arg & 3) == 0) {
+                set_level(RAMP_SIZE/6);
+            }
+            else if ((arg & 3) == 2) {
+                set_level(RAMP_SIZE/8);
+            }
+            // time out after 4 seconds
+            if (wait_ticks > TICKS_PER_SECOND*4) {
+                number_entry_value = value;
+                set_level(0);
+                pop_state();
+            }
+        }
+        return MISCHIEF_MANAGED;
+    }
+    // count clicks
+    else if (event == EV_click1_release) {
+        value ++;
+        //number_entry_value = value;
+        wait_ticks = 0;
+        empty_event_sequence();
+        // flash briefly
+        set_level(RAMP_SIZE/2);
+        delay_4ms(8/2);
+        set_level(0);
+        return MISCHIEF_MANAGED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+
+
 uint8_t nearest_level(int16_t target) {
     // bounds check
     // using int16_t here saves us a bunch of logic elsewhere,
diff --git a/spaghetti-monster/fsm-events.h b/spaghetti-monster/fsm-events.h
index 114ccc4..e3edc77 100644
--- a/spaghetti-monster/fsm-events.h
+++ b/spaghetti-monster/fsm-events.h
@@ -51,17 +51,18 @@ static volatile uint16_t ticks_since_last_event = 0;
 
 #define A_ENTER_STATE     1
 #define A_LEAVE_STATE     2
-#define A_TICK            3
-#define A_PRESS           4
-#define A_HOLD            5
-#define A_RELEASE         6
-#define A_RELEASE_TIMEOUT 7
+#define A_REENTER_STATE   3
+#define A_TICK            4
+#define A_PRESS           5
+#define A_HOLD            6
+#define A_RELEASE         7
+#define A_RELEASE_TIMEOUT 8
 // TODO: add events for over/under-heat conditions (with parameter for severity)
-#define A_OVERHEATING     8
-#define A_UNDERHEATING    9
+#define A_OVERHEATING     9
+#define A_UNDERHEATING    10
 // TODO: add events for low voltage conditions
-#define A_VOLTAGE_LOW     10
-//#define A_VOLTAGE_CRITICAL 11
+#define A_VOLTAGE_LOW     11
+//#define A_VOLTAGE_CRITICAL 12
 #define A_DEBUG           255  // test event for debugging
 
 // Event types
@@ -74,6 +75,9 @@ Event EV_enter_state[] = {
 Event EV_leave_state[] = {
     A_LEAVE_STATE,
     0 } ;
+Event EV_reenter_state[] = {
+    A_REENTER_STATE,
+    0 } ;
 Event EV_tick[] = {
     A_TICK,
     0 } ;
diff --git a/spaghetti-monster/fsm-states.c b/spaghetti-monster/fsm-states.c
index ec24dc8..2939475 100644
--- a/spaghetti-monster/fsm-states.c
+++ b/spaghetti-monster/fsm-states.c
@@ -31,13 +31,14 @@
 //       255: error (not sure what this would even mean though, or what difference it would make)
 // TODO: function to call stacked callbacks until one returns "handled"
 
-void _set_state(StatePtr new_state, uint16_t arg) {
+void _set_state(StatePtr new_state, uint16_t arg,
+                EventPtr exit_event, EventPtr enter_event) {
     // call old state-exit hook (don't use stack)
-    if (current_state != NULL) current_state(EV_leave_state, arg);
+    if (current_state != NULL) current_state(exit_event, arg);
     // set new state
     current_state = new_state;
     // call new state-enter hook (don't use stack)
-    if (new_state != NULL) current_state(EV_enter_state, arg);
+    if (new_state != NULL) current_state(enter_event, arg);
 }
 
 int8_t push_state(StatePtr new_state, uint16_t arg) {
@@ -46,7 +47,8 @@ int8_t push_state(StatePtr new_state, uint16_t arg) {
         //       new hook for non-exit recursion into child?
         state_stack[state_stack_len] = new_state;
         state_stack_len ++;
-        _set_state(new_state, arg);
+        // FIXME: use EV_stacked_state?
+        _set_state(new_state, arg, EV_leave_state, EV_enter_state);
         return state_stack_len;
     } else {
         // TODO: um...  how is a flashlight supposed to handle a recursion depth error?
@@ -66,8 +68,7 @@ StatePtr pop_state() {
         new_state = state_stack[state_stack_len-1];
     }
     // FIXME: what should 'arg' be?
-    // FIXME: do we need a EV_reenter_state?
-    _set_state(new_state, 0);
+    _set_state(new_state, 0, EV_leave_state, EV_reenter_state);
     return old_state;
 }
 
diff --git a/spaghetti-monster/fsm-states.h b/spaghetti-monster/fsm-states.h
index 0daf915..f92abba 100644
--- a/spaghetti-monster/fsm-states.h
+++ b/spaghetti-monster/fsm-states.h
@@ -35,7 +35,8 @@ volatile StatePtr current_state;
 StatePtr state_stack[STATE_STACK_SIZE];
 uint8_t state_stack_len = 0;
 
-void _set_state(StatePtr new_state, uint16_t arg);
+void _set_state(StatePtr new_state, uint16_t arg,
+                EventPtr exit_event, EventPtr enter_event);
 int8_t push_state(StatePtr new_state, uint16_t arg);
 StatePtr pop_state();
 uint8_t set_state(StatePtr new_state, uint16_t arg);
-- 
cgit v1.2.3


From 898061b52a7aa75269327b65e41ea65054bd5b6c Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sun, 27 Aug 2017 20:03:09 -0600
Subject: Made ramp config mode significantly easier to use. Added delays
 around each step. Fixed wrong number of blinks for each option.

---
 spaghetti-monster/anduril.c   | 89 +++++++++++++++++++++----------------------
 spaghetti-monster/anduril.txt | 20 ++++------
 2 files changed, 50 insertions(+), 59 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril.c b/spaghetti-monster/anduril.c
index 0123ce0..0b4241d 100644
--- a/spaghetti-monster/anduril.c
+++ b/spaghetti-monster/anduril.c
@@ -404,47 +404,23 @@ uint8_t momentary_state(EventPtr event, uint16_t arg) {
 
 
 uint8_t ramp_config_mode(EventPtr event, uint16_t arg) {
-    //static uint8_t new_floor;
-    //static uint8_t new_ceil;
-    //static uint8_t new_num_steps;
     static uint8_t config_step;
     static uint8_t num_config_steps;
     if (event == EV_enter_state) {
         config_step = 0;
         if (ramp_style) {
-            //new_floor = ramp_discrete_floor;
-            //new_ceil = ramp_discrete_ceil;
-            //new_num_steps = ramp_discrete_steps;
             num_config_steps = 3;
         }
         else {
-            //new_floor = ramp_smooth_floor;
-            //new_ceil = ramp_smooth_ceil;
             num_config_steps = 2;
         }
+        set_level(0);
         return MISCHIEF_MANAGED;
     }
     // advance forward through config steps
     else if (event == EV_tick) {
         if (config_step < num_config_steps) {
-            //config_step ++;
             push_state(number_entry_state, config_step + 1);
-            /*
-            switch (config_step) {
-                // set the floor value
-                case 0:
-                    push_state(number_entry_state, 1);
-                    break;
-                // set the ceiling value
-                case 1:
-                    push_state(number_entry_state, 2);
-                    break;
-                // set the number of steps (discrete ramp only)
-                case 2:
-                    push_state(number_entry_state, 3);
-                    break;
-            }
-            */
         }
         else {
             // TODO: save_config();
@@ -502,63 +478,84 @@ uint8_t ramp_config_mode(EventPtr event, uint16_t arg) {
 uint8_t number_entry_state(EventPtr event, uint16_t arg) {
     static uint8_t value;
     static uint8_t blinks_left;
-    static uint8_t init_completed;
+    static uint8_t entry_step;
     static uint16_t wait_ticks;
     if (event == EV_enter_state) {
         value = 0;
         blinks_left = arg;
-        init_completed = 0;
+        entry_step = 0;
         wait_ticks = 0;
         // TODO: blink out the 'arg' to show which option this is
         return MISCHIEF_MANAGED;
     }
+    // advance through the process:
+    // 0: wait a moment
+    // 1: blink out the 'arg' value
+    // 2: wait a moment
+    // 3: "buzz" while counting clicks
+    // 4: save and exit
     else if (event == EV_tick) {
+        // wait a moment
+        if ((entry_step == 0) || (entry_step == 2)) {
+            if (wait_ticks < TICKS_PER_SECOND/2)
+                wait_ticks ++;
+            else {
+                entry_step ++;
+                wait_ticks = 0;
+            }
+        }
         // blink out the option number
-        if (! init_completed) {
+        else if (entry_step == 1) {
             if (blinks_left) {
-                if ((arg & 31) == 10) {
+                if ((wait_ticks & 31) == 10) {
                     set_level(RAMP_SIZE/4);
                 }
-                else if ((arg & 31) == 20) {
+                else if ((wait_ticks & 31) == 20) {
                     set_level(0);
                 }
-                else if ((arg & 31) == 31) {
+                else if ((wait_ticks & 31) == 31) {
                     blinks_left --;
                 }
+                wait_ticks ++;
             }
             else {
-                init_completed = 1;
+                entry_step ++;
                 wait_ticks = 0;
             }
         }
-        else {  // buzz while waiting for a number to be entered
+        else if (entry_step == 3) {  // buzz while waiting for a number to be entered
             wait_ticks ++;
             // buzz for N seconds after last event
-            if ((arg & 3) == 0) {
+            if ((wait_ticks & 3) == 0) {
                 set_level(RAMP_SIZE/6);
             }
-            else if ((arg & 3) == 2) {
+            else if ((wait_ticks & 3) == 2) {
                 set_level(RAMP_SIZE/8);
             }
-            // time out after 4 seconds
-            if (wait_ticks > TICKS_PER_SECOND*4) {
-                number_entry_value = value;
+            // time out after 3 seconds
+            if (wait_ticks > TICKS_PER_SECOND*3) {
+                //number_entry_value = value;
                 set_level(0);
-                pop_state();
+                entry_step ++;
             }
         }
+        else if (entry_step == 4) {
+            number_entry_value = value;
+            pop_state();
+        }
         return MISCHIEF_MANAGED;
     }
     // count clicks
     else if (event == EV_click1_release) {
-        value ++;
-        //number_entry_value = value;
-        wait_ticks = 0;
         empty_event_sequence();
-        // flash briefly
-        set_level(RAMP_SIZE/2);
-        delay_4ms(8/2);
-        set_level(0);
+        if (entry_step == 3) {  // only count during the "buzz"
+            value ++;
+            wait_ticks = 0;
+            // flash briefly
+            set_level(RAMP_SIZE/2);
+            delay_4ms(8/2);
+            set_level(0);
+        }
         return MISCHIEF_MANAGED;
     }
     return EVENT_NOT_HANDLED;
diff --git a/spaghetti-monster/anduril.txt b/spaghetti-monster/anduril.txt
index c391691..97f13fa 100644
--- a/spaghetti-monster/anduril.txt
+++ b/spaghetti-monster/anduril.txt
@@ -6,7 +6,7 @@ From off:
   * 3 clicks: battcheck mode
   * 4 clicks: lock-out
   * 5 clicks: strobe mode
-  + 6 clicks: momentary mode (disconnect power to exit)
+  * 6 clicks: momentary mode (disconnect power to exit)
 
 In steady mode:
   * 1 click: off
@@ -14,18 +14,18 @@ In steady mode:
   * Click, hold: ramp down
   * 2 clicks: to/from turbo
   * 3 clicks: toggle smooth vs discrete ramping
-  - 4 clicks: configure current ramp
+  * 4 clicks: configure current ramp
 
 Smooth ramp config mode:
   - Setting 1: memory on/off
-  - Setting 2: low end
-  - Setting 3: high end
+  * Setting 2: low end
+  * Setting 3: high end
 
 Discrete ramp config mode:
   - Setting 1: memory on/off
-  - Setting 2: low end
-  - Setting 3: high end
-  - Setting 4: number of levels
+  * Setting 2: low end
+  * Setting 3: high end
+  * Setting 4: number of levels
 
 Strobe mode:
   * 1 click: off
@@ -63,11 +63,5 @@ Momentary mode:
 
 TODO:
   - save settings in eeprom
-  - make memory toggle-able (discrete ramping)
-  - make lowest level configurable (smooth ramping)
-  - make highest level configurable (smooth ramping)
-  - make memory toggle-able (discrete ramping)
-  - make lowest level configurable (discrete ramping)
-  - make highest level configurable (discrete ramping)
   - a way to blink out the firmware version?
   - a way to configure indicator LED behavior?
-- 
cgit v1.2.3


From 916c212ce6c8abdcedf11cbea8c1ab1d58609969 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sun, 27 Aug 2017 20:25:00 -0600
Subject: Now remembers ramp and strobe settings after battery change. Also,
 set new defaults for ramping:   - ~50% power maximum   - 0.3 lm min for
 smooth ramping, 10 lm min for discrete ramping

---
 spaghetti-monster/anduril.c   | 65 +++++++++++++++++++++++++++++++------------
 spaghetti-monster/anduril.txt |  2 +-
 2 files changed, 48 insertions(+), 19 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril.c b/spaghetti-monster/anduril.c
index 0b4241d..fc6805c 100644
--- a/spaghetti-monster/anduril.c
+++ b/spaghetti-monster/anduril.c
@@ -30,6 +30,8 @@
 #define BATTCHECK_VpT
 #define RAMP_LENGTH 150
 #define MAX_CLICKS 6
+#define USE_EEPROM
+#define EEPROM_BYTES 8
 #include "spaghetti-monster.h"
 
 // FSM states
@@ -50,15 +52,18 @@ volatile uint8_t number_entry_value;
 
 void blink_confirm(uint8_t num);
 
+void load_config();
+void save_config();
+
 // brightness control
 uint8_t memorized_level = MAX_1x7135;
 // smooth vs discrete ramping
 volatile uint8_t ramp_style = 0;  // 0 = smooth, 1 = discrete
 volatile uint8_t ramp_smooth_floor = 1;
-volatile uint8_t ramp_smooth_ceil = MAX_LEVEL;
-volatile uint8_t ramp_discrete_floor = 20;
-volatile uint8_t ramp_discrete_ceil = MAX_LEVEL - 50;
-volatile uint8_t ramp_discrete_steps = 3;
+volatile uint8_t ramp_smooth_ceil = MAX_LEVEL - 30;
+volatile uint8_t ramp_discrete_floor = 15;
+volatile uint8_t ramp_discrete_ceil = MAX_LEVEL - 30;
+volatile uint8_t ramp_discrete_steps = 5;
 uint8_t ramp_discrete_step_size;  // don't set this
 
 // calculate the nearest ramp level which would be valid at the moment
@@ -208,7 +213,7 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
     else if (event == EV_3clicks) {
         ramp_style ^= 1;
         memorized_level = nearest_level(memorized_level);
-        //save_config();
+        save_config();
         set_level(0);
         delay_4ms(20/4);
         set_level(memorized_level);
@@ -299,11 +304,7 @@ uint8_t strobe_state(EventPtr event, uint16_t arg) {
     // 2 clicks: toggle party strobe vs tactical strobe
     else if (event == EV_2clicks) {
         strobe_type ^= 1;
-        return MISCHIEF_MANAGED;
-    }
-    // 3 clicks: go back to regular modes
-    else if (event == EV_3clicks) {
-        set_state(steady_state, memorized_level);
+        save_config();
         return MISCHIEF_MANAGED;
     }
     // hold: change speed (go faster)
@@ -320,6 +321,12 @@ uint8_t strobe_state(EventPtr event, uint16_t arg) {
         }
         return MISCHIEF_MANAGED;
     }
+    // release hold: save new strobe speed
+    else if ((event == EV_click1_hold_release)
+          || (event == EV_click2_hold_release)) {
+        save_config();
+        return MISCHIEF_MANAGED;
+    }
     return EVENT_NOT_HANDLED;
 }
 
@@ -423,7 +430,7 @@ uint8_t ramp_config_mode(EventPtr event, uint16_t arg) {
             push_state(number_entry_state, config_step + 1);
         }
         else {
-            // TODO: save_config();
+            save_config();
             // TODO: blink out some sort of success pattern
             // return to steady mode
             set_state(steady_state, memorized_level);
@@ -462,13 +469,6 @@ uint8_t ramp_config_mode(EventPtr event, uint16_t arg) {
         }
         #endif
         config_step ++;
-        /* handled at next EV_tick
-        if (config_step > num_config_steps) {
-            // TODO: save_config();
-            // exit config mode
-            set_state(steady_state, memorized_level);
-        }
-        */
         return MISCHIEF_MANAGED;
     }
     return EVENT_NOT_HANDLED;
@@ -602,6 +602,33 @@ void blink_confirm(uint8_t num) {
 }
 
 
+void load_config() {
+    if (load_eeprom()) {
+        ramp_style = eeprom[0];
+        ramp_smooth_floor = eeprom[1];
+        ramp_smooth_ceil = eeprom[2];
+        ramp_discrete_floor = eeprom[3];
+        ramp_discrete_ceil = eeprom[4];
+        ramp_discrete_steps = eeprom[5];
+        strobe_type = eeprom[6];
+        strobe_delay = eeprom[7];
+    }
+}
+
+void save_config() {
+    eeprom[0] = ramp_style;
+    eeprom[1] = ramp_smooth_floor;
+    eeprom[2] = ramp_smooth_ceil;
+    eeprom[3] = ramp_discrete_floor;
+    eeprom[4] = ramp_discrete_ceil;
+    eeprom[5] = ramp_discrete_steps;
+    eeprom[6] = strobe_type;
+    eeprom[7] = strobe_delay;
+
+    save_eeprom();
+}
+
+
 void low_voltage() {
     // "step down" from strobe to something low
     if (current_state == strobe_state) {
@@ -628,6 +655,8 @@ void setup() {
     delay_4ms(3);
     set_level(0);
 
+    load_config();
+
     push_state(off_state, 0);
 }
 
diff --git a/spaghetti-monster/anduril.txt b/spaghetti-monster/anduril.txt
index 97f13fa..28d27f9 100644
--- a/spaghetti-monster/anduril.txt
+++ b/spaghetti-monster/anduril.txt
@@ -62,6 +62,6 @@ Momentary mode:
   * To exit, disconnect power.  (loosen/tighten the tailcap)
 
 TODO:
-  - save settings in eeprom
+  * save settings in eeprom
   - a way to blink out the firmware version?
   - a way to configure indicator LED behavior?
-- 
cgit v1.2.3


From a1dd029c3fb0782c67a5fec372e5cfb588d7e216 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sun, 27 Aug 2017 20:34:02 -0600
Subject: Adjusted default 2-channel 150-step ramp to start at 1/255. (this
 makes the newly-configurable moon mode able to work on pretty much any
 hardware)

---
 spaghetti-monster/fsm-ramping.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/fsm-ramping.h b/spaghetti-monster/fsm-ramping.h
index a25ff8b..b4054bf 100644
--- a/spaghetti-monster/fsm-ramping.h
+++ b/spaghetti-monster/fsm-ramping.h
@@ -54,7 +54,12 @@ volatile uint8_t actual_level = 0;
     #define MAX_1x7135 33
   #elif RAMP_LENGTH == 150
     // ../../bin/level_calc.py 2 150 7135 4 0.33 150 FET 1 10 1500
-    PROGMEM const uint8_t pwm1_levels[] = { 4,4,4,5,5,5,6,6,7,7,8,9,10,11,12,13,14,15,17,18,20,21,23,25,27,30,32,34,37,40,43,46,49,52,56,59,63,67,71,76,80,85,90,95,100,106,112,118,124,130,137,144,151,158,166,173,181,190,198,207,216,225,235,245,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0 };
+    //PROGMEM const uint8_t pwm1_levels[] = { 4,4,4,5,5,5,6,6,7,7,8,9,10,11,12,13,14,15,17,18,20,21,23,25,27,30,32,34,37,40,43,46,49,52,56,59,63,67,71,76,80,85,90,95,100,106,112,118,124,130,137,144,151,158,166,173,181,190,198,207,216,225,235,245,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0 };
+    //PROGMEM const uint8_t pwm2_levels[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,3,4,5,7,8,9,11,12,14,15,17,19,20,22,24,25,27,29,31,33,35,37,39,41,43,45,48,50,52,55,57,59,62,64,67,70,72,75,78,81,84,87,90,93,96,99,102,105,109,112,115,119,122,126,129,133,137,141,144,148,152,156,160,165,169,173,177,182,186,191,195,200,205,209,214,219,224,229,234,239,244,250,255 };
+    // ../../bin/level_calc.py 1 65 7135 1 0.8 150
+    // ... mixed with this:
+    // ../../bin/level_calc.py 2 150 7135 4 0.33 150 FET 1 10 1500
+    PROGMEM const uint8_t pwm1_levels[] = { 1,1,2,2,3,3,4,4,5,6,7,8,9,10,11,12,14,15,17,19,20,22,24,26,29,31,34,36,39,42,45,48,51,55,59,62,66,70,75,79,84,89,93,99,104,110,115,121,127,134,140,147,154,161,168,176,184,192,200,209,217,226,236,245,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0 };
     PROGMEM const uint8_t pwm2_levels[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,3,4,5,7,8,9,11,12,14,15,17,19,20,22,24,25,27,29,31,33,35,37,39,41,43,45,48,50,52,55,57,59,62,64,67,70,72,75,78,81,84,87,90,93,96,99,102,105,109,112,115,119,122,126,129,133,137,141,144,148,152,156,160,165,169,173,177,182,186,191,195,200,205,209,214,219,224,229,234,239,244,250,255 };
     #define MAX_1x7135 65
   #endif
-- 
cgit v1.2.3


From 90c983c8149c437c7e888144f21bae2811faa3b9 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sun, 27 Aug 2017 21:32:39 -0600
Subject: Added bike flasher.

---
 spaghetti-monster/anduril.c   | 71 ++++++++++++++++++++++++++++++++-----------
 spaghetti-monster/anduril.txt | 16 +++++-----
 2 files changed, 63 insertions(+), 24 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril.c b/spaghetti-monster/anduril.c
index fc6805c..daafa90 100644
--- a/spaghetti-monster/anduril.c
+++ b/spaghetti-monster/anduril.c
@@ -31,13 +31,14 @@
 #define RAMP_LENGTH 150
 #define MAX_CLICKS 6
 #define USE_EEPROM
-#define EEPROM_BYTES 8
+#define EEPROM_BYTES 9
 #include "spaghetti-monster.h"
 
 // FSM states
 uint8_t off_state(EventPtr event, uint16_t arg);
 uint8_t steady_state(EventPtr event, uint16_t arg);
 uint8_t strobe_state(EventPtr event, uint16_t arg);
+#define NUM_STROBES 3
 #ifdef USE_BATTCHECK
 uint8_t battcheck_state(EventPtr event, uint16_t arg);
 uint8_t tempcheck_state(EventPtr event, uint16_t arg);
@@ -78,7 +79,8 @@ uint8_t target_level = 0;
 
 // strobe timing
 volatile uint8_t strobe_delay = 67;
-volatile uint8_t strobe_type = 0;  // 0 == party strobe, 1 == tactical strobe
+volatile uint8_t strobe_type = 2;  // 0 == party strobe, 1 == tactical strobe, 2 == bike flasher
+volatile uint8_t bike_flasher_brightness = MAX_1x7135;
 
 // deferred "off" so we won't suspend in a weird state
 volatile uint8_t go_to_standby = 0;
@@ -301,27 +303,46 @@ uint8_t strobe_state(EventPtr event, uint16_t arg) {
         set_state(off_state, 0);
         return MISCHIEF_MANAGED;
     }
-    // 2 clicks: toggle party strobe vs tactical strobe
+    // 2 clicks: rotate through strobe/flasher modes
     else if (event == EV_2clicks) {
-        strobe_type ^= 1;
+        strobe_type = (strobe_type + 1) % NUM_STROBES;
+        interrupt_nice_delays();
         save_config();
         return MISCHIEF_MANAGED;
     }
     // hold: change speed (go faster)
+    //       or change brightness (brighter)
     else if (event == EV_click1_hold) {
-        if ((arg & 1) == 0) {
-            if (strobe_delay > 8) strobe_delay --;
+        if (strobe_type < 2) {
+            if ((arg & 1) == 0) {
+                if (strobe_delay > 8) strobe_delay --;
+            }
+        }
+        // biking mode brighter
+        else if (strobe_type == 2) {
+            if (bike_flasher_brightness < MAX_LEVEL/2)
+                bike_flasher_brightness ++;
+            set_level(bike_flasher_brightness);
         }
         return MISCHIEF_MANAGED;
     }
     // click, hold: change speed (go slower)
+    //       or change brightness (dimmer)
     else if (event == EV_click2_hold) {
-        if ((arg & 1) == 0) {
-            if (strobe_delay < 255) strobe_delay ++;
+        if (strobe_type < 2) {
+            if ((arg & 1) == 0) {
+                if (strobe_delay < 255) strobe_delay ++;
+            }
+        }
+        // biking mode dimmer
+        else if (strobe_type == 2) {
+            if (bike_flasher_brightness > 1)
+                bike_flasher_brightness --;
+            set_level(bike_flasher_brightness);
         }
         return MISCHIEF_MANAGED;
     }
-    // release hold: save new strobe speed
+    // release hold: save new strobe settings
     else if ((event == EV_click1_hold_release)
           || (event == EV_click2_hold_release)) {
         save_config();
@@ -612,6 +633,7 @@ void load_config() {
         ramp_discrete_steps = eeprom[5];
         strobe_type = eeprom[6];
         strobe_delay = eeprom[7];
+        bike_flasher_brightness = eeprom[8];
     }
 }
 
@@ -624,6 +646,7 @@ void save_config() {
     eeprom[5] = ramp_discrete_steps;
     eeprom[6] = strobe_type;
     eeprom[7] = strobe_delay;
+    eeprom[8] = bike_flasher_brightness;
 
     save_eeprom();
 }
@@ -671,15 +694,29 @@ void loop() {
     }
 
     if (current_state == strobe_state) {
-        set_level(MAX_LEVEL);
-        if (strobe_type == 0) {  // party strobe
-            if (strobe_delay < 30) delay_zero();
-            else delay_ms(1);
-        } else {  //tactical strobe
-            nice_delay_ms(strobe_delay >> 1);
+        // party / tactical strobe
+        if (strobe_type < 2) {
+            set_level(MAX_LEVEL);
+            if (strobe_type == 0) {  // party strobe
+                if (strobe_delay < 30) delay_zero();
+                else delay_ms(1);
+            } else {  //tactical strobe
+                nice_delay_ms(strobe_delay >> 1);
+            }
+            set_level(0);
+            nice_delay_ms(strobe_delay);
+        }
+        // bike flasher
+        else if (strobe_type == 2) {
+            uint8_t burst = bike_flasher_brightness << 1;
+            for(uint8_t i=0; i<4; i++) {
+                set_level(burst);
+                if (! nice_delay_ms(5)) return;
+                set_level(bike_flasher_brightness);
+                if (! nice_delay_ms(65)) return;
+            }
+            if (! nice_delay_ms(720)) return;
         }
-        set_level(0);
-        nice_delay_ms(strobe_delay);
     }
     #ifdef USE_BATTCHECK
     else if (current_state == battcheck_state) {
diff --git a/spaghetti-monster/anduril.txt b/spaghetti-monster/anduril.txt
index 28d27f9..725ebfb 100644
--- a/spaghetti-monster/anduril.txt
+++ b/spaghetti-monster/anduril.txt
@@ -4,8 +4,10 @@ From off:
   * 2 clicks: turbo
   * Click, hold: highest level then ramp down
   * 3 clicks: battcheck mode
+    (battcheck, tempcheck, beacon)
   * 4 clicks: lock-out
-  * 5 clicks: strobe mode
+  * 5 clicks: strobe modes
+    (bike flasher, party strobe, tactical strobe, police strobe?)
   * 6 clicks: momentary mode (disconnect power to exit)
 
 In steady mode:
@@ -31,14 +33,14 @@ Strobe mode:
   * 1 click: off
   * Hold: change speed (faster)
   * Click, hold: change speed (slower)
-  + 2 clicks: next strobe mode
-    (party strobe, tactical strobe, random/police strobe?, bike flasher)
+  * 2 clicks: next strobe mode
+    (bike flasher, party strobe, tactical strobe, random/police strobe?)
 
 Bike flasher:
-  - 1 click: off
-  - 2 clicks: party strobe
-  - Hold: brighter
-  - Click, hold: dimmer
+  * 1 click: off
+  * 2 clicks: party strobe
+  * Hold: brighter
+  * Click, hold: dimmer
 
 Battcheck mode:
   * 1 click: off
-- 
cgit v1.2.3


From 3eb0e1d020d689b7ae4b0d1c7777f9158e91a6ec Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sun, 27 Aug 2017 21:45:20 -0600
Subject: Remembered to put the thermal ceiling back at a sane value. UI idea
 updates.

---
 spaghetti-monster/anduril.c   | 2 +-
 spaghetti-monster/anduril.txt | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril.c b/spaghetti-monster/anduril.c
index daafa90..6d25afa 100644
--- a/spaghetti-monster/anduril.c
+++ b/spaghetti-monster/anduril.c
@@ -21,7 +21,7 @@
 #define FSM_EMISAR_D4_LAYOUT
 #define USE_LVP
 #define USE_THERMAL_REGULATION
-#define DEFAULT_THERM_CEIL 32
+#define DEFAULT_THERM_CEIL 45
 #define USE_DELAY_MS
 #define USE_DELAY_4MS
 #define USE_DELAY_ZERO
diff --git a/spaghetti-monster/anduril.txt b/spaghetti-monster/anduril.txt
index 725ebfb..23466af 100644
--- a/spaghetti-monster/anduril.txt
+++ b/spaghetti-monster/anduril.txt
@@ -49,7 +49,11 @@ Battcheck mode:
 Tempcheck mode:
   * 1 click: off
   - 2 clicks: beacon mode
-  - Hold: thermal calibration
+  - Hold: thermal calibration mode
+
+Thermal calibration mode:
+  - Hold until hot: set new ceiling value
+  - ... don't hold: blink out current ceiling value and exit
 
 Beacon mode:
   - 1 click: off
@@ -66,4 +70,5 @@ Momentary mode:
 TODO:
   * save settings in eeprom
   - a way to blink out the firmware version?
+  - indicator LED support
   - a way to configure indicator LED behavior?
-- 
cgit v1.2.3


From f48209ee791282f72353a0806c8dab7fb814a4cb Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sun, 27 Aug 2017 22:22:56 -0600
Subject: Fixed bug: double-click from off didn't *really* go to the top of the
 ramp.

---
 spaghetti-monster/anduril.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril.c b/spaghetti-monster/anduril.c
index 6d25afa..eba21d1 100644
--- a/spaghetti-monster/anduril.c
+++ b/spaghetti-monster/anduril.c
@@ -116,7 +116,7 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
     }
     // 2 clicks: highest mode
     else if (event == EV_2clicks) {
-        set_level(nearest_level(MAX_LEVEL));
+        set_state(steady_state, nearest_level(MAX_LEVEL));
         return MISCHIEF_MANAGED;
     }
     #ifdef USE_BATTCHECK
-- 
cgit v1.2.3


From f688f4c149a590b89cd850a899a0baa0149cdd27 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sun, 27 Aug 2017 22:40:49 -0600
Subject: Use different speed values for party and tactical strobes.

---
 spaghetti-monster/anduril.c | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril.c b/spaghetti-monster/anduril.c
index eba21d1..4fb6118 100644
--- a/spaghetti-monster/anduril.c
+++ b/spaghetti-monster/anduril.c
@@ -31,7 +31,7 @@
 #define RAMP_LENGTH 150
 #define MAX_CLICKS 6
 #define USE_EEPROM
-#define EEPROM_BYTES 9
+#define EEPROM_BYTES 10
 #include "spaghetti-monster.h"
 
 // FSM states
@@ -78,7 +78,7 @@ uint8_t target_level = 0;
 #endif
 
 // strobe timing
-volatile uint8_t strobe_delay = 67;
+volatile uint8_t strobe_delays[] = { 40, 67 };  // party strobe, tactical strobe
 volatile uint8_t strobe_type = 2;  // 0 == party strobe, 1 == tactical strobe, 2 == bike flasher
 volatile uint8_t bike_flasher_brightness = MAX_1x7135;
 
@@ -315,7 +315,7 @@ uint8_t strobe_state(EventPtr event, uint16_t arg) {
     else if (event == EV_click1_hold) {
         if (strobe_type < 2) {
             if ((arg & 1) == 0) {
-                if (strobe_delay > 8) strobe_delay --;
+                if (strobe_delays[strobe_type] > 8) strobe_delays[strobe_type] --;
             }
         }
         // biking mode brighter
@@ -331,7 +331,7 @@ uint8_t strobe_state(EventPtr event, uint16_t arg) {
     else if (event == EV_click2_hold) {
         if (strobe_type < 2) {
             if ((arg & 1) == 0) {
-                if (strobe_delay < 255) strobe_delay ++;
+                if (strobe_delays[strobe_type] < 255) strobe_delays[strobe_type] ++;
             }
         }
         // biking mode dimmer
@@ -632,8 +632,9 @@ void load_config() {
         ramp_discrete_ceil = eeprom[4];
         ramp_discrete_steps = eeprom[5];
         strobe_type = eeprom[6];
-        strobe_delay = eeprom[7];
-        bike_flasher_brightness = eeprom[8];
+        strobe_delays[0] = eeprom[7];
+        strobe_delays[1] = eeprom[8];
+        bike_flasher_brightness = eeprom[9];
     }
 }
 
@@ -645,8 +646,9 @@ void save_config() {
     eeprom[4] = ramp_discrete_ceil;
     eeprom[5] = ramp_discrete_steps;
     eeprom[6] = strobe_type;
-    eeprom[7] = strobe_delay;
-    eeprom[8] = bike_flasher_brightness;
+    eeprom[7] = strobe_delays[0];
+    eeprom[8] = strobe_delays[1];
+    eeprom[9] = bike_flasher_brightness;
 
     save_eeprom();
 }
@@ -698,13 +700,13 @@ void loop() {
         if (strobe_type < 2) {
             set_level(MAX_LEVEL);
             if (strobe_type == 0) {  // party strobe
-                if (strobe_delay < 30) delay_zero();
+                if (strobe_delays[strobe_type] < 42) delay_zero();
                 else delay_ms(1);
             } else {  //tactical strobe
-                nice_delay_ms(strobe_delay >> 1);
+                nice_delay_ms(strobe_delays[strobe_type] >> 1);
             }
             set_level(0);
-            nice_delay_ms(strobe_delay);
+            nice_delay_ms(strobe_delays[strobe_type]);
         }
         // bike flasher
         else if (strobe_type == 2) {
-- 
cgit v1.2.3


From 98380adfd4c1f9a5e12d7d416cc14b909284014b Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sun, 27 Aug 2017 22:41:37 -0600
Subject: Fixed a bug where sometimes the light wouldn't respond for a second
 or so after connecting power. (spurious events were detected at boot, and
 previously had to time out before it would respond)

---
 spaghetti-monster/fsm-main.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/fsm-main.c b/spaghetti-monster/fsm-main.c
index 1a0c425..ae63126 100644
--- a/spaghetti-monster/fsm-main.c
+++ b/spaghetti-monster/fsm-main.c
@@ -88,6 +88,10 @@ int main() {
     // fallback for handling a few things
     push_state(default_state, 0);
 
+    // in case any spurious button presses were detected at boot
+    delay_ms(1);
+    empty_event_sequence();
+
     // call recipe's setup
     setup();
 
-- 
cgit v1.2.3


From 2589ce5a06472c0693515294f9aa575ef83c3029 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sun, 27 Aug 2017 22:50:34 -0600
Subject: UI description up-to-date now.

---
 spaghetti-monster/anduril.txt | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril.txt b/spaghetti-monster/anduril.txt
index 23466af..d5b224e 100644
--- a/spaghetti-monster/anduril.txt
+++ b/spaghetti-monster/anduril.txt
@@ -1,40 +1,40 @@
 From off:
   * 1 click: memorized level
   * Hold: Lowest level then ramp up
-  * 2 clicks: turbo
+  * 2 clicks: highest ramp level
   * Click, hold: highest level then ramp down
   * 3 clicks: battcheck mode
-    (battcheck, tempcheck, beacon)
+    (battcheck, tempcheck, then beacon?)
   * 4 clicks: lock-out
   * 5 clicks: strobe modes
     (bike flasher, party strobe, tactical strobe, police strobe?)
+    (remembers which you last used)
   * 6 clicks: momentary mode (disconnect power to exit)
 
 In steady mode:
   * 1 click: off
   * Hold: ramp up
   * Click, hold: ramp down
-  * 2 clicks: to/from turbo
+  * 2 clicks: to/from turbo (actual turbo, not just highest ramp level)
   * 3 clicks: toggle smooth vs discrete ramping
   * 4 clicks: configure current ramp
 
 Smooth ramp config mode:
-  - Setting 1: memory on/off
+  - Setting 1: memory on/off  (not implemented yet)
   * Setting 2: low end
+    (click N times to set ramp floor to level N)
   * Setting 3: high end
+    (click N times to set ramp ceiling to level "151 - N")
 
 Discrete ramp config mode:
-  - Setting 1: memory on/off
+  - Setting 1: memory on/off  (not implemented yet)
   * Setting 2: low end
+    (click N times to set ramp floor to level N)
   * Setting 3: high end
-  * Setting 4: number of levels
-
-Strobe mode:
-  * 1 click: off
-  * Hold: change speed (faster)
-  * Click, hold: change speed (slower)
-  * 2 clicks: next strobe mode
-    (bike flasher, party strobe, tactical strobe, random/police strobe?)
+    (click N times to set ramp ceiling to level "151 - N")
+  * Setting 4: number of levels in discrete ramp
+    (click N times to make discrete mode have N stair-steps)
+    (minimum 2, maximum 150)
 
 Bike flasher:
   * 1 click: off
@@ -42,6 +42,13 @@ Bike flasher:
   * Hold: brighter
   * Click, hold: dimmer
 
+Party / Tactical strobe modes:
+  * 1 click: off
+  * Hold: change speed (faster)
+  * Click, hold: change speed (slower)
+  * 2 clicks: next strobe mode
+    (bike flasher, party strobe, tactical strobe, random/police strobe?)
+
 Battcheck mode:
   * 1 click: off
   * 2 clicks: tempcheck mode
-- 
cgit v1.2.3


From 4a16af683c167fb27bc28b50a58227eb05da8c29 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Mon, 28 Aug 2017 01:14:34 -0600
Subject: Added beacon mode and beacon config mode. Renamed ramp_config_mode to
 ramp_config_state.

---
 spaghetti-monster/anduril.c   | 83 ++++++++++++++++++++++++++++++++++++++++---
 spaghetti-monster/anduril.txt | 10 +++---
 2 files changed, 83 insertions(+), 10 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril.c b/spaghetti-monster/anduril.c
index 4fb6118..4ef0f1b 100644
--- a/spaghetti-monster/anduril.c
+++ b/spaghetti-monster/anduril.c
@@ -31,21 +31,29 @@
 #define RAMP_LENGTH 150
 #define MAX_CLICKS 6
 #define USE_EEPROM
-#define EEPROM_BYTES 10
+#define EEPROM_BYTES 11
 #include "spaghetti-monster.h"
 
 // FSM states
 uint8_t off_state(EventPtr event, uint16_t arg);
+// ramping mode and its related config mode
 uint8_t steady_state(EventPtr event, uint16_t arg);
+uint8_t ramp_config_state(EventPtr event, uint16_t arg);
+// party and tactical strobes
 uint8_t strobe_state(EventPtr event, uint16_t arg);
 #define NUM_STROBES 3
 #ifdef USE_BATTCHECK
 uint8_t battcheck_state(EventPtr event, uint16_t arg);
 uint8_t tempcheck_state(EventPtr event, uint16_t arg);
 #endif
+// soft lockout
 uint8_t lockout_state(EventPtr event, uint16_t arg);
+// momentary / signalling mode
 uint8_t momentary_state(EventPtr event, uint16_t arg);
-uint8_t ramp_config_mode(EventPtr event, uint16_t arg);
+// beacon mode and its related config mode
+uint8_t beacon_state(EventPtr event, uint16_t arg);
+uint8_t beacon_config_state(EventPtr event, uint16_t arg);
+// general helper function for config modes
 uint8_t number_entry_state(EventPtr event, uint16_t arg);
 
 // return value from number_entry_state()
@@ -53,6 +61,7 @@ volatile uint8_t number_entry_value;
 
 void blink_confirm(uint8_t num);
 
+// remember stuff even after battery was changed
 void load_config();
 void save_config();
 
@@ -80,8 +89,13 @@ uint8_t target_level = 0;
 // strobe timing
 volatile uint8_t strobe_delays[] = { 40, 67 };  // party strobe, tactical strobe
 volatile uint8_t strobe_type = 2;  // 0 == party strobe, 1 == tactical strobe, 2 == bike flasher
+
+// bike mode config options
 volatile uint8_t bike_flasher_brightness = MAX_1x7135;
 
+// beacon timing
+volatile uint8_t beacon_seconds = 2;
+
 // deferred "off" so we won't suspend in a weird state
 volatile uint8_t go_to_standby = 0;
 
@@ -223,7 +237,7 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
     }
     // 4 clicks: configure this ramp mode
     else if (event == EV_4clicks) {
-        set_state(ramp_config_mode, 0);
+        set_state(ramp_config_state, 0);
         return MISCHIEF_MANAGED;
     }
     // hold: change brightness (brighter)
@@ -373,10 +387,36 @@ uint8_t tempcheck_state(EventPtr event, uint16_t arg) {
         set_state(off_state, 0);
         return MISCHIEF_MANAGED;
     }
+    // 2 clicks: beacon mode
+    else if (event == EV_2clicks) {
+        set_state(beacon_state, 0);
+        return MISCHIEF_MANAGED;
+    }
     return EVENT_NOT_HANDLED;
 }
 #endif
 
+
+uint8_t beacon_state(EventPtr event, uint16_t arg) {
+    // 1 click: off
+    if (event == EV_1click) {
+        set_state(off_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    // 2 clicks: battcheck mode
+    else if (event == EV_2clicks) {
+        set_state(battcheck_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    // 3 clicks: beacon config mode
+    else if (event == EV_3clicks) {
+        set_state(beacon_config_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+
+
 uint8_t lockout_state(EventPtr event, uint16_t arg) {
     // conserve power while locked out
     // (allow staying awake long enough to exit, but otherwise
@@ -431,7 +471,7 @@ uint8_t momentary_state(EventPtr event, uint16_t arg) {
 }
 
 
-uint8_t ramp_config_mode(EventPtr event, uint16_t arg) {
+uint8_t ramp_config_state(EventPtr event, uint16_t arg) {
     static uint8_t config_step;
     static uint8_t num_config_steps;
     if (event == EV_enter_state) {
@@ -496,6 +536,33 @@ uint8_t ramp_config_mode(EventPtr event, uint16_t arg) {
 }
 
 
+uint8_t beacon_config_state(EventPtr event, uint16_t arg) {
+    static uint8_t done = 0;
+    if (event == EV_enter_state) {
+        set_level(0);
+        done = 0;
+        return MISCHIEF_MANAGED;
+    }
+    // advance forward through config steps
+    else if (event == EV_tick) {
+        if (! done) push_state(number_entry_state, 1);
+        else {
+            save_config();
+            // return to beacon mode
+            set_state(beacon_state, 0);
+        }
+        return MISCHIEF_MANAGED;
+    }
+    // an option was set (return from number_entry_state)
+    else if (event == EV_reenter_state) {
+        if (number_entry_value) beacon_seconds = number_entry_value;
+        done = 1;
+        return MISCHIEF_MANAGED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+
+
 uint8_t number_entry_state(EventPtr event, uint16_t arg) {
     static uint8_t value;
     static uint8_t blinks_left;
@@ -635,6 +702,7 @@ void load_config() {
         strobe_delays[0] = eeprom[7];
         strobe_delays[1] = eeprom[8];
         bike_flasher_brightness = eeprom[9];
+        beacon_seconds = eeprom[10];
     }
 }
 
@@ -649,6 +717,7 @@ void save_config() {
     eeprom[7] = strobe_delays[0];
     eeprom[8] = strobe_delays[1];
     eeprom[9] = bike_flasher_brightness;
+    eeprom[10] = beacon_seconds;
 
     save_eeprom();
 }
@@ -729,4 +798,10 @@ void loop() {
         nice_delay_ms(1000);
     }
     #endif
+    else if (current_state == beacon_state) {
+        set_level(memorized_level);
+        if (! nice_delay_ms(500)) return;
+        set_level(0);
+        nice_delay_ms(((beacon_seconds) * 1000) - 500);
+    }
 }
diff --git a/spaghetti-monster/anduril.txt b/spaghetti-monster/anduril.txt
index d5b224e..8a82447 100644
--- a/spaghetti-monster/anduril.txt
+++ b/spaghetti-monster/anduril.txt
@@ -55,7 +55,7 @@ Battcheck mode:
 
 Tempcheck mode:
   * 1 click: off
-  - 2 clicks: beacon mode
+  * 2 clicks: beacon mode
   - Hold: thermal calibration mode
 
 Thermal calibration mode:
@@ -63,11 +63,9 @@ Thermal calibration mode:
   - ... don't hold: blink out current ceiling value and exit
 
 Beacon mode:
-  - 1 click: off
-  - 2 clicks: battcheck mode
-  - Hold: brighter
-  - Click, hold: dimmer
-  - 3 clicks: configure time between pulses
+  * 1 click: off
+  * 2 clicks: battcheck mode
+  * 3 clicks: configure time between pulses
 
 Momentary mode:
   * Press button: Light on (at memorized level).
-- 
cgit v1.2.3


From a4be98cddedbbdfb87b18dd745ef468a536b1826 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Mon, 28 Aug 2017 01:59:06 -0600
Subject: Added thermal config mode...  but I'm not sure if it's the right UI
 for this or not.

---
 spaghetti-monster/anduril.c   | 41 +++++++++++++++++++++++++++++++++++++++--
 spaghetti-monster/anduril.txt |  5 +++++
 spaghetti-monster/fsm-adc.h   |  2 +-
 3 files changed, 45 insertions(+), 3 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril.c b/spaghetti-monster/anduril.c
index 4ef0f1b..9799190 100644
--- a/spaghetti-monster/anduril.c
+++ b/spaghetti-monster/anduril.c
@@ -31,7 +31,7 @@
 #define RAMP_LENGTH 150
 #define MAX_CLICKS 6
 #define USE_EEPROM
-#define EEPROM_BYTES 11
+#define EEPROM_BYTES 12
 #include "spaghetti-monster.h"
 
 // FSM states
@@ -45,6 +45,7 @@ uint8_t strobe_state(EventPtr event, uint16_t arg);
 #ifdef USE_BATTCHECK
 uint8_t battcheck_state(EventPtr event, uint16_t arg);
 uint8_t tempcheck_state(EventPtr event, uint16_t arg);
+uint8_t thermal_config_state(EventPtr event, uint16_t arg);
 #endif
 // soft lockout
 uint8_t lockout_state(EventPtr event, uint16_t arg);
@@ -392,6 +393,11 @@ uint8_t tempcheck_state(EventPtr event, uint16_t arg) {
         set_state(beacon_state, 0);
         return MISCHIEF_MANAGED;
     }
+    // 3 clicks: thermal config mode
+    else if (event == EV_3clicks) {
+        set_state(thermal_config_state, 0);
+        return MISCHIEF_MANAGED;
+    }
     return EVENT_NOT_HANDLED;
 }
 #endif
@@ -536,6 +542,34 @@ uint8_t ramp_config_state(EventPtr event, uint16_t arg) {
 }
 
 
+uint8_t thermal_config_state(EventPtr event, uint16_t arg) {
+    static uint8_t done = 0;
+    if (event == EV_enter_state) {
+        set_level(0);
+        done = 0;
+        return MISCHIEF_MANAGED;
+    }
+    // advance forward through config steps
+    else if (event == EV_tick) {
+        if (! done) push_state(number_entry_state, 1);
+        else {
+            save_config();
+            // return to beacon mode
+            set_state(tempcheck_state, 0);
+        }
+        return MISCHIEF_MANAGED;
+    }
+    // an option was set (return from number_entry_state)
+    else if (event == EV_reenter_state) {
+        if (number_entry_value) therm_ceil = 30 + number_entry_value;
+        if (therm_ceil > MAX_THERM_CEIL) therm_ceil = MAX_THERM_CEIL;
+        done = 1;
+        return MISCHIEF_MANAGED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+
+
 uint8_t beacon_config_state(EventPtr event, uint16_t arg) {
     static uint8_t done = 0;
     if (event == EV_enter_state) {
@@ -703,6 +737,7 @@ void load_config() {
         strobe_delays[1] = eeprom[8];
         bike_flasher_brightness = eeprom[9];
         beacon_seconds = eeprom[10];
+        therm_ceil = eeprom[11];
     }
 }
 
@@ -718,6 +753,7 @@ void save_config() {
     eeprom[8] = strobe_delays[1];
     eeprom[9] = bike_flasher_brightness;
     eeprom[10] = beacon_seconds;
+    eeprom[11] = therm_ceil;
 
     save_eeprom();
 }
@@ -794,9 +830,10 @@ void loop() {
         battcheck();
     }
     else if (current_state == tempcheck_state) {
-        blink_num(projected_temperature>>2);
+        blink_num(temperature>>2);
         nice_delay_ms(1000);
     }
+    // TODO: blink out therm_ceil during thermal_config_state
     #endif
     else if (current_state == beacon_state) {
         set_level(memorized_level);
diff --git a/spaghetti-monster/anduril.txt b/spaghetti-monster/anduril.txt
index 8a82447..5e6d4b9 100644
--- a/spaghetti-monster/anduril.txt
+++ b/spaghetti-monster/anduril.txt
@@ -56,8 +56,12 @@ Battcheck mode:
 Tempcheck mode:
   * 1 click: off
   * 2 clicks: beacon mode
+  * 3 clicks: thermal config mode
   - Hold: thermal calibration mode
 
+Thermal config mode:
+  * Click N times to set thermal limit to roughly 30 C + N.
+
 Thermal calibration mode:
   - Hold until hot: set new ceiling value
   - ... don't hold: blink out current ceiling value and exit
@@ -74,6 +78,7 @@ Momentary mode:
 
 TODO:
   * save settings in eeprom
+  - decide on "hold until hot" or "click N times" for thermal config mode
   - a way to blink out the firmware version?
   - indicator LED support
   - a way to configure indicator LED behavior?
diff --git a/spaghetti-monster/fsm-adc.h b/spaghetti-monster/fsm-adc.h
index c12405c..af30b69 100644
--- a/spaghetti-monster/fsm-adc.h
+++ b/spaghetti-monster/fsm-adc.h
@@ -69,7 +69,7 @@ void battcheck();
 volatile int16_t temperature;
 // temperature in a few seconds, in C (ish) * 4  (13.2 fixed-point)
 volatile int16_t projected_temperature;  // Fight the future!
-uint8_t therm_ceil = DEFAULT_THERM_CEIL;
+volatile uint8_t therm_ceil = DEFAULT_THERM_CEIL;
 //void low_temperature();
 //void high_temperature();
 #endif
-- 
cgit v1.2.3


From 4a96d3e40ee667fa819c8c95b5e360245a12865a Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Mon, 28 Aug 2017 02:13:35 -0600
Subject: Fixed a crash when user presses the button more times than the UI
 supports. (need to leave room for a trailing 0 in the array, oops)

---
 spaghetti-monster/fsm-events.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/fsm-events.c b/spaghetti-monster/fsm-events.c
index 90d0ffa..99a6a72 100644
--- a/spaghetti-monster/fsm-events.c
+++ b/spaghetti-monster/fsm-events.c
@@ -47,7 +47,7 @@ uint8_t push_event(uint8_t ev_type) {
     uint8_t prev_event = 0;  // never push the same event twice in a row
     for(i=0; current_event[i] && (i<EV_MAX_LEN); i++)
         prev_event = current_event[i];
-    if ((i < EV_MAX_LEN)  &&  (prev_event != ev_type)) {
+    if ((i < EV_MAX_LEN-1)  &&  (prev_event != ev_type)) {
         current_event[i] = ev_type;
         return 1;  // event pushed
     } else {
-- 
cgit v1.2.3


From 74487cbbe4e75a60576ed73a20dba670e0305d87 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Mon, 28 Aug 2017 02:14:19 -0600
Subject: Adjusted default ramp values for general-purpose use.

---
 spaghetti-monster/anduril.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril.c b/spaghetti-monster/anduril.c
index 9799190..e169f18 100644
--- a/spaghetti-monster/anduril.c
+++ b/spaghetti-monster/anduril.c
@@ -70,11 +70,11 @@ void save_config();
 uint8_t memorized_level = MAX_1x7135;
 // smooth vs discrete ramping
 volatile uint8_t ramp_style = 0;  // 0 = smooth, 1 = discrete
-volatile uint8_t ramp_smooth_floor = 1;
+volatile uint8_t ramp_smooth_floor = 5;
 volatile uint8_t ramp_smooth_ceil = MAX_LEVEL - 30;
-volatile uint8_t ramp_discrete_floor = 15;
+volatile uint8_t ramp_discrete_floor = 20;
 volatile uint8_t ramp_discrete_ceil = MAX_LEVEL - 30;
-volatile uint8_t ramp_discrete_steps = 5;
+volatile uint8_t ramp_discrete_steps = 7;
 uint8_t ramp_discrete_step_size;  // don't set this
 
 // calculate the nearest ramp level which would be valid at the moment
-- 
cgit v1.2.3


From d81ef25a7b1b06f092139487ee873f4fffcba237 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Mon, 28 Aug 2017 14:14:24 -0600
Subject: just ideas and minor cleanup

---
 spaghetti-monster/anduril.c   |  8 +++++++-
 spaghetti-monster/anduril.txt | 11 +++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril.c b/spaghetti-monster/anduril.c
index e169f18..6eafb5d 100644
--- a/spaghetti-monster/anduril.c
+++ b/spaghetti-monster/anduril.c
@@ -26,9 +26,9 @@
 #define USE_DELAY_4MS
 #define USE_DELAY_ZERO
 #define USE_RAMPING
+#define RAMP_LENGTH 150
 #define USE_BATTCHECK
 #define BATTCHECK_VpT
-#define RAMP_LENGTH 150
 #define MAX_CLICKS 6
 #define USE_EEPROM
 #define EEPROM_BYTES 12
@@ -684,6 +684,8 @@ uint8_t number_entry_state(EventPtr event, uint16_t arg) {
 }
 
 
+// find the ramp level closest to the target,
+// using only the levels which are allowed in the current state
 uint8_t nearest_level(int16_t target) {
     // bounds check
     // using int16_t here saves us a bunch of logic elsewhere,
@@ -781,6 +783,7 @@ void low_voltage() {
 
 
 void setup() {
+    // blink at power-on to let user know power is connected
     set_level(RAMP_SIZE/8);
     delay_4ms(3);
     set_level(0);
@@ -792,6 +795,7 @@ void setup() {
 
 
 void loop() {
+
     // deferred "off" so we won't suspend in a weird state
     // (like...  during the middle of a strobe pulse)
     if (go_to_standby) {
@@ -825,6 +829,7 @@ void loop() {
             if (! nice_delay_ms(720)) return;
         }
     }
+
     #ifdef USE_BATTCHECK
     else if (current_state == battcheck_state) {
         battcheck();
@@ -835,6 +840,7 @@ void loop() {
     }
     // TODO: blink out therm_ceil during thermal_config_state
     #endif
+
     else if (current_state == beacon_state) {
         set_level(memorized_level);
         if (! nice_delay_ms(500)) return;
diff --git a/spaghetti-monster/anduril.txt b/spaghetti-monster/anduril.txt
index 5e6d4b9..a9790b1 100644
--- a/spaghetti-monster/anduril.txt
+++ b/spaghetti-monster/anduril.txt
@@ -1,6 +1,6 @@
 From off:
   * 1 click: memorized level
-  * Hold: Lowest level then ramp up
+  * Hold: lowest level then ramp up
   * 2 clicks: highest ramp level
   * Click, hold: highest level then ramp down
   * 3 clicks: battcheck mode
@@ -60,7 +60,7 @@ Tempcheck mode:
   - Hold: thermal calibration mode
 
 Thermal config mode:
-  * Click N times to set thermal limit to roughly 30 C + N.
+  * At buzz, click N times to set thermal limit to roughly 30 C + N.
 
 Thermal calibration mode:
   - Hold until hot: set new ceiling value
@@ -71,6 +71,9 @@ Beacon mode:
   * 2 clicks: battcheck mode
   * 3 clicks: configure time between pulses
 
+Beacon config mode:
+  * At buzz, click N times to set beacon frequency to N seconds.
+
 Momentary mode:
   * Press button: Light on (at memorized level).
   * Release button: Light off.
@@ -79,6 +82,10 @@ Momentary mode:
 TODO:
   * save settings in eeprom
   - decide on "hold until hot" or "click N times" for thermal config mode
+  - test thermal regulation on an actual light
+  - improve thermal regulation
   - a way to blink out the firmware version?
   - indicator LED support
   - a way to configure indicator LED behavior?
+  - add goodnight mode?
+  - add lightning mode?
-- 
cgit v1.2.3


From bc832345a1b9a67cf113e66c8d95cef0188aae77 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Mon, 28 Aug 2017 15:11:05 -0600
Subject: Added lightning storm mode.

---
 spaghetti-monster/anduril.c | 76 +++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 70 insertions(+), 6 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril.c b/spaghetti-monster/anduril.c
index 6eafb5d..9573705 100644
--- a/spaghetti-monster/anduril.c
+++ b/spaghetti-monster/anduril.c
@@ -32,6 +32,7 @@
 #define MAX_CLICKS 6
 #define USE_EEPROM
 #define EEPROM_BYTES 12
+#define USE_LIGHTNING_MODE
 #include "spaghetti-monster.h"
 
 // FSM states
@@ -41,7 +42,11 @@ uint8_t steady_state(EventPtr event, uint16_t arg);
 uint8_t ramp_config_state(EventPtr event, uint16_t arg);
 // party and tactical strobes
 uint8_t strobe_state(EventPtr event, uint16_t arg);
+#ifdef USE_LIGHTNING_MODE
+#define NUM_STROBES 4
+#else
 #define NUM_STROBES 3
+#endif
 #ifdef USE_BATTCHECK
 uint8_t battcheck_state(EventPtr event, uint16_t arg);
 uint8_t tempcheck_state(EventPtr event, uint16_t arg);
@@ -89,11 +94,16 @@ uint8_t target_level = 0;
 
 // strobe timing
 volatile uint8_t strobe_delays[] = { 40, 67 };  // party strobe, tactical strobe
-volatile uint8_t strobe_type = 2;  // 0 == party strobe, 1 == tactical strobe, 2 == bike flasher
+volatile uint8_t strobe_type = 3;  // 0 == party strobe, 1 == tactical strobe, 2 == lightning storm, 3 == bike flasher
 
 // bike mode config options
 volatile uint8_t bike_flasher_brightness = MAX_1x7135;
 
+#ifdef USE_LIGHTNING_MODE
+volatile uint8_t pseudo_rand_seed = 0;
+uint8_t pseudo_rand();
+#endif
+
 // beacon timing
 volatile uint8_t beacon_seconds = 2;
 
@@ -334,7 +344,7 @@ uint8_t strobe_state(EventPtr event, uint16_t arg) {
             }
         }
         // biking mode brighter
-        else if (strobe_type == 2) {
+        else if (strobe_type == 3) {
             if (bike_flasher_brightness < MAX_LEVEL/2)
                 bike_flasher_brightness ++;
             set_level(bike_flasher_brightness);
@@ -350,7 +360,7 @@ uint8_t strobe_state(EventPtr event, uint16_t arg) {
             }
         }
         // biking mode dimmer
-        else if (strobe_type == 2) {
+        else if (strobe_type == 3) {
             if (bike_flasher_brightness > 1)
                 bike_flasher_brightness --;
             set_level(bike_flasher_brightness);
@@ -363,6 +373,13 @@ uint8_t strobe_state(EventPtr event, uint16_t arg) {
         save_config();
         return MISCHIEF_MANAGED;
     }
+    #ifdef USE_LIGHTNING_MODE
+    // clock tick: bump the random seed
+    else if (event == EV_tick) {
+        pseudo_rand_seed += arg;
+        return MISCHIEF_MANAGED;
+    }
+    #endif
     return EVENT_NOT_HANDLED;
 }
 
@@ -726,6 +743,17 @@ void blink_confirm(uint8_t num) {
 }
 
 
+#ifdef USE_LIGHTNING_MODE
+uint8_t pseudo_rand() {
+    static uint16_t offset = 1024;
+    // loop from 1024 to 4095
+    offset = ((offset + 1) & 0x0fff) | 0x0400;
+    pseudo_rand_seed += 0b01010101;  // 85
+    return pgm_read_byte(offset) + pseudo_rand_seed;
+}
+#endif
+
+
 void load_config() {
     if (load_eeprom()) {
         ramp_style = eeprom[0];
@@ -734,7 +762,7 @@ void load_config() {
         ramp_discrete_floor = eeprom[3];
         ramp_discrete_ceil = eeprom[4];
         ramp_discrete_steps = eeprom[5];
-        strobe_type = eeprom[6];
+        strobe_type = eeprom[6];  // TODO: move this to eeprom_wl?
         strobe_delays[0] = eeprom[7];
         strobe_delays[1] = eeprom[8];
         bike_flasher_brightness = eeprom[9];
@@ -750,7 +778,7 @@ void save_config() {
     eeprom[3] = ramp_discrete_floor;
     eeprom[4] = ramp_discrete_ceil;
     eeprom[5] = ramp_discrete_steps;
-    eeprom[6] = strobe_type;
+    eeprom[6] = strobe_type;  // TODO: move this to eeprom_wl?
     eeprom[7] = strobe_delays[0];
     eeprom[8] = strobe_delays[1];
     eeprom[9] = bike_flasher_brightness;
@@ -817,8 +845,44 @@ void loop() {
             set_level(0);
             nice_delay_ms(strobe_delays[strobe_type]);
         }
-        // bike flasher
+        #ifdef USE_LIGHTNING_MODE
+        // lightning storm
         else if (strobe_type == 2) {
+            int16_t brightness;
+            uint16_t rand_time;
+
+            // turn the emitter on at a random level,
+            // for a random amount of time between 1ms and 32ms
+            rand_time = 1 << (pseudo_rand() % 6);
+            brightness = 1 << (pseudo_rand() % 7);  // 1, 2, 4, 8, 16, 32, 64
+            brightness += 1 << (pseudo_rand()&0x03);  // 2 to 80 now
+            brightness += pseudo_rand() % brightness;  // 2 to 159 now (w/ low bias)
+            if (brightness > MAX_LEVEL) brightness = MAX_LEVEL;
+            set_level(brightness);
+            if (! nice_delay_ms(rand_time)) return;
+
+            // decrease the brightness somewhat more gradually, like lightning
+            uint8_t stepdown = brightness >> 3;
+            if (stepdown < 1) stepdown = 1;
+            while(brightness > 1) {
+                if (! nice_delay_ms(rand_time)) return;
+                brightness -= stepdown;
+                if (brightness < 0) brightness = 0;
+                set_level(brightness);
+            }
+
+            // turn the emitter off,
+            // for a random amount of time between 1ms and 8192ms
+            // (with a low bias)
+            rand_time = 1<<(pseudo_rand()%13);
+            rand_time += pseudo_rand()%rand_time;
+            set_level(0);
+            nice_delay_ms(rand_time);
+
+        }
+        #endif
+        // bike flasher
+        else if (strobe_type == 3) {
             uint8_t burst = bike_flasher_brightness << 1;
             for(uint8_t i=0; i<4; i++) {
                 set_level(burst);
-- 
cgit v1.2.3


From af0d17cf6d69fdc2df163d5f26b9de019433de4e Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Mon, 28 Aug 2017 15:14:21 -0600
Subject: Forgot to update the UI text file for lightning storm mode.

---
 spaghetti-monster/anduril.txt | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril.txt b/spaghetti-monster/anduril.txt
index a9790b1..c6213e8 100644
--- a/spaghetti-monster/anduril.txt
+++ b/spaghetti-monster/anduril.txt
@@ -7,7 +7,7 @@ From off:
     (battcheck, tempcheck, then beacon?)
   * 4 clicks: lock-out
   * 5 clicks: strobe modes
-    (bike flasher, party strobe, tactical strobe, police strobe?)
+    (bike flasher, party strobe, tactical strobe, lightning storm mode)
     (remembers which you last used)
   * 6 clicks: momentary mode (disconnect power to exit)
 
@@ -47,7 +47,12 @@ Party / Tactical strobe modes:
   * Hold: change speed (faster)
   * Click, hold: change speed (slower)
   * 2 clicks: next strobe mode
-    (bike flasher, party strobe, tactical strobe, random/police strobe?)
+    (bike flasher, party strobe, tactical strobe, lightning storm mode)
+    (TODO: random/police strobe?)
+
+Lightning storm mode:
+  * 1 click: off
+  * 2 clicks: bike flasher
 
 Battcheck mode:
   * 1 click: off
-- 
cgit v1.2.3


From 2ce364480d2fb4ea3f9d2ae15563b4ca1df8e0af Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Mon, 28 Aug 2017 21:21:50 -0600
Subject: Added goodnight mode.  Rearranged blinkies in battcheck group.

---
 spaghetti-monster/anduril.c | 69 +++++++++++++++++++++++++++++++++++++--------
 1 file changed, 58 insertions(+), 11 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril.c b/spaghetti-monster/anduril.c
index 9573705..6c21bf3 100644
--- a/spaghetti-monster/anduril.c
+++ b/spaghetti-monster/anduril.c
@@ -32,9 +32,14 @@
 #define MAX_CLICKS 6
 #define USE_EEPROM
 #define EEPROM_BYTES 12
-#define USE_LIGHTNING_MODE
 #include "spaghetti-monster.h"
 
+// Options specific to this UI (not inherited from SpaghettiMonster)
+#define USE_LIGHTNING_MODE
+// set this a bit high, since the bottom 2 ramp levels might not emit any light at all
+#define GOODNIGHT_TIME  65  // minutes (approximately)
+#define GOODNIGHT_LEVEL 24  // ~11 lm
+
 // FSM states
 uint8_t off_state(EventPtr event, uint16_t arg);
 // ramping mode and its related config mode
@@ -52,16 +57,18 @@ uint8_t battcheck_state(EventPtr event, uint16_t arg);
 uint8_t tempcheck_state(EventPtr event, uint16_t arg);
 uint8_t thermal_config_state(EventPtr event, uint16_t arg);
 #endif
+// 1-hour ramp down from low, then automatic off
+uint8_t goodnight_state(EventPtr event, uint16_t arg);
+// beacon mode and its related config mode
+uint8_t beacon_state(EventPtr event, uint16_t arg);
+uint8_t beacon_config_state(EventPtr event, uint16_t arg);
 // soft lockout
 uint8_t lockout_state(EventPtr event, uint16_t arg);
 // momentary / signalling mode
 uint8_t momentary_state(EventPtr event, uint16_t arg);
-// beacon mode and its related config mode
-uint8_t beacon_state(EventPtr event, uint16_t arg);
-uint8_t beacon_config_state(EventPtr event, uint16_t arg);
+
 // general helper function for config modes
 uint8_t number_entry_state(EventPtr event, uint16_t arg);
-
 // return value from number_entry_state()
 volatile uint8_t number_entry_value;
 
@@ -391,9 +398,9 @@ uint8_t battcheck_state(EventPtr event, uint16_t arg) {
         set_state(off_state, 0);
         return MISCHIEF_MANAGED;
     }
-    // 2 clicks: tempcheck mode
+    // 2 clicks: goodnight mode
     else if (event == EV_2clicks) {
-        set_state(tempcheck_state, 0);
+        set_state(goodnight_state, 0);
         return MISCHIEF_MANAGED;
     }
     return EVENT_NOT_HANDLED;
@@ -405,9 +412,9 @@ uint8_t tempcheck_state(EventPtr event, uint16_t arg) {
         set_state(off_state, 0);
         return MISCHIEF_MANAGED;
     }
-    // 2 clicks: beacon mode
+    // 2 clicks: battcheck mode
     else if (event == EV_2clicks) {
-        set_state(beacon_state, 0);
+        set_state(battcheck_state, 0);
         return MISCHIEF_MANAGED;
     }
     // 3 clicks: thermal config mode
@@ -426,9 +433,9 @@ uint8_t beacon_state(EventPtr event, uint16_t arg) {
         set_state(off_state, 0);
         return MISCHIEF_MANAGED;
     }
-    // 2 clicks: battcheck mode
+    // 2 clicks: tempcheck mode
     else if (event == EV_2clicks) {
-        set_state(battcheck_state, 0);
+        set_state(tempcheck_state, 0);
         return MISCHIEF_MANAGED;
     }
     // 3 clicks: beacon config mode
@@ -440,6 +447,46 @@ uint8_t beacon_state(EventPtr event, uint16_t arg) {
 }
 
 
+#define GOODNIGHT_TICKS_PER_STEPDOWN (GOODNIGHT_TIME*TICKS_PER_SECOND*60L/GOODNIGHT_LEVEL)
+uint8_t goodnight_state(EventPtr event, uint16_t arg) {
+    static uint16_t ticks_since_stepdown = 0;
+    // blink on start
+    if (event == EV_enter_state) {
+        blink_confirm(4);
+        ticks_since_stepdown = 0;
+        set_level(GOODNIGHT_LEVEL);
+        return MISCHIEF_MANAGED;
+    }
+    // 1 click: off
+    else if (event == EV_1click) {
+        set_state(off_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    // 2 clicks: beacon mode
+    else if (event == EV_2clicks) {
+        set_state(beacon_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    // tick: step down (maybe) or off (maybe)
+    else if (event == EV_tick) {
+        if (++ticks_since_stepdown > GOODNIGHT_TICKS_PER_STEPDOWN) {
+            ticks_since_stepdown = 0;
+            set_level(actual_level-1);
+            if (! actual_level) {
+                #if 0  // test blink, to help measure timing
+                set_level(MAX_LEVEL>>2);
+                delay_4ms(8/2);
+                set_level(0);
+                #endif
+                set_state(off_state, 0);
+            }
+        }
+        return MISCHIEF_MANAGED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+
+
 uint8_t lockout_state(EventPtr event, uint16_t arg) {
     // conserve power while locked out
     // (allow staying awake long enough to exit, but otherwise
-- 
cgit v1.2.3


From f881184e490bc13bb5d2436fc67ede0c1eb0c4c0 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Wed, 30 Aug 2017 22:16:37 -0600
Subject: Made event handling a bit more reliable while asleep. (was sometimes
 having difficulty getting out of soft lockout mode)

---
 spaghetti-monster/fsm-standby.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/fsm-standby.c b/spaghetti-monster/fsm-standby.c
index bef0533..86c5f0d 100644
--- a/spaghetti-monster/fsm-standby.c
+++ b/spaghetti-monster/fsm-standby.c
@@ -36,6 +36,7 @@ void sleep_until_eswitch_pressed()
 
     // make sure switch isn't currently pressed
     while (button_is_pressed()) {}
+    empty_event_sequence();  // cancel pending input on suspend
 
     PCINT_on();  // wake on e-switch event
 
@@ -45,7 +46,8 @@ void sleep_until_eswitch_pressed()
 
     // something happened; wake up
     sleep_disable();
-    PCINT_on();
+    //PCINT_on();  // should be on already
+    // FIXME? if button is down, make sure a button press event is added to the current sequence
     ADC_on();
     WDT_on();
 }
-- 
cgit v1.2.3


From f61088192b58a3e627cf97164aa05e4eb183fea3 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Wed, 30 Aug 2017 23:06:16 -0600
Subject: Updated anduril.txt to match current code.

---
 spaghetti-monster/anduril.txt | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril.txt b/spaghetti-monster/anduril.txt
index c6213e8..bb0f5e2 100644
--- a/spaghetti-monster/anduril.txt
+++ b/spaghetti-monster/anduril.txt
@@ -4,7 +4,7 @@ From off:
   * 2 clicks: highest ramp level
   * Click, hold: highest level then ramp down
   * 3 clicks: battcheck mode
-    (battcheck, tempcheck, then beacon?)
+    (battcheck, goodnight, beacon, tempcheck)
   * 4 clicks: lock-out
   * 5 clicks: strobe modes
     (bike flasher, party strobe, tactical strobe, lightning storm mode)
@@ -55,12 +55,24 @@ Lightning storm mode:
   * 2 clicks: bike flasher
 
 Battcheck mode:
+  * 1 click: off
+  * 2 clicks: goodnight mode
+
+Goodnight mode:
+  * 1 click: off
+  * 2 clicks: beacon mode
+
+Beacon mode:
   * 1 click: off
   * 2 clicks: tempcheck mode
+  * 3 clicks: configure time between pulses
+
+Beacon config mode:
+  * At buzz, click N times to set beacon frequency to N seconds.
 
 Tempcheck mode:
   * 1 click: off
-  * 2 clicks: beacon mode
+  * 2 clicks: battcheck mode
   * 3 clicks: thermal config mode
   - Hold: thermal calibration mode
 
@@ -71,14 +83,6 @@ Thermal calibration mode:
   - Hold until hot: set new ceiling value
   - ... don't hold: blink out current ceiling value and exit
 
-Beacon mode:
-  * 1 click: off
-  * 2 clicks: battcheck mode
-  * 3 clicks: configure time between pulses
-
-Beacon config mode:
-  * At buzz, click N times to set beacon frequency to N seconds.
-
 Momentary mode:
   * Press button: Light on (at memorized level).
   * Release button: Light off.
@@ -92,5 +96,5 @@ TODO:
   - a way to blink out the firmware version?
   - indicator LED support
   - a way to configure indicator LED behavior?
-  - add goodnight mode?
-  - add lightning mode?
+  * add goodnight mode?
+  * add lightning mode?
-- 
cgit v1.2.3


From 15d5b2cbe807029c7493691a1877a1898d100455 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Wed, 30 Aug 2017 23:07:55 -0600
Subject: Replaced FSM_*_LAYOUT with FSM_*_DRIVER because I think it makes more
 sense. Made momentary.c compile again. Updated fsm-main to use whichever
 delay function is available.

---
 spaghetti-monster/anduril.c    | 2 +-
 spaghetti-monster/baton.c      | 2 +-
 spaghetti-monster/darkhorse.c  | 2 +-
 spaghetti-monster/fsm-main.c   | 4 ++++
 spaghetti-monster/momentary.c  | 3 ++-
 spaghetti-monster/ramping-ui.c | 2 +-
 6 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril.c b/spaghetti-monster/anduril.c
index 6c21bf3..998c0c5 100644
--- a/spaghetti-monster/anduril.c
+++ b/spaghetti-monster/anduril.c
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define FSM_EMISAR_D4_LAYOUT
+#define FSM_EMISAR_D4_DRIVER
 #define USE_LVP
 #define USE_THERMAL_REGULATION
 #define DEFAULT_THERM_CEIL 45
diff --git a/spaghetti-monster/baton.c b/spaghetti-monster/baton.c
index 2489f4e..4ba329e 100644
--- a/spaghetti-monster/baton.c
+++ b/spaghetti-monster/baton.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define FSM_EMISAR_D4_LAYOUT
+#define FSM_EMISAR_D4_DRIVER
 #define USE_LVP
 #define USE_THERMAL_REGULATION
 #define DEFAULT_THERM_CEIL 45
diff --git a/spaghetti-monster/darkhorse.c b/spaghetti-monster/darkhorse.c
index 2aa1b7b..2aa3e90 100644
--- a/spaghetti-monster/darkhorse.c
+++ b/spaghetti-monster/darkhorse.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define FSM_EMISAR_D4_LAYOUT
+#define FSM_EMISAR_D4_DRIVER
 #define USE_LVP
 #define USE_THERMAL_REGULATION
 #define DEFAULT_THERM_CEIL 45
diff --git a/spaghetti-monster/fsm-main.c b/spaghetti-monster/fsm-main.c
index ae63126..9505322 100644
--- a/spaghetti-monster/fsm-main.c
+++ b/spaghetti-monster/fsm-main.c
@@ -89,7 +89,11 @@ int main() {
     push_state(default_state, 0);
 
     // in case any spurious button presses were detected at boot
+    #ifdef USE_DELAY_MS
     delay_ms(1);
+    #else
+    delay_4ms(1);
+    #endif
     empty_event_sequence();
 
     // call recipe's setup
diff --git a/spaghetti-monster/momentary.c b/spaghetti-monster/momentary.c
index fc26db3..6b049f4 100644
--- a/spaghetti-monster/momentary.c
+++ b/spaghetti-monster/momentary.c
@@ -19,9 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define FSM_EMISAR_D4_LAYOUT
+#define FSM_EMISAR_D4_DRIVER
 #define USE_LVP
 #define USE_DEBUG_BLINK
+#define USE_DELAY_4MS
 #include "spaghetti-monster.h"
 
 volatile uint8_t brightness;
diff --git a/spaghetti-monster/ramping-ui.c b/spaghetti-monster/ramping-ui.c
index 2369686..527a824 100644
--- a/spaghetti-monster/ramping-ui.c
+++ b/spaghetti-monster/ramping-ui.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define FSM_EMISAR_D4_LAYOUT
+#define FSM_EMISAR_D4_DRIVER
 #define USE_LVP
 #define USE_THERMAL_REGULATION
 #define DEFAULT_THERM_CEIL 32
-- 
cgit v1.2.3


From 3e7fd00e614c0ac6693d697cc0ca3473a99490bf Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Wed, 30 Aug 2017 23:08:59 -0600
Subject: Added a simpler and more accurate Baton UI clone. Basically, took out
 the party strobe and added a lockout mode instead.

---
 spaghetti-monster/baton-simpler.c | 202 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 202 insertions(+)
 create mode 100644 spaghetti-monster/baton-simpler.c

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/baton-simpler.c b/spaghetti-monster/baton-simpler.c
new file mode 100644
index 0000000..a6ddf36
--- /dev/null
+++ b/spaghetti-monster/baton-simpler.c
@@ -0,0 +1,202 @@
+/*
+ * Baton: Olight Baton-like UI for SpaghettiMonster.
+ *
+ * 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/>.
+ */
+
+#define FSM_EMISAR_D4_DRIVER
+#define USE_LVP
+#define USE_THERMAL_REGULATION
+#define DEFAULT_THERM_CEIL 45
+#define USE_DELAY_MS
+#include "spaghetti-monster.h"
+
+// FSM states
+uint8_t off_state(EventPtr event, uint16_t arg);
+uint8_t steady_state(EventPtr event, uint16_t arg);
+uint8_t lockout_state(EventPtr event, uint16_t arg);
+
+// brightness control
+uint8_t memorized_level = 1;
+uint8_t actual_level = 0;
+#ifdef USE_THERMAL_REGULATION
+uint8_t target_level = 0;
+#endif
+
+// deferred "off" so we won't suspend in a weird state
+volatile uint8_t go_to_standby = 0;
+
+// moon + ../../bin/level_calc.py 2 6 7135 18 10 150 FET 1 10 1500
+uint8_t pwm1_levels[] = { 3, 18, 110, 255, 255, 255,   0, };
+uint8_t pwm2_levels[] = { 0,  0,   0,   9,  58, 138, 255, };
+#define MAX_LEVEL (sizeof(pwm1_levels)-1)
+
+// set LED brightness
+void set_level(uint8_t lvl) {
+    actual_level = lvl;
+    PWM1_LVL = pwm1_levels[lvl];
+    PWM2_LVL = pwm2_levels[lvl];
+}
+
+uint8_t off_state(EventPtr event, uint16_t arg) {
+    // turn emitter off when entering state
+    if (event == EV_enter_state) {
+        go_to_standby = 1; // sleep while off  (lower power use)
+        return EVENT_HANDLED;
+    }
+    // hold (initially): go to lowest level, but allow abort for regular click
+    else if (event == EV_click1_press) {
+        set_level(0);
+        return EVENT_HANDLED;
+    }
+    // 1 click (before timeout): go to memorized level, but allow abort for double click
+    else if (event == EV_click1_release) {
+        set_level(memorized_level);
+        return EVENT_HANDLED;
+    }
+    // 1 click: regular mode
+    else if (event == EV_1click) {
+        set_state(steady_state, memorized_level);
+        return EVENT_HANDLED;
+    }
+    // 2 clicks: highest mode
+    else if (event == EV_2clicks) {
+        set_state(steady_state, MAX_LEVEL);
+        return EVENT_HANDLED;
+    }
+    // 4 clicks: soft lockout
+    else if (event == EV_4clicks) {
+        set_state(lockout_state, 0);
+        return EVENT_HANDLED;
+    }
+    // hold: go to lowest level
+    else if (event == EV_click1_hold) {
+        set_state(steady_state, 0);
+        return EVENT_HANDLED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+
+uint8_t steady_state(EventPtr event, uint16_t arg) {
+    // turn LED on when we first enter the mode
+    if (event == EV_enter_state) {
+        // remember this level, unless it's moon or turbo
+        if ((arg > 0) && (arg < MAX_LEVEL))
+            memorized_level = arg;
+        #ifdef USE_THERMAL_REGULATION
+        target_level = arg;
+        #endif
+        set_level(arg);
+        return EVENT_HANDLED;
+    }
+    // 1 click: off
+    else if (event == EV_1click) {
+        set_state(off_state, 0);
+        return EVENT_HANDLED;
+    }
+    // 2 clicks: go to/from highest level
+    else if (event == EV_2clicks) {
+        if (actual_level < MAX_LEVEL) {  // go to turbo
+            memorized_level = actual_level;  // in case we're on moon
+            #ifdef USE_THERMAL_REGULATION
+            target_level = MAX_LEVEL;
+            #endif
+            set_level(MAX_LEVEL);
+        }
+        else {  // return from turbo
+            #ifdef USE_THERMAL_REGULATION
+            target_level = memorized_level;
+            #endif
+            set_level(memorized_level);
+        }
+        return EVENT_HANDLED;
+    }
+    // hold: change brightness
+    else if (event == EV_click1_hold) {
+        if ((arg % HOLD_TIMEOUT) == 0) {
+            memorized_level = (actual_level+1) % (MAX_LEVEL+1);
+            #ifdef USE_THERMAL_REGULATION
+            target_level = memorized_level;
+            #endif
+            set_level(memorized_level);
+        }
+        return EVENT_HANDLED;
+    }
+    #ifdef USE_THERMAL_REGULATION
+    // overheating: drop by 1 level
+    else if (event == EV_temperature_high) {
+        if (actual_level > 1) {
+            set_level(actual_level - 1);
+        }
+        return EVENT_HANDLED;
+    }
+    // underheating: increase by 1 level if we're lower than the target
+    else if (event == EV_temperature_low) {
+        if (actual_level < target_level) {
+            set_level(actual_level + 1);
+        }
+        return EVENT_HANDLED;
+    }
+    #endif
+    return EVENT_NOT_HANDLED;
+}
+
+uint8_t lockout_state(EventPtr event, uint16_t arg) {
+    // stay asleep while locked, but allow waking long enough to click 4 times
+    if (event == EV_tick) {
+        static uint8_t ticks_spent_awake = 0;
+        ticks_spent_awake ++;
+        PWM1_LVL = 0;  PWM2_LVL = 0;
+        if (ticks_spent_awake > 3 * TICKS_PER_SECOND) {
+            ticks_spent_awake = 0;
+            go_to_standby = 1;
+        }
+        return MISCHIEF_MANAGED;
+    }
+    // 4 clicks: exit
+    else if (event == EV_4clicks) {
+        set_state(steady_state, 1);
+        return MISCHIEF_MANAGED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+
+void low_voltage() {
+    // step down by one level or turn off
+    if (actual_level > 0) {
+        set_level(actual_level - 1);
+    }
+    else {
+        set_state(off_state, 0);
+    }
+}
+
+void setup() {
+    // blink when power is connected
+    set_level(MAX_LEVEL/2);
+    delay_ms(10);
+    set_level(0);
+
+    push_state(off_state, 0);
+}
+
+void loop() {
+    if (go_to_standby) {
+        go_to_standby = 0;
+        PWM1_LVL = 0;  PWM2_LVL = 0;
+        standby_mode();
+    }
+}
-- 
cgit v1.2.3


From af011b08919e42736f514ae6ffe045571dbefda9 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Wed, 30 Aug 2017 23:15:39 -0600
Subject: Reorganized FSM files, one dir per UI.

---
 spaghetti-monster/anduril.c               | 961 ------------------------------
 spaghetti-monster/anduril.txt             | 100 ----
 spaghetti-monster/anduril/anduril.c       | 961 ++++++++++++++++++++++++++++++
 spaghetti-monster/anduril/anduril.txt     | 100 ++++
 spaghetti-monster/baton-simpler.c         | 202 -------
 spaghetti-monster/baton.c                 | 230 -------
 spaghetti-monster/baton/baton-simpler.c   | 202 +++++++
 spaghetti-monster/baton/baton.c           | 231 +++++++
 spaghetti-monster/darkhorse.c             | 378 ------------
 spaghetti-monster/darkhorse/darkhorse.c   | 378 ++++++++++++
 spaghetti-monster/momentary.c             |  81 ---
 spaghetti-monster/momentary/momentary.c   |  81 +++
 spaghetti-monster/ramping-ui.c            | 361 -----------
 spaghetti-monster/ramping-ui/ramping-ui.c | 361 +++++++++++
 14 files changed, 2314 insertions(+), 2313 deletions(-)
 delete mode 100644 spaghetti-monster/anduril.c
 delete mode 100644 spaghetti-monster/anduril.txt
 create mode 100644 spaghetti-monster/anduril/anduril.c
 create mode 100644 spaghetti-monster/anduril/anduril.txt
 delete mode 100644 spaghetti-monster/baton-simpler.c
 delete mode 100644 spaghetti-monster/baton.c
 create mode 100644 spaghetti-monster/baton/baton-simpler.c
 create mode 100644 spaghetti-monster/baton/baton.c
 delete mode 100644 spaghetti-monster/darkhorse.c
 create mode 100644 spaghetti-monster/darkhorse/darkhorse.c
 delete mode 100644 spaghetti-monster/momentary.c
 create mode 100644 spaghetti-monster/momentary/momentary.c
 delete mode 100644 spaghetti-monster/ramping-ui.c
 create mode 100644 spaghetti-monster/ramping-ui/ramping-ui.c

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril.c b/spaghetti-monster/anduril.c
deleted file mode 100644
index 998c0c5..0000000
--- a/spaghetti-monster/anduril.c
+++ /dev/null
@@ -1,961 +0,0 @@
-/*
- * Anduril: Narsil-inspired UI for SpaghettiMonster.
- * (Anduril is Aragorn's sword, the blade Narsil reforged)
- *
- * 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/>.
- */
-
-#define FSM_EMISAR_D4_DRIVER
-#define USE_LVP
-#define USE_THERMAL_REGULATION
-#define DEFAULT_THERM_CEIL 45
-#define USE_DELAY_MS
-#define USE_DELAY_4MS
-#define USE_DELAY_ZERO
-#define USE_RAMPING
-#define RAMP_LENGTH 150
-#define USE_BATTCHECK
-#define BATTCHECK_VpT
-#define MAX_CLICKS 6
-#define USE_EEPROM
-#define EEPROM_BYTES 12
-#include "spaghetti-monster.h"
-
-// Options specific to this UI (not inherited from SpaghettiMonster)
-#define USE_LIGHTNING_MODE
-// set this a bit high, since the bottom 2 ramp levels might not emit any light at all
-#define GOODNIGHT_TIME  65  // minutes (approximately)
-#define GOODNIGHT_LEVEL 24  // ~11 lm
-
-// FSM states
-uint8_t off_state(EventPtr event, uint16_t arg);
-// ramping mode and its related config mode
-uint8_t steady_state(EventPtr event, uint16_t arg);
-uint8_t ramp_config_state(EventPtr event, uint16_t arg);
-// party and tactical strobes
-uint8_t strobe_state(EventPtr event, uint16_t arg);
-#ifdef USE_LIGHTNING_MODE
-#define NUM_STROBES 4
-#else
-#define NUM_STROBES 3
-#endif
-#ifdef USE_BATTCHECK
-uint8_t battcheck_state(EventPtr event, uint16_t arg);
-uint8_t tempcheck_state(EventPtr event, uint16_t arg);
-uint8_t thermal_config_state(EventPtr event, uint16_t arg);
-#endif
-// 1-hour ramp down from low, then automatic off
-uint8_t goodnight_state(EventPtr event, uint16_t arg);
-// beacon mode and its related config mode
-uint8_t beacon_state(EventPtr event, uint16_t arg);
-uint8_t beacon_config_state(EventPtr event, uint16_t arg);
-// soft lockout
-uint8_t lockout_state(EventPtr event, uint16_t arg);
-// momentary / signalling mode
-uint8_t momentary_state(EventPtr event, uint16_t arg);
-
-// general helper function for config modes
-uint8_t number_entry_state(EventPtr event, uint16_t arg);
-// return value from number_entry_state()
-volatile uint8_t number_entry_value;
-
-void blink_confirm(uint8_t num);
-
-// remember stuff even after battery was changed
-void load_config();
-void save_config();
-
-// brightness control
-uint8_t memorized_level = MAX_1x7135;
-// smooth vs discrete ramping
-volatile uint8_t ramp_style = 0;  // 0 = smooth, 1 = discrete
-volatile uint8_t ramp_smooth_floor = 5;
-volatile uint8_t ramp_smooth_ceil = MAX_LEVEL - 30;
-volatile uint8_t ramp_discrete_floor = 20;
-volatile uint8_t ramp_discrete_ceil = MAX_LEVEL - 30;
-volatile uint8_t ramp_discrete_steps = 7;
-uint8_t ramp_discrete_step_size;  // don't set this
-
-// calculate the nearest ramp level which would be valid at the moment
-// (is a no-op for smooth ramp, but limits discrete ramp to only the
-// correct levels for the user's config)
-uint8_t nearest_level(int16_t target);
-
-#ifdef USE_THERMAL_REGULATION
-// brightness before thermal step-down
-uint8_t target_level = 0;
-#endif
-
-// strobe timing
-volatile uint8_t strobe_delays[] = { 40, 67 };  // party strobe, tactical strobe
-volatile uint8_t strobe_type = 3;  // 0 == party strobe, 1 == tactical strobe, 2 == lightning storm, 3 == bike flasher
-
-// bike mode config options
-volatile uint8_t bike_flasher_brightness = MAX_1x7135;
-
-#ifdef USE_LIGHTNING_MODE
-volatile uint8_t pseudo_rand_seed = 0;
-uint8_t pseudo_rand();
-#endif
-
-// beacon timing
-volatile uint8_t beacon_seconds = 2;
-
-// deferred "off" so we won't suspend in a weird state
-volatile uint8_t go_to_standby = 0;
-
-
-uint8_t off_state(EventPtr event, uint16_t arg) {
-    // turn emitter off when entering state
-    if (event == EV_enter_state) {
-        set_level(0);
-        // sleep while off  (lower power use)
-        go_to_standby = 1;
-        return MISCHIEF_MANAGED;
-    }
-    // hold (initially): go to lowest level, but allow abort for regular click
-    else if (event == EV_click1_press) {
-        set_level(nearest_level(1));
-        return MISCHIEF_MANAGED;
-    }
-    // 1 click (before timeout): go to memorized level, but allow abort for double click
-    else if (event == EV_click1_release) {
-        set_level(nearest_level(memorized_level));
-        return MISCHIEF_MANAGED;
-    }
-    // 1 click: regular mode
-    else if (event == EV_1click) {
-        set_state(steady_state, memorized_level);
-        return MISCHIEF_MANAGED;
-    }
-    // 2 clicks (initial press): off, to prep for later events
-    else if (event == EV_click2_press) {
-        set_level(0);
-        return MISCHIEF_MANAGED;
-    }
-    // 2 clicks: highest mode
-    else if (event == EV_2clicks) {
-        set_state(steady_state, nearest_level(MAX_LEVEL));
-        return MISCHIEF_MANAGED;
-    }
-    #ifdef USE_BATTCHECK
-    // 3 clicks: battcheck mode
-    else if (event == EV_3clicks) {
-        set_state(battcheck_state, 0);
-        return MISCHIEF_MANAGED;
-    }
-    #endif
-    // 4 clicks: soft lockout
-    else if (event == EV_4clicks) {
-        blink_confirm(5);
-        set_state(lockout_state, 0);
-        return MISCHIEF_MANAGED;
-    }
-    // 5 clicks: strobe mode
-    else if (event == EV_5clicks) {
-        set_state(strobe_state, 0);
-        return MISCHIEF_MANAGED;
-    }
-    // 6 clicks: momentary mode
-    else if (event == EV_6clicks) {
-        blink_confirm(1);
-        set_state(momentary_state, 0);
-        return MISCHIEF_MANAGED;
-    }
-    // hold: go to lowest level
-    else if (event == EV_click1_hold) {
-        // don't start ramping immediately;
-        // give the user time to release at moon level
-        if (arg >= HOLD_TIMEOUT) {
-            set_state(steady_state, 1);
-        }
-        return MISCHIEF_MANAGED;
-    }
-    // hold, release quickly: go to lowest level
-    else if (event == EV_click1_hold_release) {
-        set_state(steady_state, 1);
-        return MISCHIEF_MANAGED;
-    }
-    // click, hold: go to highest level (for ramping down)
-    else if (event == EV_click2_hold) {
-        set_state(steady_state, MAX_LEVEL);
-        return MISCHIEF_MANAGED;
-    }
-    return EVENT_NOT_HANDLED;
-}
-
-
-uint8_t steady_state(EventPtr event, uint16_t arg) {
-    uint8_t mode_min = ramp_smooth_floor;
-    uint8_t mode_max = ramp_smooth_ceil;
-    uint8_t ramp_step_size = 1;
-    if (ramp_style) {
-        mode_min = ramp_discrete_floor;
-        mode_max = ramp_discrete_ceil;
-        ramp_step_size = ramp_discrete_step_size;
-    }
-
-    // turn LED on when we first enter the mode
-    if (event == EV_enter_state) {
-        // remember this level, unless it's moon or turbo
-        if ((arg > mode_min) && (arg < mode_max))
-            memorized_level = arg;
-        // use the requested level even if not memorized
-        #ifdef USE_THERMAL_REGULATION
-        target_level = arg;
-        #endif
-        set_level(nearest_level(arg));
-        return MISCHIEF_MANAGED;
-    }
-    // 1 click: off
-    else if (event == EV_1click) {
-        set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
-    }
-    // 2 clicks: go to/from highest level
-    else if (event == EV_2clicks) {
-        if (actual_level < MAX_LEVEL) {
-            memorized_level = actual_level;  // in case we're on moon
-            #ifdef USE_THERMAL_REGULATION
-            target_level = MAX_LEVEL;
-            #endif
-            // true turbo, not the mode-specific ceiling
-            set_level(MAX_LEVEL);
-        }
-        else {
-            #ifdef USE_THERMAL_REGULATION
-            target_level = memorized_level;
-            #endif
-            set_level(memorized_level);
-        }
-        return MISCHIEF_MANAGED;
-    }
-    // 3 clicks: toggle smooth vs discrete ramping
-    else if (event == EV_3clicks) {
-        ramp_style ^= 1;
-        memorized_level = nearest_level(memorized_level);
-        save_config();
-        set_level(0);
-        delay_4ms(20/4);
-        set_level(memorized_level);
-        return MISCHIEF_MANAGED;
-    }
-    // 4 clicks: configure this ramp mode
-    else if (event == EV_4clicks) {
-        set_state(ramp_config_state, 0);
-        return MISCHIEF_MANAGED;
-    }
-    // hold: change brightness (brighter)
-    else if (event == EV_click1_hold) {
-        // ramp slower in discrete mode
-        if (ramp_style  &&  (arg % HOLD_TIMEOUT != 0)) {
-            return MISCHIEF_MANAGED;
-        }
-        // TODO? make it ramp down instead, if already at max?
-        memorized_level = nearest_level((int16_t)actual_level + ramp_step_size);
-        #ifdef USE_THERMAL_REGULATION
-        target_level = memorized_level;
-        #endif
-        // only blink once for each threshold
-        if ((memorized_level != actual_level)
-                && ((memorized_level == MAX_1x7135)
-                    || (memorized_level == mode_max))) {
-            set_level(0);
-            delay_4ms(8/4);
-        }
-        set_level(memorized_level);
-        return MISCHIEF_MANAGED;
-    }
-    // click, hold: change brightness (dimmer)
-    else if (event == EV_click2_hold) {
-        // ramp slower in discrete mode
-        if (ramp_style  &&  (arg % HOLD_TIMEOUT != 0)) {
-            return MISCHIEF_MANAGED;
-        }
-        // TODO? make it ramp up instead, if already at min?
-        memorized_level = nearest_level((int16_t)actual_level - ramp_step_size);
-        #ifdef USE_THERMAL_REGULATION
-        target_level = memorized_level;
-        #endif
-        // only blink once for each threshold
-        if ((memorized_level != actual_level)
-                && ((memorized_level == MAX_1x7135)
-                    || (memorized_level == mode_min))) {
-            set_level(0);
-            delay_4ms(8/4);
-        }
-        set_level(memorized_level);
-        return MISCHIEF_MANAGED;
-    }
-    #ifdef USE_THERMAL_REGULATION
-    // TODO: test this on a real light
-    // overheating: drop by an amount proportional to how far we are above the ceiling
-    else if (event == EV_temperature_high) {
-        if (actual_level > MAX_LEVEL/4) {
-            uint8_t stepdown = actual_level - arg;
-            if (stepdown < MAX_LEVEL/4) stepdown = MAX_LEVEL/4;
-            set_level(stepdown);
-        }
-        return MISCHIEF_MANAGED;
-    }
-    // underheating: increase slowly if we're lower than the target
-    //               (proportional to how low we are)
-    else if (event == EV_temperature_low) {
-        if (actual_level < target_level) {
-            uint8_t stepup = actual_level + (arg>>1);
-            if (stepup > target_level) stepup = target_level;
-            set_level(stepup);
-        }
-        return MISCHIEF_MANAGED;
-    }
-    #endif
-    return EVENT_NOT_HANDLED;
-}
-
-
-uint8_t strobe_state(EventPtr event, uint16_t arg) {
-    if (event == EV_enter_state) {
-        return MISCHIEF_MANAGED;
-    }
-    // 1 click: off
-    else if (event == EV_1click) {
-        set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
-    }
-    // 2 clicks: rotate through strobe/flasher modes
-    else if (event == EV_2clicks) {
-        strobe_type = (strobe_type + 1) % NUM_STROBES;
-        interrupt_nice_delays();
-        save_config();
-        return MISCHIEF_MANAGED;
-    }
-    // hold: change speed (go faster)
-    //       or change brightness (brighter)
-    else if (event == EV_click1_hold) {
-        if (strobe_type < 2) {
-            if ((arg & 1) == 0) {
-                if (strobe_delays[strobe_type] > 8) strobe_delays[strobe_type] --;
-            }
-        }
-        // biking mode brighter
-        else if (strobe_type == 3) {
-            if (bike_flasher_brightness < MAX_LEVEL/2)
-                bike_flasher_brightness ++;
-            set_level(bike_flasher_brightness);
-        }
-        return MISCHIEF_MANAGED;
-    }
-    // click, hold: change speed (go slower)
-    //       or change brightness (dimmer)
-    else if (event == EV_click2_hold) {
-        if (strobe_type < 2) {
-            if ((arg & 1) == 0) {
-                if (strobe_delays[strobe_type] < 255) strobe_delays[strobe_type] ++;
-            }
-        }
-        // biking mode dimmer
-        else if (strobe_type == 3) {
-            if (bike_flasher_brightness > 1)
-                bike_flasher_brightness --;
-            set_level(bike_flasher_brightness);
-        }
-        return MISCHIEF_MANAGED;
-    }
-    // release hold: save new strobe settings
-    else if ((event == EV_click1_hold_release)
-          || (event == EV_click2_hold_release)) {
-        save_config();
-        return MISCHIEF_MANAGED;
-    }
-    #ifdef USE_LIGHTNING_MODE
-    // clock tick: bump the random seed
-    else if (event == EV_tick) {
-        pseudo_rand_seed += arg;
-        return MISCHIEF_MANAGED;
-    }
-    #endif
-    return EVENT_NOT_HANDLED;
-}
-
-
-#ifdef USE_BATTCHECK
-uint8_t battcheck_state(EventPtr event, uint16_t arg) {
-    // 1 click: off
-    if (event == EV_1click) {
-        set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
-    }
-    // 2 clicks: goodnight mode
-    else if (event == EV_2clicks) {
-        set_state(goodnight_state, 0);
-        return MISCHIEF_MANAGED;
-    }
-    return EVENT_NOT_HANDLED;
-}
-
-uint8_t tempcheck_state(EventPtr event, uint16_t arg) {
-    // 1 click: off
-    if (event == EV_1click) {
-        set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
-    }
-    // 2 clicks: battcheck mode
-    else if (event == EV_2clicks) {
-        set_state(battcheck_state, 0);
-        return MISCHIEF_MANAGED;
-    }
-    // 3 clicks: thermal config mode
-    else if (event == EV_3clicks) {
-        set_state(thermal_config_state, 0);
-        return MISCHIEF_MANAGED;
-    }
-    return EVENT_NOT_HANDLED;
-}
-#endif
-
-
-uint8_t beacon_state(EventPtr event, uint16_t arg) {
-    // 1 click: off
-    if (event == EV_1click) {
-        set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
-    }
-    // 2 clicks: tempcheck mode
-    else if (event == EV_2clicks) {
-        set_state(tempcheck_state, 0);
-        return MISCHIEF_MANAGED;
-    }
-    // 3 clicks: beacon config mode
-    else if (event == EV_3clicks) {
-        set_state(beacon_config_state, 0);
-        return MISCHIEF_MANAGED;
-    }
-    return EVENT_NOT_HANDLED;
-}
-
-
-#define GOODNIGHT_TICKS_PER_STEPDOWN (GOODNIGHT_TIME*TICKS_PER_SECOND*60L/GOODNIGHT_LEVEL)
-uint8_t goodnight_state(EventPtr event, uint16_t arg) {
-    static uint16_t ticks_since_stepdown = 0;
-    // blink on start
-    if (event == EV_enter_state) {
-        blink_confirm(4);
-        ticks_since_stepdown = 0;
-        set_level(GOODNIGHT_LEVEL);
-        return MISCHIEF_MANAGED;
-    }
-    // 1 click: off
-    else if (event == EV_1click) {
-        set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
-    }
-    // 2 clicks: beacon mode
-    else if (event == EV_2clicks) {
-        set_state(beacon_state, 0);
-        return MISCHIEF_MANAGED;
-    }
-    // tick: step down (maybe) or off (maybe)
-    else if (event == EV_tick) {
-        if (++ticks_since_stepdown > GOODNIGHT_TICKS_PER_STEPDOWN) {
-            ticks_since_stepdown = 0;
-            set_level(actual_level-1);
-            if (! actual_level) {
-                #if 0  // test blink, to help measure timing
-                set_level(MAX_LEVEL>>2);
-                delay_4ms(8/2);
-                set_level(0);
-                #endif
-                set_state(off_state, 0);
-            }
-        }
-        return MISCHIEF_MANAGED;
-    }
-    return EVENT_NOT_HANDLED;
-}
-
-
-uint8_t lockout_state(EventPtr event, uint16_t arg) {
-    // conserve power while locked out
-    // (allow staying awake long enough to exit, but otherwise
-    //  be persistent about going back to sleep every few seconds
-    //  even if the user keeps pressing the button)
-    if (event == EV_tick) {
-        static uint8_t ticks_spent_awake = 0;
-        ticks_spent_awake ++;
-        if (ticks_spent_awake > 180) {
-            ticks_spent_awake = 0;
-            go_to_standby = 1;
-        }
-        return MISCHIEF_MANAGED;
-    }
-    // 4 clicks: exit
-    else if (event == EV_4clicks) {
-        blink_confirm(2);
-        set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
-    }
-    return EVENT_NOT_HANDLED;
-}
-
-
-uint8_t momentary_state(EventPtr event, uint16_t arg) {
-    if (event == EV_click1_press) {
-        set_level(memorized_level);
-        empty_event_sequence();  // don't attempt to parse multiple clicks
-        return MISCHIEF_MANAGED;
-    }
-
-    else if (event == EV_release) {
-        set_level(0);
-        empty_event_sequence();  // don't attempt to parse multiple clicks
-        //go_to_standby = 1;  // sleep while light is off
-        return MISCHIEF_MANAGED;
-    }
-
-    // Sleep, dammit!  (but wait a few seconds first)
-    // (because standby mode uses such little power that it can interfere
-    //  with exiting via tailcap loosen+tighten unless you leave power
-    //  disconnected for several seconds, so we want to be awake when that
-    //  happens to speed up the process)
-    else if ((event == EV_tick)  &&  (actual_level == 0)) {
-        if (arg > TICKS_PER_SECOND*15) {  // sleep after 15 seconds
-            go_to_standby = 1;  // sleep while light is off
-        }
-        return MISCHIEF_MANAGED;
-    }
-
-    return EVENT_NOT_HANDLED;
-}
-
-
-uint8_t ramp_config_state(EventPtr event, uint16_t arg) {
-    static uint8_t config_step;
-    static uint8_t num_config_steps;
-    if (event == EV_enter_state) {
-        config_step = 0;
-        if (ramp_style) {
-            num_config_steps = 3;
-        }
-        else {
-            num_config_steps = 2;
-        }
-        set_level(0);
-        return MISCHIEF_MANAGED;
-    }
-    // advance forward through config steps
-    else if (event == EV_tick) {
-        if (config_step < num_config_steps) {
-            push_state(number_entry_state, config_step + 1);
-        }
-        else {
-            save_config();
-            // TODO: blink out some sort of success pattern
-            // return to steady mode
-            set_state(steady_state, memorized_level);
-        }
-        return MISCHIEF_MANAGED;
-    }
-    // an option was set (return from number_entry_state)
-    else if (event == EV_reenter_state) {
-        #if 0
-        // FIXME? this is a kludge which relies on the vars being consecutive
-        // in RAM and in the same order as declared
-        // ... and it doesn't work; it seems they're not consecutive  :(
-        volatile uint8_t *dest;
-        if (ramp_style) dest = (&ramp_discrete_floor) + config_step;
-        else dest = (&ramp_smooth_floor) + config_step;
-        if (number_entry_value)
-            *dest = number_entry_value;
-        #else
-        switch (config_step) {
-            case 0:
-                if (number_entry_value) {
-                    if (ramp_style) ramp_discrete_floor = number_entry_value;
-                    else ramp_smooth_floor = number_entry_value;
-                }
-                break;
-            case 1:
-                if (number_entry_value) {
-                    if (ramp_style) ramp_discrete_ceil = MAX_LEVEL + 1 - number_entry_value;
-                    else ramp_smooth_ceil = MAX_LEVEL + 1 - number_entry_value;
-                }
-                break;
-            case 2:
-                if (number_entry_value)
-                    ramp_discrete_steps = number_entry_value;
-                break;
-        }
-        #endif
-        config_step ++;
-        return MISCHIEF_MANAGED;
-    }
-    return EVENT_NOT_HANDLED;
-}
-
-
-uint8_t thermal_config_state(EventPtr event, uint16_t arg) {
-    static uint8_t done = 0;
-    if (event == EV_enter_state) {
-        set_level(0);
-        done = 0;
-        return MISCHIEF_MANAGED;
-    }
-    // advance forward through config steps
-    else if (event == EV_tick) {
-        if (! done) push_state(number_entry_state, 1);
-        else {
-            save_config();
-            // return to beacon mode
-            set_state(tempcheck_state, 0);
-        }
-        return MISCHIEF_MANAGED;
-    }
-    // an option was set (return from number_entry_state)
-    else if (event == EV_reenter_state) {
-        if (number_entry_value) therm_ceil = 30 + number_entry_value;
-        if (therm_ceil > MAX_THERM_CEIL) therm_ceil = MAX_THERM_CEIL;
-        done = 1;
-        return MISCHIEF_MANAGED;
-    }
-    return EVENT_NOT_HANDLED;
-}
-
-
-uint8_t beacon_config_state(EventPtr event, uint16_t arg) {
-    static uint8_t done = 0;
-    if (event == EV_enter_state) {
-        set_level(0);
-        done = 0;
-        return MISCHIEF_MANAGED;
-    }
-    // advance forward through config steps
-    else if (event == EV_tick) {
-        if (! done) push_state(number_entry_state, 1);
-        else {
-            save_config();
-            // return to beacon mode
-            set_state(beacon_state, 0);
-        }
-        return MISCHIEF_MANAGED;
-    }
-    // an option was set (return from number_entry_state)
-    else if (event == EV_reenter_state) {
-        if (number_entry_value) beacon_seconds = number_entry_value;
-        done = 1;
-        return MISCHIEF_MANAGED;
-    }
-    return EVENT_NOT_HANDLED;
-}
-
-
-uint8_t number_entry_state(EventPtr event, uint16_t arg) {
-    static uint8_t value;
-    static uint8_t blinks_left;
-    static uint8_t entry_step;
-    static uint16_t wait_ticks;
-    if (event == EV_enter_state) {
-        value = 0;
-        blinks_left = arg;
-        entry_step = 0;
-        wait_ticks = 0;
-        // TODO: blink out the 'arg' to show which option this is
-        return MISCHIEF_MANAGED;
-    }
-    // advance through the process:
-    // 0: wait a moment
-    // 1: blink out the 'arg' value
-    // 2: wait a moment
-    // 3: "buzz" while counting clicks
-    // 4: save and exit
-    else if (event == EV_tick) {
-        // wait a moment
-        if ((entry_step == 0) || (entry_step == 2)) {
-            if (wait_ticks < TICKS_PER_SECOND/2)
-                wait_ticks ++;
-            else {
-                entry_step ++;
-                wait_ticks = 0;
-            }
-        }
-        // blink out the option number
-        else if (entry_step == 1) {
-            if (blinks_left) {
-                if ((wait_ticks & 31) == 10) {
-                    set_level(RAMP_SIZE/4);
-                }
-                else if ((wait_ticks & 31) == 20) {
-                    set_level(0);
-                }
-                else if ((wait_ticks & 31) == 31) {
-                    blinks_left --;
-                }
-                wait_ticks ++;
-            }
-            else {
-                entry_step ++;
-                wait_ticks = 0;
-            }
-        }
-        else if (entry_step == 3) {  // buzz while waiting for a number to be entered
-            wait_ticks ++;
-            // buzz for N seconds after last event
-            if ((wait_ticks & 3) == 0) {
-                set_level(RAMP_SIZE/6);
-            }
-            else if ((wait_ticks & 3) == 2) {
-                set_level(RAMP_SIZE/8);
-            }
-            // time out after 3 seconds
-            if (wait_ticks > TICKS_PER_SECOND*3) {
-                //number_entry_value = value;
-                set_level(0);
-                entry_step ++;
-            }
-        }
-        else if (entry_step == 4) {
-            number_entry_value = value;
-            pop_state();
-        }
-        return MISCHIEF_MANAGED;
-    }
-    // count clicks
-    else if (event == EV_click1_release) {
-        empty_event_sequence();
-        if (entry_step == 3) {  // only count during the "buzz"
-            value ++;
-            wait_ticks = 0;
-            // flash briefly
-            set_level(RAMP_SIZE/2);
-            delay_4ms(8/2);
-            set_level(0);
-        }
-        return MISCHIEF_MANAGED;
-    }
-    return EVENT_NOT_HANDLED;
-}
-
-
-// find the ramp level closest to the target,
-// using only the levels which are allowed in the current state
-uint8_t nearest_level(int16_t target) {
-    // bounds check
-    // using int16_t here saves us a bunch of logic elsewhere,
-    // by allowing us to correct for numbers < 0 or > 255 in one central place
-    uint8_t mode_min = ramp_smooth_floor;
-    uint8_t mode_max = ramp_smooth_ceil;
-    if (ramp_style) {
-        mode_min = ramp_discrete_floor;
-        mode_max = ramp_discrete_ceil;
-    }
-    if (target < mode_min) return mode_min;
-    if (target > mode_max) return mode_max;
-    // the rest isn't relevant for smooth ramping
-    if (! ramp_style) return target;
-
-    uint8_t ramp_range = ramp_discrete_ceil - ramp_discrete_floor;
-    ramp_discrete_step_size = ramp_range / (ramp_discrete_steps-1);
-    uint8_t this_level = ramp_discrete_floor;
-
-    for(uint8_t i=0; i<ramp_discrete_steps; i++) {
-        this_level = ramp_discrete_floor + (i * (uint16_t)ramp_range / (ramp_discrete_steps-1));
-        int8_t diff = target - this_level;
-        if (diff < 0) diff = -diff;
-        if (diff <= (ramp_discrete_step_size>>1))
-            return this_level;
-    }
-    return this_level;
-}
-
-
-void blink_confirm(uint8_t num) {
-    for (; num>0; num--) {
-        set_level(MAX_LEVEL/4);
-        delay_4ms(10/4);
-        set_level(0);
-        delay_4ms(100/4);
-    }
-}
-
-
-#ifdef USE_LIGHTNING_MODE
-uint8_t pseudo_rand() {
-    static uint16_t offset = 1024;
-    // loop from 1024 to 4095
-    offset = ((offset + 1) & 0x0fff) | 0x0400;
-    pseudo_rand_seed += 0b01010101;  // 85
-    return pgm_read_byte(offset) + pseudo_rand_seed;
-}
-#endif
-
-
-void load_config() {
-    if (load_eeprom()) {
-        ramp_style = eeprom[0];
-        ramp_smooth_floor = eeprom[1];
-        ramp_smooth_ceil = eeprom[2];
-        ramp_discrete_floor = eeprom[3];
-        ramp_discrete_ceil = eeprom[4];
-        ramp_discrete_steps = eeprom[5];
-        strobe_type = eeprom[6];  // TODO: move this to eeprom_wl?
-        strobe_delays[0] = eeprom[7];
-        strobe_delays[1] = eeprom[8];
-        bike_flasher_brightness = eeprom[9];
-        beacon_seconds = eeprom[10];
-        therm_ceil = eeprom[11];
-    }
-}
-
-void save_config() {
-    eeprom[0] = ramp_style;
-    eeprom[1] = ramp_smooth_floor;
-    eeprom[2] = ramp_smooth_ceil;
-    eeprom[3] = ramp_discrete_floor;
-    eeprom[4] = ramp_discrete_ceil;
-    eeprom[5] = ramp_discrete_steps;
-    eeprom[6] = strobe_type;  // TODO: move this to eeprom_wl?
-    eeprom[7] = strobe_delays[0];
-    eeprom[8] = strobe_delays[1];
-    eeprom[9] = bike_flasher_brightness;
-    eeprom[10] = beacon_seconds;
-    eeprom[11] = therm_ceil;
-
-    save_eeprom();
-}
-
-
-void low_voltage() {
-    // "step down" from strobe to something low
-    if (current_state == strobe_state) {
-        set_state(steady_state, RAMP_SIZE/6);
-    }
-    // in normal mode, step down by half or turn off
-    else if (current_state == steady_state) {
-        if (actual_level > 1) {
-            set_level(actual_level >> 1);
-        }
-        else {
-            set_state(off_state, 0);
-        }
-    }
-    // all other modes, just turn off when voltage is low
-    else {
-        set_state(off_state, 0);
-    }
-}
-
-
-void setup() {
-    // blink at power-on to let user know power is connected
-    set_level(RAMP_SIZE/8);
-    delay_4ms(3);
-    set_level(0);
-
-    load_config();
-
-    push_state(off_state, 0);
-}
-
-
-void loop() {
-
-    // deferred "off" so we won't suspend in a weird state
-    // (like...  during the middle of a strobe pulse)
-    if (go_to_standby) {
-        go_to_standby = 0;
-        set_level(0);
-        standby_mode();
-    }
-
-    if (current_state == strobe_state) {
-        // party / tactical strobe
-        if (strobe_type < 2) {
-            set_level(MAX_LEVEL);
-            if (strobe_type == 0) {  // party strobe
-                if (strobe_delays[strobe_type] < 42) delay_zero();
-                else delay_ms(1);
-            } else {  //tactical strobe
-                nice_delay_ms(strobe_delays[strobe_type] >> 1);
-            }
-            set_level(0);
-            nice_delay_ms(strobe_delays[strobe_type]);
-        }
-        #ifdef USE_LIGHTNING_MODE
-        // lightning storm
-        else if (strobe_type == 2) {
-            int16_t brightness;
-            uint16_t rand_time;
-
-            // turn the emitter on at a random level,
-            // for a random amount of time between 1ms and 32ms
-            rand_time = 1 << (pseudo_rand() % 6);
-            brightness = 1 << (pseudo_rand() % 7);  // 1, 2, 4, 8, 16, 32, 64
-            brightness += 1 << (pseudo_rand()&0x03);  // 2 to 80 now
-            brightness += pseudo_rand() % brightness;  // 2 to 159 now (w/ low bias)
-            if (brightness > MAX_LEVEL) brightness = MAX_LEVEL;
-            set_level(brightness);
-            if (! nice_delay_ms(rand_time)) return;
-
-            // decrease the brightness somewhat more gradually, like lightning
-            uint8_t stepdown = brightness >> 3;
-            if (stepdown < 1) stepdown = 1;
-            while(brightness > 1) {
-                if (! nice_delay_ms(rand_time)) return;
-                brightness -= stepdown;
-                if (brightness < 0) brightness = 0;
-                set_level(brightness);
-            }
-
-            // turn the emitter off,
-            // for a random amount of time between 1ms and 8192ms
-            // (with a low bias)
-            rand_time = 1<<(pseudo_rand()%13);
-            rand_time += pseudo_rand()%rand_time;
-            set_level(0);
-            nice_delay_ms(rand_time);
-
-        }
-        #endif
-        // bike flasher
-        else if (strobe_type == 3) {
-            uint8_t burst = bike_flasher_brightness << 1;
-            for(uint8_t i=0; i<4; i++) {
-                set_level(burst);
-                if (! nice_delay_ms(5)) return;
-                set_level(bike_flasher_brightness);
-                if (! nice_delay_ms(65)) return;
-            }
-            if (! nice_delay_ms(720)) return;
-        }
-    }
-
-    #ifdef USE_BATTCHECK
-    else if (current_state == battcheck_state) {
-        battcheck();
-    }
-    else if (current_state == tempcheck_state) {
-        blink_num(temperature>>2);
-        nice_delay_ms(1000);
-    }
-    // TODO: blink out therm_ceil during thermal_config_state
-    #endif
-
-    else if (current_state == beacon_state) {
-        set_level(memorized_level);
-        if (! nice_delay_ms(500)) return;
-        set_level(0);
-        nice_delay_ms(((beacon_seconds) * 1000) - 500);
-    }
-}
diff --git a/spaghetti-monster/anduril.txt b/spaghetti-monster/anduril.txt
deleted file mode 100644
index bb0f5e2..0000000
--- a/spaghetti-monster/anduril.txt
+++ /dev/null
@@ -1,100 +0,0 @@
-From off:
-  * 1 click: memorized level
-  * Hold: lowest level then ramp up
-  * 2 clicks: highest ramp level
-  * Click, hold: highest level then ramp down
-  * 3 clicks: battcheck mode
-    (battcheck, goodnight, beacon, tempcheck)
-  * 4 clicks: lock-out
-  * 5 clicks: strobe modes
-    (bike flasher, party strobe, tactical strobe, lightning storm mode)
-    (remembers which you last used)
-  * 6 clicks: momentary mode (disconnect power to exit)
-
-In steady mode:
-  * 1 click: off
-  * Hold: ramp up
-  * Click, hold: ramp down
-  * 2 clicks: to/from turbo (actual turbo, not just highest ramp level)
-  * 3 clicks: toggle smooth vs discrete ramping
-  * 4 clicks: configure current ramp
-
-Smooth ramp config mode:
-  - Setting 1: memory on/off  (not implemented yet)
-  * Setting 2: low end
-    (click N times to set ramp floor to level N)
-  * Setting 3: high end
-    (click N times to set ramp ceiling to level "151 - N")
-
-Discrete ramp config mode:
-  - Setting 1: memory on/off  (not implemented yet)
-  * Setting 2: low end
-    (click N times to set ramp floor to level N)
-  * Setting 3: high end
-    (click N times to set ramp ceiling to level "151 - N")
-  * Setting 4: number of levels in discrete ramp
-    (click N times to make discrete mode have N stair-steps)
-    (minimum 2, maximum 150)
-
-Bike flasher:
-  * 1 click: off
-  * 2 clicks: party strobe
-  * Hold: brighter
-  * Click, hold: dimmer
-
-Party / Tactical strobe modes:
-  * 1 click: off
-  * Hold: change speed (faster)
-  * Click, hold: change speed (slower)
-  * 2 clicks: next strobe mode
-    (bike flasher, party strobe, tactical strobe, lightning storm mode)
-    (TODO: random/police strobe?)
-
-Lightning storm mode:
-  * 1 click: off
-  * 2 clicks: bike flasher
-
-Battcheck mode:
-  * 1 click: off
-  * 2 clicks: goodnight mode
-
-Goodnight mode:
-  * 1 click: off
-  * 2 clicks: beacon mode
-
-Beacon mode:
-  * 1 click: off
-  * 2 clicks: tempcheck mode
-  * 3 clicks: configure time between pulses
-
-Beacon config mode:
-  * At buzz, click N times to set beacon frequency to N seconds.
-
-Tempcheck mode:
-  * 1 click: off
-  * 2 clicks: battcheck mode
-  * 3 clicks: thermal config mode
-  - Hold: thermal calibration mode
-
-Thermal config mode:
-  * At buzz, click N times to set thermal limit to roughly 30 C + N.
-
-Thermal calibration mode:
-  - Hold until hot: set new ceiling value
-  - ... don't hold: blink out current ceiling value and exit
-
-Momentary mode:
-  * Press button: Light on (at memorized level).
-  * Release button: Light off.
-  * To exit, disconnect power.  (loosen/tighten the tailcap)
-
-TODO:
-  * save settings in eeprom
-  - decide on "hold until hot" or "click N times" for thermal config mode
-  - test thermal regulation on an actual light
-  - improve thermal regulation
-  - a way to blink out the firmware version?
-  - indicator LED support
-  - a way to configure indicator LED behavior?
-  * add goodnight mode?
-  * add lightning mode?
diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
new file mode 100644
index 0000000..998c0c5
--- /dev/null
+++ b/spaghetti-monster/anduril/anduril.c
@@ -0,0 +1,961 @@
+/*
+ * Anduril: Narsil-inspired UI for SpaghettiMonster.
+ * (Anduril is Aragorn's sword, the blade Narsil reforged)
+ *
+ * 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/>.
+ */
+
+#define FSM_EMISAR_D4_DRIVER
+#define USE_LVP
+#define USE_THERMAL_REGULATION
+#define DEFAULT_THERM_CEIL 45
+#define USE_DELAY_MS
+#define USE_DELAY_4MS
+#define USE_DELAY_ZERO
+#define USE_RAMPING
+#define RAMP_LENGTH 150
+#define USE_BATTCHECK
+#define BATTCHECK_VpT
+#define MAX_CLICKS 6
+#define USE_EEPROM
+#define EEPROM_BYTES 12
+#include "spaghetti-monster.h"
+
+// Options specific to this UI (not inherited from SpaghettiMonster)
+#define USE_LIGHTNING_MODE
+// set this a bit high, since the bottom 2 ramp levels might not emit any light at all
+#define GOODNIGHT_TIME  65  // minutes (approximately)
+#define GOODNIGHT_LEVEL 24  // ~11 lm
+
+// FSM states
+uint8_t off_state(EventPtr event, uint16_t arg);
+// ramping mode and its related config mode
+uint8_t steady_state(EventPtr event, uint16_t arg);
+uint8_t ramp_config_state(EventPtr event, uint16_t arg);
+// party and tactical strobes
+uint8_t strobe_state(EventPtr event, uint16_t arg);
+#ifdef USE_LIGHTNING_MODE
+#define NUM_STROBES 4
+#else
+#define NUM_STROBES 3
+#endif
+#ifdef USE_BATTCHECK
+uint8_t battcheck_state(EventPtr event, uint16_t arg);
+uint8_t tempcheck_state(EventPtr event, uint16_t arg);
+uint8_t thermal_config_state(EventPtr event, uint16_t arg);
+#endif
+// 1-hour ramp down from low, then automatic off
+uint8_t goodnight_state(EventPtr event, uint16_t arg);
+// beacon mode and its related config mode
+uint8_t beacon_state(EventPtr event, uint16_t arg);
+uint8_t beacon_config_state(EventPtr event, uint16_t arg);
+// soft lockout
+uint8_t lockout_state(EventPtr event, uint16_t arg);
+// momentary / signalling mode
+uint8_t momentary_state(EventPtr event, uint16_t arg);
+
+// general helper function for config modes
+uint8_t number_entry_state(EventPtr event, uint16_t arg);
+// return value from number_entry_state()
+volatile uint8_t number_entry_value;
+
+void blink_confirm(uint8_t num);
+
+// remember stuff even after battery was changed
+void load_config();
+void save_config();
+
+// brightness control
+uint8_t memorized_level = MAX_1x7135;
+// smooth vs discrete ramping
+volatile uint8_t ramp_style = 0;  // 0 = smooth, 1 = discrete
+volatile uint8_t ramp_smooth_floor = 5;
+volatile uint8_t ramp_smooth_ceil = MAX_LEVEL - 30;
+volatile uint8_t ramp_discrete_floor = 20;
+volatile uint8_t ramp_discrete_ceil = MAX_LEVEL - 30;
+volatile uint8_t ramp_discrete_steps = 7;
+uint8_t ramp_discrete_step_size;  // don't set this
+
+// calculate the nearest ramp level which would be valid at the moment
+// (is a no-op for smooth ramp, but limits discrete ramp to only the
+// correct levels for the user's config)
+uint8_t nearest_level(int16_t target);
+
+#ifdef USE_THERMAL_REGULATION
+// brightness before thermal step-down
+uint8_t target_level = 0;
+#endif
+
+// strobe timing
+volatile uint8_t strobe_delays[] = { 40, 67 };  // party strobe, tactical strobe
+volatile uint8_t strobe_type = 3;  // 0 == party strobe, 1 == tactical strobe, 2 == lightning storm, 3 == bike flasher
+
+// bike mode config options
+volatile uint8_t bike_flasher_brightness = MAX_1x7135;
+
+#ifdef USE_LIGHTNING_MODE
+volatile uint8_t pseudo_rand_seed = 0;
+uint8_t pseudo_rand();
+#endif
+
+// beacon timing
+volatile uint8_t beacon_seconds = 2;
+
+// deferred "off" so we won't suspend in a weird state
+volatile uint8_t go_to_standby = 0;
+
+
+uint8_t off_state(EventPtr event, uint16_t arg) {
+    // turn emitter off when entering state
+    if (event == EV_enter_state) {
+        set_level(0);
+        // sleep while off  (lower power use)
+        go_to_standby = 1;
+        return MISCHIEF_MANAGED;
+    }
+    // hold (initially): go to lowest level, but allow abort for regular click
+    else if (event == EV_click1_press) {
+        set_level(nearest_level(1));
+        return MISCHIEF_MANAGED;
+    }
+    // 1 click (before timeout): go to memorized level, but allow abort for double click
+    else if (event == EV_click1_release) {
+        set_level(nearest_level(memorized_level));
+        return MISCHIEF_MANAGED;
+    }
+    // 1 click: regular mode
+    else if (event == EV_1click) {
+        set_state(steady_state, memorized_level);
+        return MISCHIEF_MANAGED;
+    }
+    // 2 clicks (initial press): off, to prep for later events
+    else if (event == EV_click2_press) {
+        set_level(0);
+        return MISCHIEF_MANAGED;
+    }
+    // 2 clicks: highest mode
+    else if (event == EV_2clicks) {
+        set_state(steady_state, nearest_level(MAX_LEVEL));
+        return MISCHIEF_MANAGED;
+    }
+    #ifdef USE_BATTCHECK
+    // 3 clicks: battcheck mode
+    else if (event == EV_3clicks) {
+        set_state(battcheck_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    #endif
+    // 4 clicks: soft lockout
+    else if (event == EV_4clicks) {
+        blink_confirm(5);
+        set_state(lockout_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    // 5 clicks: strobe mode
+    else if (event == EV_5clicks) {
+        set_state(strobe_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    // 6 clicks: momentary mode
+    else if (event == EV_6clicks) {
+        blink_confirm(1);
+        set_state(momentary_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    // hold: go to lowest level
+    else if (event == EV_click1_hold) {
+        // don't start ramping immediately;
+        // give the user time to release at moon level
+        if (arg >= HOLD_TIMEOUT) {
+            set_state(steady_state, 1);
+        }
+        return MISCHIEF_MANAGED;
+    }
+    // hold, release quickly: go to lowest level
+    else if (event == EV_click1_hold_release) {
+        set_state(steady_state, 1);
+        return MISCHIEF_MANAGED;
+    }
+    // click, hold: go to highest level (for ramping down)
+    else if (event == EV_click2_hold) {
+        set_state(steady_state, MAX_LEVEL);
+        return MISCHIEF_MANAGED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+
+
+uint8_t steady_state(EventPtr event, uint16_t arg) {
+    uint8_t mode_min = ramp_smooth_floor;
+    uint8_t mode_max = ramp_smooth_ceil;
+    uint8_t ramp_step_size = 1;
+    if (ramp_style) {
+        mode_min = ramp_discrete_floor;
+        mode_max = ramp_discrete_ceil;
+        ramp_step_size = ramp_discrete_step_size;
+    }
+
+    // turn LED on when we first enter the mode
+    if (event == EV_enter_state) {
+        // remember this level, unless it's moon or turbo
+        if ((arg > mode_min) && (arg < mode_max))
+            memorized_level = arg;
+        // use the requested level even if not memorized
+        #ifdef USE_THERMAL_REGULATION
+        target_level = arg;
+        #endif
+        set_level(nearest_level(arg));
+        return MISCHIEF_MANAGED;
+    }
+    // 1 click: off
+    else if (event == EV_1click) {
+        set_state(off_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    // 2 clicks: go to/from highest level
+    else if (event == EV_2clicks) {
+        if (actual_level < MAX_LEVEL) {
+            memorized_level = actual_level;  // in case we're on moon
+            #ifdef USE_THERMAL_REGULATION
+            target_level = MAX_LEVEL;
+            #endif
+            // true turbo, not the mode-specific ceiling
+            set_level(MAX_LEVEL);
+        }
+        else {
+            #ifdef USE_THERMAL_REGULATION
+            target_level = memorized_level;
+            #endif
+            set_level(memorized_level);
+        }
+        return MISCHIEF_MANAGED;
+    }
+    // 3 clicks: toggle smooth vs discrete ramping
+    else if (event == EV_3clicks) {
+        ramp_style ^= 1;
+        memorized_level = nearest_level(memorized_level);
+        save_config();
+        set_level(0);
+        delay_4ms(20/4);
+        set_level(memorized_level);
+        return MISCHIEF_MANAGED;
+    }
+    // 4 clicks: configure this ramp mode
+    else if (event == EV_4clicks) {
+        set_state(ramp_config_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    // hold: change brightness (brighter)
+    else if (event == EV_click1_hold) {
+        // ramp slower in discrete mode
+        if (ramp_style  &&  (arg % HOLD_TIMEOUT != 0)) {
+            return MISCHIEF_MANAGED;
+        }
+        // TODO? make it ramp down instead, if already at max?
+        memorized_level = nearest_level((int16_t)actual_level + ramp_step_size);
+        #ifdef USE_THERMAL_REGULATION
+        target_level = memorized_level;
+        #endif
+        // only blink once for each threshold
+        if ((memorized_level != actual_level)
+                && ((memorized_level == MAX_1x7135)
+                    || (memorized_level == mode_max))) {
+            set_level(0);
+            delay_4ms(8/4);
+        }
+        set_level(memorized_level);
+        return MISCHIEF_MANAGED;
+    }
+    // click, hold: change brightness (dimmer)
+    else if (event == EV_click2_hold) {
+        // ramp slower in discrete mode
+        if (ramp_style  &&  (arg % HOLD_TIMEOUT != 0)) {
+            return MISCHIEF_MANAGED;
+        }
+        // TODO? make it ramp up instead, if already at min?
+        memorized_level = nearest_level((int16_t)actual_level - ramp_step_size);
+        #ifdef USE_THERMAL_REGULATION
+        target_level = memorized_level;
+        #endif
+        // only blink once for each threshold
+        if ((memorized_level != actual_level)
+                && ((memorized_level == MAX_1x7135)
+                    || (memorized_level == mode_min))) {
+            set_level(0);
+            delay_4ms(8/4);
+        }
+        set_level(memorized_level);
+        return MISCHIEF_MANAGED;
+    }
+    #ifdef USE_THERMAL_REGULATION
+    // TODO: test this on a real light
+    // overheating: drop by an amount proportional to how far we are above the ceiling
+    else if (event == EV_temperature_high) {
+        if (actual_level > MAX_LEVEL/4) {
+            uint8_t stepdown = actual_level - arg;
+            if (stepdown < MAX_LEVEL/4) stepdown = MAX_LEVEL/4;
+            set_level(stepdown);
+        }
+        return MISCHIEF_MANAGED;
+    }
+    // underheating: increase slowly if we're lower than the target
+    //               (proportional to how low we are)
+    else if (event == EV_temperature_low) {
+        if (actual_level < target_level) {
+            uint8_t stepup = actual_level + (arg>>1);
+            if (stepup > target_level) stepup = target_level;
+            set_level(stepup);
+        }
+        return MISCHIEF_MANAGED;
+    }
+    #endif
+    return EVENT_NOT_HANDLED;
+}
+
+
+uint8_t strobe_state(EventPtr event, uint16_t arg) {
+    if (event == EV_enter_state) {
+        return MISCHIEF_MANAGED;
+    }
+    // 1 click: off
+    else if (event == EV_1click) {
+        set_state(off_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    // 2 clicks: rotate through strobe/flasher modes
+    else if (event == EV_2clicks) {
+        strobe_type = (strobe_type + 1) % NUM_STROBES;
+        interrupt_nice_delays();
+        save_config();
+        return MISCHIEF_MANAGED;
+    }
+    // hold: change speed (go faster)
+    //       or change brightness (brighter)
+    else if (event == EV_click1_hold) {
+        if (strobe_type < 2) {
+            if ((arg & 1) == 0) {
+                if (strobe_delays[strobe_type] > 8) strobe_delays[strobe_type] --;
+            }
+        }
+        // biking mode brighter
+        else if (strobe_type == 3) {
+            if (bike_flasher_brightness < MAX_LEVEL/2)
+                bike_flasher_brightness ++;
+            set_level(bike_flasher_brightness);
+        }
+        return MISCHIEF_MANAGED;
+    }
+    // click, hold: change speed (go slower)
+    //       or change brightness (dimmer)
+    else if (event == EV_click2_hold) {
+        if (strobe_type < 2) {
+            if ((arg & 1) == 0) {
+                if (strobe_delays[strobe_type] < 255) strobe_delays[strobe_type] ++;
+            }
+        }
+        // biking mode dimmer
+        else if (strobe_type == 3) {
+            if (bike_flasher_brightness > 1)
+                bike_flasher_brightness --;
+            set_level(bike_flasher_brightness);
+        }
+        return MISCHIEF_MANAGED;
+    }
+    // release hold: save new strobe settings
+    else if ((event == EV_click1_hold_release)
+          || (event == EV_click2_hold_release)) {
+        save_config();
+        return MISCHIEF_MANAGED;
+    }
+    #ifdef USE_LIGHTNING_MODE
+    // clock tick: bump the random seed
+    else if (event == EV_tick) {
+        pseudo_rand_seed += arg;
+        return MISCHIEF_MANAGED;
+    }
+    #endif
+    return EVENT_NOT_HANDLED;
+}
+
+
+#ifdef USE_BATTCHECK
+uint8_t battcheck_state(EventPtr event, uint16_t arg) {
+    // 1 click: off
+    if (event == EV_1click) {
+        set_state(off_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    // 2 clicks: goodnight mode
+    else if (event == EV_2clicks) {
+        set_state(goodnight_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+
+uint8_t tempcheck_state(EventPtr event, uint16_t arg) {
+    // 1 click: off
+    if (event == EV_1click) {
+        set_state(off_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    // 2 clicks: battcheck mode
+    else if (event == EV_2clicks) {
+        set_state(battcheck_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    // 3 clicks: thermal config mode
+    else if (event == EV_3clicks) {
+        set_state(thermal_config_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+#endif
+
+
+uint8_t beacon_state(EventPtr event, uint16_t arg) {
+    // 1 click: off
+    if (event == EV_1click) {
+        set_state(off_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    // 2 clicks: tempcheck mode
+    else if (event == EV_2clicks) {
+        set_state(tempcheck_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    // 3 clicks: beacon config mode
+    else if (event == EV_3clicks) {
+        set_state(beacon_config_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+
+
+#define GOODNIGHT_TICKS_PER_STEPDOWN (GOODNIGHT_TIME*TICKS_PER_SECOND*60L/GOODNIGHT_LEVEL)
+uint8_t goodnight_state(EventPtr event, uint16_t arg) {
+    static uint16_t ticks_since_stepdown = 0;
+    // blink on start
+    if (event == EV_enter_state) {
+        blink_confirm(4);
+        ticks_since_stepdown = 0;
+        set_level(GOODNIGHT_LEVEL);
+        return MISCHIEF_MANAGED;
+    }
+    // 1 click: off
+    else if (event == EV_1click) {
+        set_state(off_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    // 2 clicks: beacon mode
+    else if (event == EV_2clicks) {
+        set_state(beacon_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    // tick: step down (maybe) or off (maybe)
+    else if (event == EV_tick) {
+        if (++ticks_since_stepdown > GOODNIGHT_TICKS_PER_STEPDOWN) {
+            ticks_since_stepdown = 0;
+            set_level(actual_level-1);
+            if (! actual_level) {
+                #if 0  // test blink, to help measure timing
+                set_level(MAX_LEVEL>>2);
+                delay_4ms(8/2);
+                set_level(0);
+                #endif
+                set_state(off_state, 0);
+            }
+        }
+        return MISCHIEF_MANAGED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+
+
+uint8_t lockout_state(EventPtr event, uint16_t arg) {
+    // conserve power while locked out
+    // (allow staying awake long enough to exit, but otherwise
+    //  be persistent about going back to sleep every few seconds
+    //  even if the user keeps pressing the button)
+    if (event == EV_tick) {
+        static uint8_t ticks_spent_awake = 0;
+        ticks_spent_awake ++;
+        if (ticks_spent_awake > 180) {
+            ticks_spent_awake = 0;
+            go_to_standby = 1;
+        }
+        return MISCHIEF_MANAGED;
+    }
+    // 4 clicks: exit
+    else if (event == EV_4clicks) {
+        blink_confirm(2);
+        set_state(off_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+
+
+uint8_t momentary_state(EventPtr event, uint16_t arg) {
+    if (event == EV_click1_press) {
+        set_level(memorized_level);
+        empty_event_sequence();  // don't attempt to parse multiple clicks
+        return MISCHIEF_MANAGED;
+    }
+
+    else if (event == EV_release) {
+        set_level(0);
+        empty_event_sequence();  // don't attempt to parse multiple clicks
+        //go_to_standby = 1;  // sleep while light is off
+        return MISCHIEF_MANAGED;
+    }
+
+    // Sleep, dammit!  (but wait a few seconds first)
+    // (because standby mode uses such little power that it can interfere
+    //  with exiting via tailcap loosen+tighten unless you leave power
+    //  disconnected for several seconds, so we want to be awake when that
+    //  happens to speed up the process)
+    else if ((event == EV_tick)  &&  (actual_level == 0)) {
+        if (arg > TICKS_PER_SECOND*15) {  // sleep after 15 seconds
+            go_to_standby = 1;  // sleep while light is off
+        }
+        return MISCHIEF_MANAGED;
+    }
+
+    return EVENT_NOT_HANDLED;
+}
+
+
+uint8_t ramp_config_state(EventPtr event, uint16_t arg) {
+    static uint8_t config_step;
+    static uint8_t num_config_steps;
+    if (event == EV_enter_state) {
+        config_step = 0;
+        if (ramp_style) {
+            num_config_steps = 3;
+        }
+        else {
+            num_config_steps = 2;
+        }
+        set_level(0);
+        return MISCHIEF_MANAGED;
+    }
+    // advance forward through config steps
+    else if (event == EV_tick) {
+        if (config_step < num_config_steps) {
+            push_state(number_entry_state, config_step + 1);
+        }
+        else {
+            save_config();
+            // TODO: blink out some sort of success pattern
+            // return to steady mode
+            set_state(steady_state, memorized_level);
+        }
+        return MISCHIEF_MANAGED;
+    }
+    // an option was set (return from number_entry_state)
+    else if (event == EV_reenter_state) {
+        #if 0
+        // FIXME? this is a kludge which relies on the vars being consecutive
+        // in RAM and in the same order as declared
+        // ... and it doesn't work; it seems they're not consecutive  :(
+        volatile uint8_t *dest;
+        if (ramp_style) dest = (&ramp_discrete_floor) + config_step;
+        else dest = (&ramp_smooth_floor) + config_step;
+        if (number_entry_value)
+            *dest = number_entry_value;
+        #else
+        switch (config_step) {
+            case 0:
+                if (number_entry_value) {
+                    if (ramp_style) ramp_discrete_floor = number_entry_value;
+                    else ramp_smooth_floor = number_entry_value;
+                }
+                break;
+            case 1:
+                if (number_entry_value) {
+                    if (ramp_style) ramp_discrete_ceil = MAX_LEVEL + 1 - number_entry_value;
+                    else ramp_smooth_ceil = MAX_LEVEL + 1 - number_entry_value;
+                }
+                break;
+            case 2:
+                if (number_entry_value)
+                    ramp_discrete_steps = number_entry_value;
+                break;
+        }
+        #endif
+        config_step ++;
+        return MISCHIEF_MANAGED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+
+
+uint8_t thermal_config_state(EventPtr event, uint16_t arg) {
+    static uint8_t done = 0;
+    if (event == EV_enter_state) {
+        set_level(0);
+        done = 0;
+        return MISCHIEF_MANAGED;
+    }
+    // advance forward through config steps
+    else if (event == EV_tick) {
+        if (! done) push_state(number_entry_state, 1);
+        else {
+            save_config();
+            // return to beacon mode
+            set_state(tempcheck_state, 0);
+        }
+        return MISCHIEF_MANAGED;
+    }
+    // an option was set (return from number_entry_state)
+    else if (event == EV_reenter_state) {
+        if (number_entry_value) therm_ceil = 30 + number_entry_value;
+        if (therm_ceil > MAX_THERM_CEIL) therm_ceil = MAX_THERM_CEIL;
+        done = 1;
+        return MISCHIEF_MANAGED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+
+
+uint8_t beacon_config_state(EventPtr event, uint16_t arg) {
+    static uint8_t done = 0;
+    if (event == EV_enter_state) {
+        set_level(0);
+        done = 0;
+        return MISCHIEF_MANAGED;
+    }
+    // advance forward through config steps
+    else if (event == EV_tick) {
+        if (! done) push_state(number_entry_state, 1);
+        else {
+            save_config();
+            // return to beacon mode
+            set_state(beacon_state, 0);
+        }
+        return MISCHIEF_MANAGED;
+    }
+    // an option was set (return from number_entry_state)
+    else if (event == EV_reenter_state) {
+        if (number_entry_value) beacon_seconds = number_entry_value;
+        done = 1;
+        return MISCHIEF_MANAGED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+
+
+uint8_t number_entry_state(EventPtr event, uint16_t arg) {
+    static uint8_t value;
+    static uint8_t blinks_left;
+    static uint8_t entry_step;
+    static uint16_t wait_ticks;
+    if (event == EV_enter_state) {
+        value = 0;
+        blinks_left = arg;
+        entry_step = 0;
+        wait_ticks = 0;
+        // TODO: blink out the 'arg' to show which option this is
+        return MISCHIEF_MANAGED;
+    }
+    // advance through the process:
+    // 0: wait a moment
+    // 1: blink out the 'arg' value
+    // 2: wait a moment
+    // 3: "buzz" while counting clicks
+    // 4: save and exit
+    else if (event == EV_tick) {
+        // wait a moment
+        if ((entry_step == 0) || (entry_step == 2)) {
+            if (wait_ticks < TICKS_PER_SECOND/2)
+                wait_ticks ++;
+            else {
+                entry_step ++;
+                wait_ticks = 0;
+            }
+        }
+        // blink out the option number
+        else if (entry_step == 1) {
+            if (blinks_left) {
+                if ((wait_ticks & 31) == 10) {
+                    set_level(RAMP_SIZE/4);
+                }
+                else if ((wait_ticks & 31) == 20) {
+                    set_level(0);
+                }
+                else if ((wait_ticks & 31) == 31) {
+                    blinks_left --;
+                }
+                wait_ticks ++;
+            }
+            else {
+                entry_step ++;
+                wait_ticks = 0;
+            }
+        }
+        else if (entry_step == 3) {  // buzz while waiting for a number to be entered
+            wait_ticks ++;
+            // buzz for N seconds after last event
+            if ((wait_ticks & 3) == 0) {
+                set_level(RAMP_SIZE/6);
+            }
+            else if ((wait_ticks & 3) == 2) {
+                set_level(RAMP_SIZE/8);
+            }
+            // time out after 3 seconds
+            if (wait_ticks > TICKS_PER_SECOND*3) {
+                //number_entry_value = value;
+                set_level(0);
+                entry_step ++;
+            }
+        }
+        else if (entry_step == 4) {
+            number_entry_value = value;
+            pop_state();
+        }
+        return MISCHIEF_MANAGED;
+    }
+    // count clicks
+    else if (event == EV_click1_release) {
+        empty_event_sequence();
+        if (entry_step == 3) {  // only count during the "buzz"
+            value ++;
+            wait_ticks = 0;
+            // flash briefly
+            set_level(RAMP_SIZE/2);
+            delay_4ms(8/2);
+            set_level(0);
+        }
+        return MISCHIEF_MANAGED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+
+
+// find the ramp level closest to the target,
+// using only the levels which are allowed in the current state
+uint8_t nearest_level(int16_t target) {
+    // bounds check
+    // using int16_t here saves us a bunch of logic elsewhere,
+    // by allowing us to correct for numbers < 0 or > 255 in one central place
+    uint8_t mode_min = ramp_smooth_floor;
+    uint8_t mode_max = ramp_smooth_ceil;
+    if (ramp_style) {
+        mode_min = ramp_discrete_floor;
+        mode_max = ramp_discrete_ceil;
+    }
+    if (target < mode_min) return mode_min;
+    if (target > mode_max) return mode_max;
+    // the rest isn't relevant for smooth ramping
+    if (! ramp_style) return target;
+
+    uint8_t ramp_range = ramp_discrete_ceil - ramp_discrete_floor;
+    ramp_discrete_step_size = ramp_range / (ramp_discrete_steps-1);
+    uint8_t this_level = ramp_discrete_floor;
+
+    for(uint8_t i=0; i<ramp_discrete_steps; i++) {
+        this_level = ramp_discrete_floor + (i * (uint16_t)ramp_range / (ramp_discrete_steps-1));
+        int8_t diff = target - this_level;
+        if (diff < 0) diff = -diff;
+        if (diff <= (ramp_discrete_step_size>>1))
+            return this_level;
+    }
+    return this_level;
+}
+
+
+void blink_confirm(uint8_t num) {
+    for (; num>0; num--) {
+        set_level(MAX_LEVEL/4);
+        delay_4ms(10/4);
+        set_level(0);
+        delay_4ms(100/4);
+    }
+}
+
+
+#ifdef USE_LIGHTNING_MODE
+uint8_t pseudo_rand() {
+    static uint16_t offset = 1024;
+    // loop from 1024 to 4095
+    offset = ((offset + 1) & 0x0fff) | 0x0400;
+    pseudo_rand_seed += 0b01010101;  // 85
+    return pgm_read_byte(offset) + pseudo_rand_seed;
+}
+#endif
+
+
+void load_config() {
+    if (load_eeprom()) {
+        ramp_style = eeprom[0];
+        ramp_smooth_floor = eeprom[1];
+        ramp_smooth_ceil = eeprom[2];
+        ramp_discrete_floor = eeprom[3];
+        ramp_discrete_ceil = eeprom[4];
+        ramp_discrete_steps = eeprom[5];
+        strobe_type = eeprom[6];  // TODO: move this to eeprom_wl?
+        strobe_delays[0] = eeprom[7];
+        strobe_delays[1] = eeprom[8];
+        bike_flasher_brightness = eeprom[9];
+        beacon_seconds = eeprom[10];
+        therm_ceil = eeprom[11];
+    }
+}
+
+void save_config() {
+    eeprom[0] = ramp_style;
+    eeprom[1] = ramp_smooth_floor;
+    eeprom[2] = ramp_smooth_ceil;
+    eeprom[3] = ramp_discrete_floor;
+    eeprom[4] = ramp_discrete_ceil;
+    eeprom[5] = ramp_discrete_steps;
+    eeprom[6] = strobe_type;  // TODO: move this to eeprom_wl?
+    eeprom[7] = strobe_delays[0];
+    eeprom[8] = strobe_delays[1];
+    eeprom[9] = bike_flasher_brightness;
+    eeprom[10] = beacon_seconds;
+    eeprom[11] = therm_ceil;
+
+    save_eeprom();
+}
+
+
+void low_voltage() {
+    // "step down" from strobe to something low
+    if (current_state == strobe_state) {
+        set_state(steady_state, RAMP_SIZE/6);
+    }
+    // in normal mode, step down by half or turn off
+    else if (current_state == steady_state) {
+        if (actual_level > 1) {
+            set_level(actual_level >> 1);
+        }
+        else {
+            set_state(off_state, 0);
+        }
+    }
+    // all other modes, just turn off when voltage is low
+    else {
+        set_state(off_state, 0);
+    }
+}
+
+
+void setup() {
+    // blink at power-on to let user know power is connected
+    set_level(RAMP_SIZE/8);
+    delay_4ms(3);
+    set_level(0);
+
+    load_config();
+
+    push_state(off_state, 0);
+}
+
+
+void loop() {
+
+    // deferred "off" so we won't suspend in a weird state
+    // (like...  during the middle of a strobe pulse)
+    if (go_to_standby) {
+        go_to_standby = 0;
+        set_level(0);
+        standby_mode();
+    }
+
+    if (current_state == strobe_state) {
+        // party / tactical strobe
+        if (strobe_type < 2) {
+            set_level(MAX_LEVEL);
+            if (strobe_type == 0) {  // party strobe
+                if (strobe_delays[strobe_type] < 42) delay_zero();
+                else delay_ms(1);
+            } else {  //tactical strobe
+                nice_delay_ms(strobe_delays[strobe_type] >> 1);
+            }
+            set_level(0);
+            nice_delay_ms(strobe_delays[strobe_type]);
+        }
+        #ifdef USE_LIGHTNING_MODE
+        // lightning storm
+        else if (strobe_type == 2) {
+            int16_t brightness;
+            uint16_t rand_time;
+
+            // turn the emitter on at a random level,
+            // for a random amount of time between 1ms and 32ms
+            rand_time = 1 << (pseudo_rand() % 6);
+            brightness = 1 << (pseudo_rand() % 7);  // 1, 2, 4, 8, 16, 32, 64
+            brightness += 1 << (pseudo_rand()&0x03);  // 2 to 80 now
+            brightness += pseudo_rand() % brightness;  // 2 to 159 now (w/ low bias)
+            if (brightness > MAX_LEVEL) brightness = MAX_LEVEL;
+            set_level(brightness);
+            if (! nice_delay_ms(rand_time)) return;
+
+            // decrease the brightness somewhat more gradually, like lightning
+            uint8_t stepdown = brightness >> 3;
+            if (stepdown < 1) stepdown = 1;
+            while(brightness > 1) {
+                if (! nice_delay_ms(rand_time)) return;
+                brightness -= stepdown;
+                if (brightness < 0) brightness = 0;
+                set_level(brightness);
+            }
+
+            // turn the emitter off,
+            // for a random amount of time between 1ms and 8192ms
+            // (with a low bias)
+            rand_time = 1<<(pseudo_rand()%13);
+            rand_time += pseudo_rand()%rand_time;
+            set_level(0);
+            nice_delay_ms(rand_time);
+
+        }
+        #endif
+        // bike flasher
+        else if (strobe_type == 3) {
+            uint8_t burst = bike_flasher_brightness << 1;
+            for(uint8_t i=0; i<4; i++) {
+                set_level(burst);
+                if (! nice_delay_ms(5)) return;
+                set_level(bike_flasher_brightness);
+                if (! nice_delay_ms(65)) return;
+            }
+            if (! nice_delay_ms(720)) return;
+        }
+    }
+
+    #ifdef USE_BATTCHECK
+    else if (current_state == battcheck_state) {
+        battcheck();
+    }
+    else if (current_state == tempcheck_state) {
+        blink_num(temperature>>2);
+        nice_delay_ms(1000);
+    }
+    // TODO: blink out therm_ceil during thermal_config_state
+    #endif
+
+    else if (current_state == beacon_state) {
+        set_level(memorized_level);
+        if (! nice_delay_ms(500)) return;
+        set_level(0);
+        nice_delay_ms(((beacon_seconds) * 1000) - 500);
+    }
+}
diff --git a/spaghetti-monster/anduril/anduril.txt b/spaghetti-monster/anduril/anduril.txt
new file mode 100644
index 0000000..bb0f5e2
--- /dev/null
+++ b/spaghetti-monster/anduril/anduril.txt
@@ -0,0 +1,100 @@
+From off:
+  * 1 click: memorized level
+  * Hold: lowest level then ramp up
+  * 2 clicks: highest ramp level
+  * Click, hold: highest level then ramp down
+  * 3 clicks: battcheck mode
+    (battcheck, goodnight, beacon, tempcheck)
+  * 4 clicks: lock-out
+  * 5 clicks: strobe modes
+    (bike flasher, party strobe, tactical strobe, lightning storm mode)
+    (remembers which you last used)
+  * 6 clicks: momentary mode (disconnect power to exit)
+
+In steady mode:
+  * 1 click: off
+  * Hold: ramp up
+  * Click, hold: ramp down
+  * 2 clicks: to/from turbo (actual turbo, not just highest ramp level)
+  * 3 clicks: toggle smooth vs discrete ramping
+  * 4 clicks: configure current ramp
+
+Smooth ramp config mode:
+  - Setting 1: memory on/off  (not implemented yet)
+  * Setting 2: low end
+    (click N times to set ramp floor to level N)
+  * Setting 3: high end
+    (click N times to set ramp ceiling to level "151 - N")
+
+Discrete ramp config mode:
+  - Setting 1: memory on/off  (not implemented yet)
+  * Setting 2: low end
+    (click N times to set ramp floor to level N)
+  * Setting 3: high end
+    (click N times to set ramp ceiling to level "151 - N")
+  * Setting 4: number of levels in discrete ramp
+    (click N times to make discrete mode have N stair-steps)
+    (minimum 2, maximum 150)
+
+Bike flasher:
+  * 1 click: off
+  * 2 clicks: party strobe
+  * Hold: brighter
+  * Click, hold: dimmer
+
+Party / Tactical strobe modes:
+  * 1 click: off
+  * Hold: change speed (faster)
+  * Click, hold: change speed (slower)
+  * 2 clicks: next strobe mode
+    (bike flasher, party strobe, tactical strobe, lightning storm mode)
+    (TODO: random/police strobe?)
+
+Lightning storm mode:
+  * 1 click: off
+  * 2 clicks: bike flasher
+
+Battcheck mode:
+  * 1 click: off
+  * 2 clicks: goodnight mode
+
+Goodnight mode:
+  * 1 click: off
+  * 2 clicks: beacon mode
+
+Beacon mode:
+  * 1 click: off
+  * 2 clicks: tempcheck mode
+  * 3 clicks: configure time between pulses
+
+Beacon config mode:
+  * At buzz, click N times to set beacon frequency to N seconds.
+
+Tempcheck mode:
+  * 1 click: off
+  * 2 clicks: battcheck mode
+  * 3 clicks: thermal config mode
+  - Hold: thermal calibration mode
+
+Thermal config mode:
+  * At buzz, click N times to set thermal limit to roughly 30 C + N.
+
+Thermal calibration mode:
+  - Hold until hot: set new ceiling value
+  - ... don't hold: blink out current ceiling value and exit
+
+Momentary mode:
+  * Press button: Light on (at memorized level).
+  * Release button: Light off.
+  * To exit, disconnect power.  (loosen/tighten the tailcap)
+
+TODO:
+  * save settings in eeprom
+  - decide on "hold until hot" or "click N times" for thermal config mode
+  - test thermal regulation on an actual light
+  - improve thermal regulation
+  - a way to blink out the firmware version?
+  - indicator LED support
+  - a way to configure indicator LED behavior?
+  * add goodnight mode?
+  * add lightning mode?
diff --git a/spaghetti-monster/baton-simpler.c b/spaghetti-monster/baton-simpler.c
deleted file mode 100644
index a6ddf36..0000000
--- a/spaghetti-monster/baton-simpler.c
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Baton: Olight Baton-like UI for SpaghettiMonster.
- *
- * 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/>.
- */
-
-#define FSM_EMISAR_D4_DRIVER
-#define USE_LVP
-#define USE_THERMAL_REGULATION
-#define DEFAULT_THERM_CEIL 45
-#define USE_DELAY_MS
-#include "spaghetti-monster.h"
-
-// FSM states
-uint8_t off_state(EventPtr event, uint16_t arg);
-uint8_t steady_state(EventPtr event, uint16_t arg);
-uint8_t lockout_state(EventPtr event, uint16_t arg);
-
-// brightness control
-uint8_t memorized_level = 1;
-uint8_t actual_level = 0;
-#ifdef USE_THERMAL_REGULATION
-uint8_t target_level = 0;
-#endif
-
-// deferred "off" so we won't suspend in a weird state
-volatile uint8_t go_to_standby = 0;
-
-// moon + ../../bin/level_calc.py 2 6 7135 18 10 150 FET 1 10 1500
-uint8_t pwm1_levels[] = { 3, 18, 110, 255, 255, 255,   0, };
-uint8_t pwm2_levels[] = { 0,  0,   0,   9,  58, 138, 255, };
-#define MAX_LEVEL (sizeof(pwm1_levels)-1)
-
-// set LED brightness
-void set_level(uint8_t lvl) {
-    actual_level = lvl;
-    PWM1_LVL = pwm1_levels[lvl];
-    PWM2_LVL = pwm2_levels[lvl];
-}
-
-uint8_t off_state(EventPtr event, uint16_t arg) {
-    // turn emitter off when entering state
-    if (event == EV_enter_state) {
-        go_to_standby = 1; // sleep while off  (lower power use)
-        return EVENT_HANDLED;
-    }
-    // hold (initially): go to lowest level, but allow abort for regular click
-    else if (event == EV_click1_press) {
-        set_level(0);
-        return EVENT_HANDLED;
-    }
-    // 1 click (before timeout): go to memorized level, but allow abort for double click
-    else if (event == EV_click1_release) {
-        set_level(memorized_level);
-        return EVENT_HANDLED;
-    }
-    // 1 click: regular mode
-    else if (event == EV_1click) {
-        set_state(steady_state, memorized_level);
-        return EVENT_HANDLED;
-    }
-    // 2 clicks: highest mode
-    else if (event == EV_2clicks) {
-        set_state(steady_state, MAX_LEVEL);
-        return EVENT_HANDLED;
-    }
-    // 4 clicks: soft lockout
-    else if (event == EV_4clicks) {
-        set_state(lockout_state, 0);
-        return EVENT_HANDLED;
-    }
-    // hold: go to lowest level
-    else if (event == EV_click1_hold) {
-        set_state(steady_state, 0);
-        return EVENT_HANDLED;
-    }
-    return EVENT_NOT_HANDLED;
-}
-
-uint8_t steady_state(EventPtr event, uint16_t arg) {
-    // turn LED on when we first enter the mode
-    if (event == EV_enter_state) {
-        // remember this level, unless it's moon or turbo
-        if ((arg > 0) && (arg < MAX_LEVEL))
-            memorized_level = arg;
-        #ifdef USE_THERMAL_REGULATION
-        target_level = arg;
-        #endif
-        set_level(arg);
-        return EVENT_HANDLED;
-    }
-    // 1 click: off
-    else if (event == EV_1click) {
-        set_state(off_state, 0);
-        return EVENT_HANDLED;
-    }
-    // 2 clicks: go to/from highest level
-    else if (event == EV_2clicks) {
-        if (actual_level < MAX_LEVEL) {  // go to turbo
-            memorized_level = actual_level;  // in case we're on moon
-            #ifdef USE_THERMAL_REGULATION
-            target_level = MAX_LEVEL;
-            #endif
-            set_level(MAX_LEVEL);
-        }
-        else {  // return from turbo
-            #ifdef USE_THERMAL_REGULATION
-            target_level = memorized_level;
-            #endif
-            set_level(memorized_level);
-        }
-        return EVENT_HANDLED;
-    }
-    // hold: change brightness
-    else if (event == EV_click1_hold) {
-        if ((arg % HOLD_TIMEOUT) == 0) {
-            memorized_level = (actual_level+1) % (MAX_LEVEL+1);
-            #ifdef USE_THERMAL_REGULATION
-            target_level = memorized_level;
-            #endif
-            set_level(memorized_level);
-        }
-        return EVENT_HANDLED;
-    }
-    #ifdef USE_THERMAL_REGULATION
-    // overheating: drop by 1 level
-    else if (event == EV_temperature_high) {
-        if (actual_level > 1) {
-            set_level(actual_level - 1);
-        }
-        return EVENT_HANDLED;
-    }
-    // underheating: increase by 1 level if we're lower than the target
-    else if (event == EV_temperature_low) {
-        if (actual_level < target_level) {
-            set_level(actual_level + 1);
-        }
-        return EVENT_HANDLED;
-    }
-    #endif
-    return EVENT_NOT_HANDLED;
-}
-
-uint8_t lockout_state(EventPtr event, uint16_t arg) {
-    // stay asleep while locked, but allow waking long enough to click 4 times
-    if (event == EV_tick) {
-        static uint8_t ticks_spent_awake = 0;
-        ticks_spent_awake ++;
-        PWM1_LVL = 0;  PWM2_LVL = 0;
-        if (ticks_spent_awake > 3 * TICKS_PER_SECOND) {
-            ticks_spent_awake = 0;
-            go_to_standby = 1;
-        }
-        return MISCHIEF_MANAGED;
-    }
-    // 4 clicks: exit
-    else if (event == EV_4clicks) {
-        set_state(steady_state, 1);
-        return MISCHIEF_MANAGED;
-    }
-    return EVENT_NOT_HANDLED;
-}
-
-void low_voltage() {
-    // step down by one level or turn off
-    if (actual_level > 0) {
-        set_level(actual_level - 1);
-    }
-    else {
-        set_state(off_state, 0);
-    }
-}
-
-void setup() {
-    // blink when power is connected
-    set_level(MAX_LEVEL/2);
-    delay_ms(10);
-    set_level(0);
-
-    push_state(off_state, 0);
-}
-
-void loop() {
-    if (go_to_standby) {
-        go_to_standby = 0;
-        PWM1_LVL = 0;  PWM2_LVL = 0;
-        standby_mode();
-    }
-}
diff --git a/spaghetti-monster/baton.c b/spaghetti-monster/baton.c
deleted file mode 100644
index 4ba329e..0000000
--- a/spaghetti-monster/baton.c
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Baton: Olight Baton-like UI for SpaghettiMonster.
- *
- * 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/>.
- */
-
-#define FSM_EMISAR_D4_DRIVER
-#define USE_LVP
-#define USE_THERMAL_REGULATION
-#define DEFAULT_THERM_CEIL 45
-#define USE_DEBUG_BLINK
-#define USE_DELAY_MS
-#define USE_DELAY_ZERO
-#include "spaghetti-monster.h"
-
-// moon + ../../bin/level_calc.py 2 6 7135 18 10 150 FET 1 10 1500
-uint8_t pwm1_modes[] = { 3, 18, 110, 255, 255, 255,   0, };
-uint8_t pwm2_modes[] = { 0,  0,   0,   9,  58, 138, 255, };
-#define MAX_LEVEL (sizeof(pwm1_modes)-1)
-
-// FSM states
-uint8_t off_state(EventPtr event, uint16_t arg);
-uint8_t steady_state(EventPtr event, uint16_t arg);
-uint8_t party_strobe_state(EventPtr event, uint16_t arg);
-
-// brightness control
-uint8_t memorized_level = 1;
-uint8_t actual_level = 0;
-#ifdef USE_THERMAL_REGULATION
-uint8_t target_level = 0;
-#endif
-
-void set_level(uint8_t lvl) {
-    actual_level = lvl;
-    PWM1_LVL = pwm1_modes[lvl];
-    PWM2_LVL = pwm2_modes[lvl];
-}
-
-uint8_t off_state(EventPtr event, uint16_t arg) {
-    // turn emitter off when entering state
-    if (event == EV_enter_state) {
-        PWM1_LVL = 0;
-        PWM2_LVL = 0;
-        // sleep while off  (lower power use)
-        //empty_event_sequence();  // just in case (but shouldn't be needed)
-        standby_mode();
-        return 0;
-    }
-    // hold (initially): go to lowest level, but allow abort for regular click
-    else if (event == EV_click1_press) {
-        set_level(0);
-        return 0;
-    }
-    // 1 click (before timeout): go to memorized level, but allow abort for double click
-    else if (event == EV_click1_release) {
-        set_level(memorized_level);
-        return 0;
-    }
-    // 1 click: regular mode
-    else if (event == EV_1click) {
-        set_state(steady_state, memorized_level);
-        return 0;
-    }
-    // 2 clicks: highest mode
-    else if (event == EV_2clicks) {
-        set_state(steady_state, MAX_LEVEL);
-        return 0;
-    }
-    // 3 clicks: strobe mode
-    else if (event == EV_3clicks) {
-        set_state(party_strobe_state, 255);
-        return 0;
-    }
-    // hold: go to lowest level
-    else if (event == EV_click1_hold) {
-        set_state(steady_state, 0);
-        return 0;
-    }
-    return 1;
-}
-
-uint8_t steady_state(EventPtr event, uint16_t arg) {
-    // turn LED on when we first enter the mode
-    if (event == EV_enter_state) {
-        // remember this level, unless it's moon or turbo
-        if ((arg > 0) && (arg < MAX_LEVEL))
-            memorized_level = arg;
-        // use the requested level even if not memorized
-        #ifdef USE_THERMAL_REGULATION
-        target_level = arg;
-        #endif
-        set_level(arg);
-        return 0;
-    }
-    // 1 click: off
-    else if (event == EV_1click) {
-        set_state(off_state, 0);
-        return 0;
-    }
-    // 2 clicks: go to/from highest level
-    else if (event == EV_2clicks) {
-        if (actual_level < MAX_LEVEL) {
-            memorized_level = actual_level;  // in case we're on moon
-            #ifdef USE_THERMAL_REGULATION
-            target_level = MAX_LEVEL;
-            #endif
-            set_level(MAX_LEVEL);
-        }
-        else {
-            #ifdef USE_THERMAL_REGULATION
-            target_level = memorized_level;
-            #endif
-            set_level(memorized_level);
-        }
-        return 0;
-    }
-    // 3 clicks: go to strobe modes
-    else if (event == EV_3clicks) {
-        set_state(party_strobe_state, 0xff);
-        return 0;
-    }
-    // hold: change brightness
-    else if (event == EV_click1_hold) {
-        if ((arg % HOLD_TIMEOUT) == 0) {
-            memorized_level = (actual_level+1) % (MAX_LEVEL+1);
-            #ifdef USE_THERMAL_REGULATION
-            target_level = memorized_level;
-            #endif
-            set_level(memorized_level);
-        }
-        return 0;
-    }
-    #ifdef USE_THERMAL_REGULATION
-    // overheating: drop by 1 level
-    else if (event == EV_temperature_high) {
-        if (actual_level > 1) {
-            set_level(actual_level - 1);
-        }
-        return 0;
-    }
-    // underheating: increase by 1 level if we're lower than the target
-    else if (event == EV_temperature_low) {
-        if (actual_level < target_level) {
-            set_level(actual_level + 1);
-        }
-        return 0;
-    }
-    #endif
-    return 1;
-}
-
-uint8_t party_strobe_state(EventPtr event, uint16_t arg) {
-    static volatile uint8_t frames = 0;
-    static volatile uint8_t between = 2;
-    if (event == EV_enter_state) {
-        if (arg < 64) between = arg;
-        frames = 0;
-        return 0;
-    }
-    // tick: strobe the emitter
-    else if (event == EV_tick) {
-        if (frames == 0) {
-            PWM1_LVL = 0;
-            PWM2_LVL = 255;
-            if (between < 3) delay_zero();
-            else delay_ms(1);
-            PWM2_LVL = 0;
-        }
-        //frames = (frames + 1) % between;
-        frames++;
-        if (frames > between) frames = 0;
-        return 0;
-    }
-    // 1 click: off
-    else if (event == EV_1click) {
-        set_state(off_state, 0);
-        return 0;
-    }
-    // 2 clicks: go back to regular modes
-    else if (event == EV_2clicks) {
-        set_state(steady_state, memorized_level);
-        return 0;
-    }
-    // hold: change speed
-    else if (event == EV_click1_hold) {
-        if ((arg % HOLD_TIMEOUT) == 0) {
-            between = (between+1)%6;
-            frames = 0;
-        }
-        return 0;
-    }
-    return 1;
-}
-
-void low_voltage() {
-    // "step down" from strobe to level 2
-    if (current_state == party_strobe_state) {
-        set_state(steady_state, 1);
-    }
-    // in normal mode, step down by one level or turn off
-    else if (current_state == steady_state) {
-        if (actual_level > 0) {
-            set_level(actual_level - 1);
-        }
-        else {
-            set_state(off_state, 0);
-        }
-    }
-}
-
-void setup() {
-    debug_blink(2);
-
-    push_state(off_state, 0);
-}
-
-void loop() { }
diff --git a/spaghetti-monster/baton/baton-simpler.c b/spaghetti-monster/baton/baton-simpler.c
new file mode 100644
index 0000000..a6ddf36
--- /dev/null
+++ b/spaghetti-monster/baton/baton-simpler.c
@@ -0,0 +1,202 @@
+/*
+ * Baton: Olight Baton-like UI for SpaghettiMonster.
+ *
+ * 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/>.
+ */
+
+#define FSM_EMISAR_D4_DRIVER
+#define USE_LVP
+#define USE_THERMAL_REGULATION
+#define DEFAULT_THERM_CEIL 45
+#define USE_DELAY_MS
+#include "spaghetti-monster.h"
+
+// FSM states
+uint8_t off_state(EventPtr event, uint16_t arg);
+uint8_t steady_state(EventPtr event, uint16_t arg);
+uint8_t lockout_state(EventPtr event, uint16_t arg);
+
+// brightness control
+uint8_t memorized_level = 1;
+uint8_t actual_level = 0;
+#ifdef USE_THERMAL_REGULATION
+uint8_t target_level = 0;
+#endif
+
+// deferred "off" so we won't suspend in a weird state
+volatile uint8_t go_to_standby = 0;
+
+// moon + ../../bin/level_calc.py 2 6 7135 18 10 150 FET 1 10 1500
+uint8_t pwm1_levels[] = { 3, 18, 110, 255, 255, 255,   0, };
+uint8_t pwm2_levels[] = { 0,  0,   0,   9,  58, 138, 255, };
+#define MAX_LEVEL (sizeof(pwm1_levels)-1)
+
+// set LED brightness
+void set_level(uint8_t lvl) {
+    actual_level = lvl;
+    PWM1_LVL = pwm1_levels[lvl];
+    PWM2_LVL = pwm2_levels[lvl];
+}
+
+uint8_t off_state(EventPtr event, uint16_t arg) {
+    // turn emitter off when entering state
+    if (event == EV_enter_state) {
+        go_to_standby = 1; // sleep while off  (lower power use)
+        return EVENT_HANDLED;
+    }
+    // hold (initially): go to lowest level, but allow abort for regular click
+    else if (event == EV_click1_press) {
+        set_level(0);
+        return EVENT_HANDLED;
+    }
+    // 1 click (before timeout): go to memorized level, but allow abort for double click
+    else if (event == EV_click1_release) {
+        set_level(memorized_level);
+        return EVENT_HANDLED;
+    }
+    // 1 click: regular mode
+    else if (event == EV_1click) {
+        set_state(steady_state, memorized_level);
+        return EVENT_HANDLED;
+    }
+    // 2 clicks: highest mode
+    else if (event == EV_2clicks) {
+        set_state(steady_state, MAX_LEVEL);
+        return EVENT_HANDLED;
+    }
+    // 4 clicks: soft lockout
+    else if (event == EV_4clicks) {
+        set_state(lockout_state, 0);
+        return EVENT_HANDLED;
+    }
+    // hold: go to lowest level
+    else if (event == EV_click1_hold) {
+        set_state(steady_state, 0);
+        return EVENT_HANDLED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+
+uint8_t steady_state(EventPtr event, uint16_t arg) {
+    // turn LED on when we first enter the mode
+    if (event == EV_enter_state) {
+        // remember this level, unless it's moon or turbo
+        if ((arg > 0) && (arg < MAX_LEVEL))
+            memorized_level = arg;
+        #ifdef USE_THERMAL_REGULATION
+        target_level = arg;
+        #endif
+        set_level(arg);
+        return EVENT_HANDLED;
+    }
+    // 1 click: off
+    else if (event == EV_1click) {
+        set_state(off_state, 0);
+        return EVENT_HANDLED;
+    }
+    // 2 clicks: go to/from highest level
+    else if (event == EV_2clicks) {
+        if (actual_level < MAX_LEVEL) {  // go to turbo
+            memorized_level = actual_level;  // in case we're on moon
+            #ifdef USE_THERMAL_REGULATION
+            target_level = MAX_LEVEL;
+            #endif
+            set_level(MAX_LEVEL);
+        }
+        else {  // return from turbo
+            #ifdef USE_THERMAL_REGULATION
+            target_level = memorized_level;
+            #endif
+            set_level(memorized_level);
+        }
+        return EVENT_HANDLED;
+    }
+    // hold: change brightness
+    else if (event == EV_click1_hold) {
+        if ((arg % HOLD_TIMEOUT) == 0) {
+            memorized_level = (actual_level+1) % (MAX_LEVEL+1);
+            #ifdef USE_THERMAL_REGULATION
+            target_level = memorized_level;
+            #endif
+            set_level(memorized_level);
+        }
+        return EVENT_HANDLED;
+    }
+    #ifdef USE_THERMAL_REGULATION
+    // overheating: drop by 1 level
+    else if (event == EV_temperature_high) {
+        if (actual_level > 1) {
+            set_level(actual_level - 1);
+        }
+        return EVENT_HANDLED;
+    }
+    // underheating: increase by 1 level if we're lower than the target
+    else if (event == EV_temperature_low) {
+        if (actual_level < target_level) {
+            set_level(actual_level + 1);
+        }
+        return EVENT_HANDLED;
+    }
+    #endif
+    return EVENT_NOT_HANDLED;
+}
+
+uint8_t lockout_state(EventPtr event, uint16_t arg) {
+    // stay asleep while locked, but allow waking long enough to click 4 times
+    if (event == EV_tick) {
+        static uint8_t ticks_spent_awake = 0;
+        ticks_spent_awake ++;
+        PWM1_LVL = 0;  PWM2_LVL = 0;
+        if (ticks_spent_awake > 3 * TICKS_PER_SECOND) {
+            ticks_spent_awake = 0;
+            go_to_standby = 1;
+        }
+        return MISCHIEF_MANAGED;
+    }
+    // 4 clicks: exit
+    else if (event == EV_4clicks) {
+        set_state(steady_state, 1);
+        return MISCHIEF_MANAGED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+
+void low_voltage() {
+    // step down by one level or turn off
+    if (actual_level > 0) {
+        set_level(actual_level - 1);
+    }
+    else {
+        set_state(off_state, 0);
+    }
+}
+
+void setup() {
+    // blink when power is connected
+    set_level(MAX_LEVEL/2);
+    delay_ms(10);
+    set_level(0);
+
+    push_state(off_state, 0);
+}
+
+void loop() {
+    if (go_to_standby) {
+        go_to_standby = 0;
+        PWM1_LVL = 0;  PWM2_LVL = 0;
+        standby_mode();
+    }
+}
diff --git a/spaghetti-monster/baton/baton.c b/spaghetti-monster/baton/baton.c
new file mode 100644
index 0000000..515f2d0
--- /dev/null
+++ b/spaghetti-monster/baton/baton.c
@@ -0,0 +1,231 @@
+/*
+ * Baton: Olight Baton-like UI for SpaghettiMonster.
+ *
+ * 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/>.
+ */
+
+#define FSM_EMISAR_D4_DRIVER
+#define USE_LVP
+#define USE_THERMAL_REGULATION
+#define DEFAULT_THERM_CEIL 45
+#define USE_DEBUG_BLINK
+#define USE_DELAY_MS
+#define USE_DELAY_4MS
+#define USE_DELAY_ZERO
+#include "spaghetti-monster.h"
+
+// moon + ../../bin/level_calc.py 2 6 7135 18 10 150 FET 1 10 1500
+uint8_t pwm1_modes[] = { 3, 18, 110, 255, 255, 255,   0, };
+uint8_t pwm2_modes[] = { 0,  0,   0,   9,  58, 138, 255, };
+#define MAX_LEVEL (sizeof(pwm1_modes)-1)
+
+// FSM states
+uint8_t off_state(EventPtr event, uint16_t arg);
+uint8_t steady_state(EventPtr event, uint16_t arg);
+uint8_t party_strobe_state(EventPtr event, uint16_t arg);
+
+// brightness control
+uint8_t memorized_level = 1;
+uint8_t actual_level = 0;
+#ifdef USE_THERMAL_REGULATION
+uint8_t target_level = 0;
+#endif
+
+void set_level(uint8_t lvl) {
+    actual_level = lvl;
+    PWM1_LVL = pwm1_modes[lvl];
+    PWM2_LVL = pwm2_modes[lvl];
+}
+
+uint8_t off_state(EventPtr event, uint16_t arg) {
+    // turn emitter off when entering state
+    if (event == EV_enter_state) {
+        PWM1_LVL = 0;
+        PWM2_LVL = 0;
+        // sleep while off  (lower power use)
+        //empty_event_sequence();  // just in case (but shouldn't be needed)
+        standby_mode();
+        return 0;
+    }
+    // hold (initially): go to lowest level, but allow abort for regular click
+    else if (event == EV_click1_press) {
+        set_level(0);
+        return 0;
+    }
+    // 1 click (before timeout): go to memorized level, but allow abort for double click
+    else if (event == EV_click1_release) {
+        set_level(memorized_level);
+        return 0;
+    }
+    // 1 click: regular mode
+    else if (event == EV_1click) {
+        set_state(steady_state, memorized_level);
+        return 0;
+    }
+    // 2 clicks: highest mode
+    else if (event == EV_2clicks) {
+        set_state(steady_state, MAX_LEVEL);
+        return 0;
+    }
+    // 3 clicks: strobe mode
+    else if (event == EV_3clicks) {
+        set_state(party_strobe_state, 255);
+        return 0;
+    }
+    // hold: go to lowest level
+    else if (event == EV_click1_hold) {
+        set_state(steady_state, 0);
+        return 0;
+    }
+    return 1;
+}
+
+uint8_t steady_state(EventPtr event, uint16_t arg) {
+    // turn LED on when we first enter the mode
+    if (event == EV_enter_state) {
+        // remember this level, unless it's moon or turbo
+        if ((arg > 0) && (arg < MAX_LEVEL))
+            memorized_level = arg;
+        // use the requested level even if not memorized
+        #ifdef USE_THERMAL_REGULATION
+        target_level = arg;
+        #endif
+        set_level(arg);
+        return 0;
+    }
+    // 1 click: off
+    else if (event == EV_1click) {
+        set_state(off_state, 0);
+        return 0;
+    }
+    // 2 clicks: go to/from highest level
+    else if (event == EV_2clicks) {
+        if (actual_level < MAX_LEVEL) {
+            memorized_level = actual_level;  // in case we're on moon
+            #ifdef USE_THERMAL_REGULATION
+            target_level = MAX_LEVEL;
+            #endif
+            set_level(MAX_LEVEL);
+        }
+        else {
+            #ifdef USE_THERMAL_REGULATION
+            target_level = memorized_level;
+            #endif
+            set_level(memorized_level);
+        }
+        return 0;
+    }
+    // 3 clicks: go to strobe modes
+    else if (event == EV_3clicks) {
+        set_state(party_strobe_state, 0xff);
+        return 0;
+    }
+    // hold: change brightness
+    else if (event == EV_click1_hold) {
+        if ((arg % HOLD_TIMEOUT) == 0) {
+            memorized_level = (actual_level+1) % (MAX_LEVEL+1);
+            #ifdef USE_THERMAL_REGULATION
+            target_level = memorized_level;
+            #endif
+            set_level(memorized_level);
+        }
+        return 0;
+    }
+    #ifdef USE_THERMAL_REGULATION
+    // overheating: drop by 1 level
+    else if (event == EV_temperature_high) {
+        if (actual_level > 1) {
+            set_level(actual_level - 1);
+        }
+        return 0;
+    }
+    // underheating: increase by 1 level if we're lower than the target
+    else if (event == EV_temperature_low) {
+        if (actual_level < target_level) {
+            set_level(actual_level + 1);
+        }
+        return 0;
+    }
+    #endif
+    return 1;
+}
+
+uint8_t party_strobe_state(EventPtr event, uint16_t arg) {
+    static volatile uint8_t frames = 0;
+    static volatile uint8_t between = 2;
+    if (event == EV_enter_state) {
+        if (arg < 64) between = arg;
+        frames = 0;
+        return 0;
+    }
+    // tick: strobe the emitter
+    else if (event == EV_tick) {
+        if (frames == 0) {
+            PWM1_LVL = 0;
+            PWM2_LVL = 255;
+            if (between < 3) delay_zero();
+            else delay_ms(1);
+            PWM2_LVL = 0;
+        }
+        //frames = (frames + 1) % between;
+        frames++;
+        if (frames > between) frames = 0;
+        return 0;
+    }
+    // 1 click: off
+    else if (event == EV_1click) {
+        set_state(off_state, 0);
+        return 0;
+    }
+    // 2 clicks: go back to regular modes
+    else if (event == EV_2clicks) {
+        set_state(steady_state, memorized_level);
+        return 0;
+    }
+    // hold: change speed
+    else if (event == EV_click1_hold) {
+        if ((arg % HOLD_TIMEOUT) == 0) {
+            between = (between+1)%6;
+            frames = 0;
+        }
+        return 0;
+    }
+    return 1;
+}
+
+void low_voltage() {
+    // "step down" from strobe to level 2
+    if (current_state == party_strobe_state) {
+        set_state(steady_state, 1);
+    }
+    // in normal mode, step down by one level or turn off
+    else if (current_state == steady_state) {
+        if (actual_level > 0) {
+            set_level(actual_level - 1);
+        }
+        else {
+            set_state(off_state, 0);
+        }
+    }
+}
+
+void setup() {
+    debug_blink(2);
+
+    push_state(off_state, 0);
+}
+
+void loop() { }
diff --git a/spaghetti-monster/darkhorse.c b/spaghetti-monster/darkhorse.c
deleted file mode 100644
index 2aa3e90..0000000
--- a/spaghetti-monster/darkhorse.c
+++ /dev/null
@@ -1,378 +0,0 @@
-/*
- * DarkHorse: Improved ZebraLight clone UI for SpaghettiMonster.
- *
- * 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/>.
- */
-
-#define FSM_EMISAR_D4_DRIVER
-#define USE_LVP
-#define USE_THERMAL_REGULATION
-#define DEFAULT_THERM_CEIL 45
-#define USE_DELAY_4MS
-#define USE_RAMPING
-#define RAMP_LENGTH 150
-#define USE_BATTCHECK
-#define BATTCHECK_4bars
-#define DONT_DELAY_AFTER_BATTCHECK
-#define USE_EEPROM
-#define EEPROM_BYTES 5
-#include "spaghetti-monster.h"
-
-// FSM states
-uint8_t off_state(EventPtr event, uint16_t arg);
-uint8_t low_mode_state(EventPtr event, uint16_t arg);
-uint8_t med_mode_state(EventPtr event, uint16_t arg);
-uint8_t hi_mode_state(EventPtr event, uint16_t arg);
-uint8_t strobe_beacon_state(EventPtr event, uint16_t arg);
-#ifdef USE_BATTCHECK
-uint8_t battcheck_state(EventPtr event, uint16_t arg);
-#endif
-// Not a FSM state, just handles stuff common to all low/med/hi states
-uint8_t any_mode_state(EventPtr event, uint16_t arg, uint8_t *primary, uint8_t *secondary, uint8_t *modes);
-
-void load_config();
-void save_config();
-
-// toggle between L1/L2, M1/M2, H1/H2
-uint8_t L1 = 1;
-uint8_t M1 = 1;
-uint8_t H1 = 1;
-// brightness for L2, M2, H2  (valid range 1 to 3 inclusive)
-uint8_t L2 = 1;
-uint8_t M2 = 1;
-uint8_t H2 = 1;
-// mode groups, ish
-uint8_t low_modes[] = {12, 1, 4, 9};  // 3.3 lm, 2.0 lm, 0.8 lm, 0.3 lm
-uint8_t med_modes[] = {56, 21, 29, 37};  // 101 lm, 35 lm, 20 lm, 10 lm
-uint8_t hi_modes[] = {MAX_LEVEL, 81, 96, 113};  // 1500 lm, 678 lm, 430 lm, 270 lm
-// strobe/beacon modes:
-// 0: 0.2 Hz beacon at L1
-// 1: 0.2 Hz beacon at H1
-// 2: 4 Hz strobe at H1
-// 3: 19 Hz strobe at H1
-uint8_t strobe_beacon_mode = 0;
-
-// deferred "off" so we won't suspend in a weird state
-volatile uint8_t go_to_standby = 0;
-
-#ifdef USE_THERMAL_REGULATION
-// brightness before thermal step-down
-uint8_t target_level = 0;
-#endif
-
-void set_any_mode(uint8_t primary, uint8_t secondary, uint8_t *modes) {
-    // primary (H1/M1/L1)
-    if (primary) {
-        set_level(modes[0]);
-    }
-    // secondary (H2/M2/L2)
-    else {
-        set_level(modes[secondary]);
-    }
-    #ifdef USE_THERMAL_REGULATION
-    target_level = actual_level;
-    #endif
-}
-
-inline void set_low_mode() { set_any_mode(L1, L2, low_modes); }
-inline void set_med_mode() { set_any_mode(M1, M2, med_modes); }
-inline void set_hi_mode()  { set_any_mode(H1, H2, hi_modes); }
-
-
-uint8_t off_state(EventPtr event, uint16_t arg) {
-    // turn emitter off when entering state
-    if (event == EV_enter_state) {
-        set_level(0);
-        // sleep while off  (lower power use)
-        go_to_standby = 1;
-        return EVENT_HANDLED;
-    }
-    // hold (initially): go to lowest level, but allow abort for regular click
-    else if (event == EV_click1_press) {
-        set_low_mode();
-        return EVENT_HANDLED;
-    }
-    // 1 click (before timeout): go to high level, but allow abort for double click
-    else if (event == EV_click1_release) {
-        set_hi_mode();
-        return EVENT_HANDLED;
-    }
-    // 1 click: high mode
-    else if (event == EV_1click) {
-        set_state(hi_mode_state, 0);
-        return EVENT_HANDLED;
-    }
-    // click, press (initially): go to medium mode, but allow abort
-    else if (event == EV_click2_press) {
-        set_med_mode();
-        return EVENT_HANDLED;
-    }
-    // 2 clicks: medium mode
-    else if (event == EV_2clicks) {
-        set_state(med_mode_state, 0);
-        return EVENT_HANDLED;
-    }
-    // click, click, press (initially): light off, prep for blinkies
-    else if (event == EV_click3_press) {
-        set_level(0);
-        return EVENT_HANDLED;
-    }
-    // 3 clicks: strobe mode
-    else if (event == EV_3clicks) {
-        set_state(strobe_beacon_state, 0);
-        return EVENT_HANDLED;
-    }
-    #ifdef USE_BATTCHECK
-    // 4 clicks: battcheck mode
-    else if (event == EV_4clicks) {
-        set_state(battcheck_state, 0);
-        return EVENT_HANDLED;
-    }
-    #endif
-    // hold: go to low mode, but allow ramping up
-    else if (event == EV_click1_hold) {
-        // don't start ramping immediately;
-        // give the user time to release at low mode
-        if (arg >= HOLD_TIMEOUT)
-            set_state(low_mode_state, 0);
-        return EVENT_HANDLED;
-    }
-    // hold, release quickly: go to low mode
-    else if (event == EV_click1_hold_release) {
-        set_state(low_mode_state, 0);
-        return EVENT_HANDLED;
-    }
-    /* TODO: implement
-    // click-release-hold: discrete ramp through all levels
-    else if (event == EV_click2_hold) {
-        set_state(steady_state, MAX_LEVEL);
-        return EVENT_HANDLED;
-    }
-    */
-    return EVENT_NOT_HANDLED;
-}
-
-
-uint8_t any_mode_state(EventPtr event, uint16_t arg, uint8_t *primary, uint8_t *secondary, uint8_t *modes) {
-    // turn on LED when entering the mode
-    if (event == EV_enter_state) {
-        set_any_mode(*primary, *secondary, modes);
-        return MISCHIEF_MANAGED;
-    }
-    // 1 click: off
-    else if (event == EV_1click) {
-        set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
-    }
-    // hold: change brightness (low, med, hi, always starting at low)
-    else if (event == EV_click1_hold) {
-        uint8_t which = arg % (HOLD_TIMEOUT * 3) / HOLD_TIMEOUT;
-        switch(which) {
-            case 0:
-                set_state(low_mode_state, 0);
-                break;
-            case 1:
-                set_state(med_mode_state, 0);
-                break;
-            case 2:
-                set_state(hi_mode_state, 0);
-                break;
-        }
-        return MISCHIEF_MANAGED;
-    }
-    // 2 clicks: toggle primary/secondary level
-    else if (event == EV_2clicks) {
-        *primary ^= 1;
-        set_any_mode(*primary, *secondary, modes);
-        save_config();
-        return MISCHIEF_MANAGED;
-    }
-    // click-release-hold: change secondary level
-    else if (event == EV_click2_hold) {
-        if (arg % HOLD_TIMEOUT == 0) {
-            *secondary = (*secondary + 1) & 3;
-            if (! *secondary) *secondary = 1;
-            *primary = 0;
-            set_any_mode(*primary, *secondary, modes);
-        }
-        return MISCHIEF_MANAGED;
-    }
-    // click, hold, release: save secondary level
-    else if (event == EV_click2_hold_release) {
-        save_config();
-    }
-    #ifdef USE_THERMAL_REGULATION
-    // TODO: test this on a real light
-    // overheating: drop by an amount proportional to how far we are above the ceiling
-    else if (event == EV_temperature_high) {
-        if (actual_level > MAX_LEVEL/4) {
-            uint8_t stepdown = actual_level - arg;
-            if (stepdown < MAX_LEVEL/4) stepdown = MAX_LEVEL/4;
-            set_level(stepdown);
-        }
-        return EVENT_HANDLED;
-    }
-    // underheating: increase slowly if we're lower than the target
-    //               (proportional to how low we are)
-    else if (event == EV_temperature_low) {
-        if (actual_level < target_level) {
-            uint8_t stepup = actual_level + (arg>>1);
-            if (stepup > target_level) stepup = target_level;
-            set_level(stepup);
-        }
-        return EVENT_HANDLED;
-    }
-    #endif
-    return EVENT_NOT_HANDLED;
-}
-
-uint8_t low_mode_state(EventPtr event, uint16_t arg) {
-    return any_mode_state(event, arg, &L1, &L2, low_modes);
-}
-
-uint8_t med_mode_state(EventPtr event, uint16_t arg) {
-    return any_mode_state(event, arg, &M1, &M2, med_modes);
-}
-
-uint8_t hi_mode_state(EventPtr event, uint16_t arg) {
-    return any_mode_state(event, arg, &H1, &H2, hi_modes);
-}
-
-
-#ifdef USE_BATTCHECK
-uint8_t battcheck_state(EventPtr event, uint16_t arg) {
-    return EVENT_NOT_HANDLED;
-}
-#endif
-
-
-uint8_t strobe_beacon_state(EventPtr event, uint16_t arg) {
-    // 1 click: off
-    if (event == EV_1click) {
-        set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
-    }
-    // 1 click (initially): cancel current blink
-    if (event == EV_click1_release) {
-        interrupt_nice_delays();
-        return MISCHIEF_MANAGED;
-    }
-    // 2 clicks: rotate through blinky modes
-    else if (event == EV_2clicks) {
-        strobe_beacon_mode = (strobe_beacon_mode + 1) & 3;
-        save_config();
-        interrupt_nice_delays();
-        return MISCHIEF_MANAGED;
-    }
-    return EVENT_NOT_HANDLED;
-}
-
-
-void low_voltage() {
-    if (current_state == hi_mode_state) {
-        set_state(med_mode_state, 0);
-    }
-    else if (current_state == med_mode_state) {
-        set_state(low_mode_state, 0);
-    }
-    else if (current_state == low_mode_state) {
-        set_state(off_state, 0);
-    }
-    // "step down" from blinkies to low
-    else if (current_state == strobe_beacon_state) {
-        set_state(low_mode_state, 0);
-    }
-}
-
-void strobe(uint8_t level, uint16_t ontime, uint16_t offtime) {
-    set_level(level);
-    if (! nice_delay_ms(ontime)) return;
-    set_level(0);
-    nice_delay_ms(offtime);
-}
-
-void load_config() {
-    if (load_eeprom()) {
-        H1 = !(!(eeprom[0] & 0b00000100));
-        M1 = !(!(eeprom[0] & 0b00000010));
-        L1 = !(!(eeprom[0] & 0b00000001));
-        H2 = eeprom[1];
-        M2 = eeprom[2];
-        L2 = eeprom[3];
-        strobe_beacon_mode = eeprom[4];
-    }
-}
-
-void save_config() {
-    eeprom[0] = (H1<<2) | (M1<<1) | (L1);
-    eeprom[1] = H2;
-    eeprom[2] = M2;
-    eeprom[3] = L2;
-    eeprom[4] = strobe_beacon_mode;
-
-    save_eeprom();
-}
-
-void setup() {
-    set_level(RAMP_SIZE/8);
-    delay_4ms(3);
-    set_level(0);
-
-    load_config();
-
-    push_state(off_state, 0);
-}
-
-void loop() {
-    // deferred "off" so we won't suspend in a weird state
-    // (like...  during the middle of a strobe pulse)
-    if (go_to_standby) {
-        go_to_standby = 0;
-        set_level(0);
-        standby_mode();
-    }
-
-    if (current_state == strobe_beacon_state) {
-        switch(strobe_beacon_mode) {
-            // 0.2 Hz beacon at L1
-            case 0:
-                strobe(low_modes[0], 500, 4500);
-                break;
-            // 0.2 Hz beacon at H1
-            case 1:
-                strobe(hi_modes[0], 500, 4500);
-                break;
-            // 4 Hz tactical strobe at H1
-            case 2:
-                strobe(hi_modes[0], 83, 167);
-                break;
-            // 19 Hz tactical strobe at H1
-            case 3:
-                strobe(hi_modes[0], 17, 35);
-                break;
-        }
-    }
-
-    #ifdef USE_BATTCHECK
-    else if (current_state == battcheck_state) {
-        nice_delay_ms(500);  // wait a moment to measure voltage
-        battcheck();
-        set_state(off_state, 0);
-    }
-    #endif
-}
-
-
diff --git a/spaghetti-monster/darkhorse/darkhorse.c b/spaghetti-monster/darkhorse/darkhorse.c
new file mode 100644
index 0000000..2aa3e90
--- /dev/null
+++ b/spaghetti-monster/darkhorse/darkhorse.c
@@ -0,0 +1,378 @@
+/*
+ * DarkHorse: Improved ZebraLight clone UI for SpaghettiMonster.
+ *
+ * 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/>.
+ */
+
+#define FSM_EMISAR_D4_DRIVER
+#define USE_LVP
+#define USE_THERMAL_REGULATION
+#define DEFAULT_THERM_CEIL 45
+#define USE_DELAY_4MS
+#define USE_RAMPING
+#define RAMP_LENGTH 150
+#define USE_BATTCHECK
+#define BATTCHECK_4bars
+#define DONT_DELAY_AFTER_BATTCHECK
+#define USE_EEPROM
+#define EEPROM_BYTES 5
+#include "spaghetti-monster.h"
+
+// FSM states
+uint8_t off_state(EventPtr event, uint16_t arg);
+uint8_t low_mode_state(EventPtr event, uint16_t arg);
+uint8_t med_mode_state(EventPtr event, uint16_t arg);
+uint8_t hi_mode_state(EventPtr event, uint16_t arg);
+uint8_t strobe_beacon_state(EventPtr event, uint16_t arg);
+#ifdef USE_BATTCHECK
+uint8_t battcheck_state(EventPtr event, uint16_t arg);
+#endif
+// Not a FSM state, just handles stuff common to all low/med/hi states
+uint8_t any_mode_state(EventPtr event, uint16_t arg, uint8_t *primary, uint8_t *secondary, uint8_t *modes);
+
+void load_config();
+void save_config();
+
+// toggle between L1/L2, M1/M2, H1/H2
+uint8_t L1 = 1;
+uint8_t M1 = 1;
+uint8_t H1 = 1;
+// brightness for L2, M2, H2  (valid range 1 to 3 inclusive)
+uint8_t L2 = 1;
+uint8_t M2 = 1;
+uint8_t H2 = 1;
+// mode groups, ish
+uint8_t low_modes[] = {12, 1, 4, 9};  // 3.3 lm, 2.0 lm, 0.8 lm, 0.3 lm
+uint8_t med_modes[] = {56, 21, 29, 37};  // 101 lm, 35 lm, 20 lm, 10 lm
+uint8_t hi_modes[] = {MAX_LEVEL, 81, 96, 113};  // 1500 lm, 678 lm, 430 lm, 270 lm
+// strobe/beacon modes:
+// 0: 0.2 Hz beacon at L1
+// 1: 0.2 Hz beacon at H1
+// 2: 4 Hz strobe at H1
+// 3: 19 Hz strobe at H1
+uint8_t strobe_beacon_mode = 0;
+
+// deferred "off" so we won't suspend in a weird state
+volatile uint8_t go_to_standby = 0;
+
+#ifdef USE_THERMAL_REGULATION
+// brightness before thermal step-down
+uint8_t target_level = 0;
+#endif
+
+void set_any_mode(uint8_t primary, uint8_t secondary, uint8_t *modes) {
+    // primary (H1/M1/L1)
+    if (primary) {
+        set_level(modes[0]);
+    }
+    // secondary (H2/M2/L2)
+    else {
+        set_level(modes[secondary]);
+    }
+    #ifdef USE_THERMAL_REGULATION
+    target_level = actual_level;
+    #endif
+}
+
+inline void set_low_mode() { set_any_mode(L1, L2, low_modes); }
+inline void set_med_mode() { set_any_mode(M1, M2, med_modes); }
+inline void set_hi_mode()  { set_any_mode(H1, H2, hi_modes); }
+
+
+uint8_t off_state(EventPtr event, uint16_t arg) {
+    // turn emitter off when entering state
+    if (event == EV_enter_state) {
+        set_level(0);
+        // sleep while off  (lower power use)
+        go_to_standby = 1;
+        return EVENT_HANDLED;
+    }
+    // hold (initially): go to lowest level, but allow abort for regular click
+    else if (event == EV_click1_press) {
+        set_low_mode();
+        return EVENT_HANDLED;
+    }
+    // 1 click (before timeout): go to high level, but allow abort for double click
+    else if (event == EV_click1_release) {
+        set_hi_mode();
+        return EVENT_HANDLED;
+    }
+    // 1 click: high mode
+    else if (event == EV_1click) {
+        set_state(hi_mode_state, 0);
+        return EVENT_HANDLED;
+    }
+    // click, press (initially): go to medium mode, but allow abort
+    else if (event == EV_click2_press) {
+        set_med_mode();
+        return EVENT_HANDLED;
+    }
+    // 2 clicks: medium mode
+    else if (event == EV_2clicks) {
+        set_state(med_mode_state, 0);
+        return EVENT_HANDLED;
+    }
+    // click, click, press (initially): light off, prep for blinkies
+    else if (event == EV_click3_press) {
+        set_level(0);
+        return EVENT_HANDLED;
+    }
+    // 3 clicks: strobe mode
+    else if (event == EV_3clicks) {
+        set_state(strobe_beacon_state, 0);
+        return EVENT_HANDLED;
+    }
+    #ifdef USE_BATTCHECK
+    // 4 clicks: battcheck mode
+    else if (event == EV_4clicks) {
+        set_state(battcheck_state, 0);
+        return EVENT_HANDLED;
+    }
+    #endif
+    // hold: go to low mode, but allow ramping up
+    else if (event == EV_click1_hold) {
+        // don't start ramping immediately;
+        // give the user time to release at low mode
+        if (arg >= HOLD_TIMEOUT)
+            set_state(low_mode_state, 0);
+        return EVENT_HANDLED;
+    }
+    // hold, release quickly: go to low mode
+    else if (event == EV_click1_hold_release) {
+        set_state(low_mode_state, 0);
+        return EVENT_HANDLED;
+    }
+    /* TODO: implement
+    // click-release-hold: discrete ramp through all levels
+    else if (event == EV_click2_hold) {
+        set_state(steady_state, MAX_LEVEL);
+        return EVENT_HANDLED;
+    }
+    */
+    return EVENT_NOT_HANDLED;
+}
+
+
+uint8_t any_mode_state(EventPtr event, uint16_t arg, uint8_t *primary, uint8_t *secondary, uint8_t *modes) {
+    // turn on LED when entering the mode
+    if (event == EV_enter_state) {
+        set_any_mode(*primary, *secondary, modes);
+        return MISCHIEF_MANAGED;
+    }
+    // 1 click: off
+    else if (event == EV_1click) {
+        set_state(off_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    // hold: change brightness (low, med, hi, always starting at low)
+    else if (event == EV_click1_hold) {
+        uint8_t which = arg % (HOLD_TIMEOUT * 3) / HOLD_TIMEOUT;
+        switch(which) {
+            case 0:
+                set_state(low_mode_state, 0);
+                break;
+            case 1:
+                set_state(med_mode_state, 0);
+                break;
+            case 2:
+                set_state(hi_mode_state, 0);
+                break;
+        }
+        return MISCHIEF_MANAGED;
+    }
+    // 2 clicks: toggle primary/secondary level
+    else if (event == EV_2clicks) {
+        *primary ^= 1;
+        set_any_mode(*primary, *secondary, modes);
+        save_config();
+        return MISCHIEF_MANAGED;
+    }
+    // click-release-hold: change secondary level
+    else if (event == EV_click2_hold) {
+        if (arg % HOLD_TIMEOUT == 0) {
+            *secondary = (*secondary + 1) & 3;
+            if (! *secondary) *secondary = 1;
+            *primary = 0;
+            set_any_mode(*primary, *secondary, modes);
+        }
+        return MISCHIEF_MANAGED;
+    }
+    // click, hold, release: save secondary level
+    else if (event == EV_click2_hold_release) {
+        save_config();
+    }
+    #ifdef USE_THERMAL_REGULATION
+    // TODO: test this on a real light
+    // overheating: drop by an amount proportional to how far we are above the ceiling
+    else if (event == EV_temperature_high) {
+        if (actual_level > MAX_LEVEL/4) {
+            uint8_t stepdown = actual_level - arg;
+            if (stepdown < MAX_LEVEL/4) stepdown = MAX_LEVEL/4;
+            set_level(stepdown);
+        }
+        return EVENT_HANDLED;
+    }
+    // underheating: increase slowly if we're lower than the target
+    //               (proportional to how low we are)
+    else if (event == EV_temperature_low) {
+        if (actual_level < target_level) {
+            uint8_t stepup = actual_level + (arg>>1);
+            if (stepup > target_level) stepup = target_level;
+            set_level(stepup);
+        }
+        return EVENT_HANDLED;
+    }
+    #endif
+    return EVENT_NOT_HANDLED;
+}
+
+uint8_t low_mode_state(EventPtr event, uint16_t arg) {
+    return any_mode_state(event, arg, &L1, &L2, low_modes);
+}
+
+uint8_t med_mode_state(EventPtr event, uint16_t arg) {
+    return any_mode_state(event, arg, &M1, &M2, med_modes);
+}
+
+uint8_t hi_mode_state(EventPtr event, uint16_t arg) {
+    return any_mode_state(event, arg, &H1, &H2, hi_modes);
+}
+
+
+#ifdef USE_BATTCHECK
+uint8_t battcheck_state(EventPtr event, uint16_t arg) {
+    return EVENT_NOT_HANDLED;
+}
+#endif
+
+
+uint8_t strobe_beacon_state(EventPtr event, uint16_t arg) {
+    // 1 click: off
+    if (event == EV_1click) {
+        set_state(off_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    // 1 click (initially): cancel current blink
+    if (event == EV_click1_release) {
+        interrupt_nice_delays();
+        return MISCHIEF_MANAGED;
+    }
+    // 2 clicks: rotate through blinky modes
+    else if (event == EV_2clicks) {
+        strobe_beacon_mode = (strobe_beacon_mode + 1) & 3;
+        save_config();
+        interrupt_nice_delays();
+        return MISCHIEF_MANAGED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+
+
+void low_voltage() {
+    if (current_state == hi_mode_state) {
+        set_state(med_mode_state, 0);
+    }
+    else if (current_state == med_mode_state) {
+        set_state(low_mode_state, 0);
+    }
+    else if (current_state == low_mode_state) {
+        set_state(off_state, 0);
+    }
+    // "step down" from blinkies to low
+    else if (current_state == strobe_beacon_state) {
+        set_state(low_mode_state, 0);
+    }
+}
+
+void strobe(uint8_t level, uint16_t ontime, uint16_t offtime) {
+    set_level(level);
+    if (! nice_delay_ms(ontime)) return;
+    set_level(0);
+    nice_delay_ms(offtime);
+}
+
+void load_config() {
+    if (load_eeprom()) {
+        H1 = !(!(eeprom[0] & 0b00000100));
+        M1 = !(!(eeprom[0] & 0b00000010));
+        L1 = !(!(eeprom[0] & 0b00000001));
+        H2 = eeprom[1];
+        M2 = eeprom[2];
+        L2 = eeprom[3];
+        strobe_beacon_mode = eeprom[4];
+    }
+}
+
+void save_config() {
+    eeprom[0] = (H1<<2) | (M1<<1) | (L1);
+    eeprom[1] = H2;
+    eeprom[2] = M2;
+    eeprom[3] = L2;
+    eeprom[4] = strobe_beacon_mode;
+
+    save_eeprom();
+}
+
+void setup() {
+    set_level(RAMP_SIZE/8);
+    delay_4ms(3);
+    set_level(0);
+
+    load_config();
+
+    push_state(off_state, 0);
+}
+
+void loop() {
+    // deferred "off" so we won't suspend in a weird state
+    // (like...  during the middle of a strobe pulse)
+    if (go_to_standby) {
+        go_to_standby = 0;
+        set_level(0);
+        standby_mode();
+    }
+
+    if (current_state == strobe_beacon_state) {
+        switch(strobe_beacon_mode) {
+            // 0.2 Hz beacon at L1
+            case 0:
+                strobe(low_modes[0], 500, 4500);
+                break;
+            // 0.2 Hz beacon at H1
+            case 1:
+                strobe(hi_modes[0], 500, 4500);
+                break;
+            // 4 Hz tactical strobe at H1
+            case 2:
+                strobe(hi_modes[0], 83, 167);
+                break;
+            // 19 Hz tactical strobe at H1
+            case 3:
+                strobe(hi_modes[0], 17, 35);
+                break;
+        }
+    }
+
+    #ifdef USE_BATTCHECK
+    else if (current_state == battcheck_state) {
+        nice_delay_ms(500);  // wait a moment to measure voltage
+        battcheck();
+        set_state(off_state, 0);
+    }
+    #endif
+}
+
+
diff --git a/spaghetti-monster/momentary.c b/spaghetti-monster/momentary.c
deleted file mode 100644
index 6b049f4..0000000
--- a/spaghetti-monster/momentary.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Momentary: Very simple example UI for SpaghettiMonster.
- * Is intended to be the simplest possible FSM e-switch UI.
- * The light is on while the button is held; off otherwise.
- *
- * 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/>.
- */
-
-#define FSM_EMISAR_D4_DRIVER
-#define USE_LVP
-#define USE_DEBUG_BLINK
-#define USE_DELAY_4MS
-#include "spaghetti-monster.h"
-
-volatile uint8_t brightness;
-volatile uint8_t on_now;
-
-void light_on() {
-    on_now = 1;
-    PWM1_LVL = brightness;
-    PWM2_LVL = 0;
-}
-
-void light_off() {
-    on_now = 0;
-    PWM1_LVL = 0;
-    PWM2_LVL = 0;
-}
-
-uint8_t momentary_state(EventPtr event, uint16_t arg) {
-
-    if (event == EV_click1_press) {
-        brightness = 255;
-        light_on();
-        empty_event_sequence();  // don't attempt to parse multiple clicks
-        return 0;
-    }
-
-    else if (event == EV_release) {
-        light_off();
-        empty_event_sequence();  // don't attempt to parse multiple clicks
-        standby_mode();  // sleep while light is off
-        return 0;
-    }
-
-    return 1;  // event not handled
-}
-
-// LVP / low-voltage protection
-void low_voltage() {
-    if (brightness > 0) {
-        debug_blink(3);
-        brightness >>= 1;
-        if (on_now) light_on();
-    } else {
-        debug_blink(8);
-        light_off();
-        standby_mode();
-    }
-}
-
-void setup() {
-    debug_blink(2);
-    push_state(momentary_state, 0);
-}
-
-void loop() { }
-
diff --git a/spaghetti-monster/momentary/momentary.c b/spaghetti-monster/momentary/momentary.c
new file mode 100644
index 0000000..6b049f4
--- /dev/null
+++ b/spaghetti-monster/momentary/momentary.c
@@ -0,0 +1,81 @@
+/*
+ * Momentary: Very simple example UI for SpaghettiMonster.
+ * Is intended to be the simplest possible FSM e-switch UI.
+ * The light is on while the button is held; off otherwise.
+ *
+ * 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/>.
+ */
+
+#define FSM_EMISAR_D4_DRIVER
+#define USE_LVP
+#define USE_DEBUG_BLINK
+#define USE_DELAY_4MS
+#include "spaghetti-monster.h"
+
+volatile uint8_t brightness;
+volatile uint8_t on_now;
+
+void light_on() {
+    on_now = 1;
+    PWM1_LVL = brightness;
+    PWM2_LVL = 0;
+}
+
+void light_off() {
+    on_now = 0;
+    PWM1_LVL = 0;
+    PWM2_LVL = 0;
+}
+
+uint8_t momentary_state(EventPtr event, uint16_t arg) {
+
+    if (event == EV_click1_press) {
+        brightness = 255;
+        light_on();
+        empty_event_sequence();  // don't attempt to parse multiple clicks
+        return 0;
+    }
+
+    else if (event == EV_release) {
+        light_off();
+        empty_event_sequence();  // don't attempt to parse multiple clicks
+        standby_mode();  // sleep while light is off
+        return 0;
+    }
+
+    return 1;  // event not handled
+}
+
+// LVP / low-voltage protection
+void low_voltage() {
+    if (brightness > 0) {
+        debug_blink(3);
+        brightness >>= 1;
+        if (on_now) light_on();
+    } else {
+        debug_blink(8);
+        light_off();
+        standby_mode();
+    }
+}
+
+void setup() {
+    debug_blink(2);
+    push_state(momentary_state, 0);
+}
+
+void loop() { }
+
diff --git a/spaghetti-monster/ramping-ui.c b/spaghetti-monster/ramping-ui.c
deleted file mode 100644
index 527a824..0000000
--- a/spaghetti-monster/ramping-ui.c
+++ /dev/null
@@ -1,361 +0,0 @@
-/*
- * Ramping-UI: Ramping UI for SpaghettiMonster.
- *
- * 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/>.
- */
-
-#define FSM_EMISAR_D4_DRIVER
-#define USE_LVP
-#define USE_THERMAL_REGULATION
-#define DEFAULT_THERM_CEIL 32
-#define USE_DELAY_MS
-#define USE_DELAY_4MS
-#define USE_DELAY_ZERO
-#define USE_RAMPING
-#define USE_BATTCHECK
-#define BATTCHECK_VpT
-#define RAMP_LENGTH 150
-#include "spaghetti-monster.h"
-
-// FSM states
-uint8_t off_state(EventPtr event, uint16_t arg);
-uint8_t steady_state(EventPtr event, uint16_t arg);
-uint8_t strobe_state(EventPtr event, uint16_t arg);
-#ifdef USE_BATTCHECK
-uint8_t battcheck_state(EventPtr event, uint16_t arg);
-uint8_t tempcheck_state(EventPtr event, uint16_t arg);
-#endif
-
-// brightness control
-uint8_t memorized_level = MAX_1x7135;
-// smooth vs discrete ramping
-uint8_t ramp_step_size = 1;
-
-#ifdef USE_THERMAL_REGULATION
-// brightness before thermal step-down
-uint8_t target_level = 0;
-#endif
-
-// strobe timing
-volatile uint8_t strobe_delay = 67;
-volatile uint8_t strobe_type = 0;  // 0 == party strobe, 1 == tactical strobe
-
-
-uint8_t off_state(EventPtr event, uint16_t arg) {
-    // turn emitter off when entering state
-    if (event == EV_enter_state) {
-        set_level(0);
-        // sleep while off  (lower power use)
-        //empty_event_sequence();  // just in case (but shouldn't be needed)
-        standby_mode();
-        return MISCHIEF_MANAGED;
-    }
-    // hold (initially): go to lowest level, but allow abort for regular click
-    else if (event == EV_click1_press) {
-        set_level(1);
-        return MISCHIEF_MANAGED;
-    }
-    // 1 click (before timeout): go to memorized level, but allow abort for double click
-    else if (event == EV_click1_release) {
-        set_level(memorized_level);
-        return MISCHIEF_MANAGED;
-    }
-    // 1 click: regular mode
-    else if (event == EV_1click) {
-        set_state(steady_state, memorized_level);
-        return MISCHIEF_MANAGED;
-    }
-    // 2 clicks (initial press): off, to prep for later events
-    else if (event == EV_click2_press) {
-        set_level(0);
-        return MISCHIEF_MANAGED;
-    }
-    // 2 clicks: highest mode
-    else if (event == EV_2clicks) {
-        set_state(steady_state, MAX_LEVEL);
-        return MISCHIEF_MANAGED;
-    }
-    // 3 clicks: strobe mode
-    else if (event == EV_3clicks) {
-        set_state(strobe_state, 0);
-        return MISCHIEF_MANAGED;
-    }
-    #ifdef USE_BATTCHECK
-    // 4 clicks: battcheck mode
-    else if (event == EV_4clicks) {
-        set_state(battcheck_state, 0);
-        return MISCHIEF_MANAGED;
-    }
-    #endif
-    // hold: go to lowest level
-    else if (event == EV_click1_hold) {
-        // don't start ramping immediately;
-        // give the user time to release at moon level
-        if (arg >= HOLD_TIMEOUT)
-            set_state(steady_state, 1);
-        return MISCHIEF_MANAGED;
-    }
-    // hold, release quickly: go to lowest level
-    else if (event == EV_click1_hold_release) {
-        set_state(steady_state, 1);
-        return MISCHIEF_MANAGED;
-    }
-    // click, hold: go to highest level (for ramping down)
-    else if (event == EV_click2_hold) {
-        set_state(steady_state, MAX_LEVEL);
-        return MISCHIEF_MANAGED;
-    }
-    return EVENT_NOT_HANDLED;
-}
-
-
-uint8_t steady_state(EventPtr event, uint16_t arg) {
-    // turn LED on when we first enter the mode
-    if (event == EV_enter_state) {
-        // remember this level, unless it's moon or turbo
-        if ((arg > 1) && (arg < MAX_LEVEL))
-            memorized_level = arg;
-        // use the requested level even if not memorized
-        #ifdef USE_THERMAL_REGULATION
-        target_level = arg;
-        #endif
-        set_level(arg);
-        return MISCHIEF_MANAGED;
-    }
-    // 1 click: off
-    else if (event == EV_1click) {
-        set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
-    }
-    // 2 clicks: go to/from highest level
-    else if (event == EV_2clicks) {
-        if (actual_level < MAX_LEVEL) {
-            memorized_level = actual_level;  // in case we're on moon
-            #ifdef USE_THERMAL_REGULATION
-            target_level = MAX_LEVEL;
-            #endif
-            set_level(MAX_LEVEL);
-        }
-        else {
-            #ifdef USE_THERMAL_REGULATION
-            target_level = memorized_level;
-            #endif
-            set_level(memorized_level);
-        }
-        return MISCHIEF_MANAGED;
-    }
-    // 3 clicks: go to strobe modes
-    else if (event == EV_3clicks) {
-        set_state(strobe_state, 0);
-        return MISCHIEF_MANAGED;
-    }
-    // 4 clicks: toggle smooth vs discrete ramping
-    else if (event == EV_4clicks) {
-        if (ramp_step_size == 1) ramp_step_size = MAX_LEVEL/6;
-        else ramp_step_size = 1;
-        set_level(0);
-        delay_4ms(20/4);
-        set_level(memorized_level);
-        return MISCHIEF_MANAGED;
-    }
-    // hold: change brightness (brighter)
-    else if (event == EV_click1_hold) {
-        // ramp slower in discrete mode
-        if (arg % ramp_step_size != 0) {
-            return MISCHIEF_MANAGED;
-        }
-        // FIXME: make it ramp down instead, if already at max
-        if (actual_level + ramp_step_size < MAX_LEVEL)
-            memorized_level = actual_level + ramp_step_size;
-        else memorized_level = MAX_LEVEL;
-        #ifdef USE_THERMAL_REGULATION
-        target_level = memorized_level;
-        #endif
-        // only blink once for each threshold
-        if ((memorized_level != actual_level)
-                && ((memorized_level == MAX_1x7135)
-                    || (memorized_level == MAX_LEVEL))) {
-            set_level(0);
-            delay_4ms(8/4);
-        }
-        set_level(memorized_level);
-        return MISCHIEF_MANAGED;
-    }
-    // click, hold: change brightness (dimmer)
-    else if (event == EV_click2_hold) {
-        // ramp slower in discrete mode
-        if (arg % ramp_step_size != 0) {
-            return MISCHIEF_MANAGED;
-        }
-        // FIXME: make it ramp up instead, if already at min
-        if (actual_level > ramp_step_size)
-            memorized_level = (actual_level-ramp_step_size);
-        else
-            memorized_level = 1;
-        #ifdef USE_THERMAL_REGULATION
-        target_level = memorized_level;
-        #endif
-        // only blink once for each threshold
-        if ((memorized_level != actual_level)
-                && ((memorized_level == MAX_1x7135)
-                    || (memorized_level == 1))) {
-            set_level(0);
-            delay_4ms(8/4);
-        }
-        set_level(memorized_level);
-        return MISCHIEF_MANAGED;
-    }
-    #ifdef USE_THERMAL_REGULATION
-    // TODO: test this on a real light
-    // overheating: drop by an amount proportional to how far we are above the ceiling
-    else if (event == EV_temperature_high) {
-        if (actual_level > MAX_LEVEL/4) {
-            uint8_t stepdown = actual_level - arg;
-            if (stepdown < MAX_LEVEL/4) stepdown = MAX_LEVEL/4;
-            set_level(stepdown);
-        }
-        return MISCHIEF_MANAGED;
-    }
-    // underheating: increase slowly if we're lower than the target
-    //               (proportional to how low we are)
-    else if (event == EV_temperature_low) {
-        if (actual_level < target_level) {
-            uint8_t stepup = actual_level + (arg>>1);
-            if (stepup > target_level) stepup = target_level;
-            set_level(stepup);
-        }
-        return MISCHIEF_MANAGED;
-    }
-    #endif
-    return EVENT_NOT_HANDLED;
-}
-
-
-uint8_t strobe_state(EventPtr event, uint16_t arg) {
-    if (event == EV_enter_state) {
-        return MISCHIEF_MANAGED;
-    }
-    // 1 click: off
-    else if (event == EV_1click) {
-        set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
-    }
-    // 2 clicks: toggle party strobe vs tactical strobe
-    else if (event == EV_2clicks) {
-        strobe_type ^= 1;
-        return MISCHIEF_MANAGED;
-    }
-    // 3 clicks: go back to regular modes
-    else if (event == EV_3clicks) {
-        set_state(steady_state, memorized_level);
-        return MISCHIEF_MANAGED;
-    }
-    // hold: change speed (go faster)
-    else if (event == EV_click1_hold) {
-        if ((arg & 1) == 0) {
-            if (strobe_delay > 8) strobe_delay --;
-        }
-        return MISCHIEF_MANAGED;
-    }
-    // click, hold: change speed (go slower)
-    else if (event == EV_click2_hold) {
-        if ((arg & 1) == 0) {
-            if (strobe_delay < 255) strobe_delay ++;
-        }
-        return MISCHIEF_MANAGED;
-    }
-    return EVENT_NOT_HANDLED;
-}
-
-
-#ifdef USE_BATTCHECK
-uint8_t battcheck_state(EventPtr event, uint16_t arg) {
-    // 1 click: off
-    if (event == EV_1click) {
-        set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
-    }
-    // 2 clicks: tempcheck mode
-    else if (event == EV_2clicks) {
-        set_state(tempcheck_state, 0);
-        return MISCHIEF_MANAGED;
-    }
-    return EVENT_NOT_HANDLED;
-}
-
-uint8_t tempcheck_state(EventPtr event, uint16_t arg) {
-    // 1 click: off
-    if (event == EV_1click) {
-        set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
-    }
-    return EVENT_NOT_HANDLED;
-}
-#endif
-
-
-void low_voltage() {
-    // "step down" from strobe to something low
-    if (current_state == strobe_state) {
-        set_state(steady_state, RAMP_SIZE/6);
-    }
-    // in normal mode, step down by half or turn off
-    else if (current_state == steady_state) {
-        if (actual_level > 1) {
-            set_level(actual_level >> 1);
-        }
-        else {
-            set_state(off_state, 0);
-        }
-    }
-    // all other modes, just turn off when voltage is low
-    else {
-        set_state(off_state, 0);
-    }
-}
-
-
-void setup() {
-    set_level(RAMP_SIZE/8);
-    delay_4ms(3);
-    set_level(0);
-
-    push_state(off_state, 0);
-}
-
-
-void loop() {
-    if (current_state == strobe_state) {
-        set_level(MAX_LEVEL);
-        if (strobe_type == 0) {  // party strobe
-            if (strobe_delay < 30) delay_zero();
-            else delay_ms(1);
-        } else {  //tactical strobe
-            nice_delay_ms(strobe_delay >> 1);
-        }
-        set_level(0);
-        nice_delay_ms(strobe_delay);
-    }
-    #ifdef USE_BATTCHECK
-    else if (current_state == battcheck_state) {
-        battcheck();
-    }
-    else if (current_state == tempcheck_state) {
-        blink_num(projected_temperature>>2);
-        nice_delay_ms(1000);
-    }
-    #endif
-}
diff --git a/spaghetti-monster/ramping-ui/ramping-ui.c b/spaghetti-monster/ramping-ui/ramping-ui.c
new file mode 100644
index 0000000..527a824
--- /dev/null
+++ b/spaghetti-monster/ramping-ui/ramping-ui.c
@@ -0,0 +1,361 @@
+/*
+ * Ramping-UI: Ramping UI for SpaghettiMonster.
+ *
+ * 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/>.
+ */
+
+#define FSM_EMISAR_D4_DRIVER
+#define USE_LVP
+#define USE_THERMAL_REGULATION
+#define DEFAULT_THERM_CEIL 32
+#define USE_DELAY_MS
+#define USE_DELAY_4MS
+#define USE_DELAY_ZERO
+#define USE_RAMPING
+#define USE_BATTCHECK
+#define BATTCHECK_VpT
+#define RAMP_LENGTH 150
+#include "spaghetti-monster.h"
+
+// FSM states
+uint8_t off_state(EventPtr event, uint16_t arg);
+uint8_t steady_state(EventPtr event, uint16_t arg);
+uint8_t strobe_state(EventPtr event, uint16_t arg);
+#ifdef USE_BATTCHECK
+uint8_t battcheck_state(EventPtr event, uint16_t arg);
+uint8_t tempcheck_state(EventPtr event, uint16_t arg);
+#endif
+
+// brightness control
+uint8_t memorized_level = MAX_1x7135;
+// smooth vs discrete ramping
+uint8_t ramp_step_size = 1;
+
+#ifdef USE_THERMAL_REGULATION
+// brightness before thermal step-down
+uint8_t target_level = 0;
+#endif
+
+// strobe timing
+volatile uint8_t strobe_delay = 67;
+volatile uint8_t strobe_type = 0;  // 0 == party strobe, 1 == tactical strobe
+
+
+uint8_t off_state(EventPtr event, uint16_t arg) {
+    // turn emitter off when entering state
+    if (event == EV_enter_state) {
+        set_level(0);
+        // sleep while off  (lower power use)
+        //empty_event_sequence();  // just in case (but shouldn't be needed)
+        standby_mode();
+        return MISCHIEF_MANAGED;
+    }
+    // hold (initially): go to lowest level, but allow abort for regular click
+    else if (event == EV_click1_press) {
+        set_level(1);
+        return MISCHIEF_MANAGED;
+    }
+    // 1 click (before timeout): go to memorized level, but allow abort for double click
+    else if (event == EV_click1_release) {
+        set_level(memorized_level);
+        return MISCHIEF_MANAGED;
+    }
+    // 1 click: regular mode
+    else if (event == EV_1click) {
+        set_state(steady_state, memorized_level);
+        return MISCHIEF_MANAGED;
+    }
+    // 2 clicks (initial press): off, to prep for later events
+    else if (event == EV_click2_press) {
+        set_level(0);
+        return MISCHIEF_MANAGED;
+    }
+    // 2 clicks: highest mode
+    else if (event == EV_2clicks) {
+        set_state(steady_state, MAX_LEVEL);
+        return MISCHIEF_MANAGED;
+    }
+    // 3 clicks: strobe mode
+    else if (event == EV_3clicks) {
+        set_state(strobe_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    #ifdef USE_BATTCHECK
+    // 4 clicks: battcheck mode
+    else if (event == EV_4clicks) {
+        set_state(battcheck_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    #endif
+    // hold: go to lowest level
+    else if (event == EV_click1_hold) {
+        // don't start ramping immediately;
+        // give the user time to release at moon level
+        if (arg >= HOLD_TIMEOUT)
+            set_state(steady_state, 1);
+        return MISCHIEF_MANAGED;
+    }
+    // hold, release quickly: go to lowest level
+    else if (event == EV_click1_hold_release) {
+        set_state(steady_state, 1);
+        return MISCHIEF_MANAGED;
+    }
+    // click, hold: go to highest level (for ramping down)
+    else if (event == EV_click2_hold) {
+        set_state(steady_state, MAX_LEVEL);
+        return MISCHIEF_MANAGED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+
+
+uint8_t steady_state(EventPtr event, uint16_t arg) {
+    // turn LED on when we first enter the mode
+    if (event == EV_enter_state) {
+        // remember this level, unless it's moon or turbo
+        if ((arg > 1) && (arg < MAX_LEVEL))
+            memorized_level = arg;
+        // use the requested level even if not memorized
+        #ifdef USE_THERMAL_REGULATION
+        target_level = arg;
+        #endif
+        set_level(arg);
+        return MISCHIEF_MANAGED;
+    }
+    // 1 click: off
+    else if (event == EV_1click) {
+        set_state(off_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    // 2 clicks: go to/from highest level
+    else if (event == EV_2clicks) {
+        if (actual_level < MAX_LEVEL) {
+            memorized_level = actual_level;  // in case we're on moon
+            #ifdef USE_THERMAL_REGULATION
+            target_level = MAX_LEVEL;
+            #endif
+            set_level(MAX_LEVEL);
+        }
+        else {
+            #ifdef USE_THERMAL_REGULATION
+            target_level = memorized_level;
+            #endif
+            set_level(memorized_level);
+        }
+        return MISCHIEF_MANAGED;
+    }
+    // 3 clicks: go to strobe modes
+    else if (event == EV_3clicks) {
+        set_state(strobe_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    // 4 clicks: toggle smooth vs discrete ramping
+    else if (event == EV_4clicks) {
+        if (ramp_step_size == 1) ramp_step_size = MAX_LEVEL/6;
+        else ramp_step_size = 1;
+        set_level(0);
+        delay_4ms(20/4);
+        set_level(memorized_level);
+        return MISCHIEF_MANAGED;
+    }
+    // hold: change brightness (brighter)
+    else if (event == EV_click1_hold) {
+        // ramp slower in discrete mode
+        if (arg % ramp_step_size != 0) {
+            return MISCHIEF_MANAGED;
+        }
+        // FIXME: make it ramp down instead, if already at max
+        if (actual_level + ramp_step_size < MAX_LEVEL)
+            memorized_level = actual_level + ramp_step_size;
+        else memorized_level = MAX_LEVEL;
+        #ifdef USE_THERMAL_REGULATION
+        target_level = memorized_level;
+        #endif
+        // only blink once for each threshold
+        if ((memorized_level != actual_level)
+                && ((memorized_level == MAX_1x7135)
+                    || (memorized_level == MAX_LEVEL))) {
+            set_level(0);
+            delay_4ms(8/4);
+        }
+        set_level(memorized_level);
+        return MISCHIEF_MANAGED;
+    }
+    // click, hold: change brightness (dimmer)
+    else if (event == EV_click2_hold) {
+        // ramp slower in discrete mode
+        if (arg % ramp_step_size != 0) {
+            return MISCHIEF_MANAGED;
+        }
+        // FIXME: make it ramp up instead, if already at min
+        if (actual_level > ramp_step_size)
+            memorized_level = (actual_level-ramp_step_size);
+        else
+            memorized_level = 1;
+        #ifdef USE_THERMAL_REGULATION
+        target_level = memorized_level;
+        #endif
+        // only blink once for each threshold
+        if ((memorized_level != actual_level)
+                && ((memorized_level == MAX_1x7135)
+                    || (memorized_level == 1))) {
+            set_level(0);
+            delay_4ms(8/4);
+        }
+        set_level(memorized_level);
+        return MISCHIEF_MANAGED;
+    }
+    #ifdef USE_THERMAL_REGULATION
+    // TODO: test this on a real light
+    // overheating: drop by an amount proportional to how far we are above the ceiling
+    else if (event == EV_temperature_high) {
+        if (actual_level > MAX_LEVEL/4) {
+            uint8_t stepdown = actual_level - arg;
+            if (stepdown < MAX_LEVEL/4) stepdown = MAX_LEVEL/4;
+            set_level(stepdown);
+        }
+        return MISCHIEF_MANAGED;
+    }
+    // underheating: increase slowly if we're lower than the target
+    //               (proportional to how low we are)
+    else if (event == EV_temperature_low) {
+        if (actual_level < target_level) {
+            uint8_t stepup = actual_level + (arg>>1);
+            if (stepup > target_level) stepup = target_level;
+            set_level(stepup);
+        }
+        return MISCHIEF_MANAGED;
+    }
+    #endif
+    return EVENT_NOT_HANDLED;
+}
+
+
+uint8_t strobe_state(EventPtr event, uint16_t arg) {
+    if (event == EV_enter_state) {
+        return MISCHIEF_MANAGED;
+    }
+    // 1 click: off
+    else if (event == EV_1click) {
+        set_state(off_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    // 2 clicks: toggle party strobe vs tactical strobe
+    else if (event == EV_2clicks) {
+        strobe_type ^= 1;
+        return MISCHIEF_MANAGED;
+    }
+    // 3 clicks: go back to regular modes
+    else if (event == EV_3clicks) {
+        set_state(steady_state, memorized_level);
+        return MISCHIEF_MANAGED;
+    }
+    // hold: change speed (go faster)
+    else if (event == EV_click1_hold) {
+        if ((arg & 1) == 0) {
+            if (strobe_delay > 8) strobe_delay --;
+        }
+        return MISCHIEF_MANAGED;
+    }
+    // click, hold: change speed (go slower)
+    else if (event == EV_click2_hold) {
+        if ((arg & 1) == 0) {
+            if (strobe_delay < 255) strobe_delay ++;
+        }
+        return MISCHIEF_MANAGED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+
+
+#ifdef USE_BATTCHECK
+uint8_t battcheck_state(EventPtr event, uint16_t arg) {
+    // 1 click: off
+    if (event == EV_1click) {
+        set_state(off_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    // 2 clicks: tempcheck mode
+    else if (event == EV_2clicks) {
+        set_state(tempcheck_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+
+uint8_t tempcheck_state(EventPtr event, uint16_t arg) {
+    // 1 click: off
+    if (event == EV_1click) {
+        set_state(off_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+#endif
+
+
+void low_voltage() {
+    // "step down" from strobe to something low
+    if (current_state == strobe_state) {
+        set_state(steady_state, RAMP_SIZE/6);
+    }
+    // in normal mode, step down by half or turn off
+    else if (current_state == steady_state) {
+        if (actual_level > 1) {
+            set_level(actual_level >> 1);
+        }
+        else {
+            set_state(off_state, 0);
+        }
+    }
+    // all other modes, just turn off when voltage is low
+    else {
+        set_state(off_state, 0);
+    }
+}
+
+
+void setup() {
+    set_level(RAMP_SIZE/8);
+    delay_4ms(3);
+    set_level(0);
+
+    push_state(off_state, 0);
+}
+
+
+void loop() {
+    if (current_state == strobe_state) {
+        set_level(MAX_LEVEL);
+        if (strobe_type == 0) {  // party strobe
+            if (strobe_delay < 30) delay_zero();
+            else delay_ms(1);
+        } else {  //tactical strobe
+            nice_delay_ms(strobe_delay >> 1);
+        }
+        set_level(0);
+        nice_delay_ms(strobe_delay);
+    }
+    #ifdef USE_BATTCHECK
+    else if (current_state == battcheck_state) {
+        battcheck();
+    }
+    else if (current_state == tempcheck_state) {
+        blink_num(projected_temperature>>2);
+        nice_delay_ms(1000);
+    }
+    #endif
+}
-- 
cgit v1.2.3


From 0a801bff0f22be650aed6c3724c41cae03814d8f Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Thu, 31 Aug 2017 23:45:36 -0600
Subject: Started a Meteor M43 clone UI. So far, UI1 and battcheck both work. 
 UI2 and UI3 and other blinkies aren't implement yet. Added 6-bar battcheck
 style to match Meteor (ish). Increased maximum number of clicks to 12,
 because WTF.  If your UI needs 12 clicks, what are you even doing in life?

---
 spaghetti-monster/fsm-adc.c       |   5 +
 spaghetti-monster/fsm-adc.h       |   2 +-
 spaghetti-monster/fsm-events.h    | 168 ++++++++++++++++
 spaghetti-monster/meteor/meteor.c | 413 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 587 insertions(+), 1 deletion(-)
 create mode 100644 spaghetti-monster/meteor/meteor.c

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/fsm-adc.c b/spaghetti-monster/fsm-adc.c
index 541f9a4..7f26fde 100644
--- a/spaghetti-monster/fsm-adc.c
+++ b/spaghetti-monster/fsm-adc.c
@@ -269,6 +269,11 @@ PROGMEM const uint8_t voltage_blinks[] = {
     30, 35, 38, 40, 42, 99,
 };
 #endif
+#ifdef BATTCHECK_6bars
+PROGMEM const uint8_t voltage_blinks[] = {
+    30, 34, 36, 38, 40, 41, 43, 99,
+};
+#endif
 #ifdef BATTCHECK_8bars
 PROGMEM const uint8_t voltage_blinks[] = {
     30, 33, 35, 37, 38, 39, 40, 41, 42, 99,
diff --git a/spaghetti-monster/fsm-adc.h b/spaghetti-monster/fsm-adc.h
index af30b69..6317b0b 100644
--- a/spaghetti-monster/fsm-adc.h
+++ b/spaghetti-monster/fsm-adc.h
@@ -41,7 +41,7 @@ void battcheck();
 #ifdef BATTCHECK_VpT
 #define USE_BLINK_NUM
 #endif
-#if defined(BATTCHECK_8bars) || defined(BATTCHECK_4bars)
+#if defined(BATTCHECK_8bars) || defined(BATTCHECK_6bars) || defined(BATTCHECK_4bars)
 #define USE_BLINK_DIGIT
 #endif
 #endif
diff --git a/spaghetti-monster/fsm-events.h b/spaghetti-monster/fsm-events.h
index e3edc77..c77facd 100644
--- a/spaghetti-monster/fsm-events.h
+++ b/spaghetti-monster/fsm-events.h
@@ -233,6 +233,156 @@ Event EV_click6_complete[] = {
     A_RELEASE_TIMEOUT,
     0 };
 #endif
+#if MAX_CLICKS >= 7
+#define EV_7clicks EV_click7_complete
+Event EV_click7_complete[] = {
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_RELEASE_TIMEOUT,
+    0 };
+#endif
+#if MAX_CLICKS >= 8
+#define EV_8clicks EV_click8_complete
+Event EV_click8_complete[] = {
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_RELEASE_TIMEOUT,
+    0 };
+#endif
+#if MAX_CLICKS >= 9
+#define EV_9clicks EV_click9_complete
+Event EV_click9_complete[] = {
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_RELEASE_TIMEOUT,
+    0 };
+#endif
+#if MAX_CLICKS >= 10
+#define EV_10clicks EV_click10_complete
+Event EV_click10_complete[] = {
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_RELEASE_TIMEOUT,
+    0 };
+#endif
+#if MAX_CLICKS >= 11
+#define EV_11clicks EV_click11_complete
+Event EV_click11_complete[] = {
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_RELEASE_TIMEOUT,
+    0 };
+#endif
+#if MAX_CLICKS >= 12
+#define EV_12clicks EV_click12_complete
+Event EV_click12_complete[] = {
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_RELEASE_TIMEOUT,
+    0 };
+#endif
 // ... and so on
 
 // A list of button event types for easy iteration
@@ -264,6 +414,24 @@ EventPtr event_sequences[] = {
     #if MAX_CLICKS >= 6
     EV_click6_complete,
     #endif
+    #if MAX_CLICKS >= 7
+    EV_click7_complete,
+    #endif
+    #if MAX_CLICKS >= 8
+    EV_click8_complete,
+    #endif
+    #if MAX_CLICKS >= 9
+    EV_click9_complete,
+    #endif
+    #if MAX_CLICKS >= 10
+    EV_click10_complete,
+    #endif
+    #if MAX_CLICKS >= 11
+    EV_click11_complete,
+    #endif
+    #if MAX_CLICKS >= 12
+    EV_click12_complete,
+    #endif
     // ...
 };
 
diff --git a/spaghetti-monster/meteor/meteor.c b/spaghetti-monster/meteor/meteor.c
new file mode 100644
index 0000000..9a630cd
--- /dev/null
+++ b/spaghetti-monster/meteor/meteor.c
@@ -0,0 +1,413 @@
+/*
+ * Meteor: Meteor M43 clone UI for SpaghettiMonster.
+ *
+ * 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/>.
+ */
+
+#define FSM_EMISAR_D4_DRIVER
+#define USE_LVP
+#define USE_THERMAL_REGULATION
+#define DEFAULT_THERM_CEIL 45
+#define USE_DELAY_4MS
+#define USE_RAMPING
+#define RAMP_LENGTH 150
+#define USE_BATTCHECK
+#define BATTCHECK_6bars
+#define DONT_DELAY_AFTER_BATTCHECK
+//#define USE_EEPROM
+//#define EEPROM_BYTES 5
+#define MAX_CLICKS 11
+#include "spaghetti-monster.h"
+
+// FSM states
+uint8_t base_off_state(EventPtr event, uint16_t arg);
+uint8_t ui1_off_state(EventPtr event, uint16_t arg);
+uint8_t ui2_off_state(EventPtr event, uint16_t arg);
+uint8_t ui3_off_state(EventPtr event, uint16_t arg);
+uint8_t base_on_state(EventPtr event, uint16_t arg, uint8_t *mode, uint8_t *group);
+uint8_t ui1_on_state(EventPtr event, uint16_t arg);
+uint8_t ui2_on_state(EventPtr event, uint16_t arg);
+uint8_t ui3_on_state(EventPtr event, uint16_t arg);
+uint8_t beacon_state(EventPtr event, uint16_t arg);
+uint8_t battcheck_state(EventPtr event, uint16_t arg);
+uint8_t strobe_state(EventPtr event, uint16_t arg);
+uint8_t biking_state(EventPtr event, uint16_t arg);
+uint8_t lockout_state(EventPtr event, uint16_t arg);
+uint8_t momentary_state(EventPtr event, uint16_t arg);
+// Not a FSM state, just handles stuff common to all low/med/hi states
+uint8_t any_mode_state(EventPtr event, uint16_t arg, uint8_t *primary, uint8_t *secondary, uint8_t *modes);
+
+#ifdef USE_EEPROM
+void load_config();
+void save_config();
+#endif
+
+// fixed output levels
+uint8_t levels[] = {3, 16, 30, 43, 56, 70, 83, 96, 110, 123, 137, MAX_LEVEL};
+// select an interface
+uint8_t UI = 1;  // 1, 2, or 3
+// UI1
+uint8_t UI1_mode  = 0;
+uint8_t UI1_mode1 = 1;
+uint8_t UI1_mode2 = 1;
+uint8_t UI1_group1[] = {0, 2};
+uint8_t UI1_group2[] = {6, 9};
+// UI2
+uint8_t UI2_mode  = 0;
+uint8_t UI2_mode1 = 1;
+uint8_t UI2_mode2 = 0;
+uint8_t UI2_mode3 = 0;
+uint8_t UI2_group1[] = {0,  2};
+uint8_t UI2_group2[] = {4,  6};
+uint8_t UI2_group3[] = {8, 10};
+// UI3 can access all levels, with 3 different mode memory slots
+uint8_t UI3_mode  = 0;
+uint8_t UI3_mode1 = 2;
+uint8_t UI3_mode2 = 5;
+uint8_t UI3_mode3 = 8;
+
+// deferred "off" so we won't suspend in a weird state
+volatile uint8_t go_to_standby = 0;
+
+#ifdef USE_THERMAL_REGULATION
+// brightness before thermal step-down
+uint8_t target_level = 0;
+#endif
+
+void set_any_mode(uint8_t mode, uint8_t *group) {
+    set_level(levels[group[mode]]);
+    #ifdef USE_THERMAL_REGULATION
+    target_level = actual_level;
+    #endif
+}
+
+uint8_t base_off_state(EventPtr event, uint16_t arg) {
+    // turn emitter off when entering state
+    if (event == EV_enter_state) {
+        set_level(0);
+        // sleep while off  (lower power use)
+        go_to_standby = 1;
+        // ensure we're in a real off state, not the base
+        switch(UI) {
+            case  1: set_state(ui1_off_state, 0); break;
+            case  2: set_state(ui2_off_state, 0); break;
+            default: set_state(ui3_off_state, 0); break;
+        }
+        return EVENT_HANDLED;
+    }
+    // 3 clicks: strobe mode
+    else if (event == EV_3clicks) {
+        set_state(beacon_state, 0);
+        return EVENT_HANDLED;
+    }
+    // 4 clicks: battcheck mode
+    else if (event == EV_4clicks) {
+        set_state(battcheck_state, 0);
+        return EVENT_HANDLED;
+    }
+    // 5 clicks: battcheck mode
+    else if (event == EV_5clicks) {
+        set_state(biking_state, 0);
+        return EVENT_HANDLED;
+    }
+    // 6 clicks: soft lockout mode
+    else if (event == EV_6clicks) {
+        set_state(lockout_state, 0);
+        return EVENT_HANDLED;
+    }
+    // 9 clicks: activate UI1
+    else if (event == EV_9clicks) {
+        set_state(ui1_off_state, 0);
+        return EVENT_HANDLED;
+    }
+    // 10 clicks: activate UI2
+    else if (event == EV_10clicks) {
+        set_state(ui2_off_state, 0);
+        return EVENT_HANDLED;
+    }
+    // 11 clicks: activate UI3
+    else if (event == EV_11clicks) {
+        set_state(ui3_off_state, 0);
+        return EVENT_HANDLED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+
+uint8_t ui1_off_state(EventPtr event, uint16_t arg) {
+    UI = 1;
+    if (event == EV_enter_state) {
+        return EVENT_HANDLED;
+    }
+    // 1 click: low modes
+    if (event == EV_1click) {
+        set_any_mode(UI1_mode1, UI1_group1);
+        set_state(ui1_on_state, 0);
+        return EVENT_HANDLED;
+    }
+    // 2 clicks: high modes
+    else if (event == EV_2clicks) {
+        set_any_mode(UI1_mode2, UI1_group2);
+        set_state(ui1_on_state, 1);
+        return EVENT_HANDLED;
+    }
+    // hold: turbo
+    else if (event == EV_hold) {
+        if (arg == 0) {
+            set_level(MAX_LEVEL);
+        }
+        //set_state(ui1_on_state, 3);
+        return EVENT_HANDLED;
+    }
+    // release hold: off
+    else if (event == EV_click1_hold_release) {
+        set_state(base_off_state, 0);
+        return EVENT_HANDLED;
+    }
+    return base_off_state(event, arg);
+}
+
+uint8_t ui2_off_state(EventPtr event, uint16_t arg) {
+    UI = 2;
+    if (event == EV_enter_state) {
+        return EVENT_HANDLED;
+    }
+    return base_off_state(event, arg);
+}
+
+uint8_t ui3_off_state(EventPtr event, uint16_t arg) {
+    UI = 3;
+    if (event == EV_enter_state) {
+        return EVENT_HANDLED;
+    }
+    return base_off_state(event, arg);
+}
+
+uint8_t base_on_state(EventPtr event, uint16_t arg, uint8_t *mode, uint8_t *group) {
+    // 1 click: off
+    if (event == EV_1click) {
+        set_state(base_off_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    #ifdef USE_THERMAL_REGULATION
+    // overheating: drop by an amount proportional to how far we are above the ceiling
+    else if (event == EV_temperature_high) {
+        if (actual_level > MAX_LEVEL/4) {
+            uint8_t stepdown = actual_level - arg;
+            if (stepdown < MAX_LEVEL/4) stepdown = MAX_LEVEL/4;
+            set_level(stepdown);
+        }
+        return EVENT_HANDLED;
+    }
+    // underheating: increase slowly if we're lower than the target
+    //               (proportional to how low we are)
+    else if (event == EV_temperature_low) {
+        if (actual_level < target_level) {
+            uint8_t stepup = actual_level + (arg>>1);
+            if (stepup > target_level) stepup = target_level;
+            set_level(stepup);
+        }
+        return EVENT_HANDLED;
+    }
+    #endif
+    return EVENT_NOT_HANDLED;
+}
+
+uint8_t ui1_on_state(EventPtr event, uint16_t arg) {
+    // turn on LED when entering the mode
+    static uint8_t *mode = &UI1_mode1;
+    static uint8_t *group = UI1_group1;
+    if (event == EV_enter_state) {
+        UI1_mode = arg;
+    }
+    if (UI1_mode == 0) {
+        mode = &UI1_mode1;
+        group = UI1_group1;
+    }
+    else {
+        mode = &UI1_mode2;
+        group = UI1_group2;
+    }
+
+    if (event == EV_enter_state) {
+        set_any_mode(*mode, group);
+        return EVENT_HANDLED;
+    }
+    // 2 clicks: toggle moon/low or mid/high
+    else if (event == EV_2clicks) {
+        *mode ^= 1;
+        set_any_mode(*mode, group);
+        return MISCHIEF_MANAGED;
+    }
+    // hold: turbo
+    else if (event == EV_hold) {
+        if (arg == 0) set_level(MAX_LEVEL);
+        return MISCHIEF_MANAGED;
+    }
+    // release: exit turbo
+    else if (event == EV_click1_hold_release) {
+        set_any_mode(*mode, group);
+        return MISCHIEF_MANAGED;
+    }
+    return base_on_state(event, arg, &UI1_mode1, UI1_group1);
+}
+
+uint8_t ui2_on_state(EventPtr event, uint16_t arg) {
+    return base_on_state(event, arg, &UI2_mode1, UI2_group1);
+}
+
+uint8_t ui3_on_state(EventPtr event, uint16_t arg) {
+    return base_on_state(event, arg, &UI3_mode1, levels);
+}
+
+
+uint8_t blinky_base_state(EventPtr event, uint16_t arg) {
+    // 1 click: off
+    if (event == EV_1click) {
+        set_state(base_off_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    return EVENT_NOT_HANDLED;
+}
+
+uint8_t beacon_state(EventPtr event, uint16_t arg) {
+    return blinky_base_state(event, arg);
+}
+
+uint8_t battcheck_state(EventPtr event, uint16_t arg) {
+    return EVENT_NOT_HANDLED;
+}
+
+uint8_t strobe_state(EventPtr event, uint16_t arg) {
+    return blinky_base_state(event, arg);
+}
+
+uint8_t biking_state(EventPtr event, uint16_t arg) {
+    return blinky_base_state(event, arg);
+}
+
+uint8_t lockout_state(EventPtr event, uint16_t arg) {
+    return blinky_base_state(event, arg);
+}
+
+uint8_t momentary_state(EventPtr event, uint16_t arg) {
+    return blinky_base_state(event, arg);
+}
+
+
+void low_voltage() {
+    if ((current_state == ui1_on_state) ||
+        (current_state == ui2_on_state) ||
+        (current_state == ui3_on_state)) {
+        if (actual_level > 5) {
+            set_level(actual_level >> 1);
+        }
+        else {
+            set_state(base_off_state, 0);
+        }
+    }
+    /*
+    // "step down" from blinkies to low
+    else if (current_state == strobe_beacon_state) {
+        set_state(low_mode_state, 0);
+    }
+    */
+}
+
+void strobe(uint8_t level, uint16_t ontime, uint16_t offtime) {
+    set_level(level);
+    if (! nice_delay_ms(ontime)) return;
+    set_level(0);
+    nice_delay_ms(offtime);
+}
+
+#ifdef USE_EEPROM
+void load_config() {
+    if (load_eeprom()) {
+        H1 = !(!(eeprom[0] & 0b00000100));
+        M1 = !(!(eeprom[0] & 0b00000010));
+        L1 = !(!(eeprom[0] & 0b00000001));
+        H2 = eeprom[1];
+        M2 = eeprom[2];
+        L2 = eeprom[3];
+        strobe_beacon_mode = eeprom[4];
+    }
+}
+
+void save_config() {
+    eeprom[0] = (H1<<2) | (M1<<1) | (L1);
+    eeprom[1] = H2;
+    eeprom[2] = M2;
+    eeprom[3] = L2;
+    eeprom[4] = strobe_beacon_mode;
+
+    save_eeprom();
+}
+#endif
+
+void setup() {
+    set_level(RAMP_SIZE/8);
+    delay_4ms(3);
+    set_level(0);
+
+    #ifdef USE_EEPROM
+    load_config();
+    #endif
+
+    push_state(base_off_state, 0);
+}
+
+void loop() {
+    // deferred "off" so we won't suspend in a weird state
+    // (like...  during the middle of a strobe pulse)
+    if (go_to_standby) {
+        go_to_standby = 0;
+        set_level(0);
+        standby_mode();
+    }
+
+    /*
+    if (current_state == strobe_beacon_state) {
+        switch(strobe_beacon_mode) {
+            // 0.2 Hz beacon at L1
+            case 0:
+                strobe(low_modes[0], 500, 4500);
+                break;
+            // 0.2 Hz beacon at H1
+            case 1:
+                strobe(hi_modes[0], 500, 4500);
+                break;
+            // 4 Hz tactical strobe at H1
+            case 2:
+                strobe(hi_modes[0], 83, 167);
+                break;
+            // 19 Hz tactical strobe at H1
+            case 3:
+                strobe(hi_modes[0], 17, 35);
+                break;
+        }
+    }
+    */
+
+    #ifdef USE_BATTCHECK
+    else if (current_state == battcheck_state) {
+        nice_delay_ms(500);  // wait a moment to measure voltage
+        battcheck();
+        set_state(base_off_state, 0);
+    }
+    #endif
+}
+
+
-- 
cgit v1.2.3


From bb6314450b170220a884df49baf0b76cf549b3bc Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Fri, 1 Sep 2017 00:16:03 -0600
Subject: Added UI2.  UI2 is weird. Not sure I got everything the same; will
 have to try UI2 on my actual Meteor to see how it works.

---
 spaghetti-monster/meteor/meteor.c | 91 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 86 insertions(+), 5 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/meteor/meteor.c b/spaghetti-monster/meteor/meteor.c
index 9a630cd..c2ea6ec 100644
--- a/spaghetti-monster/meteor/meteor.c
+++ b/spaghetti-monster/meteor/meteor.c
@@ -70,9 +70,11 @@ uint8_t UI2_mode  = 0;
 uint8_t UI2_mode1 = 1;
 uint8_t UI2_mode2 = 0;
 uint8_t UI2_mode3 = 0;
-uint8_t UI2_group1[] = {0,  2};
-uint8_t UI2_group2[] = {4,  6};
-uint8_t UI2_group3[] = {8, 10};
+uint8_t UI2_mode4 = 0;  // doesn't matter, makes other code easier
+uint8_t UI2_group1[] = { 0,  2};  // moon, low
+uint8_t UI2_group2[] = { 4,  6};  // mid1, mid2
+uint8_t UI2_group3[] = { 8, 10};  // high1, high2
+uint8_t UI2_group4[] = {11, 11};  // turbo only
 // UI3 can access all levels, with 3 different mode memory slots
 uint8_t UI3_mode  = 0;
 uint8_t UI3_mode1 = 2;
@@ -94,6 +96,12 @@ void set_any_mode(uint8_t mode, uint8_t *group) {
     #endif
 }
 
+void blink_fast() {
+    set_level(MAX_LEVEL/2);
+    delay_4ms(8/4);
+    set_level(0);
+}
+
 uint8_t base_off_state(EventPtr event, uint16_t arg) {
     // turn emitter off when entering state
     if (event == EV_enter_state) {
@@ -130,16 +138,19 @@ uint8_t base_off_state(EventPtr event, uint16_t arg) {
     }
     // 9 clicks: activate UI1
     else if (event == EV_9clicks) {
+        blink_fast();
         set_state(ui1_off_state, 0);
         return EVENT_HANDLED;
     }
     // 10 clicks: activate UI2
     else if (event == EV_10clicks) {
+        blink_fast();
         set_state(ui2_off_state, 0);
         return EVENT_HANDLED;
     }
     // 11 clicks: activate UI3
     else if (event == EV_11clicks) {
+        blink_fast();
         set_state(ui3_off_state, 0);
         return EVENT_HANDLED;
     }
@@ -184,6 +195,31 @@ uint8_t ui2_off_state(EventPtr event, uint16_t arg) {
     if (event == EV_enter_state) {
         return EVENT_HANDLED;
     }
+    // 1 click: low modes
+    if (event == EV_1click) {
+        set_any_mode(UI2_mode1, UI2_group1);
+        set_state(ui2_on_state, 0);
+        return EVENT_HANDLED;
+    }
+    // 2 clicks: high modes
+    else if (event == EV_2clicks) {
+        set_any_mode(UI2_mode3, UI2_group3);
+        set_state(ui2_on_state, 2);
+        return EVENT_HANDLED;
+    }
+    // hold: turbo
+    else if (event == EV_hold) {
+        if (arg == 0) {
+            set_level(MAX_LEVEL);
+        }
+        //set_state(ui1_on_state, 3);
+        return EVENT_HANDLED;
+    }
+    // release hold: off
+    else if (event == EV_click1_hold_release) {
+        set_state(base_off_state, 0);
+        return EVENT_HANDLED;
+    }
     return base_off_state(event, arg);
 }
 
@@ -261,11 +297,56 @@ uint8_t ui1_on_state(EventPtr event, uint16_t arg) {
         set_any_mode(*mode, group);
         return MISCHIEF_MANAGED;
     }
-    return base_on_state(event, arg, &UI1_mode1, UI1_group1);
+    return base_on_state(event, arg, mode, group);
 }
 
 uint8_t ui2_on_state(EventPtr event, uint16_t arg) {
-    return base_on_state(event, arg, &UI2_mode1, UI2_group1);
+    // turn on LED when entering the mode
+    static uint8_t *mode = &UI2_mode1;
+    static uint8_t *group = UI2_group1;
+    if (event == EV_enter_state) {
+        UI2_mode = arg;
+    }
+    switch (UI2_mode) {
+        case 0:
+            mode = &UI2_mode1;
+            group = UI2_group1;
+            break;
+        case 1:
+            mode = &UI2_mode2;
+            group = UI2_group2;
+            break;
+        case 2:
+            mode = &UI2_mode3;
+            group = UI2_group3;
+            break;
+        default:  // turbo only
+            mode = &UI2_mode4;
+            group = UI2_group4;
+            break;
+    }
+
+    if (event == EV_enter_state) {
+        set_any_mode(*mode, group);
+        return EVENT_HANDLED;
+    }
+    // 2 clicks: toggle moon/low, mid1/mid2, or high1/high2
+    else if (event == EV_2clicks) {
+        *mode ^= 1;
+        set_any_mode(*mode, group);
+        return MISCHIEF_MANAGED;
+    }
+    // hold: rotate through low/mid/high/turbo
+    else if (event == EV_hold) {
+        if (arg % HOLD_TIMEOUT == 0) {
+            UI2_mode = (UI2_mode + 1) & 3;
+        }
+        else if (arg % HOLD_TIMEOUT == 1) {
+            set_any_mode(*mode, group);
+        }
+        return MISCHIEF_MANAGED;
+    }
+    return base_on_state(event, arg, mode, group);
 }
 
 uint8_t ui3_on_state(EventPtr event, uint16_t arg) {
-- 
cgit v1.2.3


From a419850e536f00549120255a627137faffded47a Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sun, 3 Sep 2017 14:58:22 -0600
Subject: Got the 4th PWM channel to work, ish.  (channel 4 is inverted though)
 Moved go_to_suspend thing into main() instead of making each UI handle that
 during loop(). Made default_state() optional. Fixed bug where battcheck and
 other number readouts could interfere with the state which interrupted them. 
  (they would sometimes turn the LED off after the new state had already
 started) Updated darkhorse's moon levels to match new ramp on D4 hardware.

---
 spaghetti-monster/anduril/anduril.c       | 13 +----
 spaghetti-monster/baton/baton-simpler.c   |  8 ---
 spaghetti-monster/baton/baton.c           |  3 +-
 spaghetti-monster/darkhorse/darkhorse.c   | 13 +----
 spaghetti-monster/fsm-events.c            |  4 --
 spaghetti-monster/fsm-main.c              | 89 ++++++++++++++++++++-----------
 spaghetti-monster/fsm-misc.c              |  2 +-
 spaghetti-monster/fsm-standby.h           |  7 +++
 spaghetti-monster/fsm-states.c            | 11 ++--
 spaghetti-monster/fsm-states.h            |  2 +
 spaghetti-monster/momentary/momentary.c   |  4 +-
 spaghetti-monster/ramping-ui/ramping-ui.c |  3 +-
 12 files changed, 81 insertions(+), 78 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 998c0c5..c27ca68 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -114,9 +114,6 @@ uint8_t pseudo_rand();
 // beacon timing
 volatile uint8_t beacon_seconds = 2;
 
-// deferred "off" so we won't suspend in a weird state
-volatile uint8_t go_to_standby = 0;
-
 
 uint8_t off_state(EventPtr event, uint16_t arg) {
     // turn emitter off when entering state
@@ -452,8 +449,8 @@ uint8_t goodnight_state(EventPtr event, uint16_t arg) {
     static uint16_t ticks_since_stepdown = 0;
     // blink on start
     if (event == EV_enter_state) {
-        blink_confirm(4);
         ticks_since_stepdown = 0;
+        blink_confirm(2);
         set_level(GOODNIGHT_LEVEL);
         return MISCHIEF_MANAGED;
     }
@@ -871,14 +868,6 @@ void setup() {
 
 void loop() {
 
-    // deferred "off" so we won't suspend in a weird state
-    // (like...  during the middle of a strobe pulse)
-    if (go_to_standby) {
-        go_to_standby = 0;
-        set_level(0);
-        standby_mode();
-    }
-
     if (current_state == strobe_state) {
         // party / tactical strobe
         if (strobe_type < 2) {
diff --git a/spaghetti-monster/baton/baton-simpler.c b/spaghetti-monster/baton/baton-simpler.c
index a6ddf36..96b0ea7 100644
--- a/spaghetti-monster/baton/baton-simpler.c
+++ b/spaghetti-monster/baton/baton-simpler.c
@@ -36,9 +36,6 @@ uint8_t actual_level = 0;
 uint8_t target_level = 0;
 #endif
 
-// deferred "off" so we won't suspend in a weird state
-volatile uint8_t go_to_standby = 0;
-
 // moon + ../../bin/level_calc.py 2 6 7135 18 10 150 FET 1 10 1500
 uint8_t pwm1_levels[] = { 3, 18, 110, 255, 255, 255,   0, };
 uint8_t pwm2_levels[] = { 0,  0,   0,   9,  58, 138, 255, };
@@ -194,9 +191,4 @@ void setup() {
 }
 
 void loop() {
-    if (go_to_standby) {
-        go_to_standby = 0;
-        PWM1_LVL = 0;  PWM2_LVL = 0;
-        standby_mode();
-    }
 }
diff --git a/spaghetti-monster/baton/baton.c b/spaghetti-monster/baton/baton.c
index 515f2d0..1266ddd 100644
--- a/spaghetti-monster/baton/baton.c
+++ b/spaghetti-monster/baton/baton.c
@@ -56,8 +56,7 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
         PWM1_LVL = 0;
         PWM2_LVL = 0;
         // sleep while off  (lower power use)
-        //empty_event_sequence();  // just in case (but shouldn't be needed)
-        standby_mode();
+        go_to_standby = 1;
         return 0;
     }
     // hold (initially): go to lowest level, but allow abort for regular click
diff --git a/spaghetti-monster/darkhorse/darkhorse.c b/spaghetti-monster/darkhorse/darkhorse.c
index 2aa3e90..97053b5 100644
--- a/spaghetti-monster/darkhorse/darkhorse.c
+++ b/spaghetti-monster/darkhorse/darkhorse.c
@@ -55,7 +55,7 @@ uint8_t L2 = 1;
 uint8_t M2 = 1;
 uint8_t H2 = 1;
 // mode groups, ish
-uint8_t low_modes[] = {12, 1, 4, 9};  // 3.3 lm, 2.0 lm, 0.8 lm, 0.3 lm
+uint8_t low_modes[] = {12, 3, 5, 9};  // 3.3 lm, 2.0 lm, 0.8 lm, 0.3 lm
 uint8_t med_modes[] = {56, 21, 29, 37};  // 101 lm, 35 lm, 20 lm, 10 lm
 uint8_t hi_modes[] = {MAX_LEVEL, 81, 96, 113};  // 1500 lm, 678 lm, 430 lm, 270 lm
 // strobe/beacon modes:
@@ -65,9 +65,6 @@ uint8_t hi_modes[] = {MAX_LEVEL, 81, 96, 113};  // 1500 lm, 678 lm, 430 lm, 270
 // 3: 19 Hz strobe at H1
 uint8_t strobe_beacon_mode = 0;
 
-// deferred "off" so we won't suspend in a weird state
-volatile uint8_t go_to_standby = 0;
-
 #ifdef USE_THERMAL_REGULATION
 // brightness before thermal step-down
 uint8_t target_level = 0;
@@ -337,14 +334,6 @@ void setup() {
 }
 
 void loop() {
-    // deferred "off" so we won't suspend in a weird state
-    // (like...  during the middle of a strobe pulse)
-    if (go_to_standby) {
-        go_to_standby = 0;
-        set_level(0);
-        standby_mode();
-    }
-
     if (current_state == strobe_beacon_state) {
         switch(strobe_beacon_mode) {
             // 0.2 Hz beacon at L1
diff --git a/spaghetti-monster/fsm-events.c b/spaghetti-monster/fsm-events.c
index 99a6a72..5448feb 100644
--- a/spaghetti-monster/fsm-events.c
+++ b/spaghetti-monster/fsm-events.c
@@ -170,8 +170,4 @@ void emit_current_event(uint16_t arg) {
     //return err;
 }
 
-// TODO? add events to a queue when inside an interrupt
-//       instead of calling the event functions directly?
-//       (then empty the queue in main loop?)
-
 #endif
diff --git a/spaghetti-monster/fsm-main.c b/spaghetti-monster/fsm-main.c
index 9505322..d526455 100644
--- a/spaghetti-monster/fsm-main.c
+++ b/spaghetti-monster/fsm-main.c
@@ -22,6 +22,20 @@
 
 #include "fsm-main.h"
 
+#if PWM_CHANNELS == 4
+// 4th PWM channel requires manually turning the pin on/off via interrupt :(
+ISR(TIMER1_OVF_vect) {
+    //bitClear(PORTB, 3);
+    PORTB &= 0b11110111;
+    //PORTB |= 0b00001000;
+}
+ISR(TIMER1_COMPA_vect) {
+    //if (!bitRead(TIFR,TOV1)) bitSet(PORTB, 3);
+    if (! (TIFR & (1<<TOV1))) PORTB |= 0b00001000;
+    //if (! (TIFR & (1<<TOV1))) PORTB &= 0b11110111;
+}
+#endif
+
 int main() {
     // Don't allow interrupts while booting
     cli();
@@ -29,49 +43,39 @@ int main() {
     //PCINT_off();
 
     // configure PWM channels
-    #if PWM_CHANNELS == 1
+    #if PWM_CHANNELS >= 1
     DDRB |= (1 << PWM1_PIN);
     TCCR0B = 0x01; // pre-scaler for timer (1 => 1, 2 => 8, 3 => 64...)
     TCCR0A = PHASE;
-    #elif PWM_CHANNELS == 2
-    DDRB |= (1 << PWM1_PIN);
-    DDRB |= (1 << PWM2_PIN);
-    TCCR0B = 0x01; // pre-scaler for timer (1 => 1, 2 => 8, 3 => 64...)
-    TCCR0A = PHASE;
-    #elif PWM_CHANNELS == 3
-    DDRB |= (1 << PWM1_PIN);
-    DDRB |= (1 << PWM2_PIN);
-    TCCR0B = 0x01; // pre-scaler for timer (1 => 1, 2 => 8, 3 => 64...)
-    TCCR0A = PHASE;
-    // Second PWM counter is ... weird
-    DDRB |= (1 << PWM3_PIN);
-    TCCR1 = _BV (CS10);
-    GTCCR = _BV (COM1B1) | _BV (PWM1B);
-    OCR1C = 255;  // Set ceiling value to maximum
-    #elif PWM_CHANNELS == 4
-    DDRB |= (1 << PWM1_PIN);
+    #endif
+    #if PWM_CHANNELS >= 2
     DDRB |= (1 << PWM2_PIN);
-    TCCR0B = 0x01; // pre-scaler for timer (1 => 1, 2 => 8, 3 => 64...)
-    TCCR0A = PHASE;
+    #endif
+    #if PWM_CHANNELS >= 3
     // Second PWM counter is ... weird
     DDRB |= (1 << PWM3_PIN);
-    // FIXME: How exactly do we do PWM on channel 4?
     TCCR1 = _BV (CS10);
     GTCCR = _BV (COM1B1) | _BV (PWM1B);
     OCR1C = 255;  // Set ceiling value to maximum
+    #endif
+    #if PWM_CHANNELS >= 4
+    // 4th PWM channel is ... not actually supported in hardware  :(
     DDRB |= (1 << PWM4_PIN);
+    //OCR1C = 255;  // Set ceiling value to maximum
+    TCCR1 = 1<<CTC1 | 1<<PWM1A | 3<<COM1A0 | 2<<CS10;
+    GTCCR = (2<<COM1B0) | (1<<PWM1B);
+    // set up an interrupt to control PWM4 pin
+    TIMSK |= (1<<OCIE1A) | (1<<TOIE1);
     #endif
 
-    // TODO: turn on ADC?
     // configure e-switch
     PORTB = (1 << SWITCH_PIN);  // e-switch is the only input
     PCMSK = (1 << SWITCH_PIN);  // pin change interrupt uses this pin
 
-    // TODO: configure sleep mode
+    // configure sleep mode
     set_sleep_mode(SLEEP_MODE_PWR_DOWN);
 
     // Read config values and saved state
-    // restore_state();  // TODO
 
     // TODO: handle long press vs short press (or even medium press)?
 
@@ -85,9 +89,6 @@ int main() {
     ADC_on();
     sei();
 
-    // fallback for handling a few things
-    push_state(default_state, 0);
-
     // in case any spurious button presses were detected at boot
     #ifdef USE_DELAY_MS
     delay_ms(1);
@@ -96,17 +97,43 @@ int main() {
     #endif
     empty_event_sequence();
 
+    // fallback for handling a few things
+    #ifndef DONT_USE_DEFAULT_STATE
+    push_state(default_state, 0);
+    #endif
+
     // call recipe's setup
     setup();
 
     // main loop
     while (1) {
-        // TODO: update e-switch press state?
-        // TODO: check voltage?
-        // TODO: check temperature?
-        // if event queue not empty, process and pop first item in queue?
+        // if event queue not empty, empty it
         process_emissions();
 
+        // enter standby mode if requested
+        // (works better if deferred like this)
+        if (go_to_standby) {
+            go_to_standby = 0;
+            #ifdef USE_RAMPING
+            set_level(0);
+            #else
+            #if PWM_CHANNELS >= 1
+            PWM1_LVL = 0;
+            #endif
+            #if PWM_CHANNELS >= 2
+            PWM2_LVL = 0;
+            #endif
+            #if PWM_CHANNELS >= 3
+            PWM3_LVL = 0;
+            #endif
+            #if PWM_CHANNELS >= 4
+            PWM4_LVL = 255;  // inverted  :(
+            #endif
+            #endif
+            standby_mode();
+        }
+
+        // give the recipe some time slices
         loop();
     }
 }
diff --git a/spaghetti-monster/fsm-misc.c b/spaghetti-monster/fsm-misc.c
index 7322a59..5d28002 100644
--- a/spaghetti-monster/fsm-misc.c
+++ b/spaghetti-monster/fsm-misc.c
@@ -30,7 +30,7 @@ uint8_t blink_digit(uint8_t num) {
 
     for (; num>0; num--) {
         set_level(BLINK_BRIGHTNESS);
-        if (! nice_delay_ms(ontime)) { set_level(0); return 0; }
+        if (! nice_delay_ms(ontime)) { return 0; }
         set_level(0);
         //if (current_state != old_state) return 0;
         if (! nice_delay_ms(400)) return 0;
diff --git a/spaghetti-monster/fsm-standby.h b/spaghetti-monster/fsm-standby.h
index baeb6af..a23bd0c 100644
--- a/spaghetti-monster/fsm-standby.h
+++ b/spaghetti-monster/fsm-standby.h
@@ -20,7 +20,14 @@
 #ifndef FSM_STANDBY_H
 #define FSM_STANDBY_H
 
+// deferred "off" so we won't suspend in a weird state
+// (like...  during the middle of a strobe pulse)
+// set this to nonzero to enter standby mode next time the system is idle
+volatile uint8_t go_to_standby = 0;
+
 #define standby_mode sleep_until_eswitch_pressed
 void sleep_until_eswitch_pressed();
 
+// TODO: half-sleep "twilight" mode with WDT on but running slowly
+
 #endif
diff --git a/spaghetti-monster/fsm-states.c b/spaghetti-monster/fsm-states.c
index 2939475..09ae804 100644
--- a/spaghetti-monster/fsm-states.c
+++ b/spaghetti-monster/fsm-states.c
@@ -67,26 +67,28 @@ StatePtr pop_state() {
     if (state_stack_len > 0) {
         new_state = state_stack[state_stack_len-1];
     }
-    // FIXME: what should 'arg' be?
+    // FIXME: what should 'arg' be?  (maybe re-entry should be entry with arg+1?)
     _set_state(new_state, 0, EV_leave_state, EV_reenter_state);
     return old_state;
 }
 
 uint8_t set_state(StatePtr new_state, uint16_t arg) {
     // FIXME: this calls exit/enter hooks it shouldn't
+    //        (for the layer underneath the top)
     pop_state();
     return push_state(new_state, arg);
 }
 
+#ifndef DONT_USE_DEFAULT_STATE
 // bottom state on stack
 // handles default actions for LVP, thermal regulation, etc
 uint8_t default_state(EventPtr event, uint16_t arg) {
-    if (0) {}
+    if (0) {}  // this should get compiled out
 
     #ifdef USE_LVP
     else if (event == EV_voltage_low) {
         low_voltage();
-        return 0;
+        return EVENT_HANDLED;
     }
     #endif
 
@@ -105,7 +107,8 @@ uint8_t default_state(EventPtr event, uint16_t arg) {
     #endif
 
     // event not handled
-    return 1;
+    return EVENT_NOT_HANDLED;
 }
+#endif
 
 #endif
diff --git a/spaghetti-monster/fsm-states.h b/spaghetti-monster/fsm-states.h
index f92abba..6e4a2a0 100644
--- a/spaghetti-monster/fsm-states.h
+++ b/spaghetti-monster/fsm-states.h
@@ -40,6 +40,8 @@ void _set_state(StatePtr new_state, uint16_t arg,
 int8_t push_state(StatePtr new_state, uint16_t arg);
 StatePtr pop_state();
 uint8_t set_state(StatePtr new_state, uint16_t arg);
+#ifndef DONT_USE_DEFAULT_STATE
 uint8_t default_state(EventPtr event, uint16_t arg);
+#endif
 
 #endif
diff --git a/spaghetti-monster/momentary/momentary.c b/spaghetti-monster/momentary/momentary.c
index 6b049f4..d4ac1db 100644
--- a/spaghetti-monster/momentary/momentary.c
+++ b/spaghetti-monster/momentary/momentary.c
@@ -52,7 +52,7 @@ uint8_t momentary_state(EventPtr event, uint16_t arg) {
     else if (event == EV_release) {
         light_off();
         empty_event_sequence();  // don't attempt to parse multiple clicks
-        standby_mode();  // sleep while light is off
+        go_to_standby = 1;  // sleep while light is off
         return 0;
     }
 
@@ -68,7 +68,7 @@ void low_voltage() {
     } else {
         debug_blink(8);
         light_off();
-        standby_mode();
+        go_to_standby = 1;
     }
 }
 
diff --git a/spaghetti-monster/ramping-ui/ramping-ui.c b/spaghetti-monster/ramping-ui/ramping-ui.c
index 527a824..e6f571d 100644
--- a/spaghetti-monster/ramping-ui/ramping-ui.c
+++ b/spaghetti-monster/ramping-ui/ramping-ui.c
@@ -59,8 +59,7 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
     if (event == EV_enter_state) {
         set_level(0);
         // sleep while off  (lower power use)
-        //empty_event_sequence();  // just in case (but shouldn't be needed)
-        standby_mode();
+        go_to_standby = 1;
         return MISCHIEF_MANAGED;
     }
     // hold (initially): go to lowest level, but allow abort for regular click
-- 
cgit v1.2.3


From e4ed3ff00a652f738b1cea483f8ff4abefa49c90 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Tue, 5 Sep 2017 03:43:18 -0600
Subject: Added momentary(ish) moon mode to lockout state. Made LVP step down
 in smaller steps.

---
 spaghetti-monster/anduril/anduril.c | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index c27ca68..dd06160 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -157,7 +157,7 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
     #endif
     // 4 clicks: soft lockout
     else if (event == EV_4clicks) {
-        blink_confirm(5);
+        blink_confirm(2);
         set_state(lockout_state, 0);
         return MISCHIEF_MANAGED;
     }
@@ -485,12 +485,31 @@ uint8_t goodnight_state(EventPtr event, uint16_t arg) {
 
 
 uint8_t lockout_state(EventPtr event, uint16_t arg) {
+    static uint8_t ticks_spent_awake = 0;
+
+    // momentary(ish) moon mode during lockout
+    // not all presses will be counted;
+    // it depends on what is in the master event_sequences table
+    uint8_t last = 0;
+    for(uint8_t i=0; pgm_read_byte(event + i) && (i<EV_MAX_LEN); i++)
+        last = pgm_read_byte(event + i);
+    if ((last == A_PRESS) || (last == A_HOLD)) {
+        // detect moon level and activate it
+        uint8_t lvl = ramp_smooth_floor;
+        if (ramp_discrete_floor < lvl) lvl = ramp_discrete_floor;
+        set_level(lvl);
+        ticks_spent_awake = 0;
+    }
+    else if ((last == A_RELEASE) || (last == A_RELEASE_TIMEOUT)) {
+        set_level(0);
+    }
+
+    // regular event handling
     // conserve power while locked out
     // (allow staying awake long enough to exit, but otherwise
     //  be persistent about going back to sleep every few seconds
     //  even if the user keeps pressing the button)
     if (event == EV_tick) {
-        static uint8_t ticks_spent_awake = 0;
         ticks_spent_awake ++;
         if (ticks_spent_awake > 180) {
             ticks_spent_awake = 0;
@@ -500,10 +519,11 @@ uint8_t lockout_state(EventPtr event, uint16_t arg) {
     }
     // 4 clicks: exit
     else if (event == EV_4clicks) {
-        blink_confirm(2);
+        blink_confirm(1);
         set_state(off_state, 0);
         return MISCHIEF_MANAGED;
     }
+
     return EVENT_NOT_HANDLED;
 }
 
@@ -841,7 +861,7 @@ void low_voltage() {
     // in normal mode, step down by half or turn off
     else if (current_state == steady_state) {
         if (actual_level > 1) {
-            set_level(actual_level >> 1);
+            set_level((actual_level >> 1) + (actual_level >> 2));
         }
         else {
             set_state(off_state, 0);
-- 
cgit v1.2.3


From 5aa64f52af0505ebe257eafba2e46d2e477f61af Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sat, 9 Sep 2017 14:38:55 -0600
Subject: Made "off" mode more vigilant about staying off.

---
 spaghetti-monster/anduril/anduril.c   | 17 ++++++++++++++++-
 spaghetti-monster/spaghetti-monster.h |  3 ---
 2 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index dd06160..91c7b0b 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -63,6 +63,7 @@ uint8_t goodnight_state(EventPtr event, uint16_t arg);
 uint8_t beacon_state(EventPtr event, uint16_t arg);
 uint8_t beacon_config_state(EventPtr event, uint16_t arg);
 // soft lockout
+#define MOON_DURING_LOCKOUT_MODE
 uint8_t lockout_state(EventPtr event, uint16_t arg);
 // momentary / signalling mode
 uint8_t momentary_state(EventPtr event, uint16_t arg);
@@ -116,11 +117,22 @@ volatile uint8_t beacon_seconds = 2;
 
 
 uint8_t off_state(EventPtr event, uint16_t arg) {
+    static uint8_t ticks_spent_awake = 0;
     // turn emitter off when entering state
     if (event == EV_enter_state) {
         set_level(0);
         // sleep while off  (lower power use)
         go_to_standby = 1;
+        ticks_spent_awake = 0;
+        return MISCHIEF_MANAGED;
+    }
+    // go back to sleep eventually if we got bumped but didn't leave "off" state
+    else if (event == EV_tick) {
+        ticks_spent_awake ++;
+        if (ticks_spent_awake > 240) {
+            ticks_spent_awake = 0;
+            go_to_standby = 1;
+        }
         return MISCHIEF_MANAGED;
     }
     // hold (initially): go to lowest level, but allow abort for regular click
@@ -149,7 +161,7 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
         return MISCHIEF_MANAGED;
     }
     #ifdef USE_BATTCHECK
-    // 3 clicks: battcheck mode
+    // 3 clicks: battcheck mode / blinky mode group 1
     else if (event == EV_3clicks) {
         set_state(battcheck_state, 0);
         return MISCHIEF_MANAGED;
@@ -162,6 +174,7 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
         return MISCHIEF_MANAGED;
     }
     // 5 clicks: strobe mode
+    // TODO: remap this to click, click, long-click?
     else if (event == EV_5clicks) {
         set_state(strobe_state, 0);
         return MISCHIEF_MANAGED;
@@ -487,6 +500,7 @@ uint8_t goodnight_state(EventPtr event, uint16_t arg) {
 uint8_t lockout_state(EventPtr event, uint16_t arg) {
     static uint8_t ticks_spent_awake = 0;
 
+    #ifdef MOON_DURING_LOCKOUT_MODE
     // momentary(ish) moon mode during lockout
     // not all presses will be counted;
     // it depends on what is in the master event_sequences table
@@ -503,6 +517,7 @@ uint8_t lockout_state(EventPtr event, uint16_t arg) {
     else if ((last == A_RELEASE) || (last == A_RELEASE_TIMEOUT)) {
         set_level(0);
     }
+    #endif
 
     // regular event handling
     // conserve power while locked out
diff --git a/spaghetti-monster/spaghetti-monster.h b/spaghetti-monster/spaghetti-monster.h
index 82800b4..5599bca 100644
--- a/spaghetti-monster/spaghetti-monster.h
+++ b/spaghetti-monster/spaghetti-monster.h
@@ -57,9 +57,6 @@ void debug_blink(uint8_t num) {
 }
 #endif
 
-// TODO? new delay() functions which handle queue consumption?
-// TODO? new interruptible delay() functions?
-
 // Define these in your SpaghettiMonster recipe
 // boot-time tasks
 void setup();
-- 
cgit v1.2.3


From 7315575b2e7506417c2f2e81846e378d09949b5e Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sat, 9 Sep 2017 22:58:26 -0600
Subject: Made thermal regulation adjust smoothly (1 PWM step at a time) to
 make adjustments less noticeable. Added set_level_gradually() and
 gradual_tick() to ramping lib. Not terribly happy with it yet, but it at
 least works in practice. Added extra thermal regulation checks because I was
 running into stupid behavior in edge cases. Increased lowest thermal stepdown
 level to MAX_LEVEL/3 because it was going down way too low before. (is still
 pretty low, but not quite as bad)

---
 spaghetti-monster/anduril/anduril.c |  41 +++++++++-
 spaghetti-monster/fsm-ramping.c     | 146 ++++++++++++++++++++++++++++++++++++
 spaghetti-monster/fsm-ramping.h     |   7 ++
 3 files changed, 190 insertions(+), 4 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 91c7b0b..cf6f7f0 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -26,6 +26,7 @@
 #define USE_DELAY_4MS
 #define USE_DELAY_ZERO
 #define USE_RAMPING
+#define USE_SET_LEVEL_GRADUALLY
 #define RAMP_LENGTH 150
 #define USE_BATTCHECK
 #define BATTCHECK_VpT
@@ -127,6 +128,7 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
         return MISCHIEF_MANAGED;
     }
     // go back to sleep eventually if we got bumped but didn't leave "off" state
+    // FIXME: can I just use arg instead of ticks_spent_awake?
     else if (event == EV_tick) {
         ticks_spent_awake ++;
         if (ticks_spent_awake > 240) {
@@ -310,24 +312,55 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         set_level(memorized_level);
         return MISCHIEF_MANAGED;
     }
+    #ifdef USE_SET_LEVEL_GRADUALLY
+    else if (event == EV_tick) {
+        //if (!(arg & 7)) gradual_tick();
+        if (!(arg & 3)) gradual_tick();
+        //gradual_tick();
+        return MISCHIEF_MANAGED;
+    }
+    #endif
     #ifdef USE_THERMAL_REGULATION
     // TODO: test this on a real light
     // overheating: drop by an amount proportional to how far we are above the ceiling
     else if (event == EV_temperature_high) {
-        if (actual_level > MAX_LEVEL/4) {
-            uint8_t stepdown = actual_level - arg;
-            if (stepdown < MAX_LEVEL/4) stepdown = MAX_LEVEL/4;
+        /*
+        uint8_t foo = actual_level;
+        set_level(0);
+        delay_4ms(2);
+        set_level(foo);
+        */
+        if (actual_level > MAX_LEVEL/3) {
+            int16_t stepdown = actual_level - arg;
+            if (stepdown < MAX_LEVEL/3) stepdown = MAX_LEVEL/3;
+            else if (stepdown > MAX_LEVEL) stepdown = MAX_LEVEL;
+            #ifdef USE_SET_LEVEL_GRADUALLY
+            set_level_gradually(stepdown);
+            #else
             set_level(stepdown);
+            #endif
         }
         return MISCHIEF_MANAGED;
     }
     // underheating: increase slowly if we're lower than the target
     //               (proportional to how low we are)
     else if (event == EV_temperature_low) {
+        /*
+        uint8_t foo = actual_level;
+        set_level(0);
+        delay_4ms(2);
+        set_level(foo);
+        */
         if (actual_level < target_level) {
-            uint8_t stepup = actual_level + (arg>>1);
+            //int16_t stepup = actual_level + (arg>>1);
+            int16_t stepup = actual_level + arg;
             if (stepup > target_level) stepup = target_level;
+            else if (stepup < MAX_LEVEL/3) stepup = MAX_LEVEL/3;
+            #ifdef USE_SET_LEVEL_GRADUALLY
+            set_level_gradually(stepup);
+            #else
             set_level(stepup);
+            #endif
         }
         return MISCHIEF_MANAGED;
     }
diff --git a/spaghetti-monster/fsm-ramping.c b/spaghetti-monster/fsm-ramping.c
index ab7bd3c..50b4102 100644
--- a/spaghetti-monster/fsm-ramping.c
+++ b/spaghetti-monster/fsm-ramping.c
@@ -25,6 +25,9 @@
 
 void set_level(uint8_t level) {
     actual_level = level;
+    #ifdef USE_SET_LEVEL_GRADUALLY
+    gradual_target = level;
+    #endif
     //TCCR0A = PHASE;
     if (level == 0) {
         #if PWM_CHANNELS >= 1
@@ -56,6 +59,149 @@ void set_level(uint8_t level) {
     }
 }
 
+#ifdef USE_SET_LEVEL_GRADUALLY
+inline void set_level_gradually(uint8_t lvl) {
+    gradual_target = lvl;
+}
+
+// FIXME: This sucks
+// FIXME: I think this can behave badly in some circumstances:
+//        - large smooth adjustment in progress
+//        - from something like (255,10) to (200, 0)
+//        - ... and a new target gets set while actual_level is ... not quite right
+//        - ... and it then ends up massively overshooting or even turning off
+//        (still haven't figured out the exact circumstances to cause it)
+//        (at the very least, actual_level can suddenly jump when multiple PWM levels are being adjusted)
+//        (so it's bad to rely on actual_level in the middle of a smooth adjustment)
+void gradual_tick() {
+    int8_t changed = 0;
+    uint8_t target;
+    uint8_t gt = gradual_target - 1;
+    // FIXME: rewrite this completely, probably
+    //        (perhaps go by only one ramp level at a time instead of directly to the target?)
+    #if PWM_CHANNELS >= 1
+    target = pgm_read_byte(pwm1_levels + gt);
+    if (PWM1_LVL < target) { PWM1_LVL ++; changed = 1; }
+    else if (PWM1_LVL > target) { PWM1_LVL --; changed = -1; }
+    #endif
+    #if PWM_CHANNELS >= 2
+    target = pgm_read_byte(pwm2_levels + gt);
+    if (PWM2_LVL < target) { PWM2_LVL ++; changed = 1; }
+    else if (PWM2_LVL > target) { PWM2_LVL --; changed = -1; }
+    #endif
+    #if PWM_CHANNELS >= 3
+    target = pgm_read_byte(pwm3_levels + gt);
+    if (PWM3_LVL < target) { PWM3_LVL ++; changed = 1; }
+    else if (PWM3_LVL > target) { PWM3_LVL --; changed = -1; }
+    #endif
+    #if PWM_CHANNELS >= 4
+    target = pgm_read_byte(pwm4_levels + gt);
+    if (PWM4_LVL < target) { PWM4_LVL ++; changed = 1; }
+    else if (PWM4_LVL > target) { PWM4_LVL --; changed = -1; }
+    #endif
+    // figure out what actual level is
+    /*
+    if (changed < 0) {
+        #if PWM_CHANNELS >= 4
+        if (PWM4_LVL < pgm_read_byte(pwm4_levels + actual_level - 1))
+            actual_level --;
+        else
+        #endif
+        #if PWM_CHANNELS >= 3
+        if (PWM3_LVL < pgm_read_byte(pwm3_levels + actual_level - 1))
+            actual_level --;
+        else
+        #endif
+        #if PWM_CHANNELS >= 2
+        if (PWM2_LVL < pgm_read_byte(pwm2_levels + actual_level - 1))
+            actual_level --;
+        else
+        #endif
+            if (PWM1_LVL < pgm_read_byte(pwm1_levels + actual_level - 1))
+                actual_level --;
+    }
+    else if (changed > 0) {
+        #if PWM_CHANNELS >= 4
+        if (PWM4_LVL > pgm_read_byte(pwm4_levels + actual_level - 1))
+            actual_level ++;
+        else
+        #endif
+        #if PWM_CHANNELS >= 3
+        if (PWM3_LVL > pgm_read_byte(pwm3_levels + actual_level - 1))
+            actual_level ++;
+        else
+        #endif
+        #if PWM_CHANNELS >= 2
+        if (PWM2_LVL > pgm_read_byte(pwm2_levels + actual_level - 1))
+            actual_level ++;
+        else
+        #endif
+            if (PWM1_LVL > pgm_read_byte(pwm1_levels + actual_level - 1))
+                actual_level ++;
+    }
+    else {
+        actual_level = gradual_target;
+    }
+    */
+    /*
+    if (changed) {
+        #if PWM_CHANNELS >= 4
+        if (PWM4_LVL != pgm_read_byte(pwm4_levels + actual_level - 1))
+            actual_level += changed;
+        else
+        #endif
+        #if PWM_CHANNELS >= 3
+        if (PWM3_LVL != pgm_read_byte(pwm3_levels + actual_level - 1))
+            actual_level += changed;
+        else
+        #endif
+        #if PWM_CHANNELS >= 2
+        if (PWM2_LVL != pgm_read_byte(pwm2_levels + actual_level - 1))
+            actual_level += changed;
+        else
+        #endif
+            if (PWM1_LVL != pgm_read_byte(pwm1_levels + actual_level - 1))
+                actual_level += changed;
+    } else {
+        actual_level = gradual_target;
+    }
+    */
+    //if (! changed) { actual_level = gradual_target; }
+    if (changed) {
+        #if PWM_CHANNELS >= 4
+        if (PWM4_LVL > 0) {
+            for (actual_level = 0;
+                 (actual_level < MAX_LEVEL) &&
+                 (PWM4_LVL <= pgm_read_byte(pwm4_levels + actual_level - 1));
+                 actual_level ++) {}
+        } else
+        #endif
+        #if PWM_CHANNELS >= 3
+        if (PWM3_LVL > 0) {
+            for (actual_level = 0;
+                 (actual_level < MAX_LEVEL) &&
+                 (PWM3_LVL <= pgm_read_byte(pwm3_levels + actual_level - 1));
+                 actual_level ++) {}
+        } else
+        #endif
+        #if PWM_CHANNELS >= 2
+        if (PWM2_LVL > 0) {
+            for (actual_level = 0;
+                 (actual_level < MAX_LEVEL) &&
+                 (PWM2_LVL <= pgm_read_byte(pwm2_levels + actual_level - 1));
+                 actual_level ++) {}
+        } else
+        #endif
+        for (actual_level = 0;
+             (actual_level < MAX_LEVEL) &&
+             (PWM1_LVL <= pgm_read_byte(pwm1_levels + actual_level - 1));
+             actual_level ++) {}
+    } else {
+        actual_level = gradual_target;
+    }
+}
+#endif
+
 // TODO: set_lvl_smooth?
 
 #endif  // ifdef USE_RAMPING
diff --git a/spaghetti-monster/fsm-ramping.h b/spaghetti-monster/fsm-ramping.h
index b4054bf..ac4e58c 100644
--- a/spaghetti-monster/fsm-ramping.h
+++ b/spaghetti-monster/fsm-ramping.h
@@ -26,6 +26,13 @@
 // actual_level: last ramp level set by set_level()
 volatile uint8_t actual_level = 0;
 
+#ifdef USE_SET_LEVEL_GRADUALLY
+// adjust brightness very smoothly
+volatile uint8_t gradual_target;
+inline void set_level_gradually(uint8_t lvl);
+void gradual_tick();
+#endif
+
 // ramp tables
 #if PWM_CHANNELS == 1
   #if RAMP_LENGTH == 50
-- 
cgit v1.2.3


From fd3f600c7b17995ba6509802da71a3d2fd0fce6e Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sat, 9 Sep 2017 23:07:35 -0600
Subject: Reworked thermal regulation. Now actually works on turbo (was
 previously emitting "temp low" instead of "temp high" while in direct-drive,
 probably due to an overflow). Made stepdown work based on an average of the
 last few temperature predictions instead of just the most recent one. 
 (reduced noise sensitivity) Made each temperature sample based on 8
 measurements instead of 4, to reduce noise. Made standby mode re-init thermal
 measurement arrays, to avoid weird behavior next time light is used. Reduced
 fixed-point precision to avoid overflows. Reduced prediction strength to
 encourage stepping down faster while hot.   (unfortunately also steps down
 later, I think, if it wasn't already hot) Not totally happy with new
 algorithm, but it's the least crappy of a whole bunch of things I tried.  
 (for example, a PID approach with correction based mostly on I...  didn't
 work very well)   (taking an average of the last few predictions is very
 similar though, and works)   (but the result is still kind of meh) Saving
 this so I'll have a functional base next time I try to improve it.

---
 spaghetti-monster/fsm-adc.c     | 85 ++++++++++++++++++++++++++---------------
 spaghetti-monster/fsm-adc.h     |  1 +
 spaghetti-monster/fsm-standby.c |  5 +++
 3 files changed, 60 insertions(+), 31 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/fsm-adc.c b/spaghetti-monster/fsm-adc.c
index 7f26fde..4efb11c 100644
--- a/spaghetti-monster/fsm-adc.c
+++ b/spaghetti-monster/fsm-adc.c
@@ -60,12 +60,14 @@ ISR(ADC_vect) {
 
     // thermal declarations
     #ifdef USE_THERMAL_REGULATION
-    #define NUM_THERMAL_VALUES 4
+    #define NUM_THERMAL_VALUES 8
     #define NUM_THERMAL_VALUES_HISTORY 16
+    #define NUM_THERMAL_PROJECTED_HISTORY 8
     #define ADC_STEPS 4
-    static uint8_t first_temp_reading = 1;
     static int16_t temperature_values[NUM_THERMAL_VALUES];  // last few readings in C
-    static int16_t temperature_history[NUM_THERMAL_VALUES_HISTORY];  // 13.2 fixed-point
+    static int16_t temperature_history[NUM_THERMAL_VALUES_HISTORY];  // 14.1 fixed-point
+    static int16_t projected_temperature_history[NUM_THERMAL_PROJECTED_HISTORY];  // 14.1 fixed-point
+    static uint8_t projected_temperature_history_counter = 0;
     static uint8_t temperature_timer = 0;
     static uint8_t overheat_lowpass = 0;
     static uint8_t underheat_lowpass = 0;
@@ -143,18 +145,21 @@ ISR(ADC_vect) {
         int16_t temp = measurement - 275 + THERM_CAL_OFFSET;
 
         // prime on first execution
-        if (first_temp_reading) {
-            first_temp_reading = 0;
+        if (reset_thermal_history) {
+            reset_thermal_history = 0;
             for(uint8_t i=0; i<NUM_THERMAL_VALUES; i++)
                 temperature_values[i] = temp;
             for(uint8_t i=0; i<NUM_THERMAL_VALUES_HISTORY; i++)
                 temperature_history[i] = temp<<2;
-            temperature = temp;
+            for(uint8_t i=0; i<NUM_THERMAL_PROJECTED_HISTORY; i++)
+                projected_temperature_history[i] = temp<<2;
+            temperature = temp<<2;
         } else {  // update our current temperature estimate
             uint8_t i;
             int16_t total=0;
 
             // rotate array
+            // FIXME: just move the index, don't move the values?
             for(i=0; i<NUM_THERMAL_VALUES-1; i++) {
                 temperature_values[i] = temperature_values[i+1];
                 total += temperature_values[i];
@@ -166,43 +171,59 @@ ISR(ADC_vect) {
             //temperature = total >> 2;
             // More precise method: use noise as extra precision
             // (values are now basically fixed-point, signed 13.2)
-            temperature = total;
+            //temperature = total;
+            // 14.1 is less prone to overflows
+            temperature = total >> 2;
         }
 
         // guess what the temperature will be in a few seconds
         {
             uint8_t i;
             int16_t diff;
+            int16_t t = temperature;
 
             // algorithm tweaking; not really intended to be modified
             // how far ahead should we predict?
-            #define THERM_PREDICTION_STRENGTH 4
+            #define THERM_PREDICTION_STRENGTH 3
             // how proportional should the adjustments be?
-            #define THERM_DIFF_ATTENUATION 4
+            #define THERM_DIFF_ATTENUATION 2
             // acceptable temperature window size in C
             #define THERM_WINDOW_SIZE 8
             // highest temperature allowed
-            // (convert configured value to 13.2 fixed-point)
-            #define THERM_CEIL (therm_ceil<<2)
-            // bottom of target temperature window (13.2 fixed-point)
-            #define THERM_FLOOR (THERM_CEIL - (THERM_WINDOW_SIZE<<2))
+            // (convert configured value to 14.1 fixed-point)
+            #define THERM_CEIL (((int16_t)therm_ceil)<<1)
+            // bottom of target temperature window (14.1 fixed-point)
+            #define THERM_FLOOR (THERM_CEIL - (THERM_WINDOW_SIZE<<1))
 
             // rotate measurements and add a new one
             for (i=0; i<NUM_THERMAL_VALUES_HISTORY-1; i++) {
                 temperature_history[i] = temperature_history[i+1];
             }
-            temperature_history[NUM_THERMAL_VALUES_HISTORY-1] = temperature;
+            temperature_history[NUM_THERMAL_VALUES_HISTORY-1] = t;
 
             // guess what the temp will be several seconds in the future
-            diff = temperature_history[NUM_THERMAL_VALUES_HISTORY-1] - temperature_history[0];
-            projected_temperature = temperature_history[NUM_THERMAL_VALUES_HISTORY-1] + (diff<<THERM_PREDICTION_STRENGTH);
+            // diff = rate of temperature change
+            //diff = temperature_history[NUM_THERMAL_VALUES_HISTORY-1] - temperature_history[0];
+            diff = t - temperature_history[0];
+            // projected_temperature = current temp extended forward by amplified rate of change
+            //projected_temperature = temperature_history[NUM_THERMAL_VALUES_HISTORY-1] + (diff<<THERM_PREDICTION_STRENGTH);
+            projected_temperature = t + (diff<<THERM_PREDICTION_STRENGTH);
 
+            // store prediction for later averaging
+            projected_temperature_history[projected_temperature_history_counter] = projected_temperature;
+            projected_temperature_history_counter = (projected_temperature_history_counter + 1) & (NUM_THERMAL_PROJECTED_HISTORY-1);
         }
 
-        // cancel counters if necessary
-        if (projected_temperature > THERM_FLOOR) {
+        // average prediction to reduce noise
+        int16_t avg_projected_temperature = 0;
+        for (uint8_t i = 0; i < NUM_THERMAL_PROJECTED_HISTORY; i++)
+            avg_projected_temperature += projected_temperature_history[i];
+        avg_projected_temperature /= NUM_THERMAL_PROJECTED_HISTORY;
+
+        // cancel counters if appropriate
+        if (avg_projected_temperature > THERM_FLOOR) {
             underheat_lowpass = 0;  // we're definitely not too cold
-        } else if (projected_temperature < THERM_CEIL) {
+        } else if (avg_projected_temperature < THERM_CEIL) {
             overheat_lowpass = 0;  // we're definitely not too hot
         }
 
@@ -211,15 +232,16 @@ ISR(ADC_vect) {
         } else {  // it has been long enough since the last warning
 
             // Too hot?
-            if (projected_temperature > THERM_CEIL) {
+            if (avg_projected_temperature > THERM_CEIL) {
                 if (overheat_lowpass < OVERHEAT_LOWPASS_STRENGTH) {
                     overheat_lowpass ++;
                 } else {
                     // how far above the ceiling?
-                    int16_t howmuch = (projected_temperature - THERM_CEIL) >> THERM_DIFF_ATTENUATION;
-                    if (howmuch < 1) howmuch = 1;
-                    // try to send out a warning
-                    emit(EV_temperature_high, howmuch);
+                    int16_t howmuch = (avg_projected_temperature - THERM_CEIL) >> THERM_DIFF_ATTENUATION;
+                    if (howmuch > 0) {
+                        // try to send out a warning
+                        emit(EV_temperature_high, howmuch);
+                    }
                     // reset counters
                     temperature_timer = TEMPERATURE_TIMER_START;
                     overheat_lowpass = 0;
@@ -227,17 +249,18 @@ ISR(ADC_vect) {
             }
 
             // Too cold?
-            else if (projected_temperature < THERM_FLOOR) {
+            else if (avg_projected_temperature < THERM_FLOOR) {
                 if (underheat_lowpass < UNDERHEAT_LOWPASS_STRENGTH) {
                     underheat_lowpass ++;
                 } else {
                     // how far below the floor?
-                    int16_t howmuch = (THERM_FLOOR - projected_temperature) >> THERM_DIFF_ATTENUATION;
-                    if (howmuch < 1) howmuch = 1;
-                    // try to send out a warning (unless voltage is low)
-                    // (LVP and underheat warnings fight each other)
-                    if (voltage > VOLTAGE_LOW)
-                        emit(EV_temperature_low, howmuch);
+                    int16_t howmuch = (THERM_FLOOR - avg_projected_temperature) >> THERM_DIFF_ATTENUATION;
+                    if (howmuch > 0) {
+                        // try to send out a warning (unless voltage is low)
+                        // (LVP and underheat warnings fight each other)
+                        if (voltage > VOLTAGE_LOW)
+                            emit(EV_temperature_low, howmuch);
+                    }
                     // reset counters
                     temperature_timer = TEMPERATURE_TIMER_START;
                     underheat_lowpass = 0;
diff --git a/spaghetti-monster/fsm-adc.h b/spaghetti-monster/fsm-adc.h
index 6317b0b..2a7c26d 100644
--- a/spaghetti-monster/fsm-adc.h
+++ b/spaghetti-monster/fsm-adc.h
@@ -72,6 +72,7 @@ volatile int16_t projected_temperature;  // Fight the future!
 volatile uint8_t therm_ceil = DEFAULT_THERM_CEIL;
 //void low_temperature();
 //void high_temperature();
+volatile uint8_t reset_thermal_history = 1;
 #endif
 
 
diff --git a/spaghetti-monster/fsm-standby.c b/spaghetti-monster/fsm-standby.c
index 86c5f0d..44a2e0a 100644
--- a/spaghetti-monster/fsm-standby.c
+++ b/spaghetti-monster/fsm-standby.c
@@ -46,6 +46,11 @@ void sleep_until_eswitch_pressed()
 
     // something happened; wake up
     sleep_disable();
+
+    // forget what the temperature was last time we were on
+    reset_thermal_history = 1;
+
+    // go back to normal running mode
     //PCINT_on();  // should be on already
     // FIXME? if button is down, make sure a button press event is added to the current sequence
     ADC_on();
-- 
cgit v1.2.3


From b34403f8ad26017a5bf311c1b168d4083282f473 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sat, 9 Sep 2017 23:51:59 -0600
Subject: Rewrote gradual_tick().  Is smaller, better, and safer now. Decreased
 gradual adjustment speed again to make thermal regulation less stair-stepped.

---
 spaghetti-monster/anduril/anduril.c |   4 +-
 spaghetti-monster/fsm-ramping.c     | 144 +++++++-----------------------------
 2 files changed, 30 insertions(+), 118 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index cf6f7f0..91a74b2 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -314,8 +314,8 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
     }
     #ifdef USE_SET_LEVEL_GRADUALLY
     else if (event == EV_tick) {
-        //if (!(arg & 7)) gradual_tick();
-        if (!(arg & 3)) gradual_tick();
+        if (!(arg & 7)) gradual_tick();
+        //if (!(arg & 3)) gradual_tick();
         //gradual_tick();
         return MISCHIEF_MANAGED;
     }
diff --git a/spaghetti-monster/fsm-ramping.c b/spaghetti-monster/fsm-ramping.c
index 50b4102..092c242 100644
--- a/spaghetti-monster/fsm-ramping.c
+++ b/spaghetti-monster/fsm-ramping.c
@@ -64,145 +64,57 @@ inline void set_level_gradually(uint8_t lvl) {
     gradual_target = lvl;
 }
 
-// FIXME: This sucks
-// FIXME: I think this can behave badly in some circumstances:
-//        - large smooth adjustment in progress
-//        - from something like (255,10) to (200, 0)
-//        - ... and a new target gets set while actual_level is ... not quite right
-//        - ... and it then ends up massively overshooting or even turning off
-//        (still haven't figured out the exact circumstances to cause it)
-//        (at the very least, actual_level can suddenly jump when multiple PWM levels are being adjusted)
-//        (so it's bad to rely on actual_level in the middle of a smooth adjustment)
+// call this every frame or every few frames to change brightness very smoothly
 void gradual_tick() {
-    int8_t changed = 0;
-    uint8_t target;
+    // go by only one ramp level at a time instead of directly to the target
     uint8_t gt = gradual_target - 1;
-    // FIXME: rewrite this completely, probably
-    //        (perhaps go by only one ramp level at a time instead of directly to the target?)
+    if (gt < actual_level) gt = actual_level - 1;
+    else if (gt > actual_level) gt = actual_level + 1;
+
+    uint8_t target;
+
     #if PWM_CHANNELS >= 1
     target = pgm_read_byte(pwm1_levels + gt);
-    if (PWM1_LVL < target) { PWM1_LVL ++; changed = 1; }
-    else if (PWM1_LVL > target) { PWM1_LVL --; changed = -1; }
+    if ((gt < actual_level)     // special case for FET-only turbo
+            && (PWM1_LVL == 0)  // (bypass adjustment period for first step)
+            && (target == 255)) PWM1_LVL = 255;
+    else if (PWM1_LVL < target) PWM1_LVL ++;
+    else if (PWM1_LVL > target) PWM1_LVL --;
     #endif
     #if PWM_CHANNELS >= 2
     target = pgm_read_byte(pwm2_levels + gt);
-    if (PWM2_LVL < target) { PWM2_LVL ++; changed = 1; }
-    else if (PWM2_LVL > target) { PWM2_LVL --; changed = -1; }
+    if (PWM2_LVL < target) PWM2_LVL ++;
+    else if (PWM2_LVL > target) PWM2_LVL --;
     #endif
     #if PWM_CHANNELS >= 3
     target = pgm_read_byte(pwm3_levels + gt);
-    if (PWM3_LVL < target) { PWM3_LVL ++; changed = 1; }
-    else if (PWM3_LVL > target) { PWM3_LVL --; changed = -1; }
+    if (PWM3_LVL < target) PWM3_LVL ++;
+    else if (PWM3_LVL > target) PWM3_LVL --;
     #endif
     #if PWM_CHANNELS >= 4
     target = pgm_read_byte(pwm4_levels + gt);
-    if (PWM4_LVL < target) { PWM4_LVL ++; changed = 1; }
-    else if (PWM4_LVL > target) { PWM4_LVL --; changed = -1; }
+    if (PWM4_LVL < target) PWM4_LVL ++;
+    else if (PWM4_LVL > target) PWM4_LVL --;
     #endif
-    // figure out what actual level is
-    /*
-    if (changed < 0) {
-        #if PWM_CHANNELS >= 4
-        if (PWM4_LVL < pgm_read_byte(pwm4_levels + actual_level - 1))
-            actual_level --;
-        else
-        #endif
-        #if PWM_CHANNELS >= 3
-        if (PWM3_LVL < pgm_read_byte(pwm3_levels + actual_level - 1))
-            actual_level --;
-        else
-        #endif
-        #if PWM_CHANNELS >= 2
-        if (PWM2_LVL < pgm_read_byte(pwm2_levels + actual_level - 1))
-            actual_level --;
-        else
-        #endif
-            if (PWM1_LVL < pgm_read_byte(pwm1_levels + actual_level - 1))
-                actual_level --;
-    }
-    else if (changed > 0) {
-        #if PWM_CHANNELS >= 4
-        if (PWM4_LVL > pgm_read_byte(pwm4_levels + actual_level - 1))
-            actual_level ++;
-        else
-        #endif
-        #if PWM_CHANNELS >= 3
-        if (PWM3_LVL > pgm_read_byte(pwm3_levels + actual_level - 1))
-            actual_level ++;
-        else
-        #endif
+
+    // did we go far enough to hit the next defined ramp level?
+    // if so, update the main ramp level tracking var
+    if ((PWM1_LVL == pgm_read_byte(pwm1_levels + gt))
         #if PWM_CHANNELS >= 2
-        if (PWM2_LVL > pgm_read_byte(pwm2_levels + actual_level - 1))
-            actual_level ++;
-        else
-        #endif
-            if (PWM1_LVL > pgm_read_byte(pwm1_levels + actual_level - 1))
-                actual_level ++;
-    }
-    else {
-        actual_level = gradual_target;
-    }
-    */
-    /*
-    if (changed) {
-        #if PWM_CHANNELS >= 4
-        if (PWM4_LVL != pgm_read_byte(pwm4_levels + actual_level - 1))
-            actual_level += changed;
-        else
+            && (PWM2_LVL == pgm_read_byte(pwm2_levels + gt))
         #endif
         #if PWM_CHANNELS >= 3
-        if (PWM3_LVL != pgm_read_byte(pwm3_levels + actual_level - 1))
-            actual_level += changed;
-        else
-        #endif
-        #if PWM_CHANNELS >= 2
-        if (PWM2_LVL != pgm_read_byte(pwm2_levels + actual_level - 1))
-            actual_level += changed;
-        else
+            && (PWM3_LVL == pgm_read_byte(pwm3_levels + gt))
         #endif
-            if (PWM1_LVL != pgm_read_byte(pwm1_levels + actual_level - 1))
-                actual_level += changed;
-    } else {
-        actual_level = gradual_target;
-    }
-    */
-    //if (! changed) { actual_level = gradual_target; }
-    if (changed) {
         #if PWM_CHANNELS >= 4
-        if (PWM4_LVL > 0) {
-            for (actual_level = 0;
-                 (actual_level < MAX_LEVEL) &&
-                 (PWM4_LVL <= pgm_read_byte(pwm4_levels + actual_level - 1));
-                 actual_level ++) {}
-        } else
-        #endif
-        #if PWM_CHANNELS >= 3
-        if (PWM3_LVL > 0) {
-            for (actual_level = 0;
-                 (actual_level < MAX_LEVEL) &&
-                 (PWM3_LVL <= pgm_read_byte(pwm3_levels + actual_level - 1));
-                 actual_level ++) {}
-        } else
+            && (PWM4_LVL == pgm_read_byte(pwm4_levels + gt))
         #endif
-        #if PWM_CHANNELS >= 2
-        if (PWM2_LVL > 0) {
-            for (actual_level = 0;
-                 (actual_level < MAX_LEVEL) &&
-                 (PWM2_LVL <= pgm_read_byte(pwm2_levels + actual_level - 1));
-                 actual_level ++) {}
-        } else
-        #endif
-        for (actual_level = 0;
-             (actual_level < MAX_LEVEL) &&
-             (PWM1_LVL <= pgm_read_byte(pwm1_levels + actual_level - 1));
-             actual_level ++) {}
-    } else {
-        actual_level = gradual_target;
+        )
+    {
+        actual_level = gt;
     }
 }
 #endif
 
-// TODO: set_lvl_smooth?
-
 #endif  // ifdef USE_RAMPING
 #endif
-- 
cgit v1.2.3


From b7d8faa65451a5c71b5b619c605e8623ecd627dc Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sun, 10 Sep 2017 00:27:30 -0600
Subject: Made thermal regulation slightly more prediction-heavy, less noisy at
 stable state, and slightly smaller. Added a bit of overflow protection since
 I think I saw it overflow with the prediction weight increased. Uses
 immediate temperature (instead of avg) for lowpass reset, to make it less
 noisy at stable state.   (more trigger-happy reset switch biases it toward
 inaction) Avoid using volatile var, to reduce space. Overflow prevention also
 caps the maximum adjustment step, which should slightly help prevent
 overshooting the target.

---
 spaghetti-monster/fsm-adc.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/fsm-adc.c b/spaghetti-monster/fsm-adc.c
index 4efb11c..699c6cb 100644
--- a/spaghetti-monster/fsm-adc.c
+++ b/spaghetti-monster/fsm-adc.c
@@ -177,6 +177,7 @@ ISR(ADC_vect) {
         }
 
         // guess what the temperature will be in a few seconds
+        int16_t pt;
         {
             uint8_t i;
             int16_t diff;
@@ -184,7 +185,7 @@ ISR(ADC_vect) {
 
             // algorithm tweaking; not really intended to be modified
             // how far ahead should we predict?
-            #define THERM_PREDICTION_STRENGTH 3
+            #define THERM_PREDICTION_STRENGTH 4
             // how proportional should the adjustments be?
             #define THERM_DIFF_ATTENUATION 2
             // acceptable temperature window size in C
@@ -207,24 +208,26 @@ ISR(ADC_vect) {
             diff = t - temperature_history[0];
             // projected_temperature = current temp extended forward by amplified rate of change
             //projected_temperature = temperature_history[NUM_THERMAL_VALUES_HISTORY-1] + (diff<<THERM_PREDICTION_STRENGTH);
-            projected_temperature = t + (diff<<THERM_PREDICTION_STRENGTH);
+            pt = projected_temperature = t + (diff<<THERM_PREDICTION_STRENGTH);
 
             // store prediction for later averaging
-            projected_temperature_history[projected_temperature_history_counter] = projected_temperature;
+            projected_temperature_history[projected_temperature_history_counter] = pt;
             projected_temperature_history_counter = (projected_temperature_history_counter + 1) & (NUM_THERMAL_PROJECTED_HISTORY-1);
         }
 
         // average prediction to reduce noise
         int16_t avg_projected_temperature = 0;
-        for (uint8_t i = 0; i < NUM_THERMAL_PROJECTED_HISTORY; i++)
+        for (uint8_t i = 0;
+             (i < NUM_THERMAL_PROJECTED_HISTORY) && (avg_projected_temperature < 16000);
+             i++)
             avg_projected_temperature += projected_temperature_history[i];
         avg_projected_temperature /= NUM_THERMAL_PROJECTED_HISTORY;
 
         // cancel counters if appropriate
-        if (avg_projected_temperature > THERM_FLOOR) {
-            underheat_lowpass = 0;  // we're definitely not too cold
-        } else if (avg_projected_temperature < THERM_CEIL) {
-            overheat_lowpass = 0;  // we're definitely not too hot
+        if (pt > THERM_FLOOR) {
+            underheat_lowpass = 0;  // we're probably not too cold
+        } else if (pt < THERM_CEIL) {
+            overheat_lowpass = 0;  // we're probably not too hot
         }
 
         if (temperature_timer) {
-- 
cgit v1.2.3


From 4c2ac2d287fd15e1db51833c0a6cb4915191edb7 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sun, 10 Sep 2017 01:33:04 -0600
Subject: Adjusted thermal regulation based on results of some handheld runtime
 tests. It was bouncing before, and now it's not. (cut response magnitude in
 half, increased width of null zone)

---
 spaghetti-monster/fsm-adc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/fsm-adc.c b/spaghetti-monster/fsm-adc.c
index 699c6cb..02fd8c2 100644
--- a/spaghetti-monster/fsm-adc.c
+++ b/spaghetti-monster/fsm-adc.c
@@ -187,9 +187,9 @@ ISR(ADC_vect) {
             // how far ahead should we predict?
             #define THERM_PREDICTION_STRENGTH 4
             // how proportional should the adjustments be?
-            #define THERM_DIFF_ATTENUATION 2
+            #define THERM_DIFF_ATTENUATION 3
             // acceptable temperature window size in C
-            #define THERM_WINDOW_SIZE 8
+            #define THERM_WINDOW_SIZE 10
             // highest temperature allowed
             // (convert configured value to 14.1 fixed-point)
             #define THERM_CEIL (((int16_t)therm_ceil)<<1)
-- 
cgit v1.2.3


From d4a3e889ec53155a913763a52fd4a82bee14d95c Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sun, 10 Sep 2017 02:37:39 -0600
Subject: Moved strobes from 5 clicks to "click, click, long-click". Moved
 momentary mode from 6 clicks to 5 clicks.

---
 spaghetti-monster/anduril/anduril.c | 15 +++++++--------
 spaghetti-monster/fsm-events.h      | 21 +++++++++++++++++++++
 2 files changed, 28 insertions(+), 8 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 91a74b2..6cc0095 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -30,7 +30,7 @@
 #define RAMP_LENGTH 150
 #define USE_BATTCHECK
 #define BATTCHECK_VpT
-#define MAX_CLICKS 6
+#define MAX_CLICKS 5
 #define USE_EEPROM
 #define EEPROM_BYTES 12
 #include "spaghetti-monster.h"
@@ -169,20 +169,19 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
         return MISCHIEF_MANAGED;
     }
     #endif
+    // click, click, long-click: strobe mode
+    else if (event == EV_click3_hold) {
+        set_state(strobe_state, 0);
+        return MISCHIEF_MANAGED;
+    }
     // 4 clicks: soft lockout
     else if (event == EV_4clicks) {
         blink_confirm(2);
         set_state(lockout_state, 0);
         return MISCHIEF_MANAGED;
     }
-    // 5 clicks: strobe mode
-    // TODO: remap this to click, click, long-click?
+    // 5 clicks: momentary mode
     else if (event == EV_5clicks) {
-        set_state(strobe_state, 0);
-        return MISCHIEF_MANAGED;
-    }
-    // 6 clicks: momentary mode
-    else if (event == EV_6clicks) {
         blink_confirm(1);
         set_state(momentary_state, 0);
         return MISCHIEF_MANAGED;
diff --git a/spaghetti-monster/fsm-events.h b/spaghetti-monster/fsm-events.h
index c77facd..074b459 100644
--- a/spaghetti-monster/fsm-events.h
+++ b/spaghetti-monster/fsm-events.h
@@ -166,6 +166,25 @@ Event EV_click3_press[] = {
     A_RELEASE,
     A_PRESS,
     0 };
+Event EV_click3_hold[] = {
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_HOLD,
+    0 };
+/*
+Event EV_click3_hold_release[] = {
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_RELEASE,
+    A_PRESS,
+    A_HOLD,
+    A_RELEASE,
+    0 };
+    */
 Event EV_click3_release[] = {
     A_PRESS,
     A_RELEASE,
@@ -402,6 +421,8 @@ EventPtr event_sequences[] = {
     #endif
     #if MAX_CLICKS >= 3
     EV_click3_press,
+    EV_click3_hold,
+    //EV_click3_hold_release,
     EV_click3_release,
     EV_click3_complete,
     #endif
-- 
cgit v1.2.3


From a23cc299a2738878ff535b9c7ba01efbe6e5983b Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sun, 10 Sep 2017 02:48:23 -0600
Subject: Applied recent changes to UI description text.

---
 spaghetti-monster/anduril/anduril.txt | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.txt b/spaghetti-monster/anduril/anduril.txt
index bb0f5e2..2fb74bf 100644
--- a/spaghetti-monster/anduril/anduril.txt
+++ b/spaghetti-monster/anduril/anduril.txt
@@ -1,15 +1,20 @@
 From off:
+
+  Ramp shortcuts:
   * 1 click: memorized level
   * Hold: lowest level then ramp up
   * 2 clicks: highest ramp level
   * Click, hold: highest level then ramp down
-  * 3 clicks: battcheck mode
-    (battcheck, goodnight, beacon, tempcheck)
-  * 4 clicks: lock-out
-  * 5 clicks: strobe modes
+
+  Blinkies:
+  * 3 clicks: specials (battcheck, goodnight, beacon, tempcheck)
+  * Click, click, hold: strobes
     (bike flasher, party strobe, tactical strobe, lightning storm mode)
     (remembers which you last used)
-  * 6 clicks: momentary mode (disconnect power to exit)
+
+  Other:
+  * 4 clicks: lock-out
+  * 5 clicks: momentary mode (disconnect power to exit)
 
 In steady mode:
   * 1 click: off
@@ -83,6 +88,10 @@ Thermal calibration mode:
   - Hold until hot: set new ceiling value
   - ... don't hold: blink out current ceiling value and exit
 
+Lockout mode:
+  * Hold: momentary moon
+  * 4 clicks: exit lockout (return to regular "off" mode)
+
 Momentary mode:
   * Press button: Light on (at memorized level).
   * Release button: Light off.
@@ -91,8 +100,8 @@ Momentary mode:
 TODO:
   * save settings in eeprom
   - decide on "hold until hot" or "click N times" for thermal config mode
-  - test thermal regulation on an actual light
-  - improve thermal regulation
+  * test thermal regulation on an actual light
+  * improve thermal regulation
   - a way to blink out the firmware version?
   - indicator LED support
   - a way to configure indicator LED behavior?
-- 
cgit v1.2.3


From e5864361c5e05aa5356d06cba6a19441ea0dc996 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sun, 10 Sep 2017 16:38:40 -0600
Subject: Fixed a bug in gradual_tick(), I think. It was off by one, and caused
 actual_level to be off by one, which caused other parts of the code to do
 weird things...   - end-of-ramp blink would happen repeatedly.   - ramping up
 went slower (or not at all, with gradual_tick on each tick)   - would
 sometimes trigger underheating code at moon level,     and then glide up to
 the minimum regulation floor

---
 spaghetti-monster/anduril/anduril.c | 1 -
 spaghetti-monster/fsm-ramping.c     | 6 ++++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 6cc0095..3d08b26 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -320,7 +320,6 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
     }
     #endif
     #ifdef USE_THERMAL_REGULATION
-    // TODO: test this on a real light
     // overheating: drop by an amount proportional to how far we are above the ceiling
     else if (event == EV_temperature_high) {
         /*
diff --git a/spaghetti-monster/fsm-ramping.c b/spaghetti-monster/fsm-ramping.c
index 092c242..cc5f486 100644
--- a/spaghetti-monster/fsm-ramping.c
+++ b/spaghetti-monster/fsm-ramping.c
@@ -67,10 +67,12 @@ inline void set_level_gradually(uint8_t lvl) {
 // call this every frame or every few frames to change brightness very smoothly
 void gradual_tick() {
     // go by only one ramp level at a time instead of directly to the target
-    uint8_t gt = gradual_target - 1;
+    uint8_t gt = gradual_target;
     if (gt < actual_level) gt = actual_level - 1;
     else if (gt > actual_level) gt = actual_level + 1;
 
+    gt --;  // convert 1-based number to 0-based
+
     uint8_t target;
 
     #if PWM_CHANNELS >= 1
@@ -111,7 +113,7 @@ void gradual_tick() {
         #endif
         )
     {
-        actual_level = gt;
+        actual_level = gt + 1;
     }
 }
 #endif
-- 
cgit v1.2.3


From 91fcc0b8ce25161692a7ef79cbc06d8c735a0318 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Fri, 22 Sep 2017 07:20:54 -0600
Subject: Added FW3A driver support to FSM and Anduril. Made lightning storm
 mode look a bit more like real lightning. Minor refactoring on how
 single-option config modes save state.

---
 spaghetti-monster/anduril/anduril.c | 44 +++++++++++++++++++++++++------------
 spaghetti-monster/fsm-ramping.h     | 12 +++++-----
 2 files changed, 36 insertions(+), 20 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 3d08b26..22f6eb9 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -19,9 +19,10 @@
  */
 
 #define FSM_EMISAR_D4_DRIVER
+//#define FSM_FW3A_DRIVER
 #define USE_LVP
 #define USE_THERMAL_REGULATION
-#define DEFAULT_THERM_CEIL 45
+#define DEFAULT_THERM_CEIL 50
 #define USE_DELAY_MS
 #define USE_DELAY_4MS
 #define USE_DELAY_ZERO
@@ -283,6 +284,9 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         // only blink once for each threshold
         if ((memorized_level != actual_level)
                 && ((memorized_level == MAX_1x7135)
+                    #if PWM_CHANNELS >= 3
+                    || (memorized_level == MAX_Nx7135)
+                    #endif
                     || (memorized_level == mode_max))) {
             set_level(0);
             delay_4ms(8/4);
@@ -304,6 +308,9 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         // only blink once for each threshold
         if ((memorized_level != actual_level)
                 && ((memorized_level == MAX_1x7135)
+                    #if PWM_CHANNELS >= 3
+                    || (memorized_level == MAX_Nx7135)
+                    #endif
                     || (memorized_level == mode_min))) {
             set_level(0);
             delay_4ms(8/4);
@@ -678,18 +685,17 @@ uint8_t thermal_config_state(EventPtr event, uint16_t arg) {
     }
     // advance forward through config steps
     else if (event == EV_tick) {
-        if (! done) push_state(number_entry_state, 1);
-        else {
-            save_config();
-            // return to beacon mode
-            set_state(tempcheck_state, 0);
-        }
+        // ask the user for a number
+        if (! done) push_state(number_entry_state, 0);
+        // return to original mode
+        else set_state(tempcheck_state, 0);
         return MISCHIEF_MANAGED;
     }
     // an option was set (return from number_entry_state)
     else if (event == EV_reenter_state) {
         if (number_entry_value) therm_ceil = 30 + number_entry_value;
         if (therm_ceil > MAX_THERM_CEIL) therm_ceil = MAX_THERM_CEIL;
+        save_config();
         done = 1;
         return MISCHIEF_MANAGED;
     }
@@ -706,17 +712,16 @@ uint8_t beacon_config_state(EventPtr event, uint16_t arg) {
     }
     // advance forward through config steps
     else if (event == EV_tick) {
-        if (! done) push_state(number_entry_state, 1);
-        else {
-            save_config();
-            // return to beacon mode
-            set_state(beacon_state, 0);
-        }
+        // ask the user for a number
+        if (! done) push_state(number_entry_state, 0);
+        // return to original mode
+        else set_state(beacon_state, 0);
         return MISCHIEF_MANAGED;
     }
     // an option was set (return from number_entry_state)
     else if (event == EV_reenter_state) {
         if (number_entry_value) beacon_seconds = number_entry_value;
+        save_config();
         done = 1;
         return MISCHIEF_MANAGED;
     }
@@ -955,7 +960,8 @@ void loop() {
 
             // turn the emitter on at a random level,
             // for a random amount of time between 1ms and 32ms
-            rand_time = 1 << (pseudo_rand() % 6);
+            //rand_time = 1 << (pseudo_rand() % 7);
+            rand_time = pseudo_rand() & 63;
             brightness = 1 << (pseudo_rand() % 7);  // 1, 2, 4, 8, 16, 32, 64
             brightness += 1 << (pseudo_rand()&0x03);  // 2 to 80 now
             brightness += pseudo_rand() % brightness;  // 2 to 159 now (w/ low bias)
@@ -971,6 +977,16 @@ void loop() {
                 brightness -= stepdown;
                 if (brightness < 0) brightness = 0;
                 set_level(brightness);
+                /*
+                if ((brightness < MAX_LEVEL/2) && (! (pseudo_rand() & 15))) {
+                    brightness <<= 1;
+                    set_level(brightness);
+                }
+                */
+                if (! (pseudo_rand() & 3)) {
+                    if (! nice_delay_ms(rand_time)) return;
+                    set_level(brightness>>1);
+                }
             }
 
             // turn the emitter off,
diff --git a/spaghetti-monster/fsm-ramping.h b/spaghetti-monster/fsm-ramping.h
index ac4e58c..04beb31 100644
--- a/spaghetti-monster/fsm-ramping.h
+++ b/spaghetti-monster/fsm-ramping.h
@@ -89,12 +89,12 @@ void gradual_tick();
     #define MAX_Nx7135 59
   #elif RAMP_LENGTH == 150
     // FIXME: These values aren't tweaked or tested at all
-    // ../../bin/level_calc.py 3 150 7135 4 0.33 150 7135 4 1 840 FET 1 10 2000
-    PROGMEM const uint8_t pwm1_levels[] = { 4,4,4,5,5,6,6,7,7,8,9,10,11,12,13,15,16,18,20,22,24,26,28,31,33,36,39,42,46,49,53,57,61,65,70,75,80,85,90,96,102,108,115,121,128,136,143,151,159,167,176,185,194,204,214,224,235,246,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0 };
-    PROGMEM const uint8_t pwm2_levels[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,6,8,10,13,15,17,20,22,25,28,30,33,36,39,42,45,48,51,55,58,62,65,69,73,76,80,84,88,92,97,101,105,110,115,119,124,129,134,139,144,149,155,160,166,171,177,183,189,195,201,207,214,220,227,234,241,248,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0 };
-    PROGMEM const uint8_t pwm3_levels[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,10,17,23,30,36,43,50,57,64,71,78,85,93,100,108,115,123,131,139,148,156,164,173,182,190,199,208,217,227,236,245,255 };
-    #define MAX_1x7135 59
-    #define MAX_Nx7135 117
+    // ../../../bin/level_calc.py 3 150 7135 1 0.33 150 7135 1 1 850 FET 1 10 1500
+    PROGMEM const uint8_t pwm1_levels[] = { 1,1,1,2,2,2,3,3,4,5,5,6,7,8,9,10,11,12,14,15,17,19,21,23,25,27,29,32,34,37,40,43,46,50,53,57,61,65,69,74,78,83,88,93,99,104,110,116,122,129,135,142,149,157,164,172,180,189,197,206,215,225,235,244,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0 };
+    PROGMEM const uint8_t pwm2_levels[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,4,6,8,10,13,15,17,19,22,24,26,29,31,34,37,39,42,45,48,51,54,57,60,64,67,70,74,77,81,85,88,92,96,100,104,108,112,116,121,125,130,134,139,143,148,153,158,163,168,173,179,184,189,195,201,206,212,218,224,230,236,243,249,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0 };
+    PROGMEM const uint8_t pwm3_levels[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,19,31,43,55,67,79,91,104,117,130,143,157,170,184,198,212,226,240,255 };
+    #define MAX_1x7135 65
+    #define MAX_Nx7135 130
   #endif
 #elif PWM_CHANNELS == 4
   4-channel PWM not really supported yet, sorry.
-- 
cgit v1.2.3


From e4634255795f04a1d859aa691fbc6e729973b14d Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Fri, 22 Sep 2017 07:22:16 -0600
Subject: Slightly increased resolution of VOLTAGE_FUDGE_FACTOR. My lights
 seemed to measure just a bit low, so hopefully this will help. It bumps up
 reported values by 0.05V.

---
 spaghetti-monster/fsm-adc.c | 3 ++-
 spaghetti-monster/fsm-adc.h | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/fsm-adc.c b/spaghetti-monster/fsm-adc.c
index 02fd8c2..5be3061 100644
--- a/spaghetti-monster/fsm-adc.c
+++ b/spaghetti-monster/fsm-adc.c
@@ -108,7 +108,8 @@ ISR(ADC_vect) {
         // calculate actual voltage: volts * 10
         // ADC = 1.1 * 1024 / volts
         // volts = 1.1 * 1024 / ADC
-        voltage = (uint16_t)(1.1*1024*10)/measurement + VOLTAGE_FUDGE_FACTOR;
+        //voltage = (uint16_t)(1.1*1024*10)/measurement + VOLTAGE_FUDGE_FACTOR;
+        voltage = ((uint16_t)(2*1.1*1024*10)/measurement + VOLTAGE_FUDGE_FACTOR) >> 1;
         #endif
         // if low, callback EV_voltage_low / EV_voltage_critical
         //         (but only if it has been more than N ticks since last call)
diff --git a/spaghetti-monster/fsm-adc.h b/spaghetti-monster/fsm-adc.h
index 2a7c26d..b9462f7 100644
--- a/spaghetti-monster/fsm-adc.h
+++ b/spaghetti-monster/fsm-adc.h
@@ -30,9 +30,9 @@
 #ifndef VOLTAGE_LOW
 #define VOLTAGE_LOW 29
 #endif
-// MCU sees voltage 0.X volts lower than actual, add X to readings
+// MCU sees voltage 0.X volts lower than actual, add X/2 to readings
 #ifndef VOLTAGE_FUDGE_FACTOR
-#define VOLTAGE_FUDGE_FACTOR 2
+#define VOLTAGE_FUDGE_FACTOR 5
 #endif
 volatile uint8_t voltage;
 void low_voltage();
-- 
cgit v1.2.3


From 8b9cb8116df4e9bd06b38e3a3c2994520e88006f Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Fri, 22 Sep 2017 07:24:23 -0600
Subject: Updated Meteor UI to use provided go_to_standby.  Started on UI3, but
 it's not really working yet. Needs some underlying plumbing changes first,
 adding support for medium-length clicks.

---
 spaghetti-monster/meteor/meteor.c | 86 +++++++++++++++++++++++++++++++++------
 1 file changed, 74 insertions(+), 12 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/meteor/meteor.c b/spaghetti-monster/meteor/meteor.c
index c2ea6ec..3ec79f4 100644
--- a/spaghetti-monster/meteor/meteor.c
+++ b/spaghetti-monster/meteor/meteor.c
@@ -81,9 +81,6 @@ uint8_t UI3_mode1 = 2;
 uint8_t UI3_mode2 = 5;
 uint8_t UI3_mode3 = 8;
 
-// deferred "off" so we won't suspend in a weird state
-volatile uint8_t go_to_standby = 0;
-
 #ifdef USE_THERMAL_REGULATION
 // brightness before thermal step-down
 uint8_t target_level = 0;
@@ -228,6 +225,37 @@ uint8_t ui3_off_state(EventPtr event, uint16_t arg) {
     if (event == EV_enter_state) {
         return EVENT_HANDLED;
     }
+    // 1 click: memory slot 1
+    if (event == EV_1click) {
+        set_level(levels[UI3_mode1]);
+        set_state(ui3_on_state, 0);
+        return EVENT_HANDLED;
+    }
+    // 2 clicks: memory slot 2
+    else if (event == EV_2clicks) {
+        set_level(levels[UI3_mode2]);
+        set_state(ui3_on_state, 1);
+        return EVENT_HANDLED;
+    }
+    // Click, hold: memory slot 3
+    else if (event == EV_click2_hold) {
+        set_level(levels[UI3_mode3]);
+        set_state(ui3_on_state, 2);
+        return EVENT_HANDLED;
+    }
+    // hold: turbo
+    else if (event == EV_hold) {
+        if (arg == 0) {
+            set_level(MAX_LEVEL);
+        }
+        //set_state(ui1_on_state, 3);
+        return EVENT_HANDLED;
+    }
+    // release hold: off
+    else if (event == EV_click1_hold_release) {
+        set_state(base_off_state, 0);
+        return EVENT_HANDLED;
+    }
     return base_off_state(event, arg);
 }
 
@@ -350,7 +378,49 @@ uint8_t ui2_on_state(EventPtr event, uint16_t arg) {
 }
 
 uint8_t ui3_on_state(EventPtr event, uint16_t arg) {
-    return base_on_state(event, arg, &UI3_mode1, levels);
+    // turn on LED when entering the mode
+    static uint8_t *mode = &UI3_mode1;
+    if (event == EV_enter_state) {
+        UI3_mode = arg;
+    }
+    // 2 clicks: rotate through mode1/mode2/mode3
+    else if (event == EV_2clicks) {
+        UI3_mode = (UI3_mode + 1) % 3;
+    }
+    // short click, long click: rotate through mode3/mode2/mode1
+    /*
+    else if (event == EV_click1_hold) {
+        if (arg % HOLD_TIMEOUT == 0)
+            UI3_mode = (UI3_mode + 4) % 3;
+    }
+    */
+    switch (UI3_mode) {
+        case 0:
+            mode = &UI3_mode1;
+            break;
+        case 1:
+            mode = &UI3_mode2;
+            break;
+        default:
+            mode = &UI3_mode3;
+            break;
+    }
+
+    if ((event == EV_enter_state)  ||  (event == EV_2clicks)) {
+        set_level(levels[*mode]);
+        return EVENT_HANDLED;
+    }
+    // short click, long click: rotate through mode3/mode2/mode1
+    /*
+    else if (event == EV_click1_hold) {
+        set_level(levels[*mode]);
+        return MISCHIEF_MANAGED;
+    }
+    */
+    // hold: turbo
+    // Click, hold: ramp up
+    // release hold, hold again: ramp in opposite direction
+    return base_on_state(event, arg, mode, levels);
 }
 
 
@@ -451,14 +521,6 @@ void setup() {
 }
 
 void loop() {
-    // deferred "off" so we won't suspend in a weird state
-    // (like...  during the middle of a strobe pulse)
-    if (go_to_standby) {
-        go_to_standby = 0;
-        set_level(0);
-        standby_mode();
-    }
-
     /*
     if (current_state == strobe_beacon_state) {
         switch(strobe_beacon_mode) {
-- 
cgit v1.2.3


From eec75332c6f876277f4afa5b3200ae0682644deb Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Fri, 22 Sep 2017 15:24:39 -0600
Subject: Added anduril UI diagram.

---
 spaghetti-monster/anduril/anduril-ui.png |  Bin 0 -> 229400 bytes
 spaghetti-monster/anduril/anduril.svg    | 3428 ++++++++++++++++++++++++++++++
 2 files changed, 3428 insertions(+)
 create mode 100644 spaghetti-monster/anduril/anduril-ui.png
 create mode 100644 spaghetti-monster/anduril/anduril.svg

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril-ui.png b/spaghetti-monster/anduril/anduril-ui.png
new file mode 100644
index 0000000..555e9a4
Binary files /dev/null and b/spaghetti-monster/anduril/anduril-ui.png differ
diff --git a/spaghetti-monster/anduril/anduril.svg b/spaghetti-monster/anduril/anduril.svg
new file mode 100644
index 0000000..11ee01c
--- /dev/null
+++ b/spaghetti-monster/anduril/anduril.svg
@@ -0,0 +1,3428 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="18.056446cm"
+   height="27.595072cm"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="anduril.svg"
+   inkscape:export-filename="/tmp/anduril-ui.png"
+   inkscape:export-xdpi="110.4545"
+   inkscape:export-ydpi="110.4545">
+  <defs
+     id="defs4">
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker61712"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path61710"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#7777ff;fill-opacity:1;fill-rule:evenodd;stroke:#7777ff;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker50318"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow1Mstart">
+      <path
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         style="fill:#009d00;fill-opacity:1;fill-rule:evenodd;stroke:#009d00;stroke-width:1.00000003pt;stroke-opacity:1"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         id="path50316"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker49438"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path49436"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#7777ff;fill-opacity:1;fill-rule:evenodd;stroke:#7777ff;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker48588"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow1Mstart">
+      <path
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         style="fill:#009d00;fill-opacity:1;fill-rule:evenodd;stroke:#009d00;stroke-width:1.00000003pt;stroke-opacity:1"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         id="path48586"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker12699"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path12697"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#009d00;fill-opacity:1;fill-rule:evenodd;stroke:#009d00;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker12161"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path9801"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#009d00;fill-opacity:1;fill-rule:evenodd;stroke:#009d00;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path9792"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#009d00;fill-opacity:1;fill-rule:evenodd;stroke:#009d00;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker11118"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path11116"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#009d00;fill-opacity:1;fill-rule:evenodd;stroke:#009d00;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker10592"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path10590"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#009d00;fill-opacity:1;fill-rule:evenodd;stroke:#009d00;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path9798"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#009d00;fill-opacity:1;fill-rule:evenodd;stroke:#009d00;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker9610"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path9608"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#009d00;fill-opacity:1;fill-rule:evenodd;stroke:#009d00;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7283">
+      <stop
+         style="stop-color:#ff0000;stop-opacity:1;"
+         offset="0"
+         id="stop7279" />
+      <stop
+         style="stop-color:#ff0000;stop-opacity:0;"
+         offset="1"
+         id="stop7281" />
+    </linearGradient>
+    <pattern
+       inkscape:stockid="Sand (bitmap)"
+       id="pattern7084"
+       height="256"
+       width="256"
+       patternUnits="userSpaceOnUse">
+      <!-- Seamless texture provided by FreeSeamlessTextures.com -->
+      <!-- License: creative commons attribution -->
+      <image
+         xlink:href="data:image/jpeg;base64,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 /p1//9k= "
+         y="0"
+         x="0"
+         id="image7082"
+         height="260"
+         width="260" />
+    </pattern>
+    <linearGradient
+       id="linearGradient1694"
+       inkscape:collect="always">
+      <stop
+         id="stop1690"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.74496644" />
+      <stop
+         id="stop1692"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5876">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop5878" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop5880" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5850"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop5852" />
+    </linearGradient>
+    <pattern
+       inkscape:stockid="Sand (bitmap)"
+       id="sand_bitmap"
+       height="256"
+       width="256"
+       patternUnits="userSpaceOnUse">
+      <!-- Seamless texture provided by FreeSeamlessTextures.com -->
+      <!-- License: creative commons attribution -->
+      <image
+         xlink:href="data:image/jpeg;base64,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 /p1//9k= "
+         y="0"
+         x="0"
+         id="image9"
+         height="260"
+         width="260" />
+    </pattern>
+    <linearGradient
+       id="linearGradient4336">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="0"
+         id="stop4338" />
+      <stop
+         id="stop5884"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="1"
+         id="stop4340" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4304">
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="0"
+         id="stop4306" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.39655173;"
+         offset="1"
+         id="stop4308" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4296">
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="0"
+         id="stop4298" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.28627452;"
+         offset="1"
+         id="stop4300" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4276">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4278" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4280" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6735"
+       osb:paint="gradient">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.31764707;"
+         offset="0"
+         id="stop6737" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop6739" />
+    </linearGradient>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lend"
+       style="overflow:visible">
+      <path
+         id="path3850"
+         d="M -10.666667,0 -14.933333,4.2666667 0,0 -14.933333,-4.2666667 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.85333335pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend"
+       style="overflow:visible">
+      <path
+         id="path3856"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <inkscape:path-effect
+       effect="skeletal"
+       id="path-effect3841"
+       is_visible="true"
+       pattern="m 0,5 10,5 V 0 Z"
+       copytype="single_stretched"
+       prop_scale="1"
+       scale_y_rel="false"
+       spacing="0"
+       normal_offset="0"
+       tang_offset="0"
+       prop_units="false"
+       vertical_pattern="false"
+       fuse_tolerance="0" />
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-5"
+       style="overflow:visible">
+      <path
+         id="path3856-7"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-0"
+       style="overflow:visible">
+      <path
+         id="path3856-5"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-58"
+       style="overflow:visible">
+      <path
+         id="path3856-2"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-9"
+       style="overflow:visible">
+      <path
+         id="path3856-54"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-3"
+       style="overflow:visible">
+      <path
+         id="path3856-6"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-03"
+       style="overflow:visible">
+      <path
+         id="path3856-0"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-2"
+       style="overflow:visible">
+      <path
+         id="path3856-3"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-4"
+       style="overflow:visible">
+      <path
+         id="path3856-00"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-7"
+       style="overflow:visible">
+      <path
+         id="path3856-9"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-76"
+       style="overflow:visible">
+      <path
+         id="path3856-64"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-6"
+       style="overflow:visible">
+      <path
+         id="path3856-4"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-65"
+       style="overflow:visible">
+      <path
+         id="path3856-8"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-1"
+       style="overflow:visible">
+      <path
+         id="path3856-01"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-29"
+       style="overflow:visible">
+      <path
+         id="path3856-60"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-71"
+       style="overflow:visible">
+      <path
+         id="path3856-83"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-26"
+       style="overflow:visible">
+      <path
+         id="path3856-67"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-61"
+       style="overflow:visible">
+      <path
+         id="path3856-86"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-48"
+       style="overflow:visible">
+      <path
+         id="path3856-867"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker5244"
+       style="overflow:visible">
+      <path
+         id="path5246"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker5248"
+       style="overflow:visible">
+      <path
+         id="path5250"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker5252"
+       style="overflow:visible">
+      <path
+         id="path5254"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker5256"
+       style="overflow:visible">
+      <path
+         id="path5258"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker5260"
+       style="overflow:visible">
+      <path
+         id="path5262"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker5264"
+       style="overflow:visible">
+      <path
+         id="path5266"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-05"
+       style="overflow:visible">
+      <path
+         id="path3856-52"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-33"
+       style="overflow:visible">
+      <path
+         id="path3856-38"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-61-6"
+       style="overflow:visible">
+      <path
+         id="path3856-86-5"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-64"
+       style="overflow:visible">
+      <path
+         id="path3856-1"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-43"
+       style="overflow:visible">
+      <path
+         id="path3856-33"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-33-5"
+       style="overflow:visible">
+      <path
+         id="path3856-38-4"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-60"
+       style="overflow:visible">
+      <path
+         id="path3856-96"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-59"
+       style="overflow:visible">
+      <path
+         id="path3856-969"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-36"
+       style="overflow:visible">
+      <path
+         id="path3856-02"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-8"
+       style="overflow:visible">
+      <path
+         id="path3856-80"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-08"
+       style="overflow:visible">
+      <path
+         id="path3856-28"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-81"
+       style="overflow:visible">
+      <path
+         id="path3856-89"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-57"
+       style="overflow:visible">
+      <path
+         id="path3856-66"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-22"
+       style="overflow:visible">
+      <path
+         id="path3856-31"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-42"
+       style="overflow:visible">
+      <path
+         id="path3856-50"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-84"
+       style="overflow:visible">
+      <path
+         id="path3856-06"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-04"
+       style="overflow:visible">
+      <path
+         id="path3856-62"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-32"
+       style="overflow:visible">
+      <path
+         id="path3856-866"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-66"
+       style="overflow:visible">
+      <path
+         id="path3856-78"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-72"
+       style="overflow:visible">
+      <path
+         id="path3856-19"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-49"
+       style="overflow:visible">
+      <path
+         id="path3856-34"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-96"
+       style="overflow:visible">
+      <path
+         id="path3856-61"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-23"
+       style="overflow:visible">
+      <path
+         id="path3856-18"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-10"
+       style="overflow:visible">
+      <path
+         id="path3856-87"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-63"
+       style="overflow:visible">
+      <path
+         id="path3856-317"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-01"
+       style="overflow:visible">
+      <path
+         id="path3856-10"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-16"
+       style="overflow:visible">
+      <path
+         id="path3856-55"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-86"
+       style="overflow:visible">
+      <path
+         id="path3856-51"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-62"
+       style="overflow:visible">
+      <path
+         id="path3856-91"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-62-7"
+       style="overflow:visible">
+      <path
+         id="path3856-91-0"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-06"
+       style="overflow:visible">
+      <path
+         id="path3856-26"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-79"
+       style="overflow:visible">
+      <path
+         id="path3856-20"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-37"
+       style="overflow:visible">
+      <path
+         id="path3856-59"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-12"
+       style="overflow:visible">
+      <path
+         id="path3856-93"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-45"
+       style="overflow:visible">
+      <path
+         id="path3856-03"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-79-1"
+       style="overflow:visible">
+      <path
+         id="path3856-20-0"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-320"
+       style="overflow:visible">
+      <path
+         id="path3856-615"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-320-4"
+       style="overflow:visible">
+      <path
+         id="path3856-615-7"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-320-5"
+       style="overflow:visible">
+      <path
+         id="path3856-615-6"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-374"
+       style="overflow:visible">
+      <path
+         id="path3856-525"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-374-7"
+       style="overflow:visible">
+      <path
+         id="path3856-525-4"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-30"
+       style="overflow:visible">
+      <path
+         id="path3856-786"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-30-8"
+       style="overflow:visible">
+      <path
+         id="path3856-786-4"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-30-8-1"
+       style="overflow:visible">
+      <path
+         id="path3856-786-4-4"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-30-8-1-2"
+       style="overflow:visible">
+      <path
+         id="path3856-786-4-4-0"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-30-8-1-2-8"
+       style="overflow:visible">
+      <path
+         id="path3856-786-4-4-0-9"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-374-3"
+       style="overflow:visible">
+      <path
+         id="path3856-525-6"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-367"
+       style="overflow:visible">
+      <path
+         id="path3856-53"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker5228"
+       style="overflow:visible">
+      <path
+         id="path5226"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-606"
+       style="overflow:visible">
+      <path
+         id="path3856-261"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker5228-8"
+       style="overflow:visible">
+      <path
+         id="path5226-7"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-62-6"
+       style="overflow:visible">
+      <path
+         id="path3856-91-1"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-367-6"
+       style="overflow:visible">
+      <path
+         id="path3856-53-1"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-597"
+       style="overflow:visible">
+      <path
+         id="path3856-76"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-367-6-3"
+       style="overflow:visible">
+      <path
+         id="path3856-53-1-6"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker12699-6"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path12697-3"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#009d00;fill-opacity:1;fill-rule:evenodd;stroke:#009d00;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-79-1-9"
+       style="overflow:visible">
+      <path
+         id="path3856-20-0-4"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-37-1"
+       style="overflow:visible">
+      <path
+         id="path3856-59-2"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-45-0"
+       style="overflow:visible">
+      <path
+         id="path3856-03-8"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4336"
+       id="radialGradient7151-3"
+       cx="359.77701"
+       cy="645.03406"
+       fx="359.77701"
+       fy="645.03406"
+       r="88.283775"
+       gradientTransform="matrix(1,0,0,0.45837941,802.95853,346.47801)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       gradientTransform="translate(826.63315,-49.099837)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient7283"
+       id="linearGradient7285-8"
+       x1="548.74939"
+       y1="603.33936"
+       x2="548.74939"
+       y2="671.01959"
+       gradientUnits="userSpaceOnUse" />
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-367-3"
+       style="overflow:visible">
+      <path
+         id="path3856-53-8"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-367-3-0"
+       style="overflow:visible">
+      <path
+         id="path3856-53-8-4"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-367-3-8"
+       style="overflow:visible">
+      <path
+         id="path3856-53-8-8"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-367-3-7"
+       style="overflow:visible">
+      <path
+         id="path3856-53-8-7"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-09"
+       style="overflow:visible">
+      <path
+         id="path3856-25"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-09-2"
+       style="overflow:visible">
+      <path
+         id="path3856-25-2"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-367-3-4"
+       style="overflow:visible">
+      <path
+         id="path3856-53-8-6"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-367-3-5"
+       style="overflow:visible">
+      <path
+         id="path3856-53-8-86"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-367-3-0-4"
+       style="overflow:visible">
+      <path
+         id="path3856-53-8-4-7"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-367-3-8-4"
+       style="overflow:visible">
+      <path
+         id="path3856-53-8-8-0"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-367-3-8-2"
+       style="overflow:visible">
+      <path
+         id="path3856-53-8-8-9"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-367-3-7-0"
+       style="overflow:visible">
+      <path
+         id="path3856-53-8-7-8"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-31"
+       style="overflow:visible">
+      <path
+         id="path3856-103"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-367-0"
+       style="overflow:visible">
+      <path
+         id="path3856-53-3"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-31-1"
+       style="overflow:visible">
+      <path
+         id="path3856-103-9"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-367-0-3"
+       style="overflow:visible">
+      <path
+         id="path3856-53-3-8"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-367-0-3-6"
+       style="overflow:visible">
+      <path
+         id="path3856-53-3-8-4"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-31-1-0"
+       style="overflow:visible">
+      <path
+         id="path3856-103-9-0"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-45-0-6"
+       style="overflow:visible">
+      <path
+         id="path3856-03-8-9"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-37-1-8"
+       style="overflow:visible">
+      <path
+         id="path3856-59-2-7"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-367-6-3-2"
+       style="overflow:visible">
+      <path
+         id="path3856-53-1-6-8"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker14034-2"
+       style="overflow:visible"
+       inkscape:isstock="true"
+       inkscape:collect="always">
+      <path
+         inkscape:connector-curvature="0"
+         id="path14032-9"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-597-9"
+       style="overflow:visible">
+      <path
+         id="path3856-76-6"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-367-6-0"
+       style="overflow:visible">
+      <path
+         id="path3856-53-1-2"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker12699-3"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path12697-2"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#009d00;fill-opacity:1;fill-rule:evenodd;stroke:#009d00;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-79-1-1"
+       style="overflow:visible">
+      <path
+         id="path3856-20-0-5"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker7637-9"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow1Mstart"
+       inkscape:collect="always">
+      <path
+         inkscape:connector-curvature="0"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         id="path7635-9" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-45-1"
+       style="overflow:visible">
+      <path
+         id="path3856-03-4"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-37-9"
+       style="overflow:visible">
+      <path
+         id="path3856-59-1"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-79-0"
+       style="overflow:visible">
+      <path
+         id="path3856-20-7"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-62-7-5"
+       style="overflow:visible">
+      <path
+         id="path3856-91-0-8"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-62-70"
+       style="overflow:visible">
+      <path
+         id="path3856-91-4"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1694"
+       id="linearGradient1364-8"
+       x1="415.74805"
+       y1="495.00006"
+       x2="415.74805"
+       y2="215.43314"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(904.95044,-71.333651)" />
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-14"
+       style="overflow:visible">
+      <path
+         id="path3856-69"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-367-9"
+       style="overflow:visible">
+      <path
+         id="path3856-53-2"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker42788"
+       style="overflow:visible">
+      <path
+         id="path42786"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-88"
+       style="overflow:visible">
+      <path
+         id="path3856-868"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker42794"
+       style="overflow:visible">
+      <path
+         id="path42792"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker42798"
+       style="overflow:visible">
+      <path
+         id="path42796"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker42802"
+       style="overflow:visible">
+      <path
+         id="path42800"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-88-5"
+       style="overflow:visible">
+      <path
+         id="path3856-868-8"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-88-9"
+       style="overflow:visible">
+      <path
+         id="path3856-868-6"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-88-9-4"
+       style="overflow:visible">
+      <path
+         id="path3856-868-6-1"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-367-9-8"
+       style="overflow:visible">
+      <path
+         id="path3856-53-2-9"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4336"
+       id="radialGradient5882-9"
+       cx="-305.73798"
+       cy="215.58585"
+       fx="-305.73798"
+       fy="215.58585"
+       r="82.355362"
+       gradientTransform="matrix(0.91925378,0.02375671,-0.01750658,0.91984172,-20.913072,24.544353)"
+       gradientUnits="userSpaceOnUse" />
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-88-9-4-1"
+       style="overflow:visible">
+      <path
+         id="path3856-868-6-1-1"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-88-9-4-0"
+       style="overflow:visible">
+      <path
+         id="path3856-868-6-1-5"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-88-7"
+       style="overflow:visible">
+      <path
+         id="path3856-868-7"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker61712-0"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path61710-6"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#7777ff;fill-opacity:1;fill-rule:evenodd;stroke:#7777ff;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-88-9-4-0-4"
+       style="overflow:visible">
+      <path
+         id="path3856-868-6-1-5-7"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-88-9-4-0-4-8"
+       style="overflow:visible">
+      <path
+         id="path3856-868-6-1-5-7-5"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-88-7-6"
+       style="overflow:visible">
+      <path
+         id="path3856-868-7-2"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.1659087"
+     inkscape:cx="96.779654"
+     inkscape:cy="521.48167"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="false"
+     gridtolerance="1"
+     inkscape:window-width="2548"
+     inkscape:window-height="1415"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     fit-margin-top="0.5"
+     fit-margin-left="0.5"
+     fit-margin-right="0.5"
+     fit-margin-bottom="0.5"
+     units="cm">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3065"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       units="cm"
+       spacingx="37.795276"
+       spacingy="37.795276"
+       originx="-1038.3034"
+       originy="1.4684007" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1038.3034,-81.024808)">
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.33333397px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="1065.9954"
+       y="133.45045"
+       id="text3021-8-4-1-8-8-2-3"><tspan
+         sodipodi:role="line"
+         x="1065.9954"
+         y="133.45045"
+         style="font-size:29.33333397px;line-height:1.25;stroke-width:1.06666672"
+         id="tspan56267">Ramps:</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.33333397px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="1270.3541"
+       y="511.25677"
+       id="text3021-8-4-1-8-8-2-6"><tspan
+         sodipodi:role="line"
+         id="tspan3023-4-0-1-9-63-8-1"
+         x="1270.3541"
+         y="511.25677"
+         style="font-size:29.33333397px;line-height:1.25;stroke-width:1.06666672">Blinkies</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.33333397px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="-885.51392"
+       y="1093.7063"
+       id="text3021-8-4-1-8-8-2-4"
+       transform="rotate(-90)"><tspan
+         sodipodi:role="line"
+         id="tspan3023-4-0-1-9-63-8-81"
+         x="-885.51392"
+         y="1093.7063"
+         style="font-size:29.33333397px;line-height:1.25;stroke-width:1.06666672">Strobes</tspan></text>
+    <rect
+       style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect5159-4"
+       width="416.73956"
+       height="363.7735"
+       x="1058.2677"
+       y="101.00932" />
+    <path
+       style="fill:none;stroke:#009d00;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-367-3-0)"
+       d="m 1528.8407,526.48049 c 8.4166,10.98488 13.1688,17.22794 14.1947,43.63137"
+       id="path5213-6-8-4-9-9-56-6-8"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#009d00;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-367-3-8)"
+       d="m 1540.7977,634.3249 c -0.7283,14.71986 -0.7604,21.35476 -15.3238,38.55104"
+       id="path5213-6-8-4-9-9-56-6-9"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#009d00;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-367-3)"
+       d="m 1359.8549,566.85777 c 0.6153,-26.89971 11.0099,-28.5571 31.3786,-36.87383"
+       id="path5213-6-8-4-9-9-56-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#009d00;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-367-3-7)"
+       d="m 1390.4848,688.37946 c -25.7766,0.44211 -30.8655,-10.77034 -30.5643,-37.49635"
+       id="path5213-6-8-4-9-9-56-6-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <rect
+       style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect5159-47"
+       width="438.90619"
+       height="260.94336"
+       x="1261.8812"
+       y="480.43896" />
+    <rect
+       style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect5159-6"
+       width="349.56049"
+       height="344.7095"
+       x="1058.2677"
+       y="758.40918" />
+    <g
+       id="g23897"
+       transform="translate(197.49566,-36.547359)">
+      <path
+         sodipodi:nodetypes="csscsscsssccsscsssssscssssssssscccssscsssssssssssssscsssscsscssssccc"
+         style="fill:url(#radialGradient7151-3);fill-opacity:1;stroke:#000000;stroke-width:3.20000005;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1161.8861,679.1619 c -0.4528,-0.77951 -1.0803,-1.93107 -1.3944,-2.55904 -1.0737,-2.14685 -4.3131,-7.98949 -5.8699,-10.58711 -4.3266,-7.21903 -7.6037,-10.33824 -10.9596,-10.43127 -1.1186,-0.0309 -1.3542,0.0431 -2.4508,0.77103 -1.2711,0.84373 -2.1683,1.85544 -3.5537,4.00743 -0.4567,0.70938 -0.958,1.29061 -1.114,1.29161 -0.156,10e-4 -0.9033,-0.54296 -1.6607,-1.20878 -7.1051,-6.24594 -14.3753,-9.53314 -19.4236,-8.7823 -3.48,0.51759 -5.0204,1.56173 -6.3938,4.33401 l -0.8858,1.78805 0.011,2.61009 c 0.011,2.85728 0.4129,4.7602 1.6033,7.59226 1.304,3.10248 4.2705,7.39835 7.3473,10.63996 0.8946,0.9425 1.5704,1.71317 1.5019,1.71263 -0.4463,-0.003 -7.9187,-2.69233 -10.6412,-3.82902 -9.6708,-4.03772 -16.4977,-8.35341 -21.7399,-13.74329 -4.3679,-4.49084 -7.1775,-8.79859 -8.874,-13.60588 -1.423,-4.03226 -1.7223,-8.61526 -0.7973,-12.20916 1.2721,-4.94273 4.1587,-9.44906 9.1295,-14.25253 8.9547,-8.65325 21.3332,-14.86929 39.844,-20.00822 2.5963,-0.72078 4.771,-1.26013 4.8325,-1.19854 0.062,0.0616 -0.1838,0.42841 -0.5455,0.81514 -3.4867,3.729 -6.1245,8.13223 -6.7635,11.29025 -0.8015,3.96135 0.9707,8.08749 4.5023,10.48189 3.6869,2.49979 7.1211,3.43584 12.0741,3.29111 2.5161,-0.0735 2.8886,-0.1349 3.94,-0.64934 2.5533,-1.24918 4.3142,-3.15132 6.057,-6.54273 1.7409,-3.38781 2.0096,-4.74402 2.7417,-13.83851 0.2853,-3.54386 0.5748,-6.74799 0.6434,-7.12032 0.2923,-1.58661 0.8641,-1.01936 2.6229,2.60221 0.6806,1.40141 1.4217,2.64659 1.6468,2.76707 0.2884,0.15436 1.0531,0.1497 2.5905,-0.0158 1.632,-0.17572 2.9123,-0.17461 5.085,0.004 2.867,0.2362 2.9101,0.23344 3.3901,-0.21752 0.2674,-0.25122 0.8726,-1.35826 1.3449,-2.46008 0.4722,-1.10183 1.099,-2.36999 1.3928,-2.81817 l 0.5342,-0.81485 0.2758,0.52623 c 0.4689,0.89501 0.8326,3.8019 1.4248,11.38899 0.497,6.36774 1.4643,9.24832 4.3881,13.06838 2.6506,3.46298 4.5846,4.27584 9.7379,4.09266 3.3642,-0.11958 5.0057,-0.46765 7.4657,-1.58306 4.2373,-1.92126 6.8173,-4.97803 7.4071,-8.77563 0.4545,-2.92687 -0.5377,-6.24976 -2.9384,-9.84036 -1.1827,-1.7688 -2.4781,-3.40213 -3.8135,-4.80832 -0.5385,-0.5671 -0.7241,-0.88226 -0.5195,-0.88226 0.4593,0 9.5442,2.56459 12.622,3.56306 22.3994,7.26655 37.858,19.25169 41.1432,31.89844 1.8774,7.22754 -0.9294,15.82998 -7.7794,23.84266 -2.308,2.69978 -3.5406,3.82883 -7.087,6.49171 -6.1933,4.65046 -11.5703,7.47767 -20.5514,10.80591 -2.9406,1.08974 -6.411,2.26689 -6.7199,2.27938 -0.043,10e-4 0.5459,-0.65721 1.3072,-1.46427 4.3463,-4.60728 7.433,-9.51352 8.6471,-13.74407 0.6134,-2.13752 0.7622,-5.66081 0.313,-7.41075 -0.6515,-2.53772 -1.9946,-4.20202 -4.2556,-5.27337 -1.3335,-0.63187 -1.4404,-0.64784 -4.2739,-0.63813 -2.6104,0.01 -3.086,0.0691 -4.6708,0.59188 -3.9756,1.31118 -8.4584,3.98094 -12.5592,7.47975 -1.1418,0.97413 -2.1694,1.76995 -2.2835,1.76848 -0.1142,-10e-4 -0.6268,-0.63027 -1.139,-1.39734 -2.7305,-4.08839 -5.1372,-5.32966 -8.1429,-4.19963 -1.7271,0.64937 -3.2592,2.01781 -5.3119,4.74462 -2.2156,2.9433 -4.0421,5.9743 -8.3381,13.83722 -1.7466,3.19688 -3.2017,5.8431 -3.2335,5.88048 -0.032,0.0373 -0.4282,-0.56984 -0.881,-1.34934 z"
+         id="path3202-5-9"
+         inkscape:connector-curvature="0" />
+      <text
+         id="text3021-8-4-1-8-1-6"
+         y="648.32428"
+         x="1096.7487"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+         xml:space="preserve"><tspan
+           style="font-size:25.60000038px;line-height:1.25;stroke-width:1.06666672"
+           y="648.32428"
+           x="1096.7487"
+           id="tspan3023-4-0-1-9-7-2"
+           sodipodi:role="line">BattCheck</tspan></text>
+    </g>
+    <g
+       id="g23902"
+       transform="translate(80.603105,97.40249)">
+      <ellipse
+         ry="29.092394"
+         rx="67.643234"
+         cy="591.11011"
+         cx="1377.9557"
+         id="path3639-4-4-3-7"
+         style="fill:url(#linearGradient7285-8);fill-opacity:1;stroke:#000000;stroke-width:3.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <text
+         id="text3021-8-4-1-8-60-5"
+         y="597.84204"
+         x="1315.8811"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.33333397px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+         xml:space="preserve"><tspan
+           style="font-size:21.33333397px;line-height:1.25;stroke-width:1.06666672"
+           y="597.84204"
+           x="1315.8811"
+           id="tspan3023-4-0-1-9-2-3"
+           sodipodi:role="line">TempCheck</tspan></text>
+    </g>
+    <g
+       id="g23907"
+       transform="translate(167.89626,-50.594534)">
+      <text
+         id="text3021-8-4-1-8-8-2-8"
+         y="663.18408"
+         x="1322.8423"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+         xml:space="preserve"><tspan
+           style="font-size:25.60000038px;line-height:1.25;stroke-width:1.06666672"
+           y="663.18408"
+           x="1322.8423"
+           id="tspan3023-4-0-1-9-63-8-83"
+           sodipodi:role="line">Beacon</tspan></text>
+      <ellipse
+         ry="29.092394"
+         rx="67.643234"
+         cy="655.36505"
+         cx="1369.5132"
+         id="path3639-4-4-9-1"
+         style="fill:none;stroke:#000000;stroke-width:3.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
+    <g
+       id="g23916"
+       transform="translate(208.53273,-230.19769)">
+      <text
+         id="text3021-8-4-1-8-8-2-8-8"
+         y="748.30658"
+         x="1253.4298"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+         xml:space="preserve"><tspan
+           id="tspan23869"
+           style="font-size:25.60000038px;line-height:1.25;text-align:center;text-anchor:middle;stroke-width:1.06666672"
+           y="748.30658"
+           x="1253.4298"
+           sodipodi:role="line"><tspan
+             style="font-size:25.60000038px;line-height:1.25;text-align:center;text-anchor:middle;stroke-width:1.06666672"
+             id="tspan23871"
+             dy="0 -0.70999998 -0.79000002">Good</tspan></tspan></text>
+      <ellipse
+         ry="29.092394"
+         rx="67.643234"
+         cy="750.01959"
+         cx="1254.1898"
+         id="path3639-4-4-9-1-6"
+         style="fill:none;stroke:#000000;stroke-width:3.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <text
+         id="text3021-8-4-1-8-8-2-8-8-4"
+         y="770.16113"
+         x="1253.4894"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+         xml:space="preserve"><tspan
+           id="tspan23869-3"
+           style="font-size:25.60000038px;line-height:1.25;text-align:center;text-anchor:middle;stroke-width:1.06666672"
+           y="770.16113"
+           x="1253.4894"
+           sodipodi:role="line">Night<tspan
+   style="font-size:25.60000038px;line-height:1.25;text-align:center;text-anchor:middle;stroke-width:1.06666672"
+   id="tspan23871-3" /></tspan></text>
+    </g>
+    <g
+       id="g47448"
+       transform="translate(99.165435,127.50358)">
+      <text
+         id="text3021-8-4-1-8-8-7-4"
+         y="554.39911"
+         x="1522.8342"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+         xml:space="preserve"><tspan
+           style="font-size:25.60000038px;line-height:1.25;text-align:center;text-anchor:middle;fill:#ff0000;fill-opacity:1;stroke-width:1.06666672"
+           y="554.39911"
+           x="1522.8342"
+           id="tspan3023-4-0-1-9-63-3-3"
+           sodipodi:role="line">Thermal</tspan><tspan
+           id="tspan4199-0"
+           style="font-size:25.60000038px;line-height:1.25;text-align:center;text-anchor:middle;fill:#ff0000;fill-opacity:1;stroke-width:1.06666672"
+           y="586.39911"
+           x="1522.8342"
+           sodipodi:role="line">Cfg</tspan></text>
+      <ellipse
+         ry="41.719299"
+         rx="67.643234"
+         cy="557.18665"
+         cx="1523.4536"
+         id="path3639-4-4-6-3"
+         style="fill:none;stroke:#ff0000;stroke-width:3.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:4.26666667, 4.26666667;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-09)"
+       d="m 1506.8841,709.43656 c 9.3945,19.37444 25.1392,27.72894 56.0431,-0.57732"
+       id="path5213-6-8-4-9-9-8-4"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <g
+       id="g27968"
+       transform="translate(81.104793,-153.43991)">
+      <text
+         inkscape:transform-center-y="10.020862"
+         inkscape:transform-center-x="-5.2422885"
+         id="text3021-8-4-1-8-8-2-8-5"
+         y="678.51373"
+         x="1497.9006"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+         xml:space="preserve"><tspan
+           style="font-size:25.60000038px;line-height:1.25;stroke-width:1.06666672"
+           y="678.51373"
+           x="1497.9006"
+           id="tspan3023-4-0-1-9-63-8-83-9"
+           sodipodi:role="line">Beacon</tspan></text>
+      <ellipse
+         inkscape:transform-center-y="11.351831"
+         inkscape:transform-center-x="-4.2569368"
+         ry="29.092394"
+         rx="67.643234"
+         cy="681.21527"
+         cx="1539.7194"
+         id="path3639-4-4-9-1-4"
+         style="fill:none;stroke:#000000;stroke-width:3.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <text
+         inkscape:transform-center-y="10.020862"
+         inkscape:transform-center-x="-5.2422885"
+         id="text3021-8-4-1-8-8-2-8-5-6"
+         y="701.0863"
+         x="1518.9524"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+         xml:space="preserve"><tspan
+           style="font-size:25.60000038px;line-height:1.25;stroke-width:1.06666672"
+           y="701.0863"
+           x="1518.9524"
+           id="tspan3023-4-0-1-9-63-8-83-9-9"
+           sodipodi:role="line">Cfg</tspan></text>
+    </g>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:4.26666667, 4.26666667;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-09-2)"
+       d="m 1604.8958,609.95637 c 16.7016,16.23216 65.1175,22.64511 29.8076,-47.21491"
+       id="path5213-6-8-4-9-9-8-4-4"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <g
+       id="g28835"
+       transform="translate(-34.014058,-126.97235)">
+      <text
+         id="text3021-8-4-1-8-8-2-7"
+         y="981.17542"
+         x="1222.7643"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+         xml:space="preserve"><tspan
+           style="font-size:25.60000038px;line-height:1.25;stroke-width:1.06666672"
+           y="981.17542"
+           x="1222.7643"
+           id="tspan3023-4-0-1-9-63-8-7"
+           sodipodi:role="line">Bike</tspan></text>
+      <ellipse
+         ry="29.092394"
+         rx="67.643234"
+         cy="986.1272"
+         cx="1248.0287"
+         id="path3639-4-4-9-5"
+         style="fill:none;stroke:#000000;stroke-width:3.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <text
+         id="text3021-8-4-1-8-8-2-7-4"
+         y="1005.0751"
+         x="1202.3188"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+         xml:space="preserve"><tspan
+           style="font-size:25.60000038px;line-height:1.25;stroke-width:1.06666672"
+           y="1005.0751"
+           x="1202.3188"
+           id="tspan3023-4-0-1-9-63-8-7-8"
+           sodipodi:role="line">Flasher</tspan></text>
+    </g>
+    <g
+       id="g28877"
+       transform="translate(-91.860301,-160.29135)">
+      <text
+         id="text3021-8-4-1-8-8-2-7-2"
+         y="1087.1008"
+         x="1357.3134"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+         xml:space="preserve"><tspan
+           style="font-size:25.60000038px;line-height:1.25;stroke-width:1.06666672"
+           y="1087.1008"
+           x="1357.3134"
+           id="tspan3023-4-0-1-9-63-8-7-89"
+           sodipodi:role="line">Party</tspan></text>
+      <ellipse
+         ry="29.092394"
+         rx="67.643234"
+         cy="1091.3002"
+         cx="1388.598"
+         id="path3639-4-4-9-5-3"
+         style="fill:none;stroke:#000000;stroke-width:3.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <text
+         id="text3021-8-4-1-8-8-2-7-4-6"
+         y="1111.7531"
+         x="1345.8983"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+         xml:space="preserve"><tspan
+           style="font-size:25.60000038px;line-height:1.25;stroke-width:1.06666672"
+           y="1111.7531"
+           x="1345.8983"
+           id="tspan3023-4-0-1-9-63-8-7-8-8"
+           sodipodi:role="line">Strobe</tspan></text>
+    </g>
+    <g
+       id="g28919"
+       transform="translate(-37.024167,-215.77056)">
+      <text
+         id="text3021-8-4-1-8-8-2-7-2-2"
+         y="1219.2247"
+         x="1200.4392"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+         xml:space="preserve"><tspan
+           style="font-size:25.60000038px;line-height:1.25;stroke-width:1.06666672"
+           y="1219.2247"
+           x="1200.4392"
+           id="tspan3023-4-0-1-9-63-8-7-89-1"
+           sodipodi:role="line">Tactical</tspan></text>
+      <ellipse
+         ry="29.092394"
+         rx="67.643234"
+         cy="1218.9089"
+         cx="1247.527"
+         id="path3639-4-4-9-5-3-0"
+         style="fill:none;stroke:#000000;stroke-width:3.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <text
+         id="text3021-8-4-1-8-8-2-7-4-6-5"
+         y="1239.3618"
+         x="1204.8273"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+         xml:space="preserve"><tspan
+           style="font-size:25.60000038px;line-height:1.25;stroke-width:1.06666672"
+           y="1239.3618"
+           x="1204.8273"
+           id="tspan3023-4-0-1-9-63-8-7-8-8-1"
+           sodipodi:role="line">Strobe</tspan></text>
+    </g>
+    <g
+       id="g28961"
+       transform="translate(-3.1408245,-176.63914)">
+      <text
+         id="text3021-8-4-1-8-8-2-7-2-2-0"
+         y="1109.4977"
+         x="1088.8826"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.33333397px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+         xml:space="preserve"><tspan
+           style="font-size:21.33333397px;line-height:1.25;stroke-width:1.06666672"
+           y="1109.4977"
+           x="1088.8826"
+           id="tspan3023-4-0-1-9-63-8-7-89-1-8"
+           sodipodi:role="line">Lightning</tspan></text>
+      <ellipse
+         ry="29.092394"
+         rx="67.643234"
+         cy="1109.5366"
+         cx="1139.1631"
+         id="path3639-4-4-9-5-3-0-5"
+         style="fill:none;stroke:#000000;stroke-width:3.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <text
+         id="text3021-8-4-1-8-8-2-7-4-6-5-0"
+         y="1131.0537"
+         x="1106.3962"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.33333397px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+         xml:space="preserve"><tspan
+           style="font-size:21.33333397px;line-height:1.25;stroke-width:1.06666672"
+           y="1131.0537"
+           x="1106.3962"
+           id="tspan3023-4-0-1-9-63-8-7-8-8-1-6"
+           sodipodi:role="line">Storm</tspan></text>
+    </g>
+    <path
+       style="fill:none;stroke:#009d00;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-367-3-5)"
+       d="m 1120.4913,902.66439 c 2.7438,-16.13458 11.0707,-23.14558 22.7576,-32.6587"
+       id="path5213-6-8-4-9-9-56-6-28"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#009d00;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-367-3-0-4)"
+       d="m 1279.6253,867.73264 c 7.7263,6.42973 10.1831,9.21307 16.3503,26.82537"
+       id="path5213-6-8-4-9-9-56-6-8-2"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#009d00;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-367-3-8-4)"
+       d="m 1297.0975,960.68661 c -2.1615,8.7482 -7.3834,15.6667 -22.2274,27.3774"
+       id="path5213-6-8-4-9-9-56-6-9-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#009d00;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-367-3-7-0)"
+       d="m 1142.8559,998.04264 c -8.749,-5.9434 -13.9821,-11.31293 -18.6473,-30.73803"
+       id="path5213-6-8-4-9-9-56-6-6-1"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:12.8, 2.13333333;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-31)"
+       d="m 1313.978,902.60229 c -0.8442,-115.21076 143.7269,-36.59438 43.4448,7.9335"
+       id="path5213-6-8-4-9-9-9-4"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="1328.644"
+       y="878.07922"
+       id="text34914"><tspan
+         sodipodi:role="line"
+         id="tspan34912"
+         x="1328.644"
+         y="878.07922">Faster</tspan></text>
+    <path
+       style="fill:none;stroke:#009d00;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:12.8, 2.13333333;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-367-0)"
+       d="m 1311.3595,959.77281 c -1.1407,100.52819 126.1466,39.17043 50.9442,-11.7896"
+       id="path5213-6-8-4-9-9-9-29-9"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#009d00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="1319.2161"
+       y="986.47839"
+       id="text35803"><tspan
+         sodipodi:role="line"
+         id="tspan35801"
+         x="1319.2161"
+         y="986.47839">Slower</tspan></text>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:12.8, 2.13333333;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-31-1)"
+       d="m 1195.0016,1031.7208 c 0.8442,115.2108 -143.7269,36.5944 -43.4448,-7.9335"
+       id="path5213-6-8-4-9-9-9-4-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="1130.8009"
+       y="1058.397"
+       id="text34914-9"><tspan
+         sodipodi:role="line"
+         id="tspan34912-3"
+         x="1130.8009"
+         y="1058.397">Faster</tspan></text>
+    <path
+       style="fill:none;stroke:#009d00;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:12.8, 2.13333333;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-367-0-3)"
+       d="m 1224.5666,1032.4393 c -1.1407,100.5282 126.1466,39.1704 50.9442,-11.7896"
+       id="path5213-6-8-4-9-9-9-29-9-0"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#009d00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="1232.4231"
+       y="1059.1449"
+       id="text35803-5"><tspan
+         sodipodi:role="line"
+         id="tspan35801-6"
+         x="1232.4231"
+         y="1059.1449">Slower</tspan></text>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:12.8, 2.13333333;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-31-1-0)"
+       d="m 1197.2911,830.48244 c 0.8442,-115.21079 -143.7269,-36.5944 -43.4448,7.9335"
+       id="path5213-6-8-4-9-9-9-4-6-4"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="1123.0569"
+       y="808.46783"
+       id="text34914-9-6"><tspan
+         sodipodi:role="line"
+         id="tspan34912-3-2"
+         x="1123.0569"
+         y="808.46783">Brighter</tspan></text>
+    <path
+       style="fill:none;stroke:#009d00;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:12.8, 2.13333333;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-367-0-3-6)"
+       d="m 1229.1137,830.51639 c -1.1407,-100.52819 126.1466,-39.1704 50.9442,11.7896"
+       id="path5213-6-8-4-9-9-9-29-9-0-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#009d00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="1235.4652"
+       y="813.22925"
+       id="text35803-5-7"><tspan
+         sodipodi:role="line"
+         id="tspan35801-6-5"
+         x="1235.4652"
+         y="813.22925">Dimmer</tspan></text>
+    <rect
+       style="opacity:1;fill:url(#linearGradient1364-8);fill-opacity:1;stroke:#000000;stroke-width:3.20000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect1356-0"
+       width="37.795277"
+       height="264.56693"
+       x="1320.6984"
+       y="144.09947" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="-312.03278"
+       y="1346.9868"
+       id="text3021-8-4-1-8-8-3-4"
+       transform="rotate(-90)"><tspan
+         sodipodi:role="line"
+         id="tspan3023-4-0-1-9-63-6-2"
+         x="-312.03278"
+         y="1346.9868"
+         style="font-size:25.60000038px;line-height:1.25;stroke-width:1.06666672">Ramp</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="1268.1858"
+       y="203.77095"
+       id="text3021-8-4-1-8-6-14-2-4-7-7-9"
+       transform="scale(1.0975814,0.91109416)"><tspan
+         sodipodi:role="line"
+         x="1268.1858"
+         y="203.77095"
+         id="tspan3613-9-7-5-6"
+         style="font-size:17.06666756px;line-height:1.25;stroke-width:1.06666672">Ceil</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="1263.0579"
+       y="426.17856"
+       id="text3021-8-4-1-8-6-14-2-4-7-7-3-1"
+       transform="scale(1.0975814,0.91109416)"><tspan
+         sodipodi:role="line"
+         x="1263.0579"
+         y="426.17856"
+         id="tspan3613-9-7-5-5-0"
+         style="font-size:17.06666756px;line-height:1.25;stroke-width:1.06666672">Floor</tspan></text>
+    <path
+       style="fill:none;stroke:#009d00;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:12.8, 2.13333333;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-62-70)"
+       d="M 1419.75,188.60753 V 372.1669"
+       id="path5213-6-8-2-4"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:12.8, 2.13333333;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-62-7-5)"
+       d="M 1400.1843,373.30946 V 191.75683"
+       id="path5213-6-8-2-9-2"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#009d00;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="-239.43126"
+       y="1515.5392"
+       id="text3021-8-4-1-8-6-14-2-4-7-7-3-3-2"
+       transform="matrix(0,-1.0975814,0.91109416,0,0,0)"><tspan
+         sodipodi:role="line"
+         x="-239.43126"
+         y="1515.5392"
+         style="font-size:17.06666756px;line-height:1.25;fill:#009d00;fill-opacity:1;stroke-width:1.06666672"
+         id="tspan2698-2">Turbo</tspan></text>
+    <path
+       style="fill:none;stroke:#009d00;stroke-width:2.1329999;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-79-0)"
+       d="m 1159.4045,270.23739 c 108.4581,4.22547 23.1574,-88.17063 154.3238,-89.5992"
+       id="path5213-6-8-4-9-9-8-2-0"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:12.8, 2.13333333;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-37-9)"
+       d="m 1161.2023,305.96846 c 19.9433,0.68416 37.9411,1.8706 43.0277,22.9023 23.0349,95.24415 139.8266,163.92069 134.3257,47.65282"
+       id="path5213-6-8-4-9-9-9-2-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:url(#marker7637-9);marker-end:url(#Arrow1Mend-45-1)"
+       d="m 1314.3007,333.29999 c -90.8252,5.74785 -43.5378,-60.02663 -137.7344,-45.56247"
+       id="path5213-6-8-4-9-9-6-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="opacity:1;fill:#c0c0c0;fill-opacity:1;stroke:#040000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4, 4;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 1320.7414,332.0074 h 37.7525"
+       id="path15687-90"
+       inkscape:connector-curvature="0" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="1109.0515"
+       y="-593.28467"
+       id="text16320-2"
+       transform="rotate(42.138927)"><tspan
+         sodipodi:role="line"
+         id="tspan16318-8"
+         x="1109.0515"
+         y="-593.28467">Mem</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="-399.5589"
+       y="1453.8257"
+       id="text16326-8"
+       transform="rotate(-90)"><tspan
+         sodipodi:role="line"
+         id="tspan16324-0"
+         x="-399.5589"
+         y="1453.8257">Regulated   Hybrid -------------- Direct Drive</tspan></text>
+    <g
+       id="g16453-4"
+       transform="translate(988.22664,-147.99262)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path16424-0"
+         d="M 453.54332,291.02364 V 555.59057"
+         style="opacity:1;fill:#c0c0c0;fill-opacity:1;stroke:#040000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path16426-9"
+         d="M 467.5047,555.59057 H 453.54332"
+         style="opacity:1;fill:#c0c0c0;fill-opacity:1;stroke:#040000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path16426-5-1"
+         d="M 467.5047,480.00002 H 453.54332"
+         style="opacity:1;fill:#c0c0c0;fill-opacity:1;stroke:#040000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path16426-3-9"
+         d="M 467.5047,291.02364 H 453.54332"
+         style="opacity:1;fill:#c0c0c0;fill-opacity:1;stroke:#040000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
+    <path
+       style="opacity:1;fill:#c0c0c0;fill-opacity:1;stroke:#040000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4, 4;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 1319.7047,180.764 h 37.7525"
+       id="path15687-2-6"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#009d00;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:12.8, 2.13333333;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-367-6-0)"
+       d="m 1131.0344,258.42719 c 48.1809,-3.99296 64.2076,-2.68523 79.9712,-42.47521 42.8072,-108.05255 133.489,-146.16407 131.2384,-34.5044"
+       id="path5213-6-8-4-9-9-9-29-5-2"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csc" />
+    <path
+       style="opacity:1;fill:#c0c0c0;fill-opacity:1;stroke:#040000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4, 4;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 1319.7047,381.98134 h 37.7525"
+       id="path15687-9-5"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:4.26666689, 4.26666689;stroke-dashoffset:4.05333376;stroke-opacity:1;marker-start:url(#marker14034-2);marker-end:url(#Arrow1Mend-597-9)"
+       d="m 1314.7557,244.15455 c -101.312,-129.32592 -99.5899,149.91799 -0.4764,14.48744"
+       id="path5213-6-8-4-9-9-8-7-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66666603px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="1432.5835"
+       y="790.91565"
+       id="text3021-8-4-1-8-8-2-3-0"><tspan
+         sodipodi:role="line"
+         id="tspan3023-4-0-1-9-63-8-8-2"
+         x="1432.5835"
+         y="790.91565"
+         style="font-size:26.66666603px;line-height:1.25;stroke-width:1.06666672">Ramp Cfg</tspan><tspan
+         sodipodi:role="line"
+         x="1432.5835"
+         y="807.58234"
+         style="font-size:26.66666603px;line-height:1.25;stroke-width:1.06666672"
+         id="tspan39566" /><tspan
+         sodipodi:role="line"
+         x="1432.5835"
+         y="807.58234"
+         style="font-size:26.66666603px;line-height:1.25;stroke-width:1.06666672"
+         id="tspan39568" /><tspan
+         sodipodi:role="line"
+         x="1432.5835"
+         y="807.58234"
+         style="font-size:26.66666603px;line-height:1.25;stroke-width:1.06666672"
+         id="tspan39570" /><tspan
+         sodipodi:role="line"
+         x="1432.5835"
+         y="807.58234"
+         style="font-size:26.66666603px;line-height:1.25;stroke-width:1.06666672"
+         id="tspan39590" /></text>
+    <rect
+       style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect5159-4-9"
+       width="275.93161"
+       height="345.61465"
+       x="1424.8558"
+       y="758.40918" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="1440.7255"
+       y="812.255"
+       id="text39556"><tspan
+         sodipodi:role="line"
+         x="1440.7255"
+         y="812.255"
+         id="tspan39558">1. Floor</tspan><tspan
+         sodipodi:role="line"
+         x="1440.7255"
+         y="832.255"
+         id="tspan58144">    (click N times for level N)</tspan><tspan
+         sodipodi:role="line"
+         x="1440.7255"
+         y="852.255"
+         id="tspan39562">2. Ceiling</tspan><tspan
+         sodipodi:role="line"
+         x="1440.7255"
+         y="872.255"
+         id="tspan58146">    (click N times for Turbo-N)</tspan><tspan
+         sodipodi:role="line"
+         x="1440.7255"
+         y="892.255"
+         id="tspan39606">3. Number of steps</tspan><tspan
+         sodipodi:role="line"
+         x="1440.7255"
+         y="912.255"
+         id="tspan43997">    (discrete ramp only)</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="1440.1165"
+       y="972.51489"
+       id="text39623"><tspan
+         sodipodi:role="line"
+         id="tspan39621"
+         x="1440.1165"
+         y="972.51489">1. Temperature limit</tspan><tspan
+         sodipodi:role="line"
+         x="1440.1165"
+         y="992.51489"
+         id="tspan39625">    (click N times for 30 C + N)</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="1438.4496"
+       y="1052.5778"
+       id="text39629"><tspan
+         sodipodi:role="line"
+         id="tspan39627"
+         x="1438.4496"
+         y="1052.5778">1. Beacon speed</tspan><tspan
+         sodipodi:role="line"
+         x="1438.4496"
+         y="1072.5778"
+         id="tspan39631">    (click N times</tspan><tspan
+         sodipodi:role="line"
+         x="1438.4496"
+         y="1092.5778"
+         id="tspan43995">     for N seconds per flash)</tspan></text>
+    <path
+       style="fill:none;stroke:#7777ff;stroke-width:2.1329999;stroke-miterlimit:4;stroke-dasharray:2.1329999, 2.1329999;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-14)"
+       d="m 1361.0391,358.39365 c 26.3813,0.76852 22.4829,57.6582 -8.9055,81.08668 -31.3884,23.42848 -96.7886,5.87049 -137.724,-26.36711"
+       id="path5213-6-8-4-9-9-1-42"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csc" />
+    <g
+       id="g47455"
+       transform="translate(-394.62442,281.246)">
+      <text
+         inkscape:transform-center-y="10.020862"
+         inkscape:transform-center-x="-5.2422885"
+         id="text3021-8-4-1-8-8-2-8-5-64"
+         y="119.67136"
+         x="1502.3363"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+         xml:space="preserve"><tspan
+           style="font-size:25.60000038px;line-height:1.25;stroke-width:1.06666672"
+           y="119.67136"
+           x="1502.3363"
+           id="tspan3023-4-0-1-9-63-8-83-9-1"
+           sodipodi:role="line">Ramp</tspan></text>
+      <ellipse
+         inkscape:transform-center-y="11.351831"
+         inkscape:transform-center-x="-4.2569368"
+         ry="29.092394"
+         rx="67.643234"
+         cy="122.72764"
+         cx="1535.9958"
+         id="path3639-4-4-9-1-4-2"
+         style="fill:none;stroke:#000000;stroke-width:3.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <text
+         inkscape:transform-center-y="10.020862"
+         inkscape:transform-center-x="-5.2422885"
+         id="text3021-8-4-1-8-8-2-8-5-6-8"
+         y="142.59866"
+         x="1515.2289"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+         xml:space="preserve"><tspan
+           style="font-size:25.60000038px;line-height:1.25;stroke-width:1.06666672"
+           y="142.59866"
+           x="1515.2289"
+           id="tspan3023-4-0-1-9-63-8-83-9-9-8"
+           sodipodi:role="line">Cfg</tspan></text>
+    </g>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-88)"
+       d="m 1499.6915,166.15809 c 49.5295,21.01119 54.6565,-32.82142 113.6548,0"
+       id="path5213-6-8-4-9-9-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:12.8, 2.13333333;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-88)"
+       d="m 1498.5459,209.88219 c 49.5295,21.01119 54.6565,-32.82141 113.6548,0"
+       id="path5213-6-8-4-9-9-9-8"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:4.26666689, 4.26666689;stroke-dashoffset:2.13333344;stroke-opacity:1;marker-end:url(#Arrow1Mend-88)"
+       d="m 1499.0847,386.36671 c 49.5295,21.01119 54.6565,-32.82142 113.6548,0"
+       id="path5213-6-8-4-9-9-8-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#7777ff;stroke-width:2.1329999;stroke-miterlimit:4;stroke-dasharray:2.1329999, 2.1329999;stroke-dashoffset:5.11919975;stroke-opacity:1;marker-end:url(#Arrow1Mend-88)"
+       d="m 1499.0847,431.64591 c 49.5295,21.01119 54.6565,-32.82142 113.6548,0"
+       id="path5213-6-8-4-9-9-1-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="1508.8501"
+       y="125.85442"
+       id="text3021-8-4-1-8-6-1-5-3"><tspan
+         sodipodi:role="line"
+         id="tspan3023-4-0-1-9-6-4-1-8"
+         x="1508.8501"
+         y="125.85442"
+         style="font-size:25.60000038px;line-height:1.25;stroke-width:1.06666672">Actions</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="1368.1968"
+       y="205.90257"
+       id="text3021-8-4-1-8-6-14-2-4-0"
+       transform="scale(1.0975814,0.91109416)"><tspan
+         sodipodi:role="line"
+         x="1368.1968"
+         y="205.90257"
+         id="tspan3613-9-4"
+         style="font-size:17.06666756px;line-height:1.25;stroke-width:1.06666672">1 Fast Click</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="1400.5447"
+       y="254.90924"
+       id="text3021-8-4-1-8-6-14-2-4-6-7"
+       transform="scale(1.0975814,0.91109416)"><tspan
+         sodipodi:role="line"
+         x="1400.5447"
+         y="254.90924"
+         id="tspan3613-9-8-6"
+         style="font-size:17.06666756px;line-height:1.25;stroke-width:1.06666672">Hold</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="1364.4215"
+       y="446.51736"
+       id="text3021-8-4-1-8-6-14-2-4-7-8"
+       transform="scale(1.0975814,0.91109416)"><tspan
+         sodipodi:role="line"
+         x="1364.4215"
+         y="446.51736"
+         id="tspan3613-9-7-9"
+         style="font-size:17.06666756px;line-height:1.25;stroke-width:1.06666672">3 Fast Clicks</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#7777ff;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="1363.7708"
+       y="497.13034"
+       id="text3021-8-4-1-8-6-14-2-4-1-0"
+       transform="scale(1.0975814,0.91109416)"><tspan
+         sodipodi:role="line"
+         x="1363.7708"
+         y="497.13034"
+         id="tspan3613-9-1-6"
+         style="font-size:17.06666756px;line-height:1.25;fill:#7777ff;fill-opacity:1;stroke-width:1.06666672">Other Action</tspan></text>
+    <rect
+       style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect5159-8"
+       width="129.83826"
+       height="363.63089"
+       x="1491.3889"
+       y="100.98911" />
+    <path
+       style="fill:none;stroke:#009d00;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-367-9)"
+       d="m 1499.2534,277.65781 c 49.5295,21.01119 54.6565,-32.82142 113.6548,0"
+       id="path5213-6-8-4-9-9-56-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#009d00;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:12.80000067, 2.13333344;stroke-dashoffset:2.98666692;stroke-opacity:1;marker-end:url(#Arrow1Mend-367-9)"
+       d="m 1498.1078,321.38191 c 49.5295,21.01119 54.6565,-32.82141 113.6548,0"
+       id="path5213-6-8-4-9-9-9-29-90"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#009d00;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="1365.7407"
+       y="328.28253"
+       id="text3021-8-4-1-8-6-14-2-4-12-3"
+       transform="scale(1.0975814,0.91109416)"><tspan
+         sodipodi:role="line"
+         x="1365.7407"
+         y="328.28253"
+         id="tspan3613-9-70-3"
+         style="font-size:17.06666756px;line-height:1.25;fill:#009d00;fill-opacity:1;stroke-width:1.06666672">2 Fast Clicks</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#009d00;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="1373.6346"
+       y="377.28925"
+       id="text3021-8-4-1-8-6-14-2-4-6-9-3"
+       transform="scale(1.0975814,0.91109416)"><tspan
+         sodipodi:role="line"
+         x="1373.6346"
+         y="377.28925"
+         id="tspan3613-9-8-3-7"
+         style="font-size:17.06666756px;line-height:1.25;fill:#009d00;fill-opacity:1;stroke-width:1.06666672">Click, Hold</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="1279.8917"
+       y="-10.637094"
+       id="text7289-7-6"
+       transform="rotate(20.271471)"
+       inkscape:transform-center-x="1.5789001"
+       inkscape:transform-center-y="-2.3416108"><tspan
+         sodipodi:role="line"
+         id="tspan7287-5-5"
+         x="1279.8917"
+         y="-10.637094">4 Clicks</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:58.66666794px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="-454.34503"
+       y="1684.3434"
+       id="text5250-2"
+       transform="rotate(-90)"><tspan
+         y="1684.3434"
+         x="-454.34503"
+         sodipodi:role="line"
+         id="tspan6532-6">Andúril‎ UI</tspan></text>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:4.26666667, 4.26666667;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-88-5)"
+       d="m 1148.9905,493.21153 c 78.9733,-34.68373 102.4315,21.18585 141.9187,78.12991"
+       id="path5213-6-8-4-9-9-8-3-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#7777ff;stroke-width:2.1329999;stroke-miterlimit:4;stroke-dasharray:2.1329999, 2.1329999;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-88-9)"
+       d="m 1079.887,532.80239 c -12.1825,60.27066 -9.0869,152.20049 5.6808,220.10165"
+       id="path5213-6-8-4-9-9-1-3-0"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#7777ff;stroke-width:2.1329999;stroke-miterlimit:4;stroke-dasharray:2.1329999, 2.1329999;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-88-9-4)"
+       d="m 1095.4547,538.45694 c -18.7171,20.99663 -15.8534,53.30012 21.8662,110.81642"
+       id="path5213-6-8-4-9-9-1-3-0-0"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <g
+       transform="translate(980.51459,-148.00986)"
+       id="g23629-5-4">
+      <ellipse
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:4.26666689;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path3639-2-0-8"
+         cx="140.59442"
+         cy="435.21741"
+         rx="48.48732"
+         ry="29.092394" />
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+         x="112.51038"
+         y="444.62402"
+         id="text3021-8-9-7"><tspan
+           sodipodi:role="line"
+           id="tspan3023-4-6-0"
+           x="112.51038"
+           y="444.62402"
+           style="font-size:25.60000038px;line-height:1.25;stroke-width:1.06666672">OFF</tspan></text>
+    </g>
+    <g
+       transform="translate(969.27179,76.164687)"
+       id="g23629-5-4-8">
+      <ellipse
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:4.26666689;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path3639-2-0-8-6"
+         cx="140.59442"
+         cy="435.21741"
+         rx="48.48732"
+         ry="29.092394" />
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+         x="112.51038"
+         y="444.62402"
+         id="text3021-8-9-7-2"><tspan
+           sodipodi:role="line"
+           id="tspan3023-4-6-0-4"
+           x="112.51038"
+           y="444.62402"
+           style="font-size:25.60000038px;line-height:1.25;stroke-width:1.06666672">OFF</tspan></text>
+    </g>
+    <path
+       style="fill:none;stroke:#009d00;stroke-width:2.1329999;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-367-9-8)"
+       d="m 1364.0175,147.54301 c 29.3791,49.772 28.7391,140.19451 -0.7576,180.57634"
+       id="path5213-6-8-4-9-9-56-7-1"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.90419513px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="text56250"
+       x="122.7574"
+       y="24.531532"
+       transform="matrix(0.85679646,0,0,0.85679646,183.47218,36.673981)"><textPath
+         xlink:href="#path5213-6-8-4-9-9-8-7-3"
+         id="textPath56258"
+         style="font-size:18.66666603px;stroke-width:0.90419513px"><tspan
+   id="tspan56248"
+   style="font-size:18.66666603px;stroke-width:0.90419513px">      Smooth / Discrete</tspan></textPath></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="1074.9415"
+       y="156.70654"
+       id="text56273"><tspan
+         sodipodi:role="line"
+         id="tspan56271"
+         x="1074.9415"
+         y="156.70654">Smooth /</tspan><tspan
+         sodipodi:role="line"
+         x="1074.9415"
+         y="179.20654"
+         id="tspan56275">Discrete</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66666603px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="1430.6689"
+       y="945.4364"
+       id="text3021-8-4-1-8-8-2-3-0-5"><tspan
+         sodipodi:role="line"
+         x="1430.6689"
+         y="945.4364"
+         style="font-size:26.66666603px;line-height:1.25;stroke-width:1.06666672"
+         id="tspan39596-4">Thermal Cfg</tspan><tspan
+         sodipodi:role="line"
+         x="1430.6689"
+         y="962.10309"
+         style="font-size:26.66666603px;line-height:1.25;stroke-width:1.06666672"
+         id="tspan39590-9" /></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66666603px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="1431.3784"
+       y="1026.7155"
+       id="text3021-8-4-1-8-8-2-3-0-3"><tspan
+         sodipodi:role="line"
+         x="1431.3784"
+         y="1026.7155"
+         style="font-size:26.66666603px;line-height:1.25;stroke-width:1.06666672"
+         id="tspan39590-4">Beacon Cfg</tspan></text>
+    <g
+       transform="translate(819.14156,-260.97873)"
+       id="g58162-9">
+      <ellipse
+         ry="29.092394"
+         rx="67.643234"
+         cy="838.49103"
+         cx="358.68741"
+         id="path3639-4-4-0"
+         style="fill:#505050;fill-opacity:1;stroke:#000000;stroke-width:3.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <text
+         id="text3021-8-4-1-8-8-20"
+         y="847.32025"
+         x="310.00983"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#c0c0c0;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+         xml:space="preserve"><tspan
+           style="font-size:25.60000038px;line-height:1.25;fill:#c0c0c0;fill-opacity:1;stroke-width:1.06666672"
+           y="847.32025"
+           x="310.00983"
+           id="tspan3023-4-0-1-9-63-1"
+           sodipodi:role="line">Lockout</tspan></text>
+    </g>
+    <g
+       id="g66511"
+       transform="translate(8.026957,5.5185329)">
+      <g
+         id="g58191-2"
+         transform="translate(811.71389,-56.245324)">
+        <path
+           sodipodi:type="star"
+           style="fill:url(#radialGradient5882-9);fill-opacity:1;stroke:#000000;stroke-width:3.75277472;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="path4327-0"
+           sodipodi:sides="7"
+           sodipodi:cx="-309.93027"
+           sodipodi:cy="215.58585"
+           sodipodi:r1="84.671265"
+           sodipodi:r2="50.343449"
+           sodipodi:arg1="0"
+           sodipodi:arg2="0.68976368"
+           inkscape:flatsided="false"
+           inkscape:rounded="0.007"
+           inkscape:randomized="0"
+           d="m -225.259,215.58585 c -0.0935,0.38012 -45.66671,31.68359 -45.83651,32.0363 -0.11206,0.23275 14.1915,34.05419 13.95691,34.16236 -0.35549,0.16391 -53.24395,-15.94928 -53.62558,-15.86212 -0.25184,0.0575 -17.77639,32.3278 -18.00722,32.21184 -0.34979,-0.17574 -20.72741,-51.57201 -21.0335,-51.81604 -0.20198,-0.16104 -36.35829,6.25792 -36.41154,6.00514 -0.0807,-0.38305 27.39728,-48.35997 27.39724,-48.75142 -3e-5,-0.25833 -27.56167,-24.52431 -27.39724,-24.72355 0.24917,-0.30192 54.89127,-8.73189 55.1973,-8.97599 0.20194,-0.16109 1.98946,-36.83923 2.24774,-36.8349 0.39141,0.007 41.05102,37.47148 41.43267,37.55854 0.25185,0.0574 30.04248,-21.41346 30.20013,-21.20882 0.23891,0.3101 -3.70149,55.45806 -3.5316,55.81073 0.11211,0.23273 35.47289,10.13708 35.4112,10.38793 z"
+           transform="matrix(0.92047755,0,0,0.7899176,640.59003,565.68064)"
+           inkscape:transform-center-x="-3.8589074" />
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+           x="356.44214"
+           y="746.58301"
+           id="text3021-8-4-1-8-7"><tspan
+             sodipodi:role="line"
+             x="356.44214"
+             y="746.58301"
+             style="font-size:16px;line-height:1.25;text-align:center;text-anchor:middle;stroke-width:1.06666672"
+             id="tspan4155-3">Momentary</tspan></text>
+      </g>
+      <text
+         id="text58230"
+         y="671.82159"
+         x="1127.8752"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           y="671.82159"
+           x="1127.8752"
+           id="tspan58228"
+           sodipodi:role="line">Signalling</tspan></text>
+    </g>
+    <path
+       style="fill:none;stroke:#7777ff;stroke-width:2.1329999;stroke-miterlimit:4;stroke-dasharray:2.133, 2.133;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-88-9-4-0)"
+       d="m 1220.1437,550.28932 c -8.127,-20.38104 -19.3148,-37.30047 -55.6441,-46.21093"
+       id="path5213-6-8-4-9-9-1-3-0-0-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-88-7)"
+       d="m 1261.8812,480.43896 c -47.6705,-9.8516 -71.2506,-9.28576 -119.0304,2.96046"
+       id="path5213-6-8-4-9-9-3-4"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:none;stroke-width:2.1329999;stroke-miterlimit:4;stroke-dasharray:2.133, 2.133;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-88-9-4-0-4)"
+       d="m 1218.1434,545.42972 c 0,0 -6.8807,-15.95197 2.0003,4.8596"
+       id="path5213-6-8-4-9-9-1-3-0-0-6-4"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:none;stroke-width:2.1329999;stroke-miterlimit:4;stroke-dasharray:2.133, 2.133;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-88-9-4-0-4-8)"
+       d="m 1366.1809,151.11654 c 0,0 8.8213,16.58792 -2.1634,-3.57353"
+       id="path5213-6-8-4-9-9-1-3-0-0-6-4-8"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="1237.2144"
+       y="-326.51682"
+       id="text7289-7-6-2"
+       transform="rotate(37.744436)"
+       inkscape:transform-center-x="1.1517845"
+       inkscape:transform-center-y="-2.5788507"><tspan
+         sodipodi:role="line"
+         id="tspan7287-5-5-6"
+         x="1237.2144"
+         y="-326.51682">4 Clicks</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="979.02216"
+       y="-745.27771"
+       id="text7289-7-6-2-0"
+       transform="rotate(65.261288)"
+       inkscape:transform-center-x="0.36232032"
+       inkscape:transform-center-y="-2.4072198"><tspan
+         sodipodi:role="line"
+         id="tspan7287-5-5-6-6"
+         x="979.02216"
+         y="-745.27771">5 Clicks</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="692.37494"
+       y="-1019.8389"
+       id="text7289-7-6-2-0-6"
+       transform="rotate(85.109955)"
+       inkscape:transform-center-x="-1.5564693"
+       inkscape:transform-center-y="-1.9746618"><tspan
+         sodipodi:role="line"
+         id="tspan7287-5-5-6-6-4"
+         x="692.37494"
+         y="-1019.8389">Click, Click, Hold</tspan></text>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-88-7-6)"
+       d="m 1058.2677,758.40918 c 0.4912,-26.15636 0.9882,-169.24427 7.3904,-226.98309"
+       id="path5213-6-8-4-9-9-3-4-8"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>
-- 
cgit v1.2.3


From 3db29bba83565fb754914fa4a280ca31ae4d8471 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Fri, 22 Sep 2017 16:32:29 -0600
Subject: Updated the FSM docs a bit, for things added or changed since the
 last time I touched the docs.

---
 spaghetti-monster/spaghetti-monster.txt | 58 +++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/spaghetti-monster.txt b/spaghetti-monster/spaghetti-monster.txt
index 8393652..0401224 100644
--- a/spaghetti-monster/spaghetti-monster.txt
+++ b/spaghetti-monster/spaghetti-monster.txt
@@ -70,6 +70,10 @@ Finite State Machine:
   function instead.  Preferably with precautions taken to allow for 
   cooperative multitasking.
 
+  If your State function takes longer than one WDT tick (16ms) once in a 
+  while, the system won't break.  Several events can be queued.  But be 
+  sure not to do it very often.
+
   Several state management functions are provided:
 
     - set_state(new_state, arg): Replace the current state on the stack.  
@@ -82,6 +86,7 @@ Finite State Machine:
     - pop_state(): Get rid of (and return) the top-most state.  Re-enter 
       the state below.
 
+
 Event types:
 
   Event types are defined in fsm-events.h.  You may want to adjust these 
@@ -95,6 +100,11 @@ Event types:
       - EV_leave_state: Sent to a state immediately before it is removed 
         from the stack.
 
+      - EV_reenter_state: If a State gets pushed on top of this one, and 
+        then it pops off, a re-enter Event happens.  This should handle 
+        things like consuming the return value of a nested input handler 
+        State.
+
     Time passing:
 
       - EV_tick: This happens once per clock tick, which is 16ms or 
@@ -165,6 +175,12 @@ Event types:
   emit() them as necessary, and handle them in State functions the same 
   as any other event.
 
+  One thing to note if you create your own Event types:  The copy which 
+  gets sent to States must be in the 'event_sequences' array, meaning 
+  the State gets a const PROGMEM version of the Event.  It cannot simply 
+  send the dynamic 'current_event' object, because it has probably 
+  already changed by the time the callback happens.
+
 
 Cooperative multitasking:
 
@@ -197,6 +213,36 @@ Cooperative multitasking:
       at once.
 
 
+Persistent data in EEPROM:
+
+  To save data which lasts after a battery change, use the eeprom 
+  functions.  Define an eeprom style (or two) at the top, define how 
+  many bytes to allocate, and then use the relevant functions as 
+  appropriate.
+
+    - USE_EEPROM / USE_EEPROM_WL: Enable the eeprom-related functions.  
+      With "WL", it uses wear-levelling.  Without, it does not.  Note:  
+      Wear levelling is not necessarily better -- it uses more ROM, and 
+      it writes more bytes per save().  So, use it only for a few bytes 
+      which change frequently -- not for many bytes or infrequent 
+      changes.
+
+    - EEPROM_BYTES N / EEPROM_WL_BYTES N: Allocate N bytes for the 
+      eeprom data.
+
+    - load_eeprom() / load_eeprom_wl(): Load the stored data into the 
+      eeprom[] or eeprom_wl[] arrays.
+      Returns 1 if data was found, 0 otherwise.
+
+    - save_eeprom() / save_eeprom_wl(): Save the eeprom[] or eeprom_wl[] 
+      array data to persistent storage.  The WL version erases all old 
+      values and writes new ones in a different part of the eeprom 
+      space.  The non-WL version updates values in place, and does not 
+      overwrite values which didn't change.
+
+  Note that all interrupts will be disabled during eeprom operations.
+
+
 Useful #defines:
 
   A variety of things can be #defined before including 
@@ -241,6 +287,18 @@ Useful #defines:
       becomes a "click" event?  Basically, the maximum time between 
       clicks in a double-click or triple-click.
 
+    - MAX_CLICKS N: Convenience define to limit the size of the 
+      recognized Event arrays.  Click sequences longer than N won't be 
+      recognized or sent to State functions.
+
+    - USE_BATTCHECK: Enable the battcheck function.  Also define one of 
+      the following to select a display style:
+
+        - BATTCHECK_VpT: Volts, pause, tenths.
+        - BATTCHECK_4bars: Blink up to 4 times.
+        - BATTCHECK_6bars: Blink up to 6 times.
+        - BATTCHECK_8bars: Blink up to 8 times.
+
     - ... and many others.  Will try to document them over time, but 
       they can be found by searching for pretty much anything in 
       all-caps in the fsm-*.[ch] files.
-- 
cgit v1.2.3


From 7bd30320d3d35e0d12a296107d6f362617208948 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Fri, 22 Sep 2017 21:30:01 -0600
Subject: Forgot to include a copy of the GPL before. It's in other parts of
 the repo, but it should be in the FSM dir too.

---
 spaghetti-monster/COPYING | 674 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 674 insertions(+)
 create mode 100644 spaghetti-monster/COPYING

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/COPYING b/spaghetti-monster/COPYING
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/spaghetti-monster/COPYING
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
-- 
cgit v1.2.3


From 520f5cdb983045c5518325f3c3665f59ca85435e Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sun, 24 Sep 2017 20:54:07 -0600
Subject: Added idle_mode() for slightly lower power use without turning off
 any regular functions. (PWM, ADC, WDT all still enabled; only useful in moon
 mode) Changed default ceilings in Anduril FW3A config.

---
 spaghetti-monster/anduril/anduril.c | 17 ++++++++++++++++-
 spaghetti-monster/fsm-main.c        | 16 ++++++++++++++--
 spaghetti-monster/fsm-standby.c     | 17 +++++++++++++++++
 spaghetti-monster/fsm-standby.h     |  7 +++++++
 4 files changed, 54 insertions(+), 3 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 22f6eb9..d15b5cb 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -34,6 +34,7 @@
 #define MAX_CLICKS 5
 #define USE_EEPROM
 #define EEPROM_BYTES 12
+#define USE_IDLE_MODE
 #include "spaghetti-monster.h"
 
 // Options specific to this UI (not inherited from SpaghettiMonster)
@@ -86,9 +87,14 @@ uint8_t memorized_level = MAX_1x7135;
 // smooth vs discrete ramping
 volatile uint8_t ramp_style = 0;  // 0 = smooth, 1 = discrete
 volatile uint8_t ramp_smooth_floor = 5;
+#if PWM_CHANNELS == 3
+volatile uint8_t ramp_smooth_ceil = MAX_Nx7135;
+volatile uint8_t ramp_discrete_ceil = MAX_Nx7135;
+#else
 volatile uint8_t ramp_smooth_ceil = MAX_LEVEL - 30;
-volatile uint8_t ramp_discrete_floor = 20;
 volatile uint8_t ramp_discrete_ceil = MAX_LEVEL - 30;
+#endif
+volatile uint8_t ramp_discrete_floor = 20;
 volatile uint8_t ramp_discrete_steps = 7;
 uint8_t ramp_discrete_step_size;  // don't set this
 
@@ -323,6 +329,9 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         if (!(arg & 7)) gradual_tick();
         //if (!(arg & 3)) gradual_tick();
         //gradual_tick();
+        #ifdef USE_IDLE_MODE
+        // go_to_idle = 1;  // use less power when nothing is happening
+        #endif
         return MISCHIEF_MANAGED;
     }
     #endif
@@ -939,6 +948,12 @@ void setup() {
 
 void loop() {
 
+    #ifdef USE_IDLE_MODE
+    if (current_state == steady_state) {
+        idle_mode();
+    } else
+    #endif
+
     if (current_state == strobe_state) {
         // party / tactical strobe
         if (strobe_type < 2) {
diff --git a/spaghetti-monster/fsm-main.c b/spaghetti-monster/fsm-main.c
index d526455..a47a4bf 100644
--- a/spaghetti-monster/fsm-main.c
+++ b/spaghetti-monster/fsm-main.c
@@ -72,8 +72,8 @@ int main() {
     PORTB = (1 << SWITCH_PIN);  // e-switch is the only input
     PCMSK = (1 << SWITCH_PIN);  // pin change interrupt uses this pin
 
-    // configure sleep mode
-    set_sleep_mode(SLEEP_MODE_PWR_DOWN);
+    //// configure sleep mode
+    //set_sleep_mode(SLEEP_MODE_PWR_DOWN);
 
     // Read config values and saved state
 
@@ -133,8 +133,20 @@ int main() {
             standby_mode();
         }
 
+        #ifdef USE_IDLE_MODE
+        /*
+        // enter idle mode if requested
+        // (works better if deferred like this)
+        if (go_to_idle) {
+            go_to_idle = 0;
+            idle_mode();
+        }
+        */
+        #endif
+
         // give the recipe some time slices
         loop();
+
     }
 }
 
diff --git a/spaghetti-monster/fsm-standby.c b/spaghetti-monster/fsm-standby.c
index 44a2e0a..5312f94 100644
--- a/spaghetti-monster/fsm-standby.c
+++ b/spaghetti-monster/fsm-standby.c
@@ -40,6 +40,9 @@ void sleep_until_eswitch_pressed()
 
     PCINT_on();  // wake on e-switch event
 
+    // configure sleep mode
+    set_sleep_mode(SLEEP_MODE_PWR_DOWN);
+
     sleep_enable();
     sleep_bod_disable();
     sleep_cpu();  // wait here
@@ -57,4 +60,18 @@ void sleep_until_eswitch_pressed()
     WDT_on();
 }
 
+#ifdef USE_IDLE_MODE
+void idle_mode()
+{
+    // configure sleep mode
+    set_sleep_mode(SLEEP_MODE_IDLE);
+
+    sleep_enable();
+    sleep_cpu();  // wait here
+
+    // something happened; wake up
+    sleep_disable();
+}
+#endif
+
 #endif
diff --git a/spaghetti-monster/fsm-standby.h b/spaghetti-monster/fsm-standby.h
index a23bd0c..3a917fd 100644
--- a/spaghetti-monster/fsm-standby.h
+++ b/spaghetti-monster/fsm-standby.h
@@ -28,6 +28,13 @@ volatile uint8_t go_to_standby = 0;
 #define standby_mode sleep_until_eswitch_pressed
 void sleep_until_eswitch_pressed();
 
+#ifdef USE_IDLE_MODE
+// deferred "idle" state trigger
+// stops processing until next click or timer tick
+//volatile uint8_t go_to_idle = 0;
+void idle_mode();
+#endif
+
 // TODO: half-sleep "twilight" mode with WDT on but running slowly
 
 #endif
-- 
cgit v1.2.3


From 08082855cbc7aa0a07f9ddfe6daa86e6c96d5b57 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sun, 24 Sep 2017 20:56:52 -0600
Subject: Removed unused code from first idle_mode(); experiment.

---
 spaghetti-monster/anduril/anduril.c |  3 ---
 spaghetti-monster/fsm-main.c        | 20 --------------------
 spaghetti-monster/fsm-standby.h     |  3 +--
 3 files changed, 1 insertion(+), 25 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index d15b5cb..b7c4421 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -329,9 +329,6 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         if (!(arg & 7)) gradual_tick();
         //if (!(arg & 3)) gradual_tick();
         //gradual_tick();
-        #ifdef USE_IDLE_MODE
-        // go_to_idle = 1;  // use less power when nothing is happening
-        #endif
         return MISCHIEF_MANAGED;
     }
     #endif
diff --git a/spaghetti-monster/fsm-main.c b/spaghetti-monster/fsm-main.c
index a47a4bf..bc41cd6 100644
--- a/spaghetti-monster/fsm-main.c
+++ b/spaghetti-monster/fsm-main.c
@@ -39,8 +39,6 @@ ISR(TIMER1_COMPA_vect) {
 int main() {
     // Don't allow interrupts while booting
     cli();
-    //WDT_off();
-    //PCINT_off();
 
     // configure PWM channels
     #if PWM_CHANNELS >= 1
@@ -72,13 +70,6 @@ int main() {
     PORTB = (1 << SWITCH_PIN);  // e-switch is the only input
     PCMSK = (1 << SWITCH_PIN);  // pin change interrupt uses this pin
 
-    //// configure sleep mode
-    //set_sleep_mode(SLEEP_MODE_PWR_DOWN);
-
-    // Read config values and saved state
-
-    // TODO: handle long press vs short press (or even medium press)?
-
     #ifdef USE_DEBUG_BLINK
     //debug_blink(1);
     #endif
@@ -133,17 +124,6 @@ int main() {
             standby_mode();
         }
 
-        #ifdef USE_IDLE_MODE
-        /*
-        // enter idle mode if requested
-        // (works better if deferred like this)
-        if (go_to_idle) {
-            go_to_idle = 0;
-            idle_mode();
-        }
-        */
-        #endif
-
         // give the recipe some time slices
         loop();
 
diff --git a/spaghetti-monster/fsm-standby.h b/spaghetti-monster/fsm-standby.h
index 3a917fd..0b410fa 100644
--- a/spaghetti-monster/fsm-standby.h
+++ b/spaghetti-monster/fsm-standby.h
@@ -29,9 +29,8 @@ volatile uint8_t go_to_standby = 0;
 void sleep_until_eswitch_pressed();
 
 #ifdef USE_IDLE_MODE
-// deferred "idle" state trigger
 // stops processing until next click or timer tick
-//volatile uint8_t go_to_idle = 0;
+// (I think)
 void idle_mode();
 #endif
 
-- 
cgit v1.2.3


From 36fc1e22964795922370008adda1b9a1732905a8 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sun, 24 Sep 2017 21:08:51 -0600
Subject: Added idle to goodnight mode, for 2mA less power at all levels.
 Reduced ROM size slightly by avoiding repeated access to the volatile
 current_state var.

---
 spaghetti-monster/anduril/anduril.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index b7c4421..8784bc5 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -945,13 +945,18 @@ void setup() {
 
 void loop() {
 
+    StatePtr state = current_state;
+
+    if (0) {}
+
     #ifdef USE_IDLE_MODE
-    if (current_state == steady_state) {
+    else if ((state == steady_state)
+            || (state == goodnight_state)) {
         idle_mode();
-    } else
+    }
     #endif
 
-    if (current_state == strobe_state) {
+    else if (state == strobe_state) {
         // party / tactical strobe
         if (strobe_type < 2) {
             set_level(MAX_LEVEL);
@@ -1025,17 +1030,17 @@ void loop() {
     }
 
     #ifdef USE_BATTCHECK
-    else if (current_state == battcheck_state) {
+    else if (state == battcheck_state) {
         battcheck();
     }
-    else if (current_state == tempcheck_state) {
+    else if (state == tempcheck_state) {
         blink_num(temperature>>2);
         nice_delay_ms(1000);
     }
     // TODO: blink out therm_ceil during thermal_config_state
     #endif
 
-    else if (current_state == beacon_state) {
+    else if (state == beacon_state) {
         set_level(memorized_level);
         if (! nice_delay_ms(500)) return;
         set_level(0);
-- 
cgit v1.2.3


From 9bde4b7bd0588b1d74f9b89f89419e8f11e3f25f Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sun, 24 Sep 2017 22:45:59 -0600
Subject: Cut moon power from ~4mA to ~2.5mA by running clock at half speed on
 very low modes. Adjusted default FET+1 ramp to compensate for speed bump.
 Added define(s) for whether to blink at ramp floor/ceiling/channel edges.
 Lowered default moon level to 1, since slower speed makes it brighter and
 more stable.

---
 spaghetti-monster/anduril/anduril.c | 33 ++++++++++++++++++++++++++++++---
 spaghetti-monster/fsm-main.c        |  6 ++++++
 spaghetti-monster/fsm-ramping.h     |  2 +-
 3 files changed, 37 insertions(+), 4 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 8784bc5..a1c9f5b 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -29,12 +29,16 @@
 #define USE_RAMPING
 #define USE_SET_LEVEL_GRADUALLY
 #define RAMP_LENGTH 150
+#define BLINK_AT_RAMP_BOUNDARIES
+//#define BLINK_AT_RAMP_FLOOR
 #define USE_BATTCHECK
 #define BATTCHECK_VpT
 #define MAX_CLICKS 5
 #define USE_EEPROM
 #define EEPROM_BYTES 12
 #define USE_IDLE_MODE
+//#define HALFSPEED_LEVEL 30  // looks good, but sounds bad
+#define HALFSPEED_LEVEL 14
 #include "spaghetti-monster.h"
 
 // Options specific to this UI (not inherited from SpaghettiMonster)
@@ -86,7 +90,7 @@ void save_config();
 uint8_t memorized_level = MAX_1x7135;
 // smooth vs discrete ramping
 volatile uint8_t ramp_style = 0;  // 0 = smooth, 1 = discrete
-volatile uint8_t ramp_smooth_floor = 5;
+volatile uint8_t ramp_smooth_floor = 1;
 #if PWM_CHANNELS == 3
 volatile uint8_t ramp_smooth_ceil = MAX_Nx7135;
 volatile uint8_t ramp_discrete_ceil = MAX_Nx7135;
@@ -226,6 +230,16 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         ramp_step_size = ramp_discrete_step_size;
     }
 
+    if (actual_level < HALFSPEED_LEVEL) {
+        // run at half speed
+        CLKPR = 1<<CLKPCE;
+        CLKPR = 1;
+    } else {
+        // run at full speed
+        CLKPR = 1<<CLKPCE;
+        CLKPR = 0;
+    }
+
     // turn LED on when we first enter the mode
     if (event == EV_enter_state) {
         // remember this level, unless it's moon or turbo
@@ -287,6 +301,7 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         #ifdef USE_THERMAL_REGULATION
         target_level = memorized_level;
         #endif
+        #ifdef BLINK_AT_RAMP_BOUNDARIES
         // only blink once for each threshold
         if ((memorized_level != actual_level)
                 && ((memorized_level == MAX_1x7135)
@@ -297,6 +312,7 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
             set_level(0);
             delay_4ms(8/4);
         }
+        #endif
         set_level(memorized_level);
         return MISCHIEF_MANAGED;
     }
@@ -311,16 +327,21 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         #ifdef USE_THERMAL_REGULATION
         target_level = memorized_level;
         #endif
+        #ifdef BLINK_AT_RAMP_BOUNDARIES
         // only blink once for each threshold
         if ((memorized_level != actual_level)
                 && ((memorized_level == MAX_1x7135)
                     #if PWM_CHANNELS >= 3
                     || (memorized_level == MAX_Nx7135)
                     #endif
-                    || (memorized_level == mode_min))) {
+                    #ifdef BLINK_AT_RAMP_FLOOR
+                    || (memorized_level == mode_min)
+                    #endif
+                    )) {
             set_level(0);
             delay_4ms(8/4);
         }
+        #endif
         set_level(memorized_level);
         return MISCHIEF_MANAGED;
     }
@@ -952,11 +973,17 @@ void loop() {
     #ifdef USE_IDLE_MODE
     else if ((state == steady_state)
             || (state == goodnight_state)) {
+        // doze until next clock tick
         idle_mode();
     }
+    else {
+        // run at full speed
+        CLKPR = 1<<CLKPCE;
+        CLKPR = 0;
+    }
     #endif
 
-    else if (state == strobe_state) {
+    if (state == strobe_state) {
         // party / tactical strobe
         if (strobe_type < 2) {
             set_level(MAX_LEVEL);
diff --git a/spaghetti-monster/fsm-main.c b/spaghetti-monster/fsm-main.c
index bc41cd6..5efcd4c 100644
--- a/spaghetti-monster/fsm-main.c
+++ b/spaghetti-monster/fsm-main.c
@@ -40,6 +40,12 @@ int main() {
     // Don't allow interrupts while booting
     cli();
 
+    #ifdef HALFSPEED
+    // run at half speed
+    CLKPR = 1<<CLKPCE;
+    CLKPR = 1;
+    #endif
+
     // configure PWM channels
     #if PWM_CHANNELS >= 1
     DDRB |= (1 << PWM1_PIN);
diff --git a/spaghetti-monster/fsm-ramping.h b/spaghetti-monster/fsm-ramping.h
index 04beb31..0914186 100644
--- a/spaghetti-monster/fsm-ramping.h
+++ b/spaghetti-monster/fsm-ramping.h
@@ -66,7 +66,7 @@ void gradual_tick();
     // ../../bin/level_calc.py 1 65 7135 1 0.8 150
     // ... mixed with this:
     // ../../bin/level_calc.py 2 150 7135 4 0.33 150 FET 1 10 1500
-    PROGMEM const uint8_t pwm1_levels[] = { 1,1,2,2,3,3,4,4,5,6,7,8,9,10,11,12,14,15,17,19,20,22,24,26,29,31,34,36,39,42,45,48,51,55,59,62,66,70,75,79,84,89,93,99,104,110,115,121,127,134,140,147,154,161,168,176,184,192,200,209,217,226,236,245,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0 };
+    PROGMEM const uint8_t pwm1_levels[] = { 1,1,2,2,3,3,4,4,5,6,7,8,9,10,12,13,14,15,17,19,20,22,24,26,29,31,34,36,39,42,45,48,51,55,59,62,66,70,75,79,84,89,93,99,104,110,115,121,127,134,140,147,154,161,168,176,184,192,200,209,217,226,236,245,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0 };
     PROGMEM const uint8_t pwm2_levels[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,3,4,5,7,8,9,11,12,14,15,17,19,20,22,24,25,27,29,31,33,35,37,39,41,43,45,48,50,52,55,57,59,62,64,67,70,72,75,78,81,84,87,90,93,96,99,102,105,109,112,115,119,122,126,129,133,137,141,144,148,152,156,160,165,169,173,177,182,186,191,195,200,205,209,214,219,224,229,234,239,244,250,255 };
     #define MAX_1x7135 65
   #endif
-- 
cgit v1.2.3


From fd9081b1587793e279c9c071b88769d1d90a7067 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sun, 24 Sep 2017 22:50:32 -0600
Subject: Moved halfspeed thing so it'll affect goodnight mode too.

---
 spaghetti-monster/anduril/anduril.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index a1c9f5b..1cc9d7c 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -230,16 +230,6 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         ramp_step_size = ramp_discrete_step_size;
     }
 
-    if (actual_level < HALFSPEED_LEVEL) {
-        // run at half speed
-        CLKPR = 1<<CLKPCE;
-        CLKPR = 1;
-    } else {
-        // run at full speed
-        CLKPR = 1<<CLKPCE;
-        CLKPR = 0;
-    }
-
     // turn LED on when we first enter the mode
     if (event == EV_enter_state) {
         // remember this level, unless it's moon or turbo
@@ -973,6 +963,15 @@ void loop() {
     #ifdef USE_IDLE_MODE
     else if ((state == steady_state)
             || (state == goodnight_state)) {
+        if (actual_level < HALFSPEED_LEVEL) {
+            // run at half speed
+            CLKPR = 1<<CLKPCE;
+            CLKPR = 1;
+        } else {
+            // run at full speed
+            CLKPR = 1<<CLKPCE;
+            CLKPR = 0;
+        }
         // doze until next clock tick
         idle_mode();
     }
-- 
cgit v1.2.3


From 608ea9202f71e6267058fcaa63c91a22fea963cf Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Mon, 25 Sep 2017 05:27:03 -0600
Subject: Dropped moon power another 0.5 mA. Fixed clock speed related
 brightness glitch when turning on at moon mode.

---
 spaghetti-monster/anduril/anduril.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 1cc9d7c..7833f4f 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -37,6 +37,7 @@
 #define USE_EEPROM
 #define EEPROM_BYTES 12
 #define USE_IDLE_MODE
+#define MOON_POWERSAVE  // cut clock speed at very low modes for better efficiency
 //#define HALFSPEED_LEVEL 30  // looks good, but sounds bad
 #define HALFSPEED_LEVEL 14
 #include "spaghetti-monster.h"
@@ -962,16 +963,21 @@ void loop() {
 
     #ifdef USE_IDLE_MODE
     else if ((state == steady_state)
+            || (state == off_state)
             || (state == goodnight_state)) {
-        if (actual_level < HALFSPEED_LEVEL) {
+        #ifdef MOON_POWERSAVE
+        if (actual_level < 5) {
+            // run at quarter speed
+            CLKPR = 1<<CLKPCE; CLKPR = 2;
+        }
+        else if (actual_level < HALFSPEED_LEVEL) {
             // run at half speed
-            CLKPR = 1<<CLKPCE;
-            CLKPR = 1;
+            CLKPR = 1<<CLKPCE; CLKPR = 1;
         } else {
             // run at full speed
-            CLKPR = 1<<CLKPCE;
-            CLKPR = 0;
+            CLKPR = 1<<CLKPCE; CLKPR = 0;
         }
+        #endif
         // doze until next clock tick
         idle_mode();
     }
-- 
cgit v1.2.3


From 491965697fc7f52f75cd737628349fd6a49a37c1 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Tue, 26 Sep 2017 15:19:58 -0600
Subject: Fixed moon in lockout state.  Was too low since the MCU wasn't
 underclocked.

---
 spaghetti-monster/anduril/anduril.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 7833f4f..1044398 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -962,9 +962,10 @@ void loop() {
     if (0) {}
 
     #ifdef USE_IDLE_MODE
-    else if ((state == steady_state)
+    else if (  (state == steady_state)
             || (state == off_state)
-            || (state == goodnight_state)) {
+            || (state == lockout_state)
+            || (state == goodnight_state)  ) {
         #ifdef MOON_POWERSAVE
         if (actual_level < 5) {
             // run at quarter speed
-- 
cgit v1.2.3


From 45e3a7758046536754f073c42ac27dc737e69fab Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Tue, 26 Sep 2017 16:47:44 -0600
Subject: Added dynamic underclocking to FSM, instead of doing it manually in
 Anduril.

---
 spaghetti-monster/anduril/anduril.c | 29 +++++------------------------
 spaghetti-monster/fsm-events.c      | 30 ++++++++++++++++++++++++++++++
 spaghetti-monster/fsm-misc.c        | 19 +++++++++++++++++++
 spaghetti-monster/fsm-misc.h        |  4 ++++
 spaghetti-monster/fsm-ramping.c     |  3 +++
 spaghetti-monster/fsm-ramping.h     |  2 ++
 6 files changed, 63 insertions(+), 24 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 1044398..6740e23 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -23,8 +23,6 @@
 #define USE_LVP
 #define USE_THERMAL_REGULATION
 #define DEFAULT_THERM_CEIL 50
-#define USE_DELAY_MS
-#define USE_DELAY_4MS
 #define USE_DELAY_ZERO
 #define USE_RAMPING
 #define USE_SET_LEVEL_GRADUALLY
@@ -37,9 +35,7 @@
 #define USE_EEPROM
 #define EEPROM_BYTES 12
 #define USE_IDLE_MODE
-#define MOON_POWERSAVE  // cut clock speed at very low modes for better efficiency
-//#define HALFSPEED_LEVEL 30  // looks good, but sounds bad
-#define HALFSPEED_LEVEL 14
+#define USE_DYNAMIC_UNDERCLOCKING  // cut clock speed at very low modes for better efficiency
 #include "spaghetti-monster.h"
 
 // Options specific to this UI (not inherited from SpaghettiMonster)
@@ -966,27 +962,12 @@ void loop() {
             || (state == off_state)
             || (state == lockout_state)
             || (state == goodnight_state)  ) {
-        #ifdef MOON_POWERSAVE
-        if (actual_level < 5) {
-            // run at quarter speed
-            CLKPR = 1<<CLKPCE; CLKPR = 2;
-        }
-        else if (actual_level < HALFSPEED_LEVEL) {
-            // run at half speed
-            CLKPR = 1<<CLKPCE; CLKPR = 1;
-        } else {
-            // run at full speed
-            CLKPR = 1<<CLKPCE; CLKPR = 0;
-        }
-        #endif
         // doze until next clock tick
         idle_mode();
     }
-    else {
-        // run at full speed
-        CLKPR = 1<<CLKPCE;
-        CLKPR = 0;
-    }
+    #endif
+    #ifdef USE_DYNAMIC_UNDERCLOCKING
+    auto_clock_speed();
     #endif
 
     if (state == strobe_state) {
@@ -995,7 +976,7 @@ void loop() {
             set_level(MAX_LEVEL);
             if (strobe_type == 0) {  // party strobe
                 if (strobe_delays[strobe_type] < 42) delay_zero();
-                else delay_ms(1);
+                else nice_delay_ms(1);
             } else {  //tactical strobe
                 nice_delay_ms(strobe_delays[strobe_type] >> 1);
             }
diff --git a/spaghetti-monster/fsm-events.c b/spaghetti-monster/fsm-events.c
index 5448feb..e965224 100644
--- a/spaghetti-monster/fsm-events.c
+++ b/spaghetti-monster/fsm-events.c
@@ -116,8 +116,26 @@ inline void interrupt_nice_delays() { nice_delay_interrupt = 1; }
 //   1: normal completion
 uint8_t nice_delay_ms(uint16_t ms) {
     StatePtr old_state = current_state;
+    /*  // delay_zero() implementation
+    if (ms == 0) {
+        CLKPR = 1<<CLKPCE; CLKPR = 0;  // full speed
+        _delay_loop_2(BOGOMIPS*98/100/3);
+        return 1;
+    }
+    */
     while(ms-- > 0) {
+        #ifdef USE_DYNAMIC_UNDERCLOCKING
+        // underclock MCU to save power
+        CLKPR = 1<<CLKPCE; CLKPR = 2;
+        // wait
+        _delay_loop_2(BOGOMIPS*98/100/4);
+        // restore regular clock speed
+        CLKPR = 1<<CLKPCE; CLKPR = 0;
+        #else
+        // wait
         _delay_loop_2(BOGOMIPS*98/100);
+        #endif
+
         process_emissions();
         if ((nice_delay_interrupt) || (old_state != current_state)) {
             nice_delay_interrupt = 0;
@@ -127,6 +145,18 @@ uint8_t nice_delay_ms(uint16_t ms) {
     return 1;
 }
 
+#ifdef USE_DYNAMIC_UNDERCLOCKING
+void delay_4ms(uint8_t ms) {
+    while(ms-- > 0) {
+        // underclock MCU to save power
+        CLKPR = 1<<CLKPCE; CLKPR = 2;
+        // wait
+        _delay_loop_2(BOGOMIPS*98/100);
+        // restore regular clock speed
+        CLKPR = 1<<CLKPCE; CLKPR = 0;
+    }
+}
+#endif
 /*
 uint8_t nice_delay_4ms(uint8_t ms) {
     return nice_delay_ms((uint16_t)ms << 2);
diff --git a/spaghetti-monster/fsm-misc.c b/spaghetti-monster/fsm-misc.c
index 5d28002..1b8f864 100644
--- a/spaghetti-monster/fsm-misc.c
+++ b/spaghetti-monster/fsm-misc.c
@@ -20,6 +20,25 @@
 #ifndef FSM_MISC_C
 #define FSM_MISC_C
 
+#ifdef USE_DYNAMIC_UNDERCLOCKING
+void auto_clock_speed() {
+    uint8_t level = actual_level;  // volatile, avoid repeat access
+    if (level < QUARTERSPEED_LEVEL) {
+        // run at quarter speed
+        // note: this only works when executed as two consecutive instructions
+        // (don't try to combine them or put other stuff between)
+        CLKPR = 1<<CLKPCE; CLKPR = 2;
+    }
+    else if (level < HALFSPEED_LEVEL) {
+        // run at half speed
+        CLKPR = 1<<CLKPCE; CLKPR = 1;
+    } else {
+        // run at full speed
+        CLKPR = 1<<CLKPCE; CLKPR = 0;
+    }
+}
+#endif
+
 #if defined(USE_BLINK_NUM) || defined(USE_BLINK_DIGIT)
 uint8_t blink_digit(uint8_t num) {
     //StatePtr old_state = current_state;
diff --git a/spaghetti-monster/fsm-misc.h b/spaghetti-monster/fsm-misc.h
index 58667a1..5e4f3d6 100644
--- a/spaghetti-monster/fsm-misc.h
+++ b/spaghetti-monster/fsm-misc.h
@@ -20,6 +20,10 @@
 #ifndef FSM_MISC_H
 #define FSM_MISC_H
 
+#ifdef USE_DYNAMIC_UNDERCLOCKING
+void auto_clock_speed();
+#endif
+
 #if defined(USE_BLINK_NUM) || defined(USE_BLINK_DIGIT)
 #ifndef BLINK_BRIGHTNESS
 #define BLINK_BRIGHTNESS (MAX_LEVEL/6)
diff --git a/spaghetti-monster/fsm-ramping.c b/spaghetti-monster/fsm-ramping.c
index cc5f486..11e56a5 100644
--- a/spaghetti-monster/fsm-ramping.c
+++ b/spaghetti-monster/fsm-ramping.c
@@ -57,6 +57,9 @@ void set_level(uint8_t level) {
         PWM4_LVL = pgm_read_byte(pwm4_levels + level);
         #endif
     }
+    #ifdef USE_DYNAMIC_UNDERCLOCKING
+    auto_clock_speed();
+    #endif
 }
 
 #ifdef USE_SET_LEVEL_GRADUALLY
diff --git a/spaghetti-monster/fsm-ramping.h b/spaghetti-monster/fsm-ramping.h
index 0914186..900630c 100644
--- a/spaghetti-monster/fsm-ramping.h
+++ b/spaghetti-monster/fsm-ramping.h
@@ -69,6 +69,8 @@ void gradual_tick();
     PROGMEM const uint8_t pwm1_levels[] = { 1,1,2,2,3,3,4,4,5,6,7,8,9,10,12,13,14,15,17,19,20,22,24,26,29,31,34,36,39,42,45,48,51,55,59,62,66,70,75,79,84,89,93,99,104,110,115,121,127,134,140,147,154,161,168,176,184,192,200,209,217,226,236,245,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0 };
     PROGMEM const uint8_t pwm2_levels[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,3,4,5,7,8,9,11,12,14,15,17,19,20,22,24,25,27,29,31,33,35,37,39,41,43,45,48,50,52,55,57,59,62,64,67,70,72,75,78,81,84,87,90,93,96,99,102,105,109,112,115,119,122,126,129,133,137,141,144,148,152,156,160,165,169,173,177,182,186,191,195,200,205,209,214,219,224,229,234,239,244,250,255 };
     #define MAX_1x7135 65
+    #define HALFSPEED_LEVEL 14
+    #define QUARTERSPEED_LEVEL 5
   #endif
 #elif PWM_CHANNELS == 3
   #if RAMP_LENGTH == 50
-- 
cgit v1.2.3


From da4033eeda5c71a75eb32471eb4c34b7e5d82890 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Tue, 26 Sep 2017 16:50:13 -0600
Subject: Er, set the clock speed *before* going idle, not after.  :)

---
 spaghetti-monster/anduril/anduril.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 6740e23..9751296 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -955,6 +955,10 @@ void loop() {
 
     StatePtr state = current_state;
 
+    #ifdef USE_DYNAMIC_UNDERCLOCKING
+    auto_clock_speed();
+    #endif
+
     if (0) {}
 
     #ifdef USE_IDLE_MODE
@@ -966,9 +970,6 @@ void loop() {
         idle_mode();
     }
     #endif
-    #ifdef USE_DYNAMIC_UNDERCLOCKING
-    auto_clock_speed();
-    #endif
 
     if (state == strobe_state) {
         // party / tactical strobe
-- 
cgit v1.2.3


From 6d729119a06180e6ee9d53056013273ae0bdbe03 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Thu, 28 Sep 2017 15:29:10 -0600
Subject: Adjusted bike flasher floor and ceiling: - floor high enough to make
 sure it always blinks - ceiling can be higher than halfway up the ramp

---
 spaghetti-monster/anduril/anduril.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 9751296..5a6b6e0 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -27,6 +27,7 @@
 #define USE_RAMPING
 #define USE_SET_LEVEL_GRADUALLY
 #define RAMP_LENGTH 150
+#define MAX_BIKING_LEVEL 120  // should be 127 or less
 #define BLINK_AT_RAMP_BOUNDARIES
 //#define BLINK_AT_RAMP_FLOOR
 #define USE_BATTCHECK
@@ -414,7 +415,7 @@ uint8_t strobe_state(EventPtr event, uint16_t arg) {
         }
         // biking mode brighter
         else if (strobe_type == 3) {
-            if (bike_flasher_brightness < MAX_LEVEL/2)
+            if (bike_flasher_brightness < MAX_BIKING_LEVEL)
                 bike_flasher_brightness ++;
             set_level(bike_flasher_brightness);
         }
@@ -430,7 +431,7 @@ uint8_t strobe_state(EventPtr event, uint16_t arg) {
         }
         // biking mode dimmer
         else if (strobe_type == 3) {
-            if (bike_flasher_brightness > 1)
+            if (bike_flasher_brightness > 2)
                 bike_flasher_brightness --;
             set_level(bike_flasher_brightness);
         }
@@ -958,7 +959,6 @@ void loop() {
     #ifdef USE_DYNAMIC_UNDERCLOCKING
     auto_clock_speed();
     #endif
-
     if (0) {}
 
     #ifdef USE_IDLE_MODE
@@ -1034,6 +1034,7 @@ void loop() {
         // bike flasher
         else if (strobe_type == 3) {
             uint8_t burst = bike_flasher_brightness << 1;
+            if (burst > MAX_LEVEL) burst = MAX_LEVEL;
             for(uint8_t i=0; i<4; i++) {
                 set_level(burst);
                 if (! nice_delay_ms(5)) return;
-- 
cgit v1.2.3


From 3507d67ee4499a56fb5a38723c00486b19b70c45 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Thu, 28 Sep 2017 16:08:27 -0600
Subject: Fleshed out options to blink at floor, ceiling, and channel
 boundaries.

---
 spaghetti-monster/anduril/anduril.c | 50 ++++++++++++++++++++++++-------------
 1 file changed, 32 insertions(+), 18 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 5a6b6e0..a47e284 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -28,8 +28,9 @@
 #define USE_SET_LEVEL_GRADUALLY
 #define RAMP_LENGTH 150
 #define MAX_BIKING_LEVEL 120  // should be 127 or less
-#define BLINK_AT_RAMP_BOUNDARIES
+#define BLINK_AT_CHANNEL_BOUNDARIES
 //#define BLINK_AT_RAMP_FLOOR
+#define BLINK_AT_RAMP_CEILING
 #define USE_BATTCHECK
 #define BATTCHECK_VpT
 #define MAX_CLICKS 5
@@ -289,14 +290,22 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         #ifdef USE_THERMAL_REGULATION
         target_level = memorized_level;
         #endif
-        #ifdef BLINK_AT_RAMP_BOUNDARIES
+        #if defined(BLINK_AT_RAMP_CEILING) || defined(BLINK_AT_CHANNEL_BOUNDARIES)
         // only blink once for each threshold
-        if ((memorized_level != actual_level)
-                && ((memorized_level == MAX_1x7135)
-                    #if PWM_CHANNELS >= 3
-                    || (memorized_level == MAX_Nx7135)
-                    #endif
-                    || (memorized_level == mode_max))) {
+        if ((memorized_level != actual_level) && (
+                #ifdef BLINK_AT_CHANNEL_BOUNDARIES
+                (memorized_level == MAX_1x7135)
+                #if PWM_CHANNELS >= 3
+                || (memorized_level == MAX_Nx7135)
+                #endif
+                #ifdef BLINK_AT_RAMP_CEILING
+                ||
+                #endif
+                #endif
+                #ifdef BLINK_AT_RAMP_CEILING
+                (memorized_level == mode_max)
+                #endif
+                )) {
             set_level(0);
             delay_4ms(8/4);
         }
@@ -315,17 +324,22 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         #ifdef USE_THERMAL_REGULATION
         target_level = memorized_level;
         #endif
-        #ifdef BLINK_AT_RAMP_BOUNDARIES
+        #if defined(BLINK_AT_RAMP_FLOOR) || defined(BLINK_AT_CHANNEL_BOUNDARIES)
         // only blink once for each threshold
-        if ((memorized_level != actual_level)
-                && ((memorized_level == MAX_1x7135)
-                    #if PWM_CHANNELS >= 3
-                    || (memorized_level == MAX_Nx7135)
-                    #endif
-                    #ifdef BLINK_AT_RAMP_FLOOR
-                    || (memorized_level == mode_min)
-                    #endif
-                    )) {
+        if ((memorized_level != actual_level) && (
+                #ifdef BLINK_AT_CHANNEL_BOUNDARIES
+                (memorized_level == MAX_1x7135)
+                #if PWM_CHANNELS >= 3
+                || (memorized_level == MAX_Nx7135)
+                #endif
+                #ifdef BLINK_AT_RAMP_FLOOR
+                ||
+                #endif
+                #endif
+                #ifdef BLINK_AT_RAMP_FLOOR
+                (memorized_level == mode_min)
+                #endif
+                )) {
             set_level(0);
             delay_4ms(8/4);
         }
-- 
cgit v1.2.3


From 8d8e9df4331f48fba51eb5f169ac904fba42cc9d Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Thu, 28 Sep 2017 16:12:57 -0600
Subject: Fixed issue where double-click-from-off followed by
 double-click-to-true-turbo would overwrite memory with the ceiling level.

---
 spaghetti-monster/anduril/anduril.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index a47e284..ab7d16d 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -249,7 +249,6 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
     // 2 clicks: go to/from highest level
     else if (event == EV_2clicks) {
         if (actual_level < MAX_LEVEL) {
-            memorized_level = actual_level;  // in case we're on moon
             #ifdef USE_THERMAL_REGULATION
             target_level = MAX_LEVEL;
             #endif
-- 
cgit v1.2.3


From 3a7c25ceaccaeca36c2ba5db2deba975ec54aa68 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Thu, 28 Sep 2017 16:25:18 -0600
Subject: Rearranged some build options and made sure the build still works if
 some are turned off.

---
 spaghetti-monster/anduril/anduril.c | 41 +++++++++++++++++++++++++++----------
 spaghetti-monster/fsm-standby.c     |  2 ++
 2 files changed, 32 insertions(+), 11 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index ab7d16d..010f060 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -18,21 +18,29 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/********* User-configurable options *********/
+// Physical driver type
 #define FSM_EMISAR_D4_DRIVER
 //#define FSM_FW3A_DRIVER
+
 #define USE_LVP
 #define USE_THERMAL_REGULATION
 #define DEFAULT_THERM_CEIL 50
-#define USE_DELAY_ZERO
-#define USE_RAMPING
 #define USE_SET_LEVEL_GRADUALLY
-#define RAMP_LENGTH 150
-#define MAX_BIKING_LEVEL 120  // should be 127 or less
 #define BLINK_AT_CHANNEL_BOUNDARIES
 //#define BLINK_AT_RAMP_FLOOR
 #define BLINK_AT_RAMP_CEILING
-#define USE_BATTCHECK
 #define BATTCHECK_VpT
+#define USE_LIGHTNING_MODE
+#define GOODNIGHT_TIME  60  // minutes (approximately)
+#define GOODNIGHT_LEVEL 24  // ~11 lm
+
+/********* Configure SpaghettiMonster *********/
+#define USE_DELAY_ZERO
+#define USE_RAMPING
+#define RAMP_LENGTH 150
+#define MAX_BIKING_LEVEL 120  // should be 127 or less
+#define USE_BATTCHECK
 #define MAX_CLICKS 5
 #define USE_EEPROM
 #define EEPROM_BYTES 12
@@ -40,11 +48,6 @@
 #define USE_DYNAMIC_UNDERCLOCKING  // cut clock speed at very low modes for better efficiency
 #include "spaghetti-monster.h"
 
-// Options specific to this UI (not inherited from SpaghettiMonster)
-#define USE_LIGHTNING_MODE
-// set this a bit high, since the bottom 2 ramp levels might not emit any light at all
-#define GOODNIGHT_TIME  65  // minutes (approximately)
-#define GOODNIGHT_LEVEL 24  // ~11 lm
 
 // FSM states
 uint8_t off_state(EventPtr event, uint16_t arg);
@@ -60,6 +63,8 @@ uint8_t strobe_state(EventPtr event, uint16_t arg);
 #endif
 #ifdef USE_BATTCHECK
 uint8_t battcheck_state(EventPtr event, uint16_t arg);
+#endif
+#ifdef USE_THERMAL_REGULATION
 uint8_t tempcheck_state(EventPtr event, uint16_t arg);
 uint8_t thermal_config_state(EventPtr event, uint16_t arg);
 #endif
@@ -481,7 +486,9 @@ uint8_t battcheck_state(EventPtr event, uint16_t arg) {
     }
     return EVENT_NOT_HANDLED;
 }
+#endif
 
+#ifdef USE_THERMAL_REGULATION
 uint8_t tempcheck_state(EventPtr event, uint16_t arg) {
     // 1 click: off
     if (event == EV_1click) {
@@ -511,7 +518,11 @@ uint8_t beacon_state(EventPtr event, uint16_t arg) {
     }
     // 2 clicks: tempcheck mode
     else if (event == EV_2clicks) {
+        #ifdef USE_THERMAL_REGULATION
         set_state(tempcheck_state, 0);
+        #else
+        set_state(battcheck_state, 0);
+        #endif
         return MISCHIEF_MANAGED;
     }
     // 3 clicks: beacon config mode
@@ -704,6 +715,7 @@ uint8_t ramp_config_state(EventPtr event, uint16_t arg) {
 }
 
 
+#ifdef USE_THERMAL_REGULATION
 uint8_t thermal_config_state(EventPtr event, uint16_t arg) {
     static uint8_t done = 0;
     if (event == EV_enter_state) {
@@ -729,6 +741,7 @@ uint8_t thermal_config_state(EventPtr event, uint16_t arg) {
     }
     return EVENT_NOT_HANDLED;
 }
+#endif
 
 
 uint8_t beacon_config_state(EventPtr event, uint16_t arg) {
@@ -910,7 +923,9 @@ void load_config() {
         strobe_delays[1] = eeprom[8];
         bike_flasher_brightness = eeprom[9];
         beacon_seconds = eeprom[10];
+        #ifdef USE_THERMAL_REGULATION
         therm_ceil = eeprom[11];
+        #endif
     }
 }
 
@@ -926,7 +941,9 @@ void save_config() {
     eeprom[8] = strobe_delays[1];
     eeprom[9] = bike_flasher_brightness;
     eeprom[10] = beacon_seconds;
+    #ifdef USE_THERMAL_REGULATION
     eeprom[11] = therm_ceil;
+    #endif
 
     save_eeprom();
 }
@@ -1062,11 +1079,13 @@ void loop() {
     else if (state == battcheck_state) {
         battcheck();
     }
+    #endif
+    #ifdef USE_THERMAL_REGULATION
+    // TODO: blink out therm_ceil during thermal_config_state
     else if (state == tempcheck_state) {
         blink_num(temperature>>2);
         nice_delay_ms(1000);
     }
-    // TODO: blink out therm_ceil during thermal_config_state
     #endif
 
     else if (state == beacon_state) {
diff --git a/spaghetti-monster/fsm-standby.c b/spaghetti-monster/fsm-standby.c
index 5312f94..5ef666f 100644
--- a/spaghetti-monster/fsm-standby.c
+++ b/spaghetti-monster/fsm-standby.c
@@ -50,8 +50,10 @@ void sleep_until_eswitch_pressed()
     // something happened; wake up
     sleep_disable();
 
+    #ifdef USE_THERMAL_REGULATION
     // forget what the temperature was last time we were on
     reset_thermal_history = 1;
+    #endif
 
     // go back to normal running mode
     //PCINT_on();  // should be on already
-- 
cgit v1.2.3


From 2ec533abd4592958bef3ec818870e3fb41b64b29 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Thu, 28 Sep 2017 17:03:58 -0600
Subject: Added reversing to Anduril.  Made EV_tick always send 0 while in
 "hold" state. Reversing is a build-time option.

---
 spaghetti-monster/anduril/anduril.c | 34 ++++++++++++++++++++++++++++++++--
 spaghetti-monster/fsm-wdt.c         | 11 ++++++++---
 2 files changed, 40 insertions(+), 5 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 010f060..6e7b0b9 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -34,6 +34,7 @@
 #define USE_LIGHTNING_MODE
 #define GOODNIGHT_TIME  60  // minutes (approximately)
 #define GOODNIGHT_LEVEL 24  // ~11 lm
+#define USE_REVERSING
 
 /********* Configure SpaghettiMonster *********/
 #define USE_DELAY_ZERO
@@ -228,6 +229,9 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
     uint8_t mode_min = ramp_smooth_floor;
     uint8_t mode_max = ramp_smooth_ceil;
     uint8_t ramp_step_size = 1;
+    #ifdef USE_REVERSING
+    static int8_t ramp_direction = 1;
+    #endif
     if (ramp_style) {
         mode_min = ramp_discrete_floor;
         mode_max = ramp_discrete_ceil;
@@ -289,8 +293,16 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         if (ramp_style  &&  (arg % HOLD_TIMEOUT != 0)) {
             return MISCHIEF_MANAGED;
         }
-        // TODO? make it ramp down instead, if already at max?
+        #ifdef USE_REVERSING
+        // make it ramp down instead, if already at max
+        if ((arg <= 1) && (actual_level >= mode_max)) {
+            ramp_direction = -1;
+        }
+        memorized_level = nearest_level((int16_t)actual_level \
+                          + (ramp_step_size * ramp_direction));
+        #else
         memorized_level = nearest_level((int16_t)actual_level + ramp_step_size);
+        #endif
         #ifdef USE_THERMAL_REGULATION
         target_level = memorized_level;
         #endif
@@ -309,6 +321,9 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
                 #ifdef BLINK_AT_RAMP_CEILING
                 (memorized_level == mode_max)
                 #endif
+                #if defined(USE_REVERSING) && defined(BLINK_AT_RAMP_FLOOR)
+                || (memorized_level == mode_min)
+                #endif
                 )) {
             set_level(0);
             delay_4ms(8/4);
@@ -317,8 +332,17 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         set_level(memorized_level);
         return MISCHIEF_MANAGED;
     }
+    #ifdef USE_REVERSING
+    // reverse ramp direction on hold release
+    else if (event == EV_click1_hold_release) {
+        ramp_direction = -ramp_direction;
+    }
+    #endif
     // click, hold: change brightness (dimmer)
     else if (event == EV_click2_hold) {
+        #ifdef USE_REVERSING
+        ramp_direction = 1;
+        #endif
         // ramp slower in discrete mode
         if (ramp_style  &&  (arg % HOLD_TIMEOUT != 0)) {
             return MISCHIEF_MANAGED;
@@ -351,11 +375,17 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         set_level(memorized_level);
         return MISCHIEF_MANAGED;
     }
-    #ifdef USE_SET_LEVEL_GRADUALLY
+    #if defined(USE_SET_LEVEL_GRADUALLY) || defined(USE_REVERSING)
     else if (event == EV_tick) {
+        #ifdef USE_SET_LEVEL_GRADUALLY
         if (!(arg & 7)) gradual_tick();
         //if (!(arg & 3)) gradual_tick();
         //gradual_tick();
+        #endif
+        #ifdef USE_REVERSING
+        // un-reverse after 1 second
+        if (arg == TICKS_PER_SECOND) ramp_direction = 1;
+        #endif
         return MISCHIEF_MANAGED;
     }
     #endif
diff --git a/spaghetti-monster/fsm-wdt.c b/spaghetti-monster/fsm-wdt.c
index afcf467..7cbe0d2 100644
--- a/spaghetti-monster/fsm-wdt.c
+++ b/spaghetti-monster/fsm-wdt.c
@@ -50,9 +50,6 @@ ISR(WDT_vect) {
     ticks_since_last_event = (ticks_since_last_event + 1) \
                              | (ticks_since_last_event & 0x8000);
 
-    // callback on each timer tick
-    emit(EV_tick, ticks_since_last_event);
-
     // if time since last event exceeds timeout,
     // append timeout to current event sequence, then
     // send event to current state callback
@@ -64,6 +61,14 @@ ISR(WDT_vect) {
     if (le_num >= 1) last_event = current_event[le_num-1];
     if (le_num >= 2) prev_event = current_event[le_num-2];
 
+    // callback on each timer tick
+    if (last_event == A_HOLD) {
+        emit(EV_tick, 0);  // override tick counter while holding button
+    }
+    else {
+        emit(EV_tick, ticks_since_last_event);
+    }
+
     // user held button long enough to count as a long click?
     if (last_event == A_PRESS) {
         if (ticks_since_last_event >= HOLD_TIMEOUT) {
-- 
cgit v1.2.3


From 9678f9ea82d44de0ce52184de2ab7ee6fd1b7cb2 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Thu, 28 Sep 2017 20:10:09 -0600
Subject: Make sure hold-from-off ramps up, not down.

---
 spaghetti-monster/anduril/anduril.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 6e7b0b9..89712fe 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -248,6 +248,9 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         target_level = arg;
         #endif
         set_level(nearest_level(arg));
+        #ifdef USE_REVERSING
+        ramp_direction = 1;
+        #endif
         return MISCHIEF_MANAGED;
     }
     // 1 click: off
-- 
cgit v1.2.3


From 976c5724bf0a3ddbe6d4b385841a0a5bf38f4b25 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Fri, 29 Sep 2017 17:31:10 -0600
Subject: Added option to start at memorized level, for momentary use on
 dual-switch lights. Renamed WL versions of eeprom functions, for naming
 consistency.

---
 spaghetti-monster/anduril/anduril.c | 46 ++++++++++++++++++++++++++++++++++++-
 spaghetti-monster/fsm-eeprom.c      |  4 ++--
 spaghetti-monster/fsm-eeprom.h      |  4 ++--
 3 files changed, 49 insertions(+), 5 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 89712fe..84cc27c 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -35,6 +35,7 @@
 #define GOODNIGHT_TIME  60  // minutes (approximately)
 #define GOODNIGHT_LEVEL 24  // ~11 lm
 #define USE_REVERSING
+//#define START_AT_MEMORIZED_LEVEL
 
 /********* Configure SpaghettiMonster *********/
 #define USE_DELAY_ZERO
@@ -45,6 +46,10 @@
 #define MAX_CLICKS 5
 #define USE_EEPROM
 #define EEPROM_BYTES 12
+#ifdef START_AT_MEMORIZED_LEVEL
+#define USE_EEPROM_WL
+#define EEPROM_WL_BYTES 1
+#endif
 #define USE_IDLE_MODE
 #define USE_DYNAMIC_UNDERCLOCKING  // cut clock speed at very low modes for better efficiency
 #include "spaghetti-monster.h"
@@ -90,6 +95,9 @@ void blink_confirm(uint8_t num);
 // remember stuff even after battery was changed
 void load_config();
 void save_config();
+#ifdef START_AT_MEMORIZED_LEVEL
+void save_config_wl();
+#endif
 
 // brightness control
 uint8_t memorized_level = MAX_1x7135;
@@ -280,6 +288,9 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         ramp_style ^= 1;
         memorized_level = nearest_level(memorized_level);
         save_config();
+        #ifdef START_AT_MEMORIZED_LEVEL
+        save_config_wl();
+        #endif
         set_level(0);
         delay_4ms(20/4);
         set_level(memorized_level);
@@ -335,10 +346,16 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         set_level(memorized_level);
         return MISCHIEF_MANAGED;
     }
-    #ifdef USE_REVERSING
+    #if defined(USE_REVERSING) || defined(START_AT_MEMORIZED_LEVEL)
     // reverse ramp direction on hold release
     else if (event == EV_click1_hold_release) {
+        #ifdef USE_REVERSING
         ramp_direction = -ramp_direction;
+        #endif
+        #ifdef START_AT_MEMORIZED_LEVEL
+        save_config_wl();
+        #endif
+        return MISCHIEF_MANAGED;
     }
     #endif
     // click, hold: change brightness (dimmer)
@@ -378,6 +395,13 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         set_level(memorized_level);
         return MISCHIEF_MANAGED;
     }
+    #ifdef START_AT_MEMORIZED_LEVEL
+    // click, release, hold, release: save new ramp level (if necessary)
+    else if (event == EV_click2_hold_release) {
+        save_config_wl();
+        return MISCHIEF_MANAGED;
+    }
+    #endif
     #if defined(USE_SET_LEVEL_GRADUALLY) || defined(USE_REVERSING)
     else if (event == EV_tick) {
         #ifdef USE_SET_LEVEL_GRADUALLY
@@ -960,6 +984,11 @@ void load_config() {
         therm_ceil = eeprom[11];
         #endif
     }
+    #ifdef START_AT_MEMORIZED_LEVEL
+    if (load_eeprom_wl()) {
+        memorized_level = eeprom_wl[0];
+    }
+    #endif
 }
 
 void save_config() {
@@ -981,6 +1010,12 @@ void save_config() {
     save_eeprom();
 }
 
+#ifdef START_AT_MEMORIZED_LEVEL
+void save_config_wl() {
+    eeprom_wl[0] = memorized_level;
+    save_eeprom_wl();
+}
+#endif
 
 void low_voltage() {
     // "step down" from strobe to something low
@@ -1004,6 +1039,14 @@ void low_voltage() {
 
 
 void setup() {
+    #ifdef START_AT_MEMORIZED_LEVEL
+    // dual switch: e-switch + power clicky
+    // power clicky acts as a momentary mode
+    load_config();
+    push_state(steady_state, memorized_level);
+
+    #else
+
     // blink at power-on to let user know power is connected
     set_level(RAMP_SIZE/8);
     delay_4ms(3);
@@ -1012,6 +1055,7 @@ void setup() {
     load_config();
 
     push_state(off_state, 0);
+    #endif
 }
 
 
diff --git a/spaghetti-monster/fsm-eeprom.c b/spaghetti-monster/fsm-eeprom.c
index e464785..45cd3fa 100644
--- a/spaghetti-monster/fsm-eeprom.c
+++ b/spaghetti-monster/fsm-eeprom.c
@@ -55,7 +55,7 @@ void save_eeprom() {
 uint8_t eeprom_wl[EEPROM_WL_BYTES];
 EEP_OFFSET_T eep_wl_prev_offset;
 
-uint8_t load_wl_eeprom() {
+uint8_t load_eeprom_wl() {
     cli();
     // check if eeprom has been initialized; abort if it hasn't
     uint8_t found = 0;
@@ -80,7 +80,7 @@ uint8_t load_wl_eeprom() {
     return found;
 }
 
-void save_wl_eeprom() {
+void save_eeprom_wl() {
     cli();
     // erase old state
     EEP_OFFSET_T offset = eep_wl_prev_offset;
diff --git a/spaghetti-monster/fsm-eeprom.h b/spaghetti-monster/fsm-eeprom.h
index c35c822..b6e1aea 100644
--- a/spaghetti-monster/fsm-eeprom.h
+++ b/spaghetti-monster/fsm-eeprom.h
@@ -47,8 +47,8 @@ void save_eeprom();
 #error Requested EEPROM_WL_BYTES too big.
 #endif
 uint8_t eeprom_wl[EEPROM_WL_BYTES];
-uint8_t load_wl_eeprom();  // returns 1 for success, 0 for no data found
-void save_wl_eeprom();
+uint8_t load_eeprom_wl();  // returns 1 for success, 0 for no data found
+void save_eeprom_wl();
 #define EEP_WL_SIZE (EEPSIZE/2)
 #endif
 
-- 
cgit v1.2.3


From 6affa025b829b2d7b212fdf42f6d85aac7a00367 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Fri, 29 Sep 2017 17:37:16 -0600
Subject: Made dual-switch startup optionally go to moon if e-switch is held.

---
 spaghetti-monster/anduril/anduril.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 84cc27c..1fdf457 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -1043,7 +1043,12 @@ void setup() {
     // dual switch: e-switch + power clicky
     // power clicky acts as a momentary mode
     load_config();
-    push_state(steady_state, memorized_level);
+    if (button_is_pressed())
+        // hold button to go to moon
+        push_state(steady_state, 1);
+    else
+        // otherwise use memory
+        push_state(steady_state, memorized_level);
 
     #else
 
-- 
cgit v1.2.3


From 4a640e385f63e747adfafafa450335d9eb0526ab Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sun, 1 Oct 2017 18:19:34 -0600
Subject: Use either full or quarter speed in nice delays, based on output
 level. This fixes issues with some blinky modes being audible (particularly
 biking and lightning modes), without sacrificing the power savings for other
 blinkies (like beacon and battcheck).

---
 spaghetti-monster/fsm-events.c | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/fsm-events.c b/spaghetti-monster/fsm-events.c
index e965224..b8e9018 100644
--- a/spaghetti-monster/fsm-events.c
+++ b/spaghetti-monster/fsm-events.c
@@ -125,16 +125,34 @@ uint8_t nice_delay_ms(uint16_t ms) {
     */
     while(ms-- > 0) {
         #ifdef USE_DYNAMIC_UNDERCLOCKING
+        #ifdef USE_RAMPING
+        uint8_t level = actual_level;  // volatile, avoid repeat access
+        if (level < QUARTERSPEED_LEVEL) {
+            CLKPR = 1<<CLKPCE; CLKPR = 2;
+            _delay_loop_2(BOGOMIPS*98/100/4);
+        }
+        //else if (level < HALFSPEED_LEVEL) {
+        //    CLKPR = 1<<CLKPCE; CLKPR = 1;
+        //    _delay_loop_2(BOGOMIPS*98/100/2);
+        //}
+        else {
+            CLKPR = 1<<CLKPCE; CLKPR = 0;
+            _delay_loop_2(BOGOMIPS*98/100);
+        }
+        // restore regular clock speed
+        CLKPR = 1<<CLKPCE; CLKPR = 0;
+        #else
         // underclock MCU to save power
         CLKPR = 1<<CLKPCE; CLKPR = 2;
         // wait
         _delay_loop_2(BOGOMIPS*98/100/4);
         // restore regular clock speed
         CLKPR = 1<<CLKPCE; CLKPR = 0;
+        #endif  // ifdef USE_RAMPING
         #else
         // wait
         _delay_loop_2(BOGOMIPS*98/100);
-        #endif
+        #endif  // ifdef USE_DYNAMIC_UNDERCLOCKING
 
         process_emissions();
         if ((nice_delay_interrupt) || (old_state != current_state)) {
-- 
cgit v1.2.3


From 37ce9f609ee5dbaf8125815d84fe17ed3fc30a3f Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Fri, 6 Oct 2017 00:33:32 -0600
Subject: Temperature is 14.1 now, now 13.2.  Divide by 2 instead of 4 before
 display.

---
 spaghetti-monster/anduril/anduril.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 1fdf457..e2e77ef 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -1165,7 +1165,7 @@ void loop() {
     #ifdef USE_THERMAL_REGULATION
     // TODO: blink out therm_ceil during thermal_config_state
     else if (state == tempcheck_state) {
-        blink_num(temperature>>2);
+        blink_num(temperature>>1);
         nice_delay_ms(1000);
     }
     #endif
-- 
cgit v1.2.3


From c3ade0cf9b7f344be2fcf14c1ba05cf49eded954 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Fri, 6 Oct 2017 00:34:34 -0600
Subject: Made HOLD_TIMEOUT and RELEASE_TIMEOUT define-able in the UI code.

---
 spaghetti-monster/fsm-events.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/fsm-events.h b/spaghetti-monster/fsm-events.h
index 074b459..453ad0b 100644
--- a/spaghetti-monster/fsm-events.h
+++ b/spaghetti-monster/fsm-events.h
@@ -46,8 +46,12 @@ uint8_t current_event[EV_MAX_LEN];
 static volatile uint16_t ticks_since_last_event = 0;
 
 // timeout durations in ticks (each tick 1/60th s)
+#ifndef HOLD_TIMEOUT
 #define HOLD_TIMEOUT 24
+#endif
+#ifndef RELEASE_TIMEOUT
 #define RELEASE_TIMEOUT 24
+#endif
 
 #define A_ENTER_STATE     1
 #define A_LEAVE_STATE     2
-- 
cgit v1.2.3


From 56316ceb551bc807fc1c20a2344a4b09e99e5c4c Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Fri, 6 Oct 2017 00:35:08 -0600
Subject: Updated more temperature bits to be 14.1 instead of 13.2.

---
 spaghetti-monster/fsm-adc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/fsm-adc.c b/spaghetti-monster/fsm-adc.c
index 5be3061..839fba8 100644
--- a/spaghetti-monster/fsm-adc.c
+++ b/spaghetti-monster/fsm-adc.c
@@ -151,10 +151,10 @@ ISR(ADC_vect) {
             for(uint8_t i=0; i<NUM_THERMAL_VALUES; i++)
                 temperature_values[i] = temp;
             for(uint8_t i=0; i<NUM_THERMAL_VALUES_HISTORY; i++)
-                temperature_history[i] = temp<<2;
+                temperature_history[i] = temp<<1;
             for(uint8_t i=0; i<NUM_THERMAL_PROJECTED_HISTORY; i++)
-                projected_temperature_history[i] = temp<<2;
-            temperature = temp<<2;
+                projected_temperature_history[i] = temp<<1;
+            temperature = temp<<1;
         } else {  // update our current temperature estimate
             uint8_t i;
             int16_t total=0;
-- 
cgit v1.2.3


From cc1b10ffcf23c74bb7d7853214f99c0632b66e03 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Fri, 20 Oct 2017 04:05:35 -0600
Subject: Added Q8 indicator LED support to Anduril. Includes options for
 off/low/high during regular operation and during lockout mode (two different
 settings).

---
 spaghetti-monster/anduril/anduril.c | 77 +++++++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index e2e77ef..59d27e5 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -36,6 +36,7 @@
 #define GOODNIGHT_LEVEL 24  // ~11 lm
 #define USE_REVERSING
 //#define START_AT_MEMORIZED_LEVEL
+#define USE_INDICATOR_LED
 
 /********* Configure SpaghettiMonster *********/
 #define USE_DELAY_ZERO
@@ -45,7 +46,13 @@
 #define USE_BATTCHECK
 #define MAX_CLICKS 5
 #define USE_EEPROM
+#ifdef USE_INDICATOR_LED
+#define EEPROM_BYTES 13
+#elif defined(USE_THERMAL_REGULATION)
 #define EEPROM_BYTES 12
+#else
+#define EEPROM_BYTES 11
+#endif
 #ifdef START_AT_MEMORIZED_LEVEL
 #define USE_EEPROM_WL
 #define EEPROM_WL_BYTES 1
@@ -92,6 +99,10 @@ volatile uint8_t number_entry_value;
 
 void blink_confirm(uint8_t num);
 
+#ifdef USE_INDICATOR_LED
+void indicator_led(uint8_t lvl);
+#endif
+
 // remember stuff even after battery was changed
 void load_config();
 void save_config();
@@ -115,6 +126,14 @@ volatile uint8_t ramp_discrete_floor = 20;
 volatile uint8_t ramp_discrete_steps = 7;
 uint8_t ramp_discrete_step_size;  // don't set this
 
+#ifdef USE_INDICATOR_LED
+// bits 2-3 control lockout mode
+// bits 0-1 control "off" mode
+// modes are: 0=off, 1=low, 2=high
+// (TODO: 3=blinking)
+uint8_t indicator_led_mode = (1<<2) + 2;
+#endif
+
 // calculate the nearest ramp level which would be valid at the moment
 // (is a no-op for smooth ramp, but limits discrete ramp to only the
 // correct levels for the user's config)
@@ -146,6 +165,9 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
     // turn emitter off when entering state
     if (event == EV_enter_state) {
         set_level(0);
+        #ifdef USE_INDICATOR_LED
+        indicator_led(indicator_led_mode & 0x03);
+        #endif
         // sleep while off  (lower power use)
         go_to_standby = 1;
         ticks_spent_awake = 0;
@@ -658,14 +680,41 @@ uint8_t lockout_state(EventPtr event, uint16_t arg) {
     // (allow staying awake long enough to exit, but otherwise
     //  be persistent about going back to sleep every few seconds
     //  even if the user keeps pressing the button)
+    #ifdef USE_INDICATOR_LED
+    if (event == EV_enter_state) {
+        indicator_led(indicator_led_mode >> 2);
+    } else
+    #endif
     if (event == EV_tick) {
         ticks_spent_awake ++;
         if (ticks_spent_awake > 180) {
             ticks_spent_awake = 0;
             go_to_standby = 1;
+            #ifdef USE_INDICATOR_LED
+            indicator_led(indicator_led_mode >> 2);
+            #endif
         }
         return MISCHIEF_MANAGED;
     }
+    #ifdef USE_INDICATOR_LED
+    // 3 clicks: rotate through indicator LED modes (lockout mode)
+    else if (event == EV_3clicks) {
+        uint8_t mode = indicator_led_mode >> 2;
+        mode = (mode + 1) % 3;
+        indicator_led_mode = (mode << 2) + (indicator_led_mode & 0x03);
+        indicator_led(mode);
+        save_config();
+        return MISCHIEF_MANAGED;
+    }
+    // 3 clicks: rotate through indicator LED modes (off mode)
+    else if (event == EV_click3_hold) {
+        uint8_t mode = (arg >> 5) % 3;
+        indicator_led_mode = (indicator_led_mode & 0b11111100) | mode;
+        indicator_led(mode);
+        save_config();
+        return MISCHIEF_MANAGED;
+    }
+    #endif
     // 4 clicks: exit
     else if (event == EV_4clicks) {
         blink_confirm(1);
@@ -967,6 +1016,26 @@ uint8_t pseudo_rand() {
 #endif
 
 
+#ifdef USE_INDICATOR_LED
+void indicator_led(uint8_t lvl) {
+    switch (lvl) {
+        case 0:  // indicator off
+            DDRB &= 0xff ^ (1 << AUXLED_PIN);
+            PORTB &= 0xff ^ (1 << AUXLED_PIN);
+            break;
+        case 1:  // indicator low
+            DDRB &= 0xff ^ (1 << AUXLED_PIN);
+            PORTB |= (1 << AUXLED_PIN);
+            break;
+        default:  // indicator high
+            DDRB |= (1 << AUXLED_PIN);
+            PORTB |= (1 << AUXLED_PIN);
+            break;
+    }
+}
+#endif  // USE_INDICATOR_LED
+
+
 void load_config() {
     if (load_eeprom()) {
         ramp_style = eeprom[0];
@@ -983,6 +1052,9 @@ void load_config() {
         #ifdef USE_THERMAL_REGULATION
         therm_ceil = eeprom[11];
         #endif
+        #ifdef USE_INDICATOR_LED
+        indicator_led_mode = eeprom[12];
+        #endif
     }
     #ifdef START_AT_MEMORIZED_LEVEL
     if (load_eeprom_wl()) {
@@ -1006,6 +1078,9 @@ void save_config() {
     #ifdef USE_THERMAL_REGULATION
     eeprom[11] = therm_ceil;
     #endif
+    #ifdef USE_INDICATOR_LED
+    eeprom[12] = indicator_led_mode;
+    #endif
 
     save_eeprom();
 }
@@ -1061,6 +1136,7 @@ void setup() {
 
     push_state(off_state, 0);
     #endif
+
 }
 
 
@@ -1087,6 +1163,7 @@ void loop() {
         // party / tactical strobe
         if (strobe_type < 2) {
             set_level(MAX_LEVEL);
+            CLKPR = 1<<CLKPCE; CLKPR = 0;  // run at full speed
             if (strobe_type == 0) {  // party strobe
                 if (strobe_delays[strobe_type] < 42) delay_zero();
                 else nice_delay_ms(1);
-- 
cgit v1.2.3


From 5764a79e80ca35b7c5268b3580891b3b17768253 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Fri, 20 Oct 2017 08:06:46 -0600
Subject: Er, don't save_config() every frame...  wait until the user lets go
 of the button.

---
 spaghetti-monster/anduril/anduril.c | 7 ++++++-
 spaghetti-monster/fsm-events.h      | 4 +---
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 59d27e5..4daec1d 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -706,11 +706,16 @@ uint8_t lockout_state(EventPtr event, uint16_t arg) {
         save_config();
         return MISCHIEF_MANAGED;
     }
-    // 3 clicks: rotate through indicator LED modes (off mode)
+    // click, click, hold: rotate through indicator LED modes (off mode)
     else if (event == EV_click3_hold) {
         uint8_t mode = (arg >> 5) % 3;
         indicator_led_mode = (indicator_led_mode & 0b11111100) | mode;
         indicator_led(mode);
+        //save_config();
+        return MISCHIEF_MANAGED;
+    }
+    // click, click, hold, release: save indicator LED mode (off mode)
+    else if (event == EV_click3_hold_release) {
         save_config();
         return MISCHIEF_MANAGED;
     }
diff --git a/spaghetti-monster/fsm-events.h b/spaghetti-monster/fsm-events.h
index 453ad0b..28f1b10 100644
--- a/spaghetti-monster/fsm-events.h
+++ b/spaghetti-monster/fsm-events.h
@@ -178,7 +178,6 @@ Event EV_click3_hold[] = {
     A_PRESS,
     A_HOLD,
     0 };
-/*
 Event EV_click3_hold_release[] = {
     A_PRESS,
     A_RELEASE,
@@ -188,7 +187,6 @@ Event EV_click3_hold_release[] = {
     A_HOLD,
     A_RELEASE,
     0 };
-    */
 Event EV_click3_release[] = {
     A_PRESS,
     A_RELEASE,
@@ -426,7 +424,7 @@ EventPtr event_sequences[] = {
     #if MAX_CLICKS >= 3
     EV_click3_press,
     EV_click3_hold,
-    //EV_click3_hold_release,
+    EV_click3_hold_release,
     EV_click3_release,
     EV_click3_complete,
     #endif
-- 
cgit v1.2.3


From 2dcb0165cd01a230d678f290f80380dfa63e6dcd Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Fri, 20 Oct 2017 08:20:10 -0600
Subject: Made indicator LED turn on/off in lightning mode along with main LED.

---
 spaghetti-monster/anduril/anduril.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 4daec1d..330f107 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -1038,6 +1038,12 @@ void indicator_led(uint8_t lvl) {
             break;
     }
 }
+
+void indicator_led_auto() {
+    if (actual_level > MAX_1x7135) indicator_led(2);
+    else if (actual_level > 0) indicator_led(1);
+    else indicator_led(0);
+}
 #endif  // USE_INDICATOR_LED
 
 
@@ -1193,6 +1199,9 @@ void loop() {
             brightness += pseudo_rand() % brightness;  // 2 to 159 now (w/ low bias)
             if (brightness > MAX_LEVEL) brightness = MAX_LEVEL;
             set_level(brightness);
+            #ifdef USE_INDICATOR_LED
+            indicator_led_auto();
+            #endif
             if (! nice_delay_ms(rand_time)) return;
 
             // decrease the brightness somewhat more gradually, like lightning
@@ -1203,6 +1212,9 @@ void loop() {
                 brightness -= stepdown;
                 if (brightness < 0) brightness = 0;
                 set_level(brightness);
+                #ifdef USE_INDICATOR_LED
+                indicator_led_auto();
+                #endif
                 /*
                 if ((brightness < MAX_LEVEL/2) && (! (pseudo_rand() & 15))) {
                     brightness <<= 1;
@@ -1221,6 +1233,9 @@ void loop() {
             rand_time = 1<<(pseudo_rand()%13);
             rand_time += pseudo_rand()%rand_time;
             set_level(0);
+            #ifdef USE_INDICATOR_LED
+            indicator_led_auto();
+            #endif
             nice_delay_ms(rand_time);
 
         }
-- 
cgit v1.2.3


From 8d967e13f18cee2bc13faa502cfac0946ae2a0d9 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sat, 21 Oct 2017 06:46:07 -0600
Subject: Delay un-setting go_to_standby until the last moment, in case
 set_level() wants to use it.

---
 spaghetti-monster/fsm-main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/fsm-main.c b/spaghetti-monster/fsm-main.c
index 5efcd4c..8f21846 100644
--- a/spaghetti-monster/fsm-main.c
+++ b/spaghetti-monster/fsm-main.c
@@ -110,7 +110,6 @@ int main() {
         // enter standby mode if requested
         // (works better if deferred like this)
         if (go_to_standby) {
-            go_to_standby = 0;
             #ifdef USE_RAMPING
             set_level(0);
             #else
@@ -127,6 +126,7 @@ int main() {
             PWM4_LVL = 255;  // inverted  :(
             #endif
             #endif
+            go_to_standby = 0;
             standby_mode();
         }
 
-- 
cgit v1.2.3


From a154ddbda5477a9b5a66333b8777fd6d1ee99d39 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sat, 21 Oct 2017 06:51:27 -0600
Subject: Moved indicator_led() from Anduril into FSM.  Made it auto-set
 indicator level based on ramp level. Made Anduril configure voltage fudge and
 indicator LED functions based on driver type. Removed "ticks_spent_awake"
 thing since it's redundant.  EV_tick arg does the same thing in fewer bytes.
 Rearranged some clauses in off_state to put events in a more coherent order.

---
 spaghetti-monster/anduril/anduril.c | 114 ++++++++++++------------------------
 spaghetti-monster/fsm-misc.c        |  28 +++++++++
 spaghetti-monster/fsm-misc.h        |   5 ++
 spaghetti-monster/fsm-ramping.c     |   7 +++
 4 files changed, 79 insertions(+), 75 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 330f107..3559235 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -20,14 +20,15 @@
 
 /********* User-configurable options *********/
 // Physical driver type
-#define FSM_EMISAR_D4_DRIVER
+//#define FSM_EMISAR_D4_DRIVER
+#define FSM_BLF_Q8_DRIVER
 //#define FSM_FW3A_DRIVER
 
 #define USE_LVP
 #define USE_THERMAL_REGULATION
 #define DEFAULT_THERM_CEIL 50
 #define USE_SET_LEVEL_GRADUALLY
-#define BLINK_AT_CHANNEL_BOUNDARIES
+//#define BLINK_AT_CHANNEL_BOUNDARIES
 //#define BLINK_AT_RAMP_FLOOR
 #define BLINK_AT_RAMP_CEILING
 #define BATTCHECK_VpT
@@ -36,7 +37,6 @@
 #define GOODNIGHT_LEVEL 24  // ~11 lm
 #define USE_REVERSING
 //#define START_AT_MEMORIZED_LEVEL
-#define USE_INDICATOR_LED
 
 /********* Configure SpaghettiMonster *********/
 #define USE_DELAY_ZERO
@@ -45,6 +45,18 @@
 #define MAX_BIKING_LEVEL 120  // should be 127 or less
 #define USE_BATTCHECK
 #define MAX_CLICKS 5
+#define USE_IDLE_MODE
+#define USE_DYNAMIC_UNDERCLOCKING  // cut clock speed at very low modes for better efficiency
+
+// specific settings for known driver types
+#ifdef FSM_BLF_Q8_DRIVER
+#define USE_INDICATOR_LED
+#define VOLTAGE_FUDGE_FACTOR 7  // add 0.35V
+#elif defined(FSM_EMISAR_D4_DRIVER)
+#define VOLTAGE_FUDGE_FACTOR 5  // add 0.25V
+#endif
+
+// try to auto-detect how many eeprom bytes
 #define USE_EEPROM
 #ifdef USE_INDICATOR_LED
 #define EEPROM_BYTES 13
@@ -57,8 +69,6 @@
 #define USE_EEPROM_WL
 #define EEPROM_WL_BYTES 1
 #endif
-#define USE_IDLE_MODE
-#define USE_DYNAMIC_UNDERCLOCKING  // cut clock speed at very low modes for better efficiency
 #include "spaghetti-monster.h"
 
 
@@ -99,10 +109,6 @@ volatile uint8_t number_entry_value;
 
 void blink_confirm(uint8_t num);
 
-#ifdef USE_INDICATOR_LED
-void indicator_led(uint8_t lvl);
-#endif
-
 // remember stuff even after battery was changed
 void load_config();
 void save_config();
@@ -161,7 +167,6 @@ volatile uint8_t beacon_seconds = 2;
 
 
 uint8_t off_state(EventPtr event, uint16_t arg) {
-    static uint8_t ticks_spent_awake = 0;
     // turn emitter off when entering state
     if (event == EV_enter_state) {
         set_level(0);
@@ -170,16 +175,15 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
         #endif
         // sleep while off  (lower power use)
         go_to_standby = 1;
-        ticks_spent_awake = 0;
         return MISCHIEF_MANAGED;
     }
     // go back to sleep eventually if we got bumped but didn't leave "off" state
-    // FIXME: can I just use arg instead of ticks_spent_awake?
     else if (event == EV_tick) {
-        ticks_spent_awake ++;
-        if (ticks_spent_awake > 240) {
-            ticks_spent_awake = 0;
+        if (arg > TICKS_PER_SECOND*2) {
             go_to_standby = 1;
+            #ifdef USE_INDICATOR_LED
+            indicator_led(indicator_led_mode & 0x03);
+            #endif
         }
         return MISCHIEF_MANAGED;
     }
@@ -188,6 +192,20 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
         set_level(nearest_level(1));
         return MISCHIEF_MANAGED;
     }
+    // hold: go to lowest level
+    else if (event == EV_click1_hold) {
+        // don't start ramping immediately;
+        // give the user time to release at moon level
+        if (arg >= HOLD_TIMEOUT) {
+            set_state(steady_state, 1);
+        }
+        return MISCHIEF_MANAGED;
+    }
+    // hold, release quickly: go to lowest level
+    else if (event == EV_click1_hold_release) {
+        set_state(steady_state, 1);
+        return MISCHIEF_MANAGED;
+    }
     // 1 click (before timeout): go to memorized level, but allow abort for double click
     else if (event == EV_click1_release) {
         set_level(nearest_level(memorized_level));
@@ -203,6 +221,11 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
         set_level(0);
         return MISCHIEF_MANAGED;
     }
+    // click, hold: go to highest level (for ramping down)
+    else if (event == EV_click2_hold) {
+        set_state(steady_state, MAX_LEVEL);
+        return MISCHIEF_MANAGED;
+    }
     // 2 clicks: highest mode
     else if (event == EV_2clicks) {
         set_state(steady_state, nearest_level(MAX_LEVEL));
@@ -232,25 +255,6 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
         set_state(momentary_state, 0);
         return MISCHIEF_MANAGED;
     }
-    // hold: go to lowest level
-    else if (event == EV_click1_hold) {
-        // don't start ramping immediately;
-        // give the user time to release at moon level
-        if (arg >= HOLD_TIMEOUT) {
-            set_state(steady_state, 1);
-        }
-        return MISCHIEF_MANAGED;
-    }
-    // hold, release quickly: go to lowest level
-    else if (event == EV_click1_hold_release) {
-        set_state(steady_state, 1);
-        return MISCHIEF_MANAGED;
-    }
-    // click, hold: go to highest level (for ramping down)
-    else if (event == EV_click2_hold) {
-        set_state(steady_state, MAX_LEVEL);
-        return MISCHIEF_MANAGED;
-    }
     return EVENT_NOT_HANDLED;
 }
 
@@ -654,8 +658,6 @@ uint8_t goodnight_state(EventPtr event, uint16_t arg) {
 
 
 uint8_t lockout_state(EventPtr event, uint16_t arg) {
-    static uint8_t ticks_spent_awake = 0;
-
     #ifdef MOON_DURING_LOCKOUT_MODE
     // momentary(ish) moon mode during lockout
     // not all presses will be counted;
@@ -668,7 +670,6 @@ uint8_t lockout_state(EventPtr event, uint16_t arg) {
         uint8_t lvl = ramp_smooth_floor;
         if (ramp_discrete_floor < lvl) lvl = ramp_discrete_floor;
         set_level(lvl);
-        ticks_spent_awake = 0;
     }
     else if ((last == A_RELEASE) || (last == A_RELEASE_TIMEOUT)) {
         set_level(0);
@@ -686,9 +687,7 @@ uint8_t lockout_state(EventPtr event, uint16_t arg) {
     } else
     #endif
     if (event == EV_tick) {
-        ticks_spent_awake ++;
-        if (ticks_spent_awake > 180) {
-            ticks_spent_awake = 0;
+        if (arg > TICKS_PER_SECOND*2) {
             go_to_standby = 1;
             #ifdef USE_INDICATOR_LED
             indicator_led(indicator_led_mode >> 2);
@@ -1021,32 +1020,6 @@ uint8_t pseudo_rand() {
 #endif
 
 
-#ifdef USE_INDICATOR_LED
-void indicator_led(uint8_t lvl) {
-    switch (lvl) {
-        case 0:  // indicator off
-            DDRB &= 0xff ^ (1 << AUXLED_PIN);
-            PORTB &= 0xff ^ (1 << AUXLED_PIN);
-            break;
-        case 1:  // indicator low
-            DDRB &= 0xff ^ (1 << AUXLED_PIN);
-            PORTB |= (1 << AUXLED_PIN);
-            break;
-        default:  // indicator high
-            DDRB |= (1 << AUXLED_PIN);
-            PORTB |= (1 << AUXLED_PIN);
-            break;
-    }
-}
-
-void indicator_led_auto() {
-    if (actual_level > MAX_1x7135) indicator_led(2);
-    else if (actual_level > 0) indicator_led(1);
-    else indicator_led(0);
-}
-#endif  // USE_INDICATOR_LED
-
-
 void load_config() {
     if (load_eeprom()) {
         ramp_style = eeprom[0];
@@ -1199,9 +1172,6 @@ void loop() {
             brightness += pseudo_rand() % brightness;  // 2 to 159 now (w/ low bias)
             if (brightness > MAX_LEVEL) brightness = MAX_LEVEL;
             set_level(brightness);
-            #ifdef USE_INDICATOR_LED
-            indicator_led_auto();
-            #endif
             if (! nice_delay_ms(rand_time)) return;
 
             // decrease the brightness somewhat more gradually, like lightning
@@ -1212,9 +1182,6 @@ void loop() {
                 brightness -= stepdown;
                 if (brightness < 0) brightness = 0;
                 set_level(brightness);
-                #ifdef USE_INDICATOR_LED
-                indicator_led_auto();
-                #endif
                 /*
                 if ((brightness < MAX_LEVEL/2) && (! (pseudo_rand() & 15))) {
                     brightness <<= 1;
@@ -1233,9 +1200,6 @@ void loop() {
             rand_time = 1<<(pseudo_rand()%13);
             rand_time += pseudo_rand()%rand_time;
             set_level(0);
-            #ifdef USE_INDICATOR_LED
-            indicator_led_auto();
-            #endif
             nice_delay_ms(rand_time);
 
         }
diff --git a/spaghetti-monster/fsm-misc.c b/spaghetti-monster/fsm-misc.c
index 1b8f864..acef28c 100644
--- a/spaghetti-monster/fsm-misc.c
+++ b/spaghetti-monster/fsm-misc.c
@@ -109,4 +109,32 @@ uint8_t blink_num(uint8_t num) {
 }
 #endif
 
+#ifdef USE_INDICATOR_LED
+void indicator_led(uint8_t lvl) {
+    switch (lvl) {
+        case 0:  // indicator off
+            DDRB &= 0xff ^ (1 << AUXLED_PIN);
+            PORTB &= 0xff ^ (1 << AUXLED_PIN);
+            break;
+        case 1:  // indicator low
+            DDRB &= 0xff ^ (1 << AUXLED_PIN);
+            PORTB |= (1 << AUXLED_PIN);
+            break;
+        default:  // indicator high
+            DDRB |= (1 << AUXLED_PIN);
+            PORTB |= (1 << AUXLED_PIN);
+            break;
+    }
+}
+
+/*
+void indicator_led_auto() {
+    if (actual_level > MAX_1x7135) indicator_led(2);
+    else if (actual_level > 0) indicator_led(1);
+    else indicator_led(0);
+}
+*/
+#endif  // USE_INDICATOR_LED
+
+
 #endif
diff --git a/spaghetti-monster/fsm-misc.h b/spaghetti-monster/fsm-misc.h
index 5e4f3d6..4e0eb4f 100644
--- a/spaghetti-monster/fsm-misc.h
+++ b/spaghetti-monster/fsm-misc.h
@@ -42,4 +42,9 @@ uint8_t blink(uint8_t num, uint8_t speed);
 #endif
 */
 
+#ifdef USE_INDICATOR_LED
+void indicator_led(uint8_t lvl);
+#endif
+
+
 #endif
diff --git a/spaghetti-monster/fsm-ramping.c b/spaghetti-monster/fsm-ramping.c
index 11e56a5..ec132ae 100644
--- a/spaghetti-monster/fsm-ramping.c
+++ b/spaghetti-monster/fsm-ramping.c
@@ -28,6 +28,13 @@ void set_level(uint8_t level) {
     #ifdef USE_SET_LEVEL_GRADUALLY
     gradual_target = level;
     #endif
+    #ifdef USE_INDICATOR_LED
+    if (! go_to_standby)
+        indicator_led((level > 0) + (level > MAX_1x7135));
+    //if (level > MAX_1x7135) indicator_led(2);
+    //else if (level > 0) indicator_led(1);
+    //else if (! go_to_standby) indicator_led(0);
+    #endif
     //TCCR0A = PHASE;
     if (level == 0) {
         #if PWM_CHANNELS >= 1
-- 
cgit v1.2.3


From 9ae4f570a4b56fb3eb60f4c244931c771415944b Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Mon, 6 Nov 2017 08:51:57 -0700
Subject: Made FSM eeprom more atomic by writing marker byte last.

---
 spaghetti-monster/fsm-eeprom.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/fsm-eeprom.c b/spaghetti-monster/fsm-eeprom.c
index 45cd3fa..012e088 100644
--- a/spaghetti-monster/fsm-eeprom.c
+++ b/spaghetti-monster/fsm-eeprom.c
@@ -41,12 +41,14 @@ uint8_t load_eeprom() {
 
 void save_eeprom() {
     cli();
-    eeprom_update_byte((uint8_t *)EEP_START, EEP_MARKER);
 
     // save the actual data
     for(uint8_t i=0; i<EEPROM_BYTES; i++) {
         eeprom_update_byte((uint8_t *)(EEP_START+1+i), eeprom[i]);
     }
+
+    // save the marker last, to indicate the transaction is complete
+    eeprom_update_byte((uint8_t *)EEP_START, EEP_MARKER);
     sei();
 }
 #endif
@@ -93,6 +95,7 @@ void save_eeprom_wl() {
     if (offset > EEP_WL_SIZE-EEPROM_WL_BYTES-1) offset = 0;
     eep_wl_prev_offset = offset;
     // marker byte
+    // FIXME: write the marker last, to signal completed transaction
     eeprom_update_byte((uint8_t *)offset, EEP_MARKER);
     offset ++;
     // user data
-- 
cgit v1.2.3


From c71a30fb6ab512177aa2cfe4e4a17d83d0a5e144 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Mon, 6 Nov 2017 08:52:43 -0700
Subject: Added an incredibly simple muggle mode...  1-mode, on/off only,
 disconnect power to exit.

---
 spaghetti-monster/anduril/anduril.c | 59 +++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 3559235..4c28fcb 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -37,6 +37,7 @@
 #define GOODNIGHT_LEVEL 24  // ~11 lm
 #define USE_REVERSING
 //#define START_AT_MEMORIZED_LEVEL
+#define USE_MUGGLE_MODE
 
 /********* Configure SpaghettiMonster *********/
 #define USE_DELAY_ZERO
@@ -44,7 +45,11 @@
 #define RAMP_LENGTH 150
 #define MAX_BIKING_LEVEL 120  // should be 127 or less
 #define USE_BATTCHECK
+#ifdef USE_MUGGLE_MODE
+#define MAX_CLICKS 6
+#else
 #define MAX_CLICKS 5
+#endif
 #define USE_IDLE_MODE
 #define USE_DYNAMIC_UNDERCLOCKING  // cut clock speed at very low modes for better efficiency
 
@@ -101,6 +106,10 @@ uint8_t beacon_config_state(EventPtr event, uint16_t arg);
 uint8_t lockout_state(EventPtr event, uint16_t arg);
 // momentary / signalling mode
 uint8_t momentary_state(EventPtr event, uint16_t arg);
+#ifdef USE_MUGGLE_MODE
+// muggle mode, super-simple, hard to exit
+uint8_t muggle_state(EventPtr event, uint16_t arg);
+#endif
 
 // general helper function for config modes
 uint8_t number_entry_state(EventPtr event, uint16_t arg);
@@ -255,6 +264,14 @@ uint8_t off_state(EventPtr event, uint16_t arg) {
         set_state(momentary_state, 0);
         return MISCHIEF_MANAGED;
     }
+    #ifdef USE_MUGGLE_MODE
+    // 6 clicks: muggle mode
+    else if (event == EV_6clicks) {
+        blink_confirm(1);
+        set_state(muggle_state, 0);
+        return MISCHIEF_MANAGED;
+    }
+    #endif
     return EVENT_NOT_HANDLED;
 }
 
@@ -760,6 +777,48 @@ uint8_t momentary_state(EventPtr event, uint16_t arg) {
 }
 
 
+#ifdef USE_MUGGLE_MODE
+uint8_t muggle_state(EventPtr event, uint16_t arg) {
+    //static uint8_t lvl = 0;
+    //uint8_t lvls[] = {MAX_1x7135/2, MAX_1x7135, MAX_1x7135+10};
+
+    if (event == EV_click1_press) {
+        /*
+        if (actual_level == 0) {
+            set_level(lvls[lvl]);
+            lvl = (lvl + 1) % sizeof(lvls);
+        }
+        else {  // turn off
+        }
+        */
+        if (actual_level == 0) {
+            set_level(MAX_1x7135);
+        }
+        else {  // turn off
+            set_level(0);
+        }
+        empty_event_sequence();
+        return MISCHIEF_MANAGED;
+    }
+
+    else if (event == EV_release) {
+        empty_event_sequence();  // don't attempt to parse multiple clicks
+        return MISCHIEF_MANAGED;
+    }
+
+    // Sleep, dammit!
+    else if ((event == EV_tick)  &&  (actual_level == 0)) {
+        if (arg > TICKS_PER_SECOND*1) {  // sleep after 1 second
+            go_to_standby = 1;  // sleep while light is off
+        }
+        return MISCHIEF_MANAGED;
+    }
+
+    return EVENT_NOT_HANDLED;
+}
+#endif
+
+
 uint8_t ramp_config_state(EventPtr event, uint16_t arg) {
     static uint8_t config_step;
     static uint8_t num_config_steps;
-- 
cgit v1.2.3


From d0a5b654b7c030bca21c16f69d09b36d7d994ef5 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Wed, 8 Nov 2017 12:18:47 -0700
Subject: Added a candle flicker mode to Anduril.  Easy to enable/disable at
 compile time.

---
 spaghetti-monster/anduril/anduril.c | 93 +++++++++++++++++++++++++++++++++----
 1 file changed, 85 insertions(+), 8 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 4c28fcb..85fe493 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -33,6 +33,7 @@
 #define BLINK_AT_RAMP_CEILING
 #define BATTCHECK_VpT
 #define USE_LIGHTNING_MODE
+#define USE_CANDLE_MODE
 #define GOODNIGHT_TIME  60  // minutes (approximately)
 #define GOODNIGHT_LEVEL 24  // ~11 lm
 #define USE_REVERSING
@@ -74,6 +75,25 @@
 #define USE_EEPROM_WL
 #define EEPROM_WL_BYTES 1
 #endif
+
+// auto-configure other stuff...
+#if defined(USE_LIGHTNING_MODE) || defined(USE_CANDLE_MODE)
+#define USE_PSEUDO_RAND
+#endif
+// count the strobe modes (seems like there should be an easier way to do this)
+#define NUM_STROBES_BASE 3
+#ifdef USE_LIGHTNING_MODE
+#define ADD_LIGHTNING_STROBE 1
+#else
+#define ADD_LIGHTNING_STROBE 0
+#endif
+#ifdef USE_CANDLE_MODE
+#define ADD_CANDLE_MODE 1
+#else
+#define ADD_CANDLE_MODE 0
+#endif
+#define NUM_STROBES (NUM_STROBES_BASE+ADD_LIGHTNING_STROBE+ADD_CANDLE_MODE)
+
 #include "spaghetti-monster.h"
 
 
@@ -84,11 +104,6 @@ uint8_t steady_state(EventPtr event, uint16_t arg);
 uint8_t ramp_config_state(EventPtr event, uint16_t arg);
 // party and tactical strobes
 uint8_t strobe_state(EventPtr event, uint16_t arg);
-#ifdef USE_LIGHTNING_MODE
-#define NUM_STROBES 4
-#else
-#define NUM_STROBES 3
-#endif
 #ifdef USE_BATTCHECK
 uint8_t battcheck_state(EventPtr event, uint16_t arg);
 #endif
@@ -166,11 +181,15 @@ volatile uint8_t strobe_type = 3;  // 0 == party strobe, 1 == tactical strobe, 2
 // bike mode config options
 volatile uint8_t bike_flasher_brightness = MAX_1x7135;
 
-#ifdef USE_LIGHTNING_MODE
+#ifdef USE_PSEUDO_RAND
 volatile uint8_t pseudo_rand_seed = 0;
 uint8_t pseudo_rand();
 #endif
 
+#ifdef USE_CANDLE_MODE
+uint8_t triangle_wave(uint8_t phase);
+#endif
+
 // beacon timing
 volatile uint8_t beacon_seconds = 2;
 
@@ -508,6 +527,16 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
 
 
 uint8_t strobe_state(EventPtr event, uint16_t arg) {
+    #ifdef USE_CANDLE_MODE
+    //#define MAX_CANDLE_LEVEL (RAMP_SIZE-8-6-4)
+    #define MAX_CANDLE_LEVEL (RAMP_SIZE/2)
+    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;
+    static uint8_t candle_mode_brightness = 12;
+    #endif
+
     if (event == EV_enter_state) {
         return MISCHIEF_MANAGED;
     }
@@ -537,6 +566,13 @@ uint8_t strobe_state(EventPtr event, uint16_t arg) {
                 bike_flasher_brightness ++;
             set_level(bike_flasher_brightness);
         }
+        #ifdef USE_CANDLE_MODE
+        // candle mode brighter
+        else if (strobe_type == 4) {
+            if (candle_mode_brightness < MAX_CANDLE_LEVEL)
+                candle_mode_brightness ++;
+        }
+        #endif
         return MISCHIEF_MANAGED;
     }
     // click, hold: change speed (go slower)
@@ -553,6 +589,13 @@ uint8_t strobe_state(EventPtr event, uint16_t arg) {
                 bike_flasher_brightness --;
             set_level(bike_flasher_brightness);
         }
+        #ifdef USE_CANDLE_MODE
+        // candle mode dimmer
+        else if (strobe_type == 4) {
+            if (candle_mode_brightness > 1)
+                candle_mode_brightness --;
+        }
+        #endif
         return MISCHIEF_MANAGED;
     }
     // release hold: save new strobe settings
@@ -561,10 +604,32 @@ uint8_t strobe_state(EventPtr event, uint16_t arg) {
         save_config();
         return MISCHIEF_MANAGED;
     }
-    #ifdef USE_LIGHTNING_MODE
+    #if defined(USE_LIGHTNING_MODE) || defined(USE_CANDLE_MODE)
     // clock tick: bump the random seed
     else if (event == EV_tick) {
+        #ifdef USE_LIGHTNING_MODE
         pseudo_rand_seed += arg;
+        #endif
+        #ifdef USE_CANDLE_MODE
+        if (strobe_type == 4) {
+            // 3-oscillator synth for a relatively organic pattern
+            uint8_t add;
+            add = ((triangle_wave(candle_wave1) * 8) >> 8)
+                + ((triangle_wave(candle_wave2) * 7) >> 8)
+                + ((triangle_wave(candle_wave3) * 4) >> 8);
+            set_level(candle_mode_brightness + add);
+            // slow LFO
+            if ((arg & 1) == 0) candle_wave1 += pseudo_rand()&1;
+            // faster LFO
+            //candle_wave2 += pseudo_rand()%13;
+            candle_wave2 += candle_wave2_speed;
+            // erratic fast wave
+            candle_wave3 += pseudo_rand()%37;
+            // S&H on wave2 frequency to make it more erratic
+            if ((pseudo_rand()>>3) == 0)
+                candle_wave2_speed = pseudo_rand()%13;
+        }
+        #endif
         return MISCHIEF_MANAGED;
     }
     #endif
@@ -1068,7 +1133,7 @@ void blink_confirm(uint8_t num) {
 }
 
 
-#ifdef USE_LIGHTNING_MODE
+#ifdef USE_PSEUDO_RAND
 uint8_t pseudo_rand() {
     static uint16_t offset = 1024;
     // loop from 1024 to 4095
@@ -1079,6 +1144,15 @@ uint8_t pseudo_rand() {
 #endif
 
 
+#ifdef USE_CANDLE_MODE
+uint8_t triangle_wave(uint8_t phase) {
+    uint8_t result = phase << 1;
+    if (phase > 127) result = 255 - result;
+    return result;
+}
+#endif
+
+
 void load_config() {
     if (load_eeprom()) {
         ramp_style = eeprom[0];
@@ -1205,6 +1279,9 @@ void loop() {
     if (state == strobe_state) {
         // party / tactical strobe
         if (strobe_type < 2) {
+            // FIXME: for tactical strobe, use max Nx7135 level?
+            //        (perhaps a compile option)
+            //        (is relevant for FW3A)
             set_level(MAX_LEVEL);
             CLKPR = 1<<CLKPCE; CLKPR = 0;  // run at full speed
             if (strobe_type == 0) {  // party strobe
-- 
cgit v1.2.3


From 9fbfa14e63a6b7f8e495ca4cf1f7b82c2e638215 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sun, 3 Dec 2017 17:22:01 -0700
Subject: Made it possible to override address of eeprom array in RAM. (useful
 when trying to use a single large data structure without wasting twice its
 size in RAM)

---
 spaghetti-monster/fsm-eeprom.c | 4 ++++
 spaghetti-monster/fsm-eeprom.h | 4 ++++
 2 files changed, 8 insertions(+)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/fsm-eeprom.c b/spaghetti-monster/fsm-eeprom.c
index 012e088..bb63c7e 100644
--- a/spaghetti-monster/fsm-eeprom.c
+++ b/spaghetti-monster/fsm-eeprom.c
@@ -23,7 +23,11 @@
 #include "fsm-eeprom.h"
 
 #if EEPROM_BYTES > 0
+#ifdef EEPROM_OVERRIDE
+uint8_t *eeprom;
+#else
 uint8_t eeprom[EEPROM_BYTES];
+#endif
 
 uint8_t load_eeprom() {
     cli();
diff --git a/spaghetti-monster/fsm-eeprom.h b/spaghetti-monster/fsm-eeprom.h
index b6e1aea..a668588 100644
--- a/spaghetti-monster/fsm-eeprom.h
+++ b/spaghetti-monster/fsm-eeprom.h
@@ -36,7 +36,11 @@
 #if EEPROM_BYTES >= (EEPSIZE/2)
 #error Requested EEPROM_BYTES too big.
 #endif
+#ifdef EEPROM_OVERRIDE
+uint8_t *eeprom;
+#else
 uint8_t eeprom[EEPROM_BYTES];
+#endif
 uint8_t load_eeprom();  // returns 1 for success, 0 for no data found
 void save_eeprom();
 #define EEP_START (EEPSIZE/2)
-- 
cgit v1.2.3


From e52df9c3ac606b24bda70287bc62323b46b7b4c4 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Mon, 11 Dec 2017 15:03:17 -0700
Subject: Working toward a FW3A release now.  Made strobes use Nx7135 (when
 available) instead of FET. Added some ideas.  Simplified some syntax.

---
 spaghetti-monster/anduril/anduril.c | 52 +++++++++++++++++++++++--------------
 spaghetti-monster/fsm-ramping.h     |  6 ++++-
 2 files changed, 38 insertions(+), 20 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 85fe493..4915b39 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -21,14 +21,14 @@
 /********* User-configurable options *********/
 // Physical driver type
 //#define FSM_EMISAR_D4_DRIVER
-#define FSM_BLF_Q8_DRIVER
-//#define FSM_FW3A_DRIVER
+//#define FSM_BLF_Q8_DRIVER
+#define FSM_FW3A_DRIVER
 
 #define USE_LVP
 #define USE_THERMAL_REGULATION
 #define DEFAULT_THERM_CEIL 50
 #define USE_SET_LEVEL_GRADUALLY
-//#define BLINK_AT_CHANNEL_BOUNDARIES
+#define BLINK_AT_CHANNEL_BOUNDARIES
 //#define BLINK_AT_RAMP_FLOOR
 #define BLINK_AT_RAMP_CEILING
 #define BATTCHECK_VpT
@@ -60,6 +60,8 @@
 #define VOLTAGE_FUDGE_FACTOR 7  // add 0.35V
 #elif defined(FSM_EMISAR_D4_DRIVER)
 #define VOLTAGE_FUDGE_FACTOR 5  // add 0.25V
+#elif defined(FSM_FW3A_DRIVER)
+#define VOLTAGE_FUDGE_FACTOR 5  // add 0.25V
 #endif
 
 // try to auto-detect how many eeprom bytes
@@ -94,6 +96,14 @@
 #endif
 #define NUM_STROBES (NUM_STROBES_BASE+ADD_LIGHTNING_STROBE+ADD_CANDLE_MODE)
 
+// full FET strobe can be a bit much...  use max regulated level instead,
+// if there's a bright enough regulated level
+#ifdef MAX_Nx7135
+#define STROBE_BRIGHTNESS MAX_Nx7135
+#else
+#define STROBE_BRIGHTNESS MAX_LEVEL
+#endif
+
 #include "spaghetti-monster.h"
 
 
@@ -385,17 +395,15 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         #if defined(BLINK_AT_RAMP_CEILING) || defined(BLINK_AT_CHANNEL_BOUNDARIES)
         // only blink once for each threshold
         if ((memorized_level != actual_level) && (
+                0  // for easier syntax below
                 #ifdef BLINK_AT_CHANNEL_BOUNDARIES
-                (memorized_level == MAX_1x7135)
+                || (memorized_level == MAX_1x7135)
                 #if PWM_CHANNELS >= 3
                 || (memorized_level == MAX_Nx7135)
                 #endif
-                #ifdef BLINK_AT_RAMP_CEILING
-                ||
-                #endif
                 #endif
                 #ifdef BLINK_AT_RAMP_CEILING
-                (memorized_level == mode_max)
+                || (memorized_level == mode_max)
                 #endif
                 #if defined(USE_REVERSING) && defined(BLINK_AT_RAMP_FLOOR)
                 || (memorized_level == mode_min)
@@ -437,17 +445,15 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
         #if defined(BLINK_AT_RAMP_FLOOR) || defined(BLINK_AT_CHANNEL_BOUNDARIES)
         // only blink once for each threshold
         if ((memorized_level != actual_level) && (
+                0  // for easier syntax below
                 #ifdef BLINK_AT_CHANNEL_BOUNDARIES
-                (memorized_level == MAX_1x7135)
+                || (memorized_level == MAX_1x7135)
                 #if PWM_CHANNELS >= 3
                 || (memorized_level == MAX_Nx7135)
                 #endif
-                #ifdef BLINK_AT_RAMP_FLOOR
-                ||
-                #endif
                 #endif
                 #ifdef BLINK_AT_RAMP_FLOOR
-                (memorized_level == mode_min)
+                || (memorized_level == mode_min)
                 #endif
                 )) {
             set_level(0);
@@ -467,6 +473,15 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
     #if defined(USE_SET_LEVEL_GRADUALLY) || defined(USE_REVERSING)
     else if (event == EV_tick) {
         #ifdef USE_SET_LEVEL_GRADUALLY
+        /* TODO: make thermal adjustment speed scale with magnitude
+        if (ticks_since_adjust > ticks_per_adjust) {
+            gradual_tick();
+            ticks_since_adjust = 0;
+            ticks_per_adjust = (TICKS_PER_SECOND*2) \
+                             / (diff(actual_level, target_level)) \
+                             + 8 - log2(actual_level);
+        }
+        */
         if (!(arg & 7)) gradual_tick();
         //if (!(arg & 3)) gradual_tick();
         //gradual_tick();
@@ -527,6 +542,7 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
 
 
 uint8_t strobe_state(EventPtr event, uint16_t arg) {
+    // FIXME: re-order the strobes so candle and lightning are adjacent
     #ifdef USE_CANDLE_MODE
     //#define MAX_CANDLE_LEVEL (RAMP_SIZE-8-6-4)
     #define MAX_CANDLE_LEVEL (RAMP_SIZE/2)
@@ -534,7 +550,7 @@ uint8_t strobe_state(EventPtr event, uint16_t arg) {
     static uint8_t candle_wave2 = 0;
     static uint8_t candle_wave3 = 0;
     static uint8_t candle_wave2_speed = 0;
-    static uint8_t candle_mode_brightness = 12;
+    static uint8_t candle_mode_brightness = 20;
     #endif
 
     if (event == EV_enter_state) {
@@ -813,6 +829,7 @@ uint8_t lockout_state(EventPtr event, uint16_t arg) {
 
 
 uint8_t momentary_state(EventPtr event, uint16_t arg) {
+    // TODO: momentary strobe here?  (for light painting)
     if (event == EV_click1_press) {
         set_level(memorized_level);
         empty_event_sequence();  // don't attempt to parse multiple clicks
@@ -1014,7 +1031,6 @@ uint8_t number_entry_state(EventPtr event, uint16_t arg) {
         blinks_left = arg;
         entry_step = 0;
         wait_ticks = 0;
-        // TODO: blink out the 'arg' to show which option this is
         return MISCHIEF_MANAGED;
     }
     // advance through the process:
@@ -1279,10 +1295,8 @@ void loop() {
     if (state == strobe_state) {
         // party / tactical strobe
         if (strobe_type < 2) {
-            // FIXME: for tactical strobe, use max Nx7135 level?
-            //        (perhaps a compile option)
-            //        (is relevant for FW3A)
-            set_level(MAX_LEVEL);
+            // TODO: make tac strobe brightness configurable?
+            set_level(STROBE_BRIGHTNESS);
             CLKPR = 1<<CLKPCE; CLKPR = 0;  // run at full speed
             if (strobe_type == 0) {  // party strobe
                 if (strobe_delays[strobe_type] < 42) delay_zero();
diff --git a/spaghetti-monster/fsm-ramping.h b/spaghetti-monster/fsm-ramping.h
index 900630c..1657e4a 100644
--- a/spaghetti-monster/fsm-ramping.h
+++ b/spaghetti-monster/fsm-ramping.h
@@ -91,12 +91,16 @@ void gradual_tick();
     #define MAX_Nx7135 59
   #elif RAMP_LENGTH == 150
     // FIXME: These values aren't tweaked or tested at all
+    // ../../bin/level_calc.py 1 65 7135 1 0.8 150
+    // ... mixed with this:
     // ../../../bin/level_calc.py 3 150 7135 1 0.33 150 7135 1 1 850 FET 1 10 1500
-    PROGMEM const uint8_t pwm1_levels[] = { 1,1,1,2,2,2,3,3,4,5,5,6,7,8,9,10,11,12,14,15,17,19,21,23,25,27,29,32,34,37,40,43,46,50,53,57,61,65,69,74,78,83,88,93,99,104,110,116,122,129,135,142,149,157,164,172,180,189,197,206,215,225,235,244,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0 };
+    PROGMEM const uint8_t pwm1_levels[] = { 1,1,2,2,3,3,4,4,5,6,7,8,9,10,12,13,14,15,17,19,20,22,24,26,29,31,34,36,39,42,45,48,51,55,59,62,66,70,75,79,84,89,93,99,104,110,115,121,127,134,140,147,154,161,168,176,184,192,200,209,217,226,236,245,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0 };
     PROGMEM const uint8_t pwm2_levels[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,4,6,8,10,13,15,17,19,22,24,26,29,31,34,37,39,42,45,48,51,54,57,60,64,67,70,74,77,81,85,88,92,96,100,104,108,112,116,121,125,130,134,139,143,148,153,158,163,168,173,179,184,189,195,201,206,212,218,224,230,236,243,249,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0 };
     PROGMEM const uint8_t pwm3_levels[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,19,31,43,55,67,79,91,104,117,130,143,157,170,184,198,212,226,240,255 };
     #define MAX_1x7135 65
     #define MAX_Nx7135 130
+    #define HALFSPEED_LEVEL 14
+    #define QUARTERSPEED_LEVEL 5
   #endif
 #elif PWM_CHANNELS == 4
   4-channel PWM not really supported yet, sorry.
-- 
cgit v1.2.3


From d50c46d08a6d7f52dffb9b43784c62b11d78df8c Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Mon, 11 Dec 2017 19:56:15 -0700
Subject: Greatly improved button debouncing.  Helps a lot on FW3A and my light
 saber. Debouncing isn't 100% yet though.

---
 spaghetti-monster/fsm-pcint.c   | 25 +++++++++++++++++++++----
 spaghetti-monster/fsm-pcint.h   |  5 ++++-
 spaghetti-monster/fsm-standby.c |  1 +
 spaghetti-monster/fsm-wdt.c     | 33 +++++++++++++++++++++++++++++++--
 4 files changed, 57 insertions(+), 7 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/fsm-pcint.c b/spaghetti-monster/fsm-pcint.c
index 763c1fe..c04375a 100644
--- a/spaghetti-monster/fsm-pcint.c
+++ b/spaghetti-monster/fsm-pcint.c
@@ -59,10 +59,25 @@ ISR(PCINT0_vect) {
 
     //DEBUG_FLASH;
 
-    uint8_t pushed;
+    /*
+    uint8_t pressed;
 
     // add event to current sequence
-    if (button_is_pressed()) {
+    pressed = button_is_pressed();
+    PCINT_inner(pressed);
+    */
+    if (! PCINT_since_WDT) {
+        PCINT_since_WDT = 1;
+        PCINT_inner(button_is_pressed());
+    }
+}
+
+// should only be called from PCINT and WDT
+// (is a separate function to reduce code duplication)
+void PCINT_inner(uint8_t pressed) {
+    uint8_t pushed;
+
+    if (pressed) {
         pushed = push_event(A_PRESS);
     } else {
         pushed = push_event(A_RELEASE);
@@ -70,7 +85,9 @@ ISR(PCINT0_vect) {
 
     // check if sequence matches any defined sequences
     // if so, send event to current state callback
-    if (pushed) emit_current_event(0);
+    if (pushed) {
+        button_last_state = pressed;
+        emit_current_event(0);
+    }
 }
-
 #endif
diff --git a/spaghetti-monster/fsm-pcint.h b/spaghetti-monster/fsm-pcint.h
index cda5ad7..a94fc82 100644
--- a/spaghetti-monster/fsm-pcint.h
+++ b/spaghetti-monster/fsm-pcint.h
@@ -21,9 +21,12 @@
 #define FSM_PCINT_H
 
 //static volatile uint8_t button_was_pressed;
-#define BP_SAMPLES 16
+#define BP_SAMPLES 32
+volatile uint8_t button_last_state;
+volatile uint8_t PCINT_since_WDT;
 uint8_t button_is_pressed();
 inline void PCINT_on();
 inline void PCINT_off();
+void PCINT_inner(uint8_t pressed);
 
 #endif
diff --git a/spaghetti-monster/fsm-standby.c b/spaghetti-monster/fsm-standby.c
index 5ef666f..eb631d6 100644
--- a/spaghetti-monster/fsm-standby.c
+++ b/spaghetti-monster/fsm-standby.c
@@ -37,6 +37,7 @@ void sleep_until_eswitch_pressed()
     // make sure switch isn't currently pressed
     while (button_is_pressed()) {}
     empty_event_sequence();  // cancel pending input on suspend
+    PCINT_since_WDT = 0;  // ensure PCINT won't ignore itself
 
     PCINT_on();  // wake on e-switch event
 
diff --git a/spaghetti-monster/fsm-wdt.c b/spaghetti-monster/fsm-wdt.c
index 7cbe0d2..bee2914 100644
--- a/spaghetti-monster/fsm-wdt.c
+++ b/spaghetti-monster/fsm-wdt.c
@@ -50,13 +50,42 @@ ISR(WDT_vect) {
     ticks_since_last_event = (ticks_since_last_event + 1) \
                              | (ticks_since_last_event & 0x8000);
 
+    // just in case the pin change interrupt missed something
+    uint8_t le_num = last_event_num();
+    uint8_t last_event = 0;
+    if (le_num >= 1) last_event = current_event[le_num-1];
+    uint8_t pressed = button_is_pressed();
+    uint8_t was_pressed_before = (last_event == A_PRESS) || (last_event == A_HOLD);
+    //if (pressed != button_last_state) {
+    if (pressed != was_pressed_before) {
+        PCINT_inner(pressed);
+        /*
+        uint8_t pushed;
+        if (pressed) {
+            pushed = push_event(A_PRESS);
+        } else {
+            pushed = push_event(A_RELEASE);
+        }
+
+        // check if sequence matches any defined sequences
+        // if so, send event to current state callback
+        if (pushed) {
+            button_last_state = pressed;
+            emit_current_event(0);
+        }
+        */
+    }
+    PCINT_since_WDT = 0;
+
     // if time since last event exceeds timeout,
     // append timeout to current event sequence, then
     // send event to current state callback
 
     // preload recent events
-    uint8_t le_num = last_event_num();
-    uint8_t last_event = 0;
+    //uint8_t le_num = last_event_num();
+    le_num = last_event_num();
+    //uint8_t last_event = 0;
+    last_event = 0;
     uint8_t prev_event = 0;
     if (le_num >= 1) last_event = current_event[le_num-1];
     if (le_num >= 2) prev_event = current_event[le_num-2];
-- 
cgit v1.2.3


From 8c13fd82557dadbe81023c534cd19c31ec40bde4 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Tue, 12 Dec 2017 15:22:42 -0700
Subject: Debouncing finally works (at least, it does on my two test hosts).

---
 spaghetti-monster/fsm-pcint.c   | 40 +++++++++++++++++-----------------------
 spaghetti-monster/fsm-pcint.h   |  1 -
 spaghetti-monster/fsm-standby.c |  2 +-
 spaghetti-monster/fsm-wdt.c     | 38 +++++++-------------------------------
 4 files changed, 25 insertions(+), 56 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/fsm-pcint.c b/spaghetti-monster/fsm-pcint.c
index c04375a..722cb88 100644
--- a/spaghetti-monster/fsm-pcint.c
+++ b/spaghetti-monster/fsm-pcint.c
@@ -24,20 +24,19 @@
 #include <util/delay_basic.h>
 
 uint8_t button_is_pressed() {
-    // debounce a little
-    uint8_t highcount = 0;
-    // measure for 16/64ths of a ms
-    for(uint8_t i=0; i<BP_SAMPLES; i++) {
-        // check current value
-        uint8_t bit = ((PINB & (1<<SWITCH_PIN)) == 0);
-        highcount += bit;
+    // remember the past 32 measurements
+    static uint32_t readings = 0;
+    // take at least one new measurement,
+    // and wait for measurements to settle to all zeroes or all ones
+    do {
+        // shift past readings and add current value
+        readings = (readings << 1) | ((PINB & (1<<SWITCH_PIN)) == 0);
         // wait a moment
-        _delay_loop_2(BOGOMIPS/64);
+        _delay_loop_2(BOGOMIPS/16);  // up to 2ms to stabilize
     }
-    // use most common value
-    uint8_t result = (highcount > (BP_SAMPLES/2));
-    //button_was_pressed = result;
-    return result;
+    while ((readings != 0) && (readings != 0xFFFFFFFF));
+    button_last_state = readings;
+    return readings;
 }
 
 inline void PCINT_on() {
@@ -59,20 +58,15 @@ ISR(PCINT0_vect) {
 
     //DEBUG_FLASH;
 
-    /*
-    uint8_t pressed;
+    // as it turns out, it's more reliable to detect pin changes from WDT
+    // because PCINT itself tends to double-tap when connected to a
+    // noisy / bouncy switch (so the content of this function has been
+    // moved to a separate function, called from WDT only)
+    // PCINT_inner(button_is_pressed());
 
-    // add event to current sequence
-    pressed = button_is_pressed();
-    PCINT_inner(pressed);
-    */
-    if (! PCINT_since_WDT) {
-        PCINT_since_WDT = 1;
-        PCINT_inner(button_is_pressed());
-    }
 }
 
-// should only be called from PCINT and WDT
+// should only be called from PCINT and/or WDT
 // (is a separate function to reduce code duplication)
 void PCINT_inner(uint8_t pressed) {
     uint8_t pushed;
diff --git a/spaghetti-monster/fsm-pcint.h b/spaghetti-monster/fsm-pcint.h
index a94fc82..ec3ae4b 100644
--- a/spaghetti-monster/fsm-pcint.h
+++ b/spaghetti-monster/fsm-pcint.h
@@ -23,7 +23,6 @@
 //static volatile uint8_t button_was_pressed;
 #define BP_SAMPLES 32
 volatile uint8_t button_last_state;
-volatile uint8_t PCINT_since_WDT;
 uint8_t button_is_pressed();
 inline void PCINT_on();
 inline void PCINT_off();
diff --git a/spaghetti-monster/fsm-standby.c b/spaghetti-monster/fsm-standby.c
index eb631d6..b90ccea 100644
--- a/spaghetti-monster/fsm-standby.c
+++ b/spaghetti-monster/fsm-standby.c
@@ -37,7 +37,7 @@ void sleep_until_eswitch_pressed()
     // make sure switch isn't currently pressed
     while (button_is_pressed()) {}
     empty_event_sequence();  // cancel pending input on suspend
-    PCINT_since_WDT = 0;  // ensure PCINT won't ignore itself
+    //PCINT_since_WDT = 0;  // ensure PCINT won't ignore itself
 
     PCINT_on();  // wake on e-switch event
 
diff --git a/spaghetti-monster/fsm-wdt.c b/spaghetti-monster/fsm-wdt.c
index bee2914..777bef0 100644
--- a/spaghetti-monster/fsm-wdt.c
+++ b/spaghetti-monster/fsm-wdt.c
@@ -45,47 +45,23 @@ inline void WDT_off()
 
 // clock tick -- this runs every 16ms (62.5 fps)
 ISR(WDT_vect) {
+    // detect and emit button change events
+    uint8_t was_pressed = button_last_state;
+    uint8_t pressed = button_is_pressed();
+    if (was_pressed != pressed) PCINT_inner(pressed);
+
     //if (ticks_since_last_event < 0xff) ticks_since_last_event ++;
     // increment, but loop from max back to half
     ticks_since_last_event = (ticks_since_last_event + 1) \
                              | (ticks_since_last_event & 0x8000);
 
-    // just in case the pin change interrupt missed something
-    uint8_t le_num = last_event_num();
-    uint8_t last_event = 0;
-    if (le_num >= 1) last_event = current_event[le_num-1];
-    uint8_t pressed = button_is_pressed();
-    uint8_t was_pressed_before = (last_event == A_PRESS) || (last_event == A_HOLD);
-    //if (pressed != button_last_state) {
-    if (pressed != was_pressed_before) {
-        PCINT_inner(pressed);
-        /*
-        uint8_t pushed;
-        if (pressed) {
-            pushed = push_event(A_PRESS);
-        } else {
-            pushed = push_event(A_RELEASE);
-        }
-
-        // check if sequence matches any defined sequences
-        // if so, send event to current state callback
-        if (pushed) {
-            button_last_state = pressed;
-            emit_current_event(0);
-        }
-        */
-    }
-    PCINT_since_WDT = 0;
-
     // if time since last event exceeds timeout,
     // append timeout to current event sequence, then
     // send event to current state callback
 
     // preload recent events
-    //uint8_t le_num = last_event_num();
-    le_num = last_event_num();
-    //uint8_t last_event = 0;
-    last_event = 0;
+    uint8_t le_num = last_event_num();
+    uint8_t last_event = 0;
     uint8_t prev_event = 0;
     if (le_num >= 1) last_event = current_event[le_num-1];
     if (le_num >= 2) prev_event = current_event[le_num-2];
-- 
cgit v1.2.3


From 148b2f04e528a13051fd81c5054a7268e0dc4dac Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Thu, 4 Jan 2018 00:10:42 -0700
Subject: Made thermal adjustment speed change depending on how far it needs to
 go.   (faster for large changes, much slower for smaller changes)   (actual
 thermal behavior not tested yet) Made lockout mode moon match the current
 ramp instead of using the lowest of both. Made ramp-type toggle stop doing
 gradual adjustments back to the previous ramp's level (I hope). Added LVP to
 muggle mode.

---
 spaghetti-monster/anduril/anduril.c | 40 ++++++++++++++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 5 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 4915b39..40809af 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -359,6 +359,12 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
     else if (event == EV_3clicks) {
         ramp_style ^= 1;
         memorized_level = nearest_level(memorized_level);
+        #ifdef USE_THERMAL_REGULATION
+        target_level = memorized_level;
+        #ifdef USE_SET_LEVEL_GRADUALLY
+        //set_level_gradually(lvl);
+        #endif
+        #endif
         save_config();
         #ifdef START_AT_MEMORIZED_LEVEL
         save_config_wl();
@@ -482,7 +488,15 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
                              + 8 - log2(actual_level);
         }
         */
-        if (!(arg & 7)) gradual_tick();
+        uint8_t diff;
+        if (target_level > actual_level) diff = target_level - actual_level;
+        else diff = actual_level - target_level;
+        if (! diff) diff = 1;
+        uint8_t ticks_per_adjust = (TICKS_PER_SECOND*2) / diff;
+        if (!(arg % ticks_per_adjust)) gradual_tick();
+
+        // adjust every N frames
+        //if (!(arg & 7)) gradual_tick();
         //if (!(arg & 3)) gradual_tick();
         //gradual_tick();
         #endif
@@ -766,7 +780,13 @@ uint8_t lockout_state(EventPtr event, uint16_t arg) {
     if ((last == A_PRESS) || (last == A_HOLD)) {
         // detect moon level and activate it
         uint8_t lvl = ramp_smooth_floor;
+        #ifdef LOCKOUT_MOON_LOWEST
+        // Use lowest moon configured
         if (ramp_discrete_floor < lvl) lvl = ramp_discrete_floor;
+        #else
+        // Use moon from current ramp
+        if (ramp_style) lvl = ramp_discrete_floor;
+        #endif
         set_level(lvl);
     }
     else if ((last == A_RELEASE) || (last == A_RELEASE_TIMEOUT)) {
@@ -1226,14 +1246,24 @@ void save_config_wl() {
 #endif
 
 void low_voltage() {
+    StatePtr state = current_state;
+
     // "step down" from strobe to something low
-    if (current_state == strobe_state) {
+    if (state == strobe_state) {
         set_state(steady_state, RAMP_SIZE/6);
     }
-    // in normal mode, step down by half or turn off
-    else if (current_state == steady_state) {
+    // in normal or muggle mode, step down by half or turn off
+    else if ((state == steady_state) || (state == muggle_state)) {
         if (actual_level > 1) {
-            set_level((actual_level >> 1) + (actual_level >> 2));
+            uint8_t lvl = (actual_level >> 1) + (actual_level >> 2);
+            set_level(lvl);
+            #ifdef USE_THERMAL_REGULATION
+            target_level = lvl;
+            #ifdef USE_SET_LEVEL_GRADUALLY
+            // not needed?
+            //set_level_gradually(lvl);
+            #endif
+            #endif
         }
         else {
             set_state(off_state, 0);
-- 
cgit v1.2.3


From 30b13cc13baba55ac1610ad471ca737a6c817683 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Wed, 24 Jan 2018 18:27:44 -0700
Subject: Work around issues related to ADC interrupt auto-triggering itself.
 (was firing off 1000 times faster than desired, causing several issues) (now
 only executes when explicitly requested by the WDT)

---
 spaghetti-monster/fsm-adc.c | 25 +++++++++++++++++--------
 spaghetti-monster/fsm-adc.h |  1 +
 spaghetti-monster/fsm-wdt.c |  4 ++--
 3 files changed, 20 insertions(+), 10 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/fsm-adc.c b/spaghetti-monster/fsm-adc.c
index 839fba8..d863b94 100644
--- a/spaghetti-monster/fsm-adc.c
+++ b/spaghetti-monster/fsm-adc.c
@@ -44,6 +44,13 @@ inline void ADC_off() {
 #endif
 // TODO: is this better done in main() or WDT()?
 ISR(ADC_vect) {
+    // For some reason, the ADC interrupt is getting called a *lot*
+    // more often than it should be, like it's auto-triggering after each
+    // measurement, but I don't know why, or how to turn that off...
+    // So, skip every call except when explicitly requested.
+    if (! adcint_enable) return;
+    adcint_enable = 0;
+
     static uint8_t adc_step = 0;
 
     // LVP declarations
@@ -218,11 +225,13 @@ ISR(ADC_vect) {
 
         // average prediction to reduce noise
         int16_t avg_projected_temperature = 0;
-        for (uint8_t i = 0;
+        uint8_t i;
+        for (i = 0;
              (i < NUM_THERMAL_PROJECTED_HISTORY) && (avg_projected_temperature < 16000);
              i++)
             avg_projected_temperature += projected_temperature_history[i];
         avg_projected_temperature /= NUM_THERMAL_PROJECTED_HISTORY;
+        //avg_projected_temperature /= i;
 
         // cancel counters if appropriate
         if (pt > THERM_FLOOR) {
@@ -240,15 +249,15 @@ ISR(ADC_vect) {
                 if (overheat_lowpass < OVERHEAT_LOWPASS_STRENGTH) {
                     overheat_lowpass ++;
                 } else {
+                    // reset counters
+                    overheat_lowpass = 0;
+                    temperature_timer = TEMPERATURE_TIMER_START;
                     // how far above the ceiling?
                     int16_t howmuch = (avg_projected_temperature - THERM_CEIL) >> THERM_DIFF_ATTENUATION;
                     if (howmuch > 0) {
                         // try to send out a warning
                         emit(EV_temperature_high, howmuch);
                     }
-                    // reset counters
-                    temperature_timer = TEMPERATURE_TIMER_START;
-                    overheat_lowpass = 0;
                 }
             }
 
@@ -257,6 +266,9 @@ ISR(ADC_vect) {
                 if (underheat_lowpass < UNDERHEAT_LOWPASS_STRENGTH) {
                     underheat_lowpass ++;
                 } else {
+                    // reset counters
+                    underheat_lowpass = 0;
+                    temperature_timer = TEMPERATURE_TIMER_START;
                     // how far below the floor?
                     int16_t howmuch = (THERM_FLOOR - avg_projected_temperature) >> THERM_DIFF_ATTENUATION;
                     if (howmuch > 0) {
@@ -265,9 +277,6 @@ ISR(ADC_vect) {
                         if (voltage > VOLTAGE_LOW)
                             emit(EV_temperature_low, howmuch);
                     }
-                    // reset counters
-                    temperature_timer = TEMPERATURE_TIMER_START;
-                    underheat_lowpass = 0;
                 }
             }
         }
@@ -275,7 +284,7 @@ ISR(ADC_vect) {
     #endif  // ifdef USE_THERMAL_REGULATION
 
 
-    // start another measurement for next time
+    // set the correct type of measurement for next time
     #ifdef USE_THERMAL_REGULATION
         #ifdef USE_LVP
         if (adc_step < 2) ADMUX = ADMUX_VCC;
diff --git a/spaghetti-monster/fsm-adc.h b/spaghetti-monster/fsm-adc.h
index b9462f7..5ffbb73 100644
--- a/spaghetti-monster/fsm-adc.h
+++ b/spaghetti-monster/fsm-adc.h
@@ -35,6 +35,7 @@
 #define VOLTAGE_FUDGE_FACTOR 5
 #endif
 volatile uint8_t voltage;
+volatile uint8_t adcint_enable;  // kludge, because adc auto-retrigger won't turn off
 void low_voltage();
 #ifdef USE_BATTCHECK
 void battcheck();
diff --git a/spaghetti-monster/fsm-wdt.c b/spaghetti-monster/fsm-wdt.c
index 777bef0..ff96ffb 100644
--- a/spaghetti-monster/fsm-wdt.c
+++ b/spaghetti-monster/fsm-wdt.c
@@ -107,9 +107,9 @@ ISR(WDT_vect) {
     // start a new ADC measurement every 4 ticks
     static uint8_t adc_trigger = 0;
     adc_trigger ++;
-    if (adc_trigger > 3) {
-        adc_trigger = 0;
+    if (0 == (adc_trigger & 3)) {
         ADCSRA |= (1 << ADSC) | (1 << ADIE);
+        adcint_enable = 1;
     }
     #endif
 }
-- 
cgit v1.2.3


From 8267c1f121d9766e37d2056004bd7bb47b512288 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Wed, 24 Jan 2018 18:28:29 -0700
Subject: Save a few bytes by changing how PCINT is defined. Minor comment
 cleaning.

---
 spaghetti-monster/fsm-events.h | 2 --
 spaghetti-monster/fsm-pcint.c  | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/fsm-events.h b/spaghetti-monster/fsm-events.h
index 28f1b10..2721303 100644
--- a/spaghetti-monster/fsm-events.h
+++ b/spaghetti-monster/fsm-events.h
@@ -61,10 +61,8 @@ static volatile uint16_t ticks_since_last_event = 0;
 #define A_HOLD            6
 #define A_RELEASE         7
 #define A_RELEASE_TIMEOUT 8
-// TODO: add events for over/under-heat conditions (with parameter for severity)
 #define A_OVERHEATING     9
 #define A_UNDERHEATING    10
-// TODO: add events for low voltage conditions
 #define A_VOLTAGE_LOW     11
 //#define A_VOLTAGE_CRITICAL 12
 #define A_DEBUG           255  // test event for debugging
diff --git a/spaghetti-monster/fsm-pcint.c b/spaghetti-monster/fsm-pcint.c
index 722cb88..a79572d 100644
--- a/spaghetti-monster/fsm-pcint.c
+++ b/spaghetti-monster/fsm-pcint.c
@@ -54,6 +54,8 @@ inline void PCINT_off() {
 }
 
 //void button_change_interrupt() {
+EMPTY_INTERRUPT(PCINT0_vect);
+/*
 ISR(PCINT0_vect) {
 
     //DEBUG_FLASH;
@@ -65,6 +67,7 @@ ISR(PCINT0_vect) {
     // PCINT_inner(button_is_pressed());
 
 }
+*/
 
 // should only be called from PCINT and/or WDT
 // (is a separate function to reduce code duplication)
-- 
cgit v1.2.3


From 653c370cb4f243e2ea8c46bd5d8582f42244cb47 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Wed, 24 Jan 2018 18:31:37 -0700
Subject: Thermal regulation adjustments... - Don't step down lower than 1x7135
 level. - Change speed of gradual adjustments based on how far it needs to go,
   but in all cases slower than before.   (may need further adjusting)   (is
 currently a mess, but I wanted to check it in before I tweak it further)

---
 spaghetti-monster/anduril/anduril.c | 40 +++++++++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 11 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 40809af..1a490ce 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -20,13 +20,14 @@
 
 /********* User-configurable options *********/
 // Physical driver type
-//#define FSM_EMISAR_D4_DRIVER
+#define FSM_EMISAR_D4_DRIVER
 //#define FSM_BLF_Q8_DRIVER
-#define FSM_FW3A_DRIVER
+//#define FSM_FW3A_DRIVER
 
 #define USE_LVP
 #define USE_THERMAL_REGULATION
 #define DEFAULT_THERM_CEIL 50
+#define MIN_THERM_STEPDOWN MAX_1x7135  // lowest value it'll step down to
 #define USE_SET_LEVEL_GRADUALLY
 #define BLINK_AT_CHANNEL_BOUNDARIES
 //#define BLINK_AT_RAMP_FLOOR
@@ -488,11 +489,28 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
                              + 8 - log2(actual_level);
         }
         */
+        // [int(62*3 / (x**0.75)) for x in (1,2,4,8,16,32,64,128)]
+        //uint8_t intervals[] = {186, 110, 65, 39, 23, 13, 8, 4};
+        // [int(62*4 / (x**0.66666)) for x in (1,2,4,8,16,32,64,128)]
+        uint8_t intervals[] = {248, 156, 98, 62, 39, 24, 15, 9};
         uint8_t diff;
+        //static uint8_t ticks_since_adjust = 0;
+        //ticks_since_adjust ++;
         if (target_level > actual_level) diff = target_level - actual_level;
         else diff = actual_level - target_level;
-        if (! diff) diff = 1;
-        uint8_t ticks_per_adjust = (TICKS_PER_SECOND*2) / diff;
+        //if (! diff) diff = 1;
+        //uint8_t ticks_per_adjust = (TICKS_PER_SECOND*4) / diff;
+        uint8_t magnitude = 0;
+        while (diff) {
+            magnitude ++;
+            diff >>= 1;
+        }
+        uint8_t ticks_per_adjust = intervals[magnitude];
+        //if (ticks_since_adjust > ticks_per_adjust)
+        //{
+        //    gradual_tick();
+        //    ticks_since_adjust = 0;
+        //}
         if (!(arg % ticks_per_adjust)) gradual_tick();
 
         // adjust every N frames
@@ -510,15 +528,15 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
     #ifdef USE_THERMAL_REGULATION
     // overheating: drop by an amount proportional to how far we are above the ceiling
     else if (event == EV_temperature_high) {
-        /*
+        #if 0
         uint8_t foo = actual_level;
         set_level(0);
         delay_4ms(2);
         set_level(foo);
-        */
-        if (actual_level > MAX_LEVEL/3) {
+        #endif
+        if (actual_level > MIN_THERM_STEPDOWN) {
             int16_t stepdown = actual_level - arg;
-            if (stepdown < MAX_LEVEL/3) stepdown = MAX_LEVEL/3;
+            if (stepdown < MIN_THERM_STEPDOWN) stepdown = MIN_THERM_STEPDOWN;
             else if (stepdown > MAX_LEVEL) stepdown = MAX_LEVEL;
             #ifdef USE_SET_LEVEL_GRADUALLY
             set_level_gradually(stepdown);
@@ -531,17 +549,17 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
     // underheating: increase slowly if we're lower than the target
     //               (proportional to how low we are)
     else if (event == EV_temperature_low) {
-        /*
+        #if 0
         uint8_t foo = actual_level;
         set_level(0);
         delay_4ms(2);
         set_level(foo);
-        */
+        #endif
         if (actual_level < target_level) {
             //int16_t stepup = actual_level + (arg>>1);
             int16_t stepup = actual_level + arg;
             if (stepup > target_level) stepup = target_level;
-            else if (stepup < MAX_LEVEL/3) stepup = MAX_LEVEL/3;
+            else if (stepup < MIN_THERM_STEPDOWN) stepup = MIN_THERM_STEPDOWN;
             #ifdef USE_SET_LEVEL_GRADUALLY
             set_level_gradually(stepup);
             #else
-- 
cgit v1.2.3


From 5ee5845d4614cb8285cdf0bf529c26bec7ce7217 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Wed, 24 Jan 2018 19:43:00 -0700
Subject: FSM: added ability to adjust temperature calibration in UI
 (lower-case therm_cal_offset var).

---
 spaghetti-monster/fsm-adc.c | 2 +-
 spaghetti-monster/fsm-adc.h | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/fsm-adc.c b/spaghetti-monster/fsm-adc.c
index d863b94..c6f5d2a 100644
--- a/spaghetti-monster/fsm-adc.c
+++ b/spaghetti-monster/fsm-adc.c
@@ -150,7 +150,7 @@ ISR(ADC_vect) {
     // temperature
     else if (adc_step == 3) {
         // Convert ADC units to Celsius (ish)
-        int16_t temp = measurement - 275 + THERM_CAL_OFFSET;
+        int16_t temp = measurement - 275 + THERM_CAL_OFFSET + therm_cal_offset;
 
         // prime on first execution
         if (reset_thermal_history) {
diff --git a/spaghetti-monster/fsm-adc.h b/spaghetti-monster/fsm-adc.h
index 5ffbb73..1b16d01 100644
--- a/spaghetti-monster/fsm-adc.h
+++ b/spaghetti-monster/fsm-adc.h
@@ -66,11 +66,12 @@ void battcheck();
 #ifndef THERM_CAL_OFFSET
 #define THERM_CAL_OFFSET 0
 #endif
-// temperature now, in C (ish)
+// temperature now, in C (ish) * 2  (14.1 fixed-point)
 volatile int16_t temperature;
-// temperature in a few seconds, in C (ish) * 4  (13.2 fixed-point)
+// temperature in a few seconds, in C (ish) * 2  (14.1 fixed-point)
 volatile int16_t projected_temperature;  // Fight the future!
-volatile uint8_t therm_ceil = DEFAULT_THERM_CEIL;
+uint8_t therm_ceil = DEFAULT_THERM_CEIL;
+int8_t therm_cal_offset = 0;
 //void low_temperature();
 //void high_temperature();
 volatile uint8_t reset_thermal_history = 1;
-- 
cgit v1.2.3


From b005fc57c07d2acd7debedb4195450b691452642 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Wed, 24 Jan 2018 19:44:31 -0700
Subject: Anduril: Added room-temperature calibration function.  Slowed down
 thermal regulation speed for small adjustments.

---
 spaghetti-monster/anduril/anduril.c | 87 +++++++++++++++++++------------------
 1 file changed, 44 insertions(+), 43 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 1a490ce..eae671a 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -66,11 +66,12 @@
 #endif
 
 // try to auto-detect how many eeprom bytes
+// FIXME: detect this better, and assign offsets better, for various configs
 #define USE_EEPROM
 #ifdef USE_INDICATOR_LED
-#define EEPROM_BYTES 13
+#define EEPROM_BYTES 14
 #elif defined(USE_THERMAL_REGULATION)
-#define EEPROM_BYTES 12
+#define EEPROM_BYTES 13
 #else
 #define EEPROM_BYTES 11
 #endif
@@ -479,48 +480,32 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
     #endif
     #if defined(USE_SET_LEVEL_GRADUALLY) || defined(USE_REVERSING)
     else if (event == EV_tick) {
+        #ifdef USE_REVERSING
+        // un-reverse after 1 second
+        if (arg == TICKS_PER_SECOND) ramp_direction = 1;
+        #endif
         #ifdef USE_SET_LEVEL_GRADUALLY
-        /* TODO: make thermal adjustment speed scale with magnitude
-        if (ticks_since_adjust > ticks_per_adjust) {
-            gradual_tick();
-            ticks_since_adjust = 0;
-            ticks_per_adjust = (TICKS_PER_SECOND*2) \
-                             / (diff(actual_level, target_level)) \
-                             + 8 - log2(actual_level);
-        }
-        */
-        // [int(62*3 / (x**0.75)) for x in (1,2,4,8,16,32,64,128)]
-        //uint8_t intervals[] = {186, 110, 65, 39, 23, 13, 8, 4};
-        // [int(62*4 / (x**0.66666)) for x in (1,2,4,8,16,32,64,128)]
-        uint8_t intervals[] = {248, 156, 98, 62, 39, 24, 15, 9};
+        // make thermal adjustment speed scale with magnitude
+        if (arg & 1) return MISCHIEF_MANAGED;  // adjust slower
+        // [int(62*4 / (x**0.8)) for x in (1,2,4,8,16,32,64,128)]
+        uint8_t intervals[] = {248, 142, 81, 46, 26, 15, 8, 5};
         uint8_t diff;
-        //static uint8_t ticks_since_adjust = 0;
-        //ticks_since_adjust ++;
+        static uint8_t ticks_since_adjust = 0;
+        ticks_since_adjust ++;
         if (target_level > actual_level) diff = target_level - actual_level;
         else diff = actual_level - target_level;
-        //if (! diff) diff = 1;
-        //uint8_t ticks_per_adjust = (TICKS_PER_SECOND*4) / diff;
         uint8_t magnitude = 0;
         while (diff) {
             magnitude ++;
             diff >>= 1;
         }
         uint8_t ticks_per_adjust = intervals[magnitude];
-        //if (ticks_since_adjust > ticks_per_adjust)
-        //{
-        //    gradual_tick();
-        //    ticks_since_adjust = 0;
-        //}
-        if (!(arg % ticks_per_adjust)) gradual_tick();
-
-        // adjust every N frames
-        //if (!(arg & 7)) gradual_tick();
-        //if (!(arg & 3)) gradual_tick();
-        //gradual_tick();
-        #endif
-        #ifdef USE_REVERSING
-        // un-reverse after 1 second
-        if (arg == TICKS_PER_SECOND) ramp_direction = 1;
+        if (ticks_since_adjust > ticks_per_adjust)
+        {
+            gradual_tick();
+            ticks_since_adjust = 0;
+        }
+        //if (!(arg % ticks_per_adjust)) gradual_tick();
         #endif
         return MISCHIEF_MANAGED;
     }
@@ -1006,26 +991,40 @@ uint8_t ramp_config_state(EventPtr event, uint16_t arg) {
 
 #ifdef USE_THERMAL_REGULATION
 uint8_t thermal_config_state(EventPtr event, uint16_t arg) {
-    static uint8_t done = 0;
+    static uint8_t config_step;
     if (event == EV_enter_state) {
         set_level(0);
-        done = 0;
+        config_step = 0;
         return MISCHIEF_MANAGED;
     }
     // advance forward through config steps
     else if (event == EV_tick) {
         // ask the user for a number
-        if (! done) push_state(number_entry_state, 0);
+        if (config_step < 2) {
+            push_state(number_entry_state, config_step + 1);
+        }
         // return to original mode
-        else set_state(tempcheck_state, 0);
+        else {
+            save_config();
+            set_state(tempcheck_state, 0);
+        }
         return MISCHIEF_MANAGED;
     }
     // an option was set (return from number_entry_state)
     else if (event == EV_reenter_state) {
-        if (number_entry_value) therm_ceil = 30 + number_entry_value;
+        if (number_entry_value) {
+            // calibrate room temperature
+            if (config_step == 0) {
+                int8_t rawtemp = (temperature >> 1) - therm_cal_offset;
+                therm_cal_offset = number_entry_value - rawtemp;
+            }
+            // set maximum heat limit
+            else {
+                therm_ceil = 30 + number_entry_value;
+            }
+        }
         if (therm_ceil > MAX_THERM_CEIL) therm_ceil = MAX_THERM_CEIL;
-        save_config();
-        done = 1;
+        config_step ++;
         return MISCHIEF_MANAGED;
     }
     return EVENT_NOT_HANDLED;
@@ -1222,9 +1221,10 @@ void load_config() {
         beacon_seconds = eeprom[10];
         #ifdef USE_THERMAL_REGULATION
         therm_ceil = eeprom[11];
+        therm_cal_offset = eeprom[12];
         #endif
         #ifdef USE_INDICATOR_LED
-        indicator_led_mode = eeprom[12];
+        indicator_led_mode = eeprom[13];
         #endif
     }
     #ifdef START_AT_MEMORIZED_LEVEL
@@ -1248,9 +1248,10 @@ void save_config() {
     eeprom[10] = beacon_seconds;
     #ifdef USE_THERMAL_REGULATION
     eeprom[11] = therm_ceil;
+    eeprom[12] = therm_cal_offset;
     #endif
     #ifdef USE_INDICATOR_LED
-    eeprom[12] = indicator_led_mode;
+    eeprom[13] = indicator_led_mode;
     #endif
 
     save_eeprom();
-- 
cgit v1.2.3


From e7ba9ebb7ddbad952da046c70853a835c737d4a7 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Wed, 24 Jan 2018 20:06:11 -0700
Subject: Anduril: Re-ordered strobe modes.  Reduced compiled size a bit by
 caching volatile vars.

---
 spaghetti-monster/anduril/anduril.c | 84 +++++++++++++++++++++----------------
 1 file changed, 49 insertions(+), 35 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index eae671a..2509218 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -188,7 +188,12 @@ uint8_t target_level = 0;
 
 // strobe timing
 volatile uint8_t strobe_delays[] = { 40, 67 };  // party strobe, tactical strobe
-volatile uint8_t strobe_type = 3;  // 0 == party strobe, 1 == tactical strobe, 2 == lightning storm, 3 == bike flasher
+// 0 == bike flasher
+// 1 == party strobe
+// 2 == tactical strobe
+// 3 == lightning storm
+// 4 == candle mode
+volatile uint8_t strobe_type = 4;
 
 // bike mode config options
 volatile uint8_t bike_flasher_brightness = MAX_1x7135;
@@ -560,6 +565,7 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
 
 uint8_t strobe_state(EventPtr event, uint16_t arg) {
     // FIXME: re-order the strobes so candle and lightning are adjacent
+    uint8_t st = strobe_type;
     #ifdef USE_CANDLE_MODE
     //#define MAX_CANDLE_LEVEL (RAMP_SIZE-8-6-4)
     #define MAX_CANDLE_LEVEL (RAMP_SIZE/2)
@@ -580,7 +586,7 @@ uint8_t strobe_state(EventPtr event, uint16_t arg) {
     }
     // 2 clicks: rotate through strobe/flasher modes
     else if (event == EV_2clicks) {
-        strobe_type = (strobe_type + 1) % NUM_STROBES;
+        strobe_type = (st + 1) % NUM_STROBES;
         interrupt_nice_delays();
         save_config();
         return MISCHIEF_MANAGED;
@@ -588,20 +594,23 @@ uint8_t strobe_state(EventPtr event, uint16_t arg) {
     // hold: change speed (go faster)
     //       or change brightness (brighter)
     else if (event == EV_click1_hold) {
-        if (strobe_type < 2) {
-            if ((arg & 1) == 0) {
-                if (strobe_delays[strobe_type] > 8) strobe_delays[strobe_type] --;
-            }
-        }
         // biking mode brighter
-        else if (strobe_type == 3) {
+        if (st == 0) {
             if (bike_flasher_brightness < MAX_BIKING_LEVEL)
                 bike_flasher_brightness ++;
             set_level(bike_flasher_brightness);
         }
+        // strobe faster
+        else if (st < 3) {
+            if ((arg & 1) == 0) {
+                if (strobe_delays[st-1] > 8) strobe_delays[st-1] --;
+            }
+        }
+        // lightning has no adjustments
+        // else if (st == 3) {}
         #ifdef USE_CANDLE_MODE
         // candle mode brighter
-        else if (strobe_type == 4) {
+        else if (st == 4) {
             if (candle_mode_brightness < MAX_CANDLE_LEVEL)
                 candle_mode_brightness ++;
         }
@@ -611,20 +620,23 @@ uint8_t strobe_state(EventPtr event, uint16_t arg) {
     // click, hold: change speed (go slower)
     //       or change brightness (dimmer)
     else if (event == EV_click2_hold) {
-        if (strobe_type < 2) {
-            if ((arg & 1) == 0) {
-                if (strobe_delays[strobe_type] < 255) strobe_delays[strobe_type] ++;
-            }
-        }
         // biking mode dimmer
-        else if (strobe_type == 3) {
+        if (st == 0) {
             if (bike_flasher_brightness > 2)
                 bike_flasher_brightness --;
             set_level(bike_flasher_brightness);
         }
+        // strobe slower
+        else if (st < 3) {
+            if ((arg & 1) == 0) {
+                if (strobe_delays[st-1] < 255) strobe_delays[st-1] ++;
+            }
+        }
+        // lightning has no adjustments
+        // else if (st == 3) {}
         #ifdef USE_CANDLE_MODE
         // candle mode dimmer
-        else if (strobe_type == 4) {
+        else if (st == 4) {
             if (candle_mode_brightness > 1)
                 candle_mode_brightness --;
         }
@@ -644,7 +656,7 @@ uint8_t strobe_state(EventPtr event, uint16_t arg) {
         pseudo_rand_seed += arg;
         #endif
         #ifdef USE_CANDLE_MODE
-        if (strobe_type == 4) {
+        if (st == 4) {
             // 3-oscillator synth for a relatively organic pattern
             uint8_t add;
             add = ((triangle_wave(candle_wave1) * 8) >> 8)
@@ -1342,23 +1354,37 @@ void loop() {
     #endif
 
     if (state == strobe_state) {
+        uint8_t st = strobe_type;
+        // bike flasher
+        if (st == 0) {
+            uint8_t burst = bike_flasher_brightness << 1;
+            if (burst > MAX_LEVEL) burst = MAX_LEVEL;
+            for(uint8_t i=0; i<4; i++) {
+                set_level(burst);
+                if (! nice_delay_ms(5)) return;
+                set_level(bike_flasher_brightness);
+                if (! nice_delay_ms(65)) return;
+            }
+            if (! nice_delay_ms(720)) return;
+        }
         // party / tactical strobe
-        if (strobe_type < 2) {
+        else if (st < 3) {
+            uint8_t del = strobe_delays[st-1];
             // TODO: make tac strobe brightness configurable?
             set_level(STROBE_BRIGHTNESS);
             CLKPR = 1<<CLKPCE; CLKPR = 0;  // run at full speed
-            if (strobe_type == 0) {  // party strobe
-                if (strobe_delays[strobe_type] < 42) delay_zero();
+            if (st == 1) {  // party strobe
+                if (del < 42) delay_zero();
                 else nice_delay_ms(1);
             } else {  //tactical strobe
-                nice_delay_ms(strobe_delays[strobe_type] >> 1);
+                nice_delay_ms(del >> 1);
             }
             set_level(0);
-            nice_delay_ms(strobe_delays[strobe_type]);
+            nice_delay_ms(del);
         }
         #ifdef USE_LIGHTNING_MODE
         // lightning storm
-        else if (strobe_type == 2) {
+        else if (st == 3) {
             int16_t brightness;
             uint16_t rand_time;
 
@@ -1403,18 +1429,6 @@ void loop() {
 
         }
         #endif
-        // bike flasher
-        else if (strobe_type == 3) {
-            uint8_t burst = bike_flasher_brightness << 1;
-            if (burst > MAX_LEVEL) burst = MAX_LEVEL;
-            for(uint8_t i=0; i<4; i++) {
-                set_level(burst);
-                if (! nice_delay_ms(5)) return;
-                set_level(bike_flasher_brightness);
-                if (! nice_delay_ms(65)) return;
-            }
-            if (! nice_delay_ms(720)) return;
-        }
     }
 
     #ifdef USE_BATTCHECK
-- 
cgit v1.2.3


From 729d7e2cecf19f9de18e5a2ef45cd28b369334ab Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Wed, 24 Jan 2018 20:45:10 -0700
Subject: Made candle mode more candle-like and more complex.

---
 spaghetti-monster/anduril/anduril.c | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 2509218..71c3d62 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -573,6 +573,8 @@ uint8_t strobe_state(EventPtr event, uint16_t arg) {
     static uint8_t candle_wave2 = 0;
     static uint8_t candle_wave3 = 0;
     static uint8_t candle_wave2_speed = 0;
+    static uint8_t candle_wave2_depth = 7;
+    static uint8_t candle_wave3_depth = 4;
     static uint8_t candle_mode_brightness = 20;
     #endif
 
@@ -660,19 +662,32 @@ uint8_t strobe_state(EventPtr event, uint16_t arg) {
             // 3-oscillator synth for a relatively organic pattern
             uint8_t add;
             add = ((triangle_wave(candle_wave1) * 8) >> 8)
-                + ((triangle_wave(candle_wave2) * 7) >> 8)
-                + ((triangle_wave(candle_wave3) * 4) >> 8);
+                + ((triangle_wave(candle_wave2) * candle_wave2_depth) >> 8)
+                + ((triangle_wave(candle_wave3) * candle_wave3_depth) >> 8);
             set_level(candle_mode_brightness + add);
-            // slow LFO
+            // wave1: slow random LFO
             if ((arg & 1) == 0) candle_wave1 += pseudo_rand()&1;
-            // faster LFO
-            //candle_wave2 += pseudo_rand()%13;
+            // wave2: medium-speed erratic LFO
             candle_wave2 += candle_wave2_speed;
-            // erratic fast wave
+            // wave3: erratic fast wave
             candle_wave3 += pseudo_rand()%37;
             // S&H on wave2 frequency to make it more erratic
-            if ((pseudo_rand()>>3) == 0)
+            if ((pseudo_rand()>>2) == 0)
                 candle_wave2_speed = pseudo_rand()%13;
+            // downward sawtooth on wave2 depth to simulate stabilizing
+            if ((candle_wave2_depth > 0) && ((pseudo_rand()>>2) == 0))
+                candle_wave2_depth --;
+            // random sawtooth retrigger
+            if ((pseudo_rand()) == 0) {
+                candle_wave2_depth = 6;
+                //candle_wave3_depth = 5;
+                candle_wave2 = 0;
+            }
+            // downward sawtooth on wave3 depth to simulate stabilizing
+            if ((candle_wave3_depth > 2) && ((pseudo_rand()>>3) == 0))
+                candle_wave3_depth --;
+            if ((pseudo_rand()>>1) == 0)
+                candle_wave3_depth = 4;
         }
         #endif
         return MISCHIEF_MANAGED;
-- 
cgit v1.2.3


From e28b53c50d967a291b29c713ed9e637edd072e30 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Wed, 24 Jan 2018 21:07:08 -0700
Subject: Minor candle mode tweaks for a better appearance.

---
 spaghetti-monster/anduril/anduril.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 71c3d62..9d7e0d8 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -575,7 +575,7 @@ uint8_t strobe_state(EventPtr event, uint16_t arg) {
     static uint8_t candle_wave2_speed = 0;
     static uint8_t candle_wave2_depth = 7;
     static uint8_t candle_wave3_depth = 4;
-    static uint8_t candle_mode_brightness = 20;
+    static uint8_t candle_mode_brightness = 24;
     #endif
 
     if (event == EV_enter_state) {
@@ -679,7 +679,7 @@ uint8_t strobe_state(EventPtr event, uint16_t arg) {
                 candle_wave2_depth --;
             // random sawtooth retrigger
             if ((pseudo_rand()) == 0) {
-                candle_wave2_depth = 6;
+                candle_wave2_depth = 7;
                 //candle_wave3_depth = 5;
                 candle_wave2 = 0;
             }
@@ -687,7 +687,7 @@ uint8_t strobe_state(EventPtr event, uint16_t arg) {
             if ((candle_wave3_depth > 2) && ((pseudo_rand()>>3) == 0))
                 candle_wave3_depth --;
             if ((pseudo_rand()>>1) == 0)
-                candle_wave3_depth = 4;
+                candle_wave3_depth = 5;
         }
         #endif
         return MISCHIEF_MANAGED;
-- 
cgit v1.2.3


From 07ca00069778798296170a14bfe1c33e8b2e360e Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Thu, 25 Jan 2018 04:32:33 -0700
Subject: Updated Anduril UI text/diagram to match current code.

---
 spaghetti-monster/anduril/anduril-ui.png |  Bin 229400 -> 237749 bytes
 spaghetti-monster/anduril/anduril.svg    | 1264 +++++++++++++++++++-----------
 spaghetti-monster/anduril/anduril.txt    |   10 +-
 3 files changed, 835 insertions(+), 439 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril-ui.png b/spaghetti-monster/anduril/anduril-ui.png
index 555e9a4..2776696 100644
Binary files a/spaghetti-monster/anduril/anduril-ui.png and b/spaghetti-monster/anduril/anduril-ui.png differ
diff --git a/spaghetti-monster/anduril/anduril.svg b/spaghetti-monster/anduril/anduril.svg
index 11ee01c..b72e2f8 100644
--- a/spaghetti-monster/anduril/anduril.svg
+++ b/spaghetti-monster/anduril/anduril.svg
@@ -12,14 +12,14 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18.056446cm"
-   height="27.595072cm"
+   height="26.675991cm"
    id="svg2"
    version="1.1"
    inkscape:version="0.92.1 r15371"
    sodipodi:docname="anduril.svg"
    inkscape:export-filename="/tmp/anduril-ui.png"
-   inkscape:export-xdpi="110.4545"
-   inkscape:export-ydpi="110.4545">
+   inkscape:export-xdpi="114.26005"
+   inkscape:export-ydpi="114.26005">
   <defs
      id="defs4">
     <marker
@@ -1452,10 +1452,10 @@
        fx="359.77701"
        fy="645.03406"
        r="88.283775"
-       gradientTransform="matrix(1,0,0,0.45837941,802.95853,346.47801)"
+       gradientTransform="matrix(1,0,0,0.45837941,1046.7373,309.93065)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       gradientTransform="translate(826.63315,-49.099837)"
+       gradientTransform="translate(946.65782,48.302653)"
        inkscape:collect="always"
        xlink:href="#linearGradient7283"
        id="linearGradient7285-8"
@@ -2050,7 +2050,7 @@
        fx="-305.73798"
        fy="215.58585"
        r="82.355362"
-       gradientTransform="matrix(0.91925378,0.02375671,-0.01750658,0.91984172,-20.913072,24.544353)"
+       gradientTransform="matrix(0.81547374,1.0752196e-8,0,0.75203116,-56.41674,53.458608)"
        gradientUnits="userSpaceOnUse" />
     <marker
        inkscape:stockid="Arrow1Mend"
@@ -2145,6 +2145,186 @@
          style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
          inkscape:connector-curvature="0" />
     </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-367-0-3-6-6"
+       style="overflow:visible">
+      <path
+         id="path3856-53-3-8-4-2"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-31-1-0-9"
+       style="overflow:visible">
+      <path
+         id="path3856-103-9-0-1"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-367-3-5-0"
+       style="overflow:visible">
+      <path
+         id="path3856-53-8-86-6"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-367-3-5-6"
+       style="overflow:visible">
+      <path
+         id="path3856-53-8-86-1"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-367-3-5-7"
+       style="overflow:visible">
+      <path
+         id="path3856-53-8-86-9"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-367-3-5-2"
+       style="overflow:visible">
+      <path
+         id="path3856-53-8-86-3"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-367-3-5-5"
+       style="overflow:visible">
+      <path
+         id="path3856-53-8-86-92"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-31-1-0-9-9"
+       style="overflow:visible">
+      <path
+         id="path3856-103-9-0-1-7"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-367-3-02"
+       style="overflow:visible">
+      <path
+         id="path3856-53-8-1"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-367-3-51"
+       style="overflow:visible">
+      <path
+         id="path3856-53-8-10"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-367-3-50"
+       style="overflow:visible">
+      <path
+         id="path3856-53-8-64"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4336"
+       id="radialGradient5882-9-2"
+       cx="-308.42361"
+       cy="215.26414"
+       fx="-308.42361"
+       fy="215.26414"
+       r="82.355362"
+       gradientTransform="matrix(0.97462339,0.03065639,-0.00222587,0.92717931,-7.2787813,25.071964)"
+       gradientUnits="userSpaceOnUse" />
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-88-9-4-4"
+       style="overflow:visible">
+      <path
+         id="path3856-868-6-1-0"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-88-9-4-0-4-9"
+       style="overflow:visible">
+      <path
+         id="path3856-868-6-1-5-7-6"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -2153,13 +2333,13 @@
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.1659087"
-     inkscape:cx="96.779654"
-     inkscape:cy="521.48167"
+     inkscape:zoom="1.2060783"
+     inkscape:cx="341.22418"
+     inkscape:cy="504.11322"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="false"
+     showgrid="false"
+     showguides="true"
      gridtolerance="1"
      inkscape:window-width="2548"
      inkscape:window-height="1415"
@@ -2170,7 +2350,13 @@
      fit-margin-left="0.5"
      fit-margin-right="0.5"
      fit-margin-bottom="0.5"
-     units="cm">
+     units="cm"
+     inkscape:snap-global="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true">
     <inkscape:grid
        type="xygrid"
        id="grid3065"
@@ -2182,7 +2368,7 @@
        spacingx="37.795276"
        spacingy="37.795276"
        originx="-1038.3034"
-       originy="1.4684007" />
+       originy="-33.268489" />
   </sodipodi:namedview>
   <metadata
      id="metadata7">
@@ -2215,12 +2401,12 @@
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.33333397px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
-       x="1270.3541"
+       x="1309.1692"
        y="511.25677"
        id="text3021-8-4-1-8-8-2-6"><tspan
          sodipodi:role="line"
          id="tspan3023-4-0-1-9-63-8-1"
-         x="1270.3541"
+         x="1309.1692"
          y="511.25677"
          style="font-size:29.33333397px;line-height:1.25;stroke-width:1.06666672">Blinkies</tspan></text>
     <text
@@ -2242,477 +2428,314 @@
        height="363.7735"
        x="1058.2677"
        y="101.00932" />
-    <path
-       style="fill:none;stroke:#009d00;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-367-3-0)"
-       d="m 1528.8407,526.48049 c 8.4166,10.98488 13.1688,17.22794 14.1947,43.63137"
-       id="path5213-6-8-4-9-9-56-6-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#009d00;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-367-3-8)"
-       d="m 1540.7977,634.3249 c -0.7283,14.71986 -0.7604,21.35476 -15.3238,38.55104"
-       id="path5213-6-8-4-9-9-56-6-9"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#009d00;stroke-width:2.1329999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect14693"
+       width="192.66586"
+       height="169.39575"
+       x="1405.2867"
+       y="520.16724"
+       rx="37" />
     <path
        style="fill:none;stroke:#009d00;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-367-3)"
-       d="m 1359.8549,566.85777 c 0.6153,-26.89971 11.0099,-28.5571 31.3786,-36.87383"
+       d="m 1423.7634,525.54094 c 0.4636,-0.36597 1.7694,-0.51555 5.2997,-2.53158"
        id="path5213-6-8-4-9-9-56-6"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#009d00;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-367-3-7)"
-       d="m 1390.4848,688.37946 c -25.7766,0.44211 -30.8655,-10.77034 -30.5643,-37.49635"
-       id="path5213-6-8-4-9-9-56-6-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
     <rect
        style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect5159-47"
-       width="438.90619"
+       width="399.48456"
        height="260.94336"
-       x="1261.8812"
+       x="1301.3027"
        y="480.43896" />
+    <ellipse
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#9cb9e2;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path13346"
+       cx="1225.0675"
+       cy="1364.3586"
+       rx="153.35057"
+       ry="94.775864" />
     <rect
        style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect5159-6"
-       width="349.56049"
-       height="344.7095"
+       width="349.56042"
+       height="310.40146"
        x="1058.2677"
        y="758.40918" />
     <g
-       id="g23897"
-       transform="translate(197.49566,-36.547359)">
+       id="g14799"
+       transform="translate(-1.0079016)">
+      <path
+         sodipodi:nodetypes="csscsscsssccsscsssssscssssssssscccssscsssssssssssssscsssscsscssssccc"
+         style="fill:#ffffff;fill-opacity:0.99504945;stroke:#000000;stroke-width:3.20000005;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1405.6649,642.61454 c -0.4528,-0.77951 -1.0803,-1.93107 -1.3944,-2.55904 -1.0737,-2.14685 -4.3131,-7.98949 -5.8699,-10.58711 -4.3266,-7.21903 -7.6037,-10.33824 -10.9596,-10.43127 -1.1186,-0.0309 -1.3542,0.0431 -2.4508,0.77103 -1.2711,0.84373 -2.1683,1.85544 -3.5537,4.00743 -0.4567,0.70938 -0.958,1.29061 -1.114,1.29161 -0.156,0.001 -0.9033,-0.54296 -1.6607,-1.20878 -7.1051,-6.24594 -14.3753,-9.53314 -19.4236,-8.7823 -3.48,0.51759 -5.0204,1.56173 -6.3938,4.33401 l -0.8858,1.78805 0.011,2.61009 c 0.011,2.85728 0.4129,4.7602 1.6033,7.59226 1.304,3.10248 4.2705,7.39835 7.3473,10.63996 0.8946,0.9425 1.5704,1.71317 1.5019,1.71263 -0.4463,-0.003 -7.9187,-2.69233 -10.6412,-3.82902 -9.6708,-4.03772 -16.4977,-8.35341 -21.7399,-13.74329 -4.3679,-4.49084 -7.1775,-8.79859 -8.874,-13.60588 -1.423,-4.03226 -1.7223,-8.61526 -0.7973,-12.20916 1.2721,-4.94273 4.1587,-9.44906 9.1295,-14.25253 8.9547,-8.65325 21.3332,-14.86929 39.844,-20.00822 2.5963,-0.72078 4.771,-1.26013 4.8325,-1.19854 0.062,0.0616 -0.1838,0.42841 -0.5455,0.81514 -3.4867,3.729 -6.1245,8.13223 -6.7635,11.29025 -0.8015,3.96135 0.9707,8.08749 4.5023,10.48189 3.6869,2.49979 7.1211,3.43584 12.0741,3.29111 2.5161,-0.0735 2.8886,-0.1349 3.94,-0.64934 2.5533,-1.24918 4.3142,-3.15132 6.057,-6.54273 1.7409,-3.38781 2.0096,-4.74402 2.7417,-13.83851 0.2853,-3.54386 0.5748,-6.74799 0.6434,-7.12032 0.2923,-1.58661 0.8641,-1.01936 2.6229,2.60221 0.6806,1.40141 1.4217,2.64659 1.6468,2.76707 0.2884,0.15436 1.0531,0.1497 2.5905,-0.0158 1.632,-0.17572 2.9123,-0.17461 5.085,0.004 2.867,0.2362 2.9101,0.23344 3.3901,-0.21752 0.2674,-0.25122 0.8726,-1.35826 1.3449,-2.46008 0.4722,-1.10183 1.099,-2.36999 1.3928,-2.81817 l 0.5342,-0.81485 0.2758,0.52623 c 0.4689,0.89501 0.8326,3.8019 1.4248,11.38899 0.497,6.36774 1.4643,9.24832 4.3881,13.06838 2.6506,3.46298 4.5846,4.27584 9.7379,4.09266 3.3642,-0.11958 5.0057,-0.46765 7.4657,-1.58306 4.2373,-1.92126 6.8173,-4.97803 7.4071,-8.77563 0.4545,-2.92687 -0.5377,-6.24976 -2.9384,-9.84036 -1.1827,-1.7688 -2.4781,-3.40213 -3.8135,-4.80832 -0.5385,-0.5671 -0.7241,-0.88226 -0.5195,-0.88226 0.4593,0 9.5442,2.56459 12.622,3.56306 22.3994,7.26655 37.858,19.25169 41.1432,31.89844 1.8774,7.22754 -0.9294,15.82998 -7.7794,23.84266 -2.308,2.69978 -3.5406,3.82883 -7.087,6.49171 -6.1933,4.65046 -11.5703,7.47767 -20.5514,10.80591 -2.9406,1.08974 -6.411,2.26689 -6.7199,2.27938 -0.043,0.001 0.5459,-0.65721 1.3072,-1.46427 4.3463,-4.60728 7.433,-9.51352 8.6471,-13.74407 0.6134,-2.13752 0.7622,-5.66081 0.313,-7.41075 -0.6515,-2.53772 -1.9946,-4.20202 -4.2556,-5.27337 -1.3335,-0.63187 -1.4404,-0.64784 -4.2739,-0.63813 -2.6104,0.01 -3.086,0.0691 -4.6708,0.59188 -3.9756,1.31118 -8.4584,3.98094 -12.5592,7.47975 -1.1418,0.97413 -2.1694,1.76995 -2.2835,1.76848 -0.1142,-10e-4 -0.6268,-0.63027 -1.139,-1.39734 -2.7305,-4.08839 -5.1372,-5.32966 -8.1429,-4.19963 -1.7271,0.64937 -3.2592,2.01781 -5.3119,4.74462 -2.2156,2.9433 -4.0421,5.9743 -8.3381,13.83722 -1.7466,3.19688 -3.2017,5.8431 -3.2335,5.88048 -0.032,0.0373 -0.4282,-0.56984 -0.881,-1.34934 z"
+         id="path3202-5-9-8"
+         inkscape:connector-curvature="0" />
       <path
          sodipodi:nodetypes="csscsscsssccsscsssssscssssssssscccssscsssssssssssssscsssscsscssssccc"
          style="fill:url(#radialGradient7151-3);fill-opacity:1;stroke:#000000;stroke-width:3.20000005;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 1161.8861,679.1619 c -0.4528,-0.77951 -1.0803,-1.93107 -1.3944,-2.55904 -1.0737,-2.14685 -4.3131,-7.98949 -5.8699,-10.58711 -4.3266,-7.21903 -7.6037,-10.33824 -10.9596,-10.43127 -1.1186,-0.0309 -1.3542,0.0431 -2.4508,0.77103 -1.2711,0.84373 -2.1683,1.85544 -3.5537,4.00743 -0.4567,0.70938 -0.958,1.29061 -1.114,1.29161 -0.156,10e-4 -0.9033,-0.54296 -1.6607,-1.20878 -7.1051,-6.24594 -14.3753,-9.53314 -19.4236,-8.7823 -3.48,0.51759 -5.0204,1.56173 -6.3938,4.33401 l -0.8858,1.78805 0.011,2.61009 c 0.011,2.85728 0.4129,4.7602 1.6033,7.59226 1.304,3.10248 4.2705,7.39835 7.3473,10.63996 0.8946,0.9425 1.5704,1.71317 1.5019,1.71263 -0.4463,-0.003 -7.9187,-2.69233 -10.6412,-3.82902 -9.6708,-4.03772 -16.4977,-8.35341 -21.7399,-13.74329 -4.3679,-4.49084 -7.1775,-8.79859 -8.874,-13.60588 -1.423,-4.03226 -1.7223,-8.61526 -0.7973,-12.20916 1.2721,-4.94273 4.1587,-9.44906 9.1295,-14.25253 8.9547,-8.65325 21.3332,-14.86929 39.844,-20.00822 2.5963,-0.72078 4.771,-1.26013 4.8325,-1.19854 0.062,0.0616 -0.1838,0.42841 -0.5455,0.81514 -3.4867,3.729 -6.1245,8.13223 -6.7635,11.29025 -0.8015,3.96135 0.9707,8.08749 4.5023,10.48189 3.6869,2.49979 7.1211,3.43584 12.0741,3.29111 2.5161,-0.0735 2.8886,-0.1349 3.94,-0.64934 2.5533,-1.24918 4.3142,-3.15132 6.057,-6.54273 1.7409,-3.38781 2.0096,-4.74402 2.7417,-13.83851 0.2853,-3.54386 0.5748,-6.74799 0.6434,-7.12032 0.2923,-1.58661 0.8641,-1.01936 2.6229,2.60221 0.6806,1.40141 1.4217,2.64659 1.6468,2.76707 0.2884,0.15436 1.0531,0.1497 2.5905,-0.0158 1.632,-0.17572 2.9123,-0.17461 5.085,0.004 2.867,0.2362 2.9101,0.23344 3.3901,-0.21752 0.2674,-0.25122 0.8726,-1.35826 1.3449,-2.46008 0.4722,-1.10183 1.099,-2.36999 1.3928,-2.81817 l 0.5342,-0.81485 0.2758,0.52623 c 0.4689,0.89501 0.8326,3.8019 1.4248,11.38899 0.497,6.36774 1.4643,9.24832 4.3881,13.06838 2.6506,3.46298 4.5846,4.27584 9.7379,4.09266 3.3642,-0.11958 5.0057,-0.46765 7.4657,-1.58306 4.2373,-1.92126 6.8173,-4.97803 7.4071,-8.77563 0.4545,-2.92687 -0.5377,-6.24976 -2.9384,-9.84036 -1.1827,-1.7688 -2.4781,-3.40213 -3.8135,-4.80832 -0.5385,-0.5671 -0.7241,-0.88226 -0.5195,-0.88226 0.4593,0 9.5442,2.56459 12.622,3.56306 22.3994,7.26655 37.858,19.25169 41.1432,31.89844 1.8774,7.22754 -0.9294,15.82998 -7.7794,23.84266 -2.308,2.69978 -3.5406,3.82883 -7.087,6.49171 -6.1933,4.65046 -11.5703,7.47767 -20.5514,10.80591 -2.9406,1.08974 -6.411,2.26689 -6.7199,2.27938 -0.043,10e-4 0.5459,-0.65721 1.3072,-1.46427 4.3463,-4.60728 7.433,-9.51352 8.6471,-13.74407 0.6134,-2.13752 0.7622,-5.66081 0.313,-7.41075 -0.6515,-2.53772 -1.9946,-4.20202 -4.2556,-5.27337 -1.3335,-0.63187 -1.4404,-0.64784 -4.2739,-0.63813 -2.6104,0.01 -3.086,0.0691 -4.6708,0.59188 -3.9756,1.31118 -8.4584,3.98094 -12.5592,7.47975 -1.1418,0.97413 -2.1694,1.76995 -2.2835,1.76848 -0.1142,-10e-4 -0.6268,-0.63027 -1.139,-1.39734 -2.7305,-4.08839 -5.1372,-5.32966 -8.1429,-4.19963 -1.7271,0.64937 -3.2592,2.01781 -5.3119,4.74462 -2.2156,2.9433 -4.0421,5.9743 -8.3381,13.83722 -1.7466,3.19688 -3.2017,5.8431 -3.2335,5.88048 -0.032,0.0373 -0.4282,-0.56984 -0.881,-1.34934 z"
+         d="m 1405.6649,642.61454 c -0.4528,-0.77951 -1.0803,-1.93107 -1.3944,-2.55904 -1.0737,-2.14685 -4.3131,-7.98949 -5.8699,-10.58711 -4.3266,-7.21903 -7.6037,-10.33824 -10.9596,-10.43127 -1.1186,-0.0309 -1.3542,0.0431 -2.4508,0.77103 -1.2711,0.84373 -2.1683,1.85544 -3.5537,4.00743 -0.4567,0.70938 -0.958,1.29061 -1.114,1.29161 -0.156,0.001 -0.9033,-0.54296 -1.6607,-1.20878 -7.1051,-6.24594 -14.3753,-9.53314 -19.4236,-8.7823 -3.48,0.51759 -5.0204,1.56173 -6.3938,4.33401 l -0.8858,1.78805 0.011,2.61009 c 0.011,2.85728 0.4129,4.7602 1.6033,7.59226 1.304,3.10248 4.2705,7.39835 7.3473,10.63996 0.8946,0.9425 1.5704,1.71317 1.5019,1.71263 -0.4463,-0.003 -7.9187,-2.69233 -10.6412,-3.82902 -9.6708,-4.03772 -16.4977,-8.35341 -21.7399,-13.74329 -4.3679,-4.49084 -7.1775,-8.79859 -8.874,-13.60588 -1.423,-4.03226 -1.7223,-8.61526 -0.7973,-12.20916 1.2721,-4.94273 4.1587,-9.44906 9.1295,-14.25253 8.9547,-8.65325 21.3332,-14.86929 39.844,-20.00822 2.5963,-0.72078 4.771,-1.26013 4.8325,-1.19854 0.062,0.0616 -0.1838,0.42841 -0.5455,0.81514 -3.4867,3.729 -6.1245,8.13223 -6.7635,11.29025 -0.8015,3.96135 0.9707,8.08749 4.5023,10.48189 3.6869,2.49979 7.1211,3.43584 12.0741,3.29111 2.5161,-0.0735 2.8886,-0.1349 3.94,-0.64934 2.5533,-1.24918 4.3142,-3.15132 6.057,-6.54273 1.7409,-3.38781 2.0096,-4.74402 2.7417,-13.83851 0.2853,-3.54386 0.5748,-6.74799 0.6434,-7.12032 0.2923,-1.58661 0.8641,-1.01936 2.6229,2.60221 0.6806,1.40141 1.4217,2.64659 1.6468,2.76707 0.2884,0.15436 1.0531,0.1497 2.5905,-0.0158 1.632,-0.17572 2.9123,-0.17461 5.085,0.004 2.867,0.2362 2.9101,0.23344 3.3901,-0.21752 0.2674,-0.25122 0.8726,-1.35826 1.3449,-2.46008 0.4722,-1.10183 1.099,-2.36999 1.3928,-2.81817 l 0.5342,-0.81485 0.2758,0.52623 c 0.4689,0.89501 0.8326,3.8019 1.4248,11.38899 0.497,6.36774 1.4643,9.24832 4.3881,13.06838 2.6506,3.46298 4.5846,4.27584 9.7379,4.09266 3.3642,-0.11958 5.0057,-0.46765 7.4657,-1.58306 4.2373,-1.92126 6.8173,-4.97803 7.4071,-8.77563 0.4545,-2.92687 -0.5377,-6.24976 -2.9384,-9.84036 -1.1827,-1.7688 -2.4781,-3.40213 -3.8135,-4.80832 -0.5385,-0.5671 -0.7241,-0.88226 -0.5195,-0.88226 0.4593,0 9.5442,2.56459 12.622,3.56306 22.3994,7.26655 37.858,19.25169 41.1432,31.89844 1.8774,7.22754 -0.9294,15.82998 -7.7794,23.84266 -2.308,2.69978 -3.5406,3.82883 -7.087,6.49171 -6.1933,4.65046 -11.5703,7.47767 -20.5514,10.80591 -2.9406,1.08974 -6.411,2.26689 -6.7199,2.27938 -0.043,0.001 0.5459,-0.65721 1.3072,-1.46427 4.3463,-4.60728 7.433,-9.51352 8.6471,-13.74407 0.6134,-2.13752 0.7622,-5.66081 0.313,-7.41075 -0.6515,-2.53772 -1.9946,-4.20202 -4.2556,-5.27337 -1.3335,-0.63187 -1.4404,-0.64784 -4.2739,-0.63813 -2.6104,0.01 -3.086,0.0691 -4.6708,0.59188 -3.9756,1.31118 -8.4584,3.98094 -12.5592,7.47975 -1.1418,0.97413 -2.1694,1.76995 -2.2835,1.76848 -0.1142,-10e-4 -0.6268,-0.63027 -1.139,-1.39734 -2.7305,-4.08839 -5.1372,-5.32966 -8.1429,-4.19963 -1.7271,0.64937 -3.2592,2.01781 -5.3119,4.74462 -2.2156,2.9433 -4.0421,5.9743 -8.3381,13.83722 -1.7466,3.19688 -3.2017,5.8431 -3.2335,5.88048 -0.032,0.0373 -0.4282,-0.56984 -0.881,-1.34934 z"
          id="path3202-5-9"
          inkscape:connector-curvature="0" />
       <text
          id="text3021-8-4-1-8-1-6"
-         y="648.32428"
-         x="1096.7487"
+         y="611.77692"
+         x="1340.5275"
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
          xml:space="preserve"><tspan
            style="font-size:25.60000038px;line-height:1.25;stroke-width:1.06666672"
-           y="648.32428"
-           x="1096.7487"
+           y="611.77692"
+           x="1340.5275"
            id="tspan3023-4-0-1-9-7-2"
            sodipodi:role="line">BattCheck</tspan></text>
     </g>
     <g
-       id="g23902"
-       transform="translate(80.603105,97.40249)">
+       id="g14764">
+      <ellipse
+         ry="29.092394"
+         rx="67.643234"
+         cy="688.51257"
+         cx="1497.9803"
+         id="path3639-4-4-3-7-2"
+         style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <ellipse
          ry="29.092394"
          rx="67.643234"
-         cy="591.11011"
-         cx="1377.9557"
+         cy="688.51257"
+         cx="1497.9803"
          id="path3639-4-4-3-7"
          style="fill:url(#linearGradient7285-8);fill-opacity:1;stroke:#000000;stroke-width:3.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <text
          id="text3021-8-4-1-8-60-5"
-         y="597.84204"
-         x="1315.8811"
+         y="695.24451"
+         x="1435.9058"
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.33333397px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
          xml:space="preserve"><tspan
            style="font-size:21.33333397px;line-height:1.25;stroke-width:1.06666672"
-           y="597.84204"
-           x="1315.8811"
+           y="695.24451"
+           x="1435.9058"
            id="tspan3023-4-0-1-9-2-3"
            sodipodi:role="line">TempCheck</tspan></text>
     </g>
     <g
-       id="g23907"
-       transform="translate(167.89626,-50.594534)">
+       id="g14731">
+      <ellipse
+         ry="29.092394"
+         rx="67.643234"
+         cy="604.77051"
+         cx="1593.5562"
+         id="path3639-4-4-9-1"
+         style="fill:#ffffff;stroke:#000000;stroke-width:3.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;fill-opacity:1" />
       <text
          id="text3021-8-4-1-8-8-2-8"
-         y="663.18408"
-         x="1322.8423"
+         y="612.58954"
+         x="1546.8853"
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
          xml:space="preserve"><tspan
            style="font-size:25.60000038px;line-height:1.25;stroke-width:1.06666672"
-           y="663.18408"
-           x="1322.8423"
+           y="612.58954"
+           x="1546.8853"
            id="tspan3023-4-0-1-9-63-8-83"
            sodipodi:role="line">Beacon</tspan></text>
-      <ellipse
-         ry="29.092394"
-         rx="67.643234"
-         cy="655.36505"
-         cx="1369.5132"
-         id="path3639-4-4-9-1"
-         style="fill:none;stroke:#000000;stroke-width:3.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
     <g
-       id="g23916"
-       transform="translate(208.53273,-230.19769)">
-      <text
-         id="text3021-8-4-1-8-8-2-8-8"
-         y="748.30658"
-         x="1253.4298"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
-         xml:space="preserve"><tspan
-           id="tspan23869"
-           style="font-size:25.60000038px;line-height:1.25;text-align:center;text-anchor:middle;stroke-width:1.06666672"
-           y="748.30658"
-           x="1253.4298"
-           sodipodi:role="line"><tspan
-             style="font-size:25.60000038px;line-height:1.25;text-align:center;text-anchor:middle;stroke-width:1.06666672"
-             id="tspan23871"
-             dy="0 -0.70999998 -0.79000002">Good</tspan></tspan></text>
-      <ellipse
-         ry="29.092394"
-         rx="67.643234"
-         cy="750.01959"
-         cx="1254.1898"
-         id="path3639-4-4-9-1-6"
-         style="fill:none;stroke:#000000;stroke-width:3.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <text
-         id="text3021-8-4-1-8-8-2-8-8-4"
-         y="770.16113"
-         x="1253.4894"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
-         xml:space="preserve"><tspan
-           id="tspan23869-3"
-           style="font-size:25.60000038px;line-height:1.25;text-align:center;text-anchor:middle;stroke-width:1.06666672"
-           y="770.16113"
-           x="1253.4894"
-           sodipodi:role="line">Night<tspan
-   style="font-size:25.60000038px;line-height:1.25;text-align:center;text-anchor:middle;stroke-width:1.06666672"
-   id="tspan23871-3" /></tspan></text>
+       id="g21356">
+      <g
+         id="g21349">
+        <ellipse
+           style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="path3639-4-4-9-1-6"
+           cx="1502.1442"
+           cy="519.8219"
+           rx="67.643234"
+           ry="29.092394" />
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:85.00000238%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+           x="1501.6129"
+           y="529.14062"
+           id="text3021-8-4-1-8-8-2-8-8"><tspan
+             sodipodi:role="line"
+             x="1501.6129"
+             y="529.14062"
+             style="font-size:25.60000038px;line-height:85.00000238%;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke-width:1.06666672"
+             id="tspan14716">Sunset<tspan
+   id="tspan23871"
+   style="font-size:25.60000038px;line-height:85.00000238%;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke-width:1.06666672" /></tspan></text>
+      </g>
     </g>
     <g
-       id="g47448"
-       transform="translate(99.165435,127.50358)">
+       id="g14689"
+       transform="translate(0.47473145)">
       <text
          id="text3021-8-4-1-8-8-7-4"
-         y="554.39911"
-         x="1522.8342"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+         y="699.71509"
+         x="1639.6669"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
          xml:space="preserve"><tspan
-           style="font-size:25.60000038px;line-height:1.25;text-align:center;text-anchor:middle;fill:#ff0000;fill-opacity:1;stroke-width:1.06666672"
-           y="554.39911"
-           x="1522.8342"
+           style="font-size:18.66666603px;line-height:1;text-align:center;text-anchor:middle;fill:#ff0000;fill-opacity:1;stroke-width:1.06666672"
+           y="699.71509"
+           x="1639.6669"
            id="tspan3023-4-0-1-9-63-3-3"
            sodipodi:role="line">Thermal</tspan><tspan
            id="tspan4199-0"
-           style="font-size:25.60000038px;line-height:1.25;text-align:center;text-anchor:middle;fill:#ff0000;fill-opacity:1;stroke-width:1.06666672"
-           y="586.39911"
-           x="1522.8342"
+           style="font-size:18.66666603px;line-height:1;text-align:center;text-anchor:middle;fill:#ff0000;fill-opacity:1;stroke-width:1.06666672"
+           y="718.38177"
+           x="1639.6669"
            sodipodi:role="line">Cfg</tspan></text>
       <ellipse
-         ry="41.719299"
-         rx="67.643234"
-         cy="557.18665"
-         cx="1523.4536"
+         ry="31.258007"
+         rx="50.681404"
+         cy="699.95654"
+         cx="1638.769"
          id="path3639-4-4-6-3"
-         style="fill:none;stroke:#ff0000;stroke-width:3.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="fill:none;stroke:#ff0000;stroke-width:2.39758635;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
     <path
        style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:4.26666667, 4.26666667;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-09)"
-       d="m 1506.8841,709.43656 c 9.3945,19.37444 25.1392,27.72894 56.0431,-0.57732"
+       d="m 1513.2522,717.92736 c 2.42,16.34201 29.9911,22.87705 72.4182,-3.30651"
        id="path5213-6-8-4-9-9-8-4"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
     <g
-       id="g27968"
-       transform="translate(81.104793,-153.43991)">
+       id="g14683">
       <text
          inkscape:transform-center-y="10.020862"
          inkscape:transform-center-x="-5.2422885"
          id="text3021-8-4-1-8-8-2-8-5"
-         y="678.51373"
-         x="1497.9006"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+         y="511.39166"
+         x="1639.1299"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:85.00000238%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
          xml:space="preserve"><tspan
-           style="font-size:25.60000038px;line-height:1.25;stroke-width:1.06666672"
-           y="678.51373"
-           x="1497.9006"
+           style="font-size:18.66666603px;line-height:85.00000238%;text-align:center;text-anchor:middle;stroke-width:1.06666672"
+           y="511.39166"
+           x="1639.1299"
            id="tspan3023-4-0-1-9-63-8-83-9"
-           sodipodi:role="line">Beacon</tspan></text>
+           sodipodi:role="line">Beacon</tspan><tspan
+           style="font-size:18.66666603px;line-height:85.00000238%;text-align:center;text-anchor:middle;stroke-width:1.06666672"
+           y="527.25836"
+           x="1639.1299"
+           sodipodi:role="line"
+           id="tspan14667">Cfg</tspan></text>
       <ellipse
-         inkscape:transform-center-y="11.351831"
-         inkscape:transform-center-x="-4.2569368"
-         ry="29.092394"
-         rx="67.643234"
-         cy="681.21527"
-         cx="1539.7194"
+         inkscape:transform-center-y="8.5053065"
+         inkscape:transform-center-x="-3.1895436"
+         ry="21.797352"
+         rx="50.681404"
+         cy="512.03644"
+         cx="1639.2438"
          id="path3639-4-4-9-1-4"
-         style="fill:none;stroke:#000000;stroke-width:3.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <text
-         inkscape:transform-center-y="10.020862"
-         inkscape:transform-center-x="-5.2422885"
-         id="text3021-8-4-1-8-8-2-8-5-6"
-         y="701.0863"
-         x="1518.9524"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
-         xml:space="preserve"><tspan
-           style="font-size:25.60000038px;line-height:1.25;stroke-width:1.06666672"
-           y="701.0863"
-           x="1518.9524"
-           id="tspan3023-4-0-1-9-63-8-83-9-9"
-           sodipodi:role="line">Cfg</tspan></text>
+         style="fill:none;stroke:#000000;stroke-width:2.39758635;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
     <path
        style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:4.26666667, 4.26666667;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-09-2)"
-       d="m 1604.8958,609.95637 c 16.7016,16.23216 65.1175,22.64511 29.8076,-47.21491"
+       d="m 1655.5374,617.2342 c 16.7016,16.23216 46.3164,-11.31808 11.0065,-81.1781"
        id="path5213-6-8-4-9-9-8-4-4"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
-    <g
-       id="g28835"
-       transform="translate(-34.014058,-126.97235)">
-      <text
-         id="text3021-8-4-1-8-8-2-7"
-         y="981.17542"
-         x="1222.7643"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
-         xml:space="preserve"><tspan
-           style="font-size:25.60000038px;line-height:1.25;stroke-width:1.06666672"
-           y="981.17542"
-           x="1222.7643"
-           id="tspan3023-4-0-1-9-63-8-7"
-           sodipodi:role="line">Bike</tspan></text>
-      <ellipse
-         ry="29.092394"
-         rx="67.643234"
-         cy="986.1272"
-         cx="1248.0287"
-         id="path3639-4-4-9-5"
-         style="fill:none;stroke:#000000;stroke-width:3.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <text
-         id="text3021-8-4-1-8-8-2-7-4"
-         y="1005.0751"
-         x="1202.3188"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
-         xml:space="preserve"><tspan
-           style="font-size:25.60000038px;line-height:1.25;stroke-width:1.06666672"
-           y="1005.0751"
-           x="1202.3188"
-           id="tspan3023-4-0-1-9-63-8-7-8"
-           sodipodi:role="line">Flasher</tspan></text>
-    </g>
-    <g
-       id="g28877"
-       transform="translate(-91.860301,-160.29135)">
-      <text
-         id="text3021-8-4-1-8-8-2-7-2"
-         y="1087.1008"
-         x="1357.3134"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
-         xml:space="preserve"><tspan
-           style="font-size:25.60000038px;line-height:1.25;stroke-width:1.06666672"
-           y="1087.1008"
-           x="1357.3134"
-           id="tspan3023-4-0-1-9-63-8-7-89"
-           sodipodi:role="line">Party</tspan></text>
-      <ellipse
-         ry="29.092394"
-         rx="67.643234"
-         cy="1091.3002"
-         cx="1388.598"
-         id="path3639-4-4-9-5-3"
-         style="fill:none;stroke:#000000;stroke-width:3.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <text
-         id="text3021-8-4-1-8-8-2-7-4-6"
-         y="1111.7531"
-         x="1345.8983"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
-         xml:space="preserve"><tspan
-           style="font-size:25.60000038px;line-height:1.25;stroke-width:1.06666672"
-           y="1111.7531"
-           x="1345.8983"
-           id="tspan3023-4-0-1-9-63-8-7-8-8"
-           sodipodi:role="line">Strobe</tspan></text>
-    </g>
-    <g
-       id="g28919"
-       transform="translate(-37.024167,-215.77056)">
-      <text
-         id="text3021-8-4-1-8-8-2-7-2-2"
-         y="1219.2247"
-         x="1200.4392"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
-         xml:space="preserve"><tspan
-           style="font-size:25.60000038px;line-height:1.25;stroke-width:1.06666672"
-           y="1219.2247"
-           x="1200.4392"
-           id="tspan3023-4-0-1-9-63-8-7-89-1"
-           sodipodi:role="line">Tactical</tspan></text>
-      <ellipse
-         ry="29.092394"
-         rx="67.643234"
-         cy="1218.9089"
-         cx="1247.527"
-         id="path3639-4-4-9-5-3-0"
-         style="fill:none;stroke:#000000;stroke-width:3.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <text
-         id="text3021-8-4-1-8-8-2-7-4-6-5"
-         y="1239.3618"
-         x="1204.8273"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
-         xml:space="preserve"><tspan
-           style="font-size:25.60000038px;line-height:1.25;stroke-width:1.06666672"
-           y="1239.3618"
-           x="1204.8273"
-           id="tspan3023-4-0-1-9-63-8-7-8-8-1"
-           sodipodi:role="line">Strobe</tspan></text>
-    </g>
-    <g
-       id="g28961"
-       transform="translate(-3.1408245,-176.63914)">
-      <text
-         id="text3021-8-4-1-8-8-2-7-2-2-0"
-         y="1109.4977"
-         x="1088.8826"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.33333397px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
-         xml:space="preserve"><tspan
-           style="font-size:21.33333397px;line-height:1.25;stroke-width:1.06666672"
-           y="1109.4977"
-           x="1088.8826"
-           id="tspan3023-4-0-1-9-63-8-7-89-1-8"
-           sodipodi:role="line">Lightning</tspan></text>
-      <ellipse
-         ry="29.092394"
-         rx="67.643234"
-         cy="1109.5366"
-         cx="1139.1631"
-         id="path3639-4-4-9-5-3-0-5"
-         style="fill:none;stroke:#000000;stroke-width:3.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <text
-         id="text3021-8-4-1-8-8-2-7-4-6-5-0"
-         y="1131.0537"
-         x="1106.3962"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.33333397px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
-         xml:space="preserve"><tspan
-           style="font-size:21.33333397px;line-height:1.25;stroke-width:1.06666672"
-           y="1131.0537"
-           x="1106.3962"
-           id="tspan3023-4-0-1-9-63-8-7-8-8-1-6"
-           sodipodi:role="line">Storm</tspan></text>
-    </g>
-    <path
-       style="fill:none;stroke:#009d00;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-367-3-5)"
-       d="m 1120.4913,902.66439 c 2.7438,-16.13458 11.0707,-23.14558 22.7576,-32.6587"
-       id="path5213-6-8-4-9-9-56-6-28"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#009d00;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-367-3-0-4)"
-       d="m 1279.6253,867.73264 c 7.7263,6.42973 10.1831,9.21307 16.3503,26.82537"
-       id="path5213-6-8-4-9-9-56-6-8-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#009d00;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-367-3-8-4)"
-       d="m 1297.0975,960.68661 c -2.1615,8.7482 -7.3834,15.6667 -22.2274,27.3774"
-       id="path5213-6-8-4-9-9-56-6-9-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
     <path
        style="fill:none;stroke:#009d00;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-367-3-7-0)"
-       d="m 1142.8559,998.04264 c -8.749,-5.9434 -13.9821,-11.31293 -18.6473,-30.73803"
+       d="m 1491.9398,1267.3605 c -8.749,-5.9434 -13.9821,-11.313 -18.6473,-30.7381"
        id="path5213-6-8-4-9-9-56-6-6-1"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
     <path
        style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:12.8, 2.13333333;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-31)"
-       d="m 1313.978,902.60229 c -0.8442,-115.21076 143.7269,-36.59438 43.4448,7.9335"
+       d="m 1749.3643,1233.7512 c -0.8442,-115.2108 143.7269,-36.5944 43.4448,7.9335"
        id="path5213-6-8-4-9-9-9-4"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="1328.644"
-       y="878.07922"
+       x="1764.0304"
+       y="1209.2281"
        id="text34914"><tspan
          sodipodi:role="line"
          id="tspan34912"
-         x="1328.644"
-         y="878.07922">Faster</tspan></text>
+         x="1764.0304"
+         y="1209.2281">Faster</tspan></text>
     <path
        style="fill:none;stroke:#009d00;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:12.8, 2.13333333;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-367-0)"
-       d="m 1311.3595,959.77281 c -1.1407,100.52819 126.1466,39.17043 50.9442,-11.7896"
+       d="m 1750.1766,1268.1926 c -1.1407,100.5282 126.1466,39.1705 50.9442,-11.7896"
        id="path5213-6-8-4-9-9-9-29-9"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#009d00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="1319.2161"
-       y="986.47839"
+       x="1758.0332"
+       y="1294.8982"
        id="text35803"><tspan
          sodipodi:role="line"
          id="tspan35801"
-         x="1319.2161"
-         y="986.47839">Slower</tspan></text>
+         x="1758.0332"
+         y="1294.8982">Slower</tspan></text>
     <path
        style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:12.8, 2.13333333;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-31-1)"
-       d="m 1195.0016,1031.7208 c 0.8442,115.2108 -143.7269,36.5944 -43.4448,-7.9335"
+       d="m 1598.9783,1248.5227 c 0.8442,115.2108 -143.7269,36.5944 -43.4448,-7.9335"
        id="path5213-6-8-4-9-9-9-4-6"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="1130.8009"
-       y="1058.397"
+       x="1534.7776"
+       y="1275.1989"
        id="text34914-9"><tspan
          sodipodi:role="line"
          id="tspan34912-3"
-         x="1130.8009"
-         y="1058.397">Faster</tspan></text>
+         x="1534.7776"
+         y="1275.1989">Faster</tspan></text>
     <path
        style="fill:none;stroke:#009d00;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:12.8, 2.13333333;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-367-0-3)"
-       d="m 1224.5666,1032.4393 c -1.1407,100.5282 126.1466,39.1704 50.9442,-11.7896"
+       d="m 1628.5433,1249.2412 c -1.1407,100.5282 126.1466,39.1704 50.9442,-11.7896"
        id="path5213-6-8-4-9-9-9-29-9-0"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#009d00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="1232.4231"
-       y="1059.1449"
+       x="1636.3998"
+       y="1275.9468"
        id="text35803-5"><tspan
          sodipodi:role="line"
          id="tspan35801-6"
-         x="1232.4231"
-         y="1059.1449">Slower</tspan></text>
+         x="1636.3998"
+         y="1275.9468">Slower</tspan></text>
     <path
        style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:12.8, 2.13333333;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-31-1-0)"
-       d="m 1197.2911,830.48244 c 0.8442,-115.21079 -143.7269,-36.5944 -43.4448,7.9335"
+       d="m 1526.6479,1394.4202 c 0.8442,-115.2107 -143.7269,-36.5943 -43.4448,7.9335"
        id="path5213-6-8-4-9-9-9-4-6-4"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="1123.0569"
-       y="808.46783"
+       x="1452.4137"
+       y="1372.4056"
        id="text34914-9-6"><tspan
          sodipodi:role="line"
          id="tspan34912-3-2"
-         x="1123.0569"
-         y="808.46783">Brighter</tspan></text>
+         x="1452.4137"
+         y="1372.4056">Brighter</tspan></text>
     <path
        style="fill:none;stroke:#009d00;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:12.8, 2.13333333;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-367-0-3-6)"
-       d="m 1229.1137,830.51639 c -1.1407,-100.52819 126.1466,-39.1704 50.9442,11.7896"
+       d="m 1558.4705,1394.4542 c -1.1407,-100.5282 126.1467,-39.1704 50.9443,11.7896"
        id="path5213-6-8-4-9-9-9-29-9-0-6"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#009d00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="1235.4652"
-       y="813.22925"
+       x="1564.822"
+       y="1377.1671"
        id="text35803-5-7"><tspan
          sodipodi:role="line"
          id="tspan35801-6-5"
-         x="1235.4652"
-         y="813.22925">Dimmer</tspan></text>
+         x="1564.822"
+         y="1377.1671">Dimmer</tspan></text>
     <rect
        style="opacity:1;fill:url(#linearGradient1364-8);fill-opacity:1;stroke:#000000;stroke-width:3.20000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect1356-0"
@@ -2764,7 +2787,7 @@
        sodipodi:nodetypes="cc" />
     <path
        style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:12.8, 2.13333333;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-62-7-5)"
-       d="M 1400.1843,373.30946 V 191.75683"
+       d="M 1400.1843,366.71374 V 191.75683"
        id="path5213-6-8-2-9-2"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
@@ -2873,103 +2896,111 @@
        sodipodi:nodetypes="cc" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66666603px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
-       x="1432.5835"
-       y="790.91565"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="1434.2471"
+       y="787.48492"
        id="text3021-8-4-1-8-8-2-3-0"><tspan
          sodipodi:role="line"
          id="tspan3023-4-0-1-9-63-8-8-2"
-         x="1432.5835"
-         y="790.91565"
-         style="font-size:26.66666603px;line-height:1.25;stroke-width:1.06666672">Ramp Cfg</tspan><tspan
+         x="1434.2471"
+         y="787.48492"
+         style="font-size:24px;line-height:1.25;stroke-width:1.06666672">Ramp Cfg</tspan><tspan
          sodipodi:role="line"
-         x="1432.5835"
-         y="807.58234"
-         style="font-size:26.66666603px;line-height:1.25;stroke-width:1.06666672"
+         x="1434.2471"
+         y="802.48492"
+         style="font-size:24px;line-height:1.25;stroke-width:1.06666672"
          id="tspan39566" /><tspan
          sodipodi:role="line"
-         x="1432.5835"
-         y="807.58234"
-         style="font-size:26.66666603px;line-height:1.25;stroke-width:1.06666672"
+         x="1434.2471"
+         y="802.48492"
+         style="font-size:24px;line-height:1.25;stroke-width:1.06666672"
          id="tspan39568" /><tspan
          sodipodi:role="line"
-         x="1432.5835"
-         y="807.58234"
-         style="font-size:26.66666603px;line-height:1.25;stroke-width:1.06666672"
+         x="1434.2471"
+         y="802.48492"
+         style="font-size:24px;line-height:1.25;stroke-width:1.06666672"
          id="tspan39570" /><tspan
          sodipodi:role="line"
-         x="1432.5835"
-         y="807.58234"
-         style="font-size:26.66666603px;line-height:1.25;stroke-width:1.06666672"
+         x="1434.2471"
+         y="802.48492"
+         style="font-size:24px;line-height:1.25;stroke-width:1.06666672"
          id="tspan39590" /></text>
     <rect
        style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect5159-4-9"
-       width="275.93161"
-       height="345.61465"
+       width="275.93164"
+       height="310.87778"
        x="1424.8558"
        y="758.40918" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="1440.7255"
-       y="812.255"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.66666698px;line-height:110.00000238%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="1444.4535"
+       y="806.21515"
        id="text39556"><tspan
          sodipodi:role="line"
-         x="1440.7255"
-         y="812.255"
+         x="1444.4535"
+         y="806.21515"
          id="tspan39558">1. Floor</tspan><tspan
          sodipodi:role="line"
-         x="1440.7255"
-         y="832.255"
+         x="1444.4535"
+         y="822.34851"
          id="tspan58144">    (click N times for level N)</tspan><tspan
          sodipodi:role="line"
-         x="1440.7255"
-         y="852.255"
+         x="1444.4535"
+         y="838.48181"
          id="tspan39562">2. Ceiling</tspan><tspan
          sodipodi:role="line"
-         x="1440.7255"
-         y="872.255"
-         id="tspan58146">    (click N times for Turbo-N)</tspan><tspan
+         x="1444.4535"
+         y="854.61517"
+         id="tspan58146">    (click N times for 1+Turbo-N)</tspan><tspan
          sodipodi:role="line"
-         x="1440.7255"
-         y="892.255"
+         x="1444.4535"
+         y="870.74847"
          id="tspan39606">3. Number of steps</tspan><tspan
          sodipodi:role="line"
-         x="1440.7255"
-         y="912.255"
-         id="tspan43997">    (discrete ramp only)</tspan></text>
+         x="1444.4535"
+         y="886.88184"
+         id="tspan43997">    (stepped ramp only)</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="1440.1165"
-       y="972.51489"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.66666698px;line-height:110.00000238%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="1444.4535"
+       y="929.23431"
        id="text39623"><tspan
          sodipodi:role="line"
          id="tspan39621"
-         x="1440.1165"
-         y="972.51489">1. Temperature limit</tspan><tspan
+         x="1444.4535"
+         y="929.23431">1. Current temperature</tspan><tspan
+         sodipodi:role="line"
+         x="1444.4535"
+         y="945.36768"
+         id="tspan14663">    (click N times for N deg C)</tspan><tspan
          sodipodi:role="line"
-         x="1440.1165"
-         y="992.51489"
+         x="1444.4535"
+         y="961.50098"
+         id="tspan14661">2. Temperature limit</tspan><tspan
+         sodipodi:role="line"
+         x="1444.4535"
+         y="977.63434"
          id="tspan39625">    (click N times for 30 C + N)</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="1438.4496"
-       y="1052.5778"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.66666698px;line-height:110.00000238%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="1444.4535"
+       y="1019.1274"
        id="text39629"><tspan
          sodipodi:role="line"
          id="tspan39627"
-         x="1438.4496"
-         y="1052.5778">1. Beacon speed</tspan><tspan
+         x="1444.4535"
+         y="1019.1274">1. Beacon speed</tspan><tspan
          sodipodi:role="line"
-         x="1438.4496"
-         y="1072.5778"
+         x="1444.4535"
+         y="1035.2607"
          id="tspan39631">    (click N times</tspan><tspan
          sodipodi:role="line"
-         x="1438.4496"
-         y="1092.5778"
+         x="1444.4535"
+         y="1051.394"
          id="tspan43995">     for N seconds per flash)</tspan></text>
     <path
        style="fill:none;stroke:#7777ff;stroke-width:2.1329999;stroke-miterlimit:4;stroke-dasharray:2.1329999, 2.1329999;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-14)"
@@ -3168,7 +3199,7 @@
          id="tspan6532-6">Andúril‎ UI</tspan></text>
     <path
        style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:4.26666667, 4.26666667;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-88-5)"
-       d="m 1148.9905,493.21153 c 78.9733,-34.68373 102.4315,21.18585 141.9187,78.12991"
+       d="m 1151.6852,495.69893 c 78.9733,-34.68373 144.1831,19.3203 183.6703,76.26436"
        id="path5213-6-8-4-9-9-8-3-7"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
@@ -3180,7 +3211,7 @@
        sodipodi:nodetypes="cc" />
     <path
        style="fill:none;stroke:#7777ff;stroke-width:2.1329999;stroke-miterlimit:4;stroke-dasharray:2.1329999, 2.1329999;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-88-9-4)"
-       d="m 1095.4547,538.45694 c -18.7171,20.99663 -15.8534,53.30012 21.8662,110.81642"
+       d="m 1109.1006,543.61207 c -5.3744,57.689 -10.8606,99.77877 39.243,100.48777"
        id="path5213-6-8-4-9-9-1-3-0-0"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
@@ -3245,7 +3276,7 @@
          id="textPath56258"
          style="font-size:18.66666603px;stroke-width:0.90419513px"><tspan
    id="tspan56248"
-   style="font-size:18.66666603px;stroke-width:0.90419513px">      Smooth / Discrete</tspan></textPath></text>
+   style="font-size:18.66666603px;stroke-width:0.90419513px">      Smooth / Stepped</tspan></textPath></text>
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@@ -3259,36 +3290,36 @@
          sodipodi:role="line"
          x="1074.9415"
          y="179.20654"
-         id="tspan56275">Discrete</tspan></text>
+         id="tspan56275">Stepped</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66666603px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
-       x="1430.6689"
-       y="945.4364"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="1436.6729"
+       y="910.76184"
        id="text3021-8-4-1-8-8-2-3-0-5"><tspan
          sodipodi:role="line"
-         x="1430.6689"
-         y="945.4364"
-         style="font-size:26.66666603px;line-height:1.25;stroke-width:1.06666672"
+         x="1436.6729"
+         y="910.76184"
+         style="font-size:24px;line-height:1.25;stroke-width:1.06666672"
          id="tspan39596-4">Thermal Cfg</tspan><tspan
          sodipodi:role="line"
-         x="1430.6689"
-         y="962.10309"
-         style="font-size:26.66666603px;line-height:1.25;stroke-width:1.06666672"
+         x="1436.6729"
+         y="925.76184"
+         style="font-size:24px;line-height:1.25;stroke-width:1.06666672"
          id="tspan39590-9" /></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66666603px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
-       x="1431.3784"
-       y="1026.7155"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="1434.2471"
+       y="1000.3971"
        id="text3021-8-4-1-8-8-2-3-0-3"><tspan
          sodipodi:role="line"
-         x="1431.3784"
-         y="1026.7155"
-         style="font-size:26.66666603px;line-height:1.25;stroke-width:1.06666672"
+         x="1434.2471"
+         y="1000.3971"
+         style="font-size:24px;line-height:1.25;stroke-width:1.06666672"
          id="tspan39590-4">Beacon Cfg</tspan></text>
     <g
-       transform="translate(819.14156,-260.97873)"
+       transform="translate(861.28782,-266.43715)"
        id="g58162-9">
       <ellipse
          ry="29.092394"
@@ -3311,7 +3342,7 @@
     </g>
     <g
        id="g66511"
-       transform="translate(8.026957,5.5185329)">
+       transform="translate(-260.15697,-113.49087)">
       <g
          id="g58191-2"
          transform="translate(811.71389,-56.245324)">
@@ -3322,14 +3353,14 @@
            sodipodi:sides="7"
            sodipodi:cx="-309.93027"
            sodipodi:cy="215.58585"
-           sodipodi:r1="84.671265"
+           sodipodi:r1="69.471764"
            sodipodi:r2="50.343449"
-           sodipodi:arg1="0"
-           sodipodi:arg2="0.68976368"
+           sodipodi:arg1="-0.13301265"
+           sodipodi:arg2="0.55675103"
            inkscape:flatsided="false"
            inkscape:rounded="0.007"
            inkscape:randomized="0"
-           d="m -225.259,215.58585 c -0.0935,0.38012 -45.66671,31.68359 -45.83651,32.0363 -0.11206,0.23275 14.1915,34.05419 13.95691,34.16236 -0.35549,0.16391 -53.24395,-15.94928 -53.62558,-15.86212 -0.25184,0.0575 -17.77639,32.3278 -18.00722,32.21184 -0.34979,-0.17574 -20.72741,-51.57201 -21.0335,-51.81604 -0.20198,-0.16104 -36.35829,6.25792 -36.41154,6.00514 -0.0807,-0.38305 27.39728,-48.35997 27.39724,-48.75142 -3e-5,-0.25833 -27.56167,-24.52431 -27.39724,-24.72355 0.24917,-0.30192 54.89127,-8.73189 55.1973,-8.97599 0.20194,-0.16109 1.98946,-36.83923 2.24774,-36.8349 0.39141,0.007 41.05102,37.47148 41.43267,37.55854 0.25185,0.0574 30.04248,-21.41346 30.20013,-21.20882 0.23891,0.3101 -3.70149,55.45806 -3.5316,55.81073 0.11211,0.23273 35.47289,10.13708 35.4112,10.38793 z"
+           d="m -241.07216,206.37245 c -0.0335,0.30848 -26.02137,35.52146 -26.11771,35.81642 -0.0494,0.15121 7.5296,21.40277 7.39526,21.48795 -0.26206,0.16616 -43.99586,1.80294 -44.28653,1.91153 -0.14902,0.0557 -12.03874,19.23129 -12.1891,19.17936 -0.2933,-0.10128 -28.84056,-33.27323 -29.10669,-33.43278 -0.13644,-0.0818 -22.54165,2.57825 -22.59481,2.42832 -0.10367,-0.29247 8.03227,-43.29399 7.99108,-43.60153 -0.0211,-0.15767 -16.07025,-16.01627 -15.98616,-16.1513 0.16401,-0.26341 38.85663,-20.71348 39.0714,-20.93744 0.1101,-0.11481 2.50238,-22.5502 2.66038,-22.56865 0.3082,-0.036 40.42117,17.4647 40.73017,17.49298 0.15841,0.0145 19.19067,-12.10338 19.30361,-11.99136 0.2203,0.21851 11.54773,42.4916 11.71828,42.75082 0.0874,0.13289 21.42799,7.45753 21.41082,7.61568 z"
            transform="matrix(0.92047755,0,0,0.7899176,640.59003,565.68064)"
            inkscape:transform-center-x="-3.8589074" />
         <text
@@ -3357,19 +3388,19 @@
     </g>
     <path
        style="fill:none;stroke:#7777ff;stroke-width:2.1329999;stroke-miterlimit:4;stroke-dasharray:2.133, 2.133;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-88-9-4-0)"
-       d="m 1220.1437,550.28932 c -8.127,-20.38104 -19.3148,-37.30047 -55.6441,-46.21093"
+       d="m 1127.941,552.67567 c 8.2381,55.86142 12.4246,16.66987 28.876,-16.227 18.1418,-36.27675 65.1509,-72.19798 76.5732,0.99224"
        id="path5213-6-8-4-9-9-1-3-0-0-6"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       sodipodi:nodetypes="csc" />
     <path
        style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-88-7)"
-       d="m 1261.8812,480.43896 c -47.6705,-9.8516 -71.2506,-9.28576 -119.0304,2.96046"
+       d="m 1300.9995,480.43896 c -47.6705,-9.8516 -110.3689,-9.28576 -158.1487,2.96046"
        id="path5213-6-8-4-9-9-3-4"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
     <path
        style="fill:none;stroke:none;stroke-width:2.1329999;stroke-miterlimit:4;stroke-dasharray:2.133, 2.133;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-88-9-4-0-4)"
-       d="m 1218.1434,545.42972 c 0,0 -6.8807,-15.95197 2.0003,4.8596"
+       d="m 1104.0483,552.32849 c 0,0 25.6454,8.80842 22.0934,-6.76915"
        id="path5213-6-8-4-9-9-1-3-0-0-6-4"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
@@ -3382,47 +3413,406 @@
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="1237.2144"
-       y="-326.51682"
        id="text7289-7-6-2"
-       transform="rotate(37.744436)"
        inkscape:transform-center-x="1.1517845"
-       inkscape:transform-center-y="-2.5788507"><tspan
-         sodipodi:role="line"
-         id="tspan7287-5-5-6"
-         x="1237.2144"
-         y="-326.51682">4 Clicks</tspan></text>
+       inkscape:transform-center-y="-2.5788507"
+       transform="translate(11.068361,12.736197)"><textPath
+         xlink:href="#path5213-6-8-4-9-9-1-3-0-0-6"
+         id="textPath20030"><tspan
+   id="tspan7287-5-5-6">                4 Clicks</tspan></textPath></text>
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="979.02216"
-       y="-745.27771"
        id="text7289-7-6-2-0"
-       transform="rotate(65.261288)"
        inkscape:transform-center-x="0.36232032"
-       inkscape:transform-center-y="-2.4072198"><tspan
-         sodipodi:role="line"
-         id="tspan7287-5-5-6-6"
-         x="979.02216"
-         y="-745.27771">5 Clicks</tspan></text>
+       inkscape:transform-center-y="-2.4072198"
+       transform="translate(3.9941843,-3.1212455)"><textPath
+         xlink:href="#path5213-6-8-4-9-9-1-3-0-0"
+         id="textPath20018"><tspan
+   id="tspan7287-5-5-6-6">        5 Clicks</tspan></textPath></text>
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="692.37494"
-       y="-1019.8389"
        id="text7289-7-6-2-0-6"
-       transform="rotate(85.109955)"
        inkscape:transform-center-x="-1.5564693"
-       inkscape:transform-center-y="-1.9746618"><tspan
-         sodipodi:role="line"
-         id="tspan7287-5-5-6-6-4"
-         x="692.37494"
-         y="-1019.8389">Click, Click, Hold</tspan></text>
+       inkscape:transform-center-y="-1.9746618"
+       transform="translate(4.5029255)"><textPath
+         xlink:href="#path5213-6-8-4-9-9-1-3-0"
+         id="textPath20024"><tspan
+   id="tspan7287-5-5-6-6-4">            Click, Click, Hold</tspan></textPath></text>
     <path
        style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-88-7-6)"
        d="m 1058.2677,758.40918 c 0.4912,-26.15636 0.9882,-169.24427 7.3904,-226.98309"
        id="path5213-6-8-4-9-9-3-4-8"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
+    <g
+       id="g14659"
+       transform="translate(0,-45.458105)">
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path5213-6-8-4-9-9-56-6-28-20"
+         d="m 1293.1165,914.73803 c 22.9934,5.0006 51.8174,18.31502 72.3787,39.21347"
+         style="fill:none;stroke:#009d00;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-367-3-5-7)" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path5213-6-8-4-9-9-56-6-28-2"
+         d="m 1094.1498,960.95909 c 17.8272,-22.80331 42.9724,-34.59893 64.3085,-42.39665"
+         style="fill:none;stroke:#009d00;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-367-3-5-0)" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path5213-6-8-4-9-9-56-6-28-7"
+         d="m 1099.1838,1048.3297 c -10.8263,-13.3296 -17.2825,-22.994 -19.3174,-41.9076"
+         style="fill:none;stroke:#009d00;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-367-3-5-2)" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path5213-6-8-4-9-9-56-6-28-8"
+         d="m 1386.1562,998.74948 c -0.01,16.47992 -3.5377,27.95532 -16.4966,45.71352"
+         style="fill:none;stroke:#009d00;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-367-3-5-6)" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path5213-6-8-4-9-9-56-6-9-6"
+         d="m 1286.1122,1090.3622 c -32.6374,7.6868 -68.0318,7.3275 -98.7961,1.9808"
+         style="fill:none;stroke:#009d00;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-367-3-8-4)" />
+      <g
+         transform="translate(0.00410028,9.005851)"
+         id="g7243">
+        <g
+           id="g28835"
+           transform="translate(81.09879,-12.221496)">
+          <text
+             id="text3021-8-4-1-8-8-2-7"
+             y="981.17542"
+             x="1222.7643"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+             xml:space="preserve"><tspan
+               style="font-size:25.60000038px;line-height:1.25;stroke-width:1.06666672"
+               y="981.17542"
+               x="1222.7643"
+               id="tspan3023-4-0-1-9-63-8-7"
+               sodipodi:role="line">Bike</tspan></text>
+          <ellipse
+             ry="29.092394"
+             rx="67.643234"
+             cy="986.1272"
+             cx="1248.0287"
+             id="path3639-4-4-9-5"
+             style="fill:none;stroke:#000000;stroke-width:3.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+          <text
+             id="text3021-8-4-1-8-8-2-7-4"
+             y="1005.0751"
+             x="1202.3188"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+             xml:space="preserve"><tspan
+               style="font-size:25.60000038px;line-height:1.25;stroke-width:1.06666672"
+               y="1005.0751"
+               x="1202.3188"
+               id="tspan3023-4-0-1-9-63-8-7-8"
+               sodipodi:role="line">Flasher</tspan></text>
+        </g>
+        <g
+           id="g28877"
+           transform="translate(-82.541209,-37.878365)">
+          <text
+             id="text3021-8-4-1-8-8-2-7-2"
+             y="1087.1008"
+             x="1357.3134"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+             xml:space="preserve"><tspan
+               style="font-size:25.60000038px;line-height:1.25;stroke-width:1.06666672"
+               y="1087.1008"
+               x="1357.3134"
+               id="tspan3023-4-0-1-9-63-8-7-89"
+               sodipodi:role="line">Party</tspan></text>
+          <ellipse
+             ry="29.092394"
+             rx="67.643234"
+             cy="1091.3002"
+             cx="1388.598"
+             id="path3639-4-4-9-5-3"
+             style="fill:none;stroke:#000000;stroke-width:3.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+          <text
+             id="text3021-8-4-1-8-8-2-7-4-6"
+             y="1111.7531"
+             x="1345.8983"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+             xml:space="preserve"><tspan
+               style="font-size:25.60000038px;line-height:1.25;stroke-width:1.06666672"
+               y="1111.7531"
+               x="1345.8983"
+               id="tspan3023-4-0-1-9-63-8-7-8-8"
+               sodipodi:role="line">Strobe</tspan></text>
+        </g>
+        <g
+           id="g28919"
+           transform="translate(-88.581451,-166.13611)">
+          <text
+             id="text3021-8-4-1-8-8-2-7-2-2"
+             y="1219.2247"
+             x="1200.4392"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+             xml:space="preserve"><tspan
+               style="font-size:25.60000038px;line-height:1.25;stroke-width:1.06666672"
+               y="1219.2247"
+               x="1200.4392"
+               id="tspan3023-4-0-1-9-63-8-7-89-1"
+               sodipodi:role="line">Tactical</tspan></text>
+          <ellipse
+             ry="29.092394"
+             rx="67.643234"
+             cy="1218.9089"
+             cx="1247.527"
+             id="path3639-4-4-9-5-3-0"
+             style="fill:none;stroke:#000000;stroke-width:3.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+          <text
+             id="text3021-8-4-1-8-8-2-7-4-6-5"
+             y="1239.3618"
+             x="1204.8273"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+             xml:space="preserve"><tspan
+               style="font-size:25.60000038px;line-height:1.25;stroke-width:1.06666672"
+               y="1239.3618"
+               x="1204.8273"
+               id="tspan3023-4-0-1-9-63-8-7-8-8-1"
+               sodipodi:role="line">Strobe</tspan></text>
+        </g>
+        <g
+           id="g28961"
+           transform="translate(-2.2028768,-134.13011)">
+          <text
+             id="text3021-8-4-1-8-8-2-7-2-2-0"
+             y="1109.4977"
+             x="1088.8826"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.33333397px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+             xml:space="preserve"><tspan
+               style="font-size:21.33333397px;line-height:1.25;stroke-width:1.06666672"
+               y="1109.4977"
+               x="1088.8826"
+               id="tspan3023-4-0-1-9-63-8-7-89-1-8"
+               sodipodi:role="line">Lightning</tspan></text>
+          <ellipse
+             ry="29.092394"
+             rx="67.643234"
+             cy="1109.5366"
+             cx="1139.1631"
+             id="path3639-4-4-9-5-3-0-5"
+             style="fill:none;stroke:#000000;stroke-width:3.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+          <text
+             id="text3021-8-4-1-8-8-2-7-4-6-5-0"
+             y="1131.0537"
+             x="1106.3962"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.33333397px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+             xml:space="preserve"><tspan
+               style="font-size:21.33333397px;line-height:1.25;stroke-width:1.06666672"
+               y="1131.0537"
+               x="1106.3962"
+               id="tspan3023-4-0-1-9-63-8-7-8-8-1-6"
+               sodipodi:role="line">Storm</tspan></text>
+        </g>
+        <g
+           id="g5944"
+           transform="translate(2.1928969,2.1881554)">
+          <text
+             id="text3021-8-4-1-8-8-2-7-2-2-0-6"
+             y="923.39539"
+             x="1182.9138"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:25.60000038px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+             xml:space="preserve"><tspan
+               style="font-size:25.60000038px;line-height:1.25;stroke-width:1.06666672"
+               y="923.39539"
+               x="1182.9138"
+               id="tspan3023-4-0-1-9-63-8-7-89-1-8-7"
+               sodipodi:role="line">Candle</tspan></text>
+          <ellipse
+             ry="29.092394"
+             rx="67.643234"
+             cy="913.85162"
+             cx="1227.4263"
+             id="path3639-4-4-9-5-3-0-5-5"
+             style="fill:none;stroke:#000000;stroke-width:3.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        </g>
+      </g>
+    </g>
+    <g
+       id="g14617"
+       transform="translate(-13.294351,-32.815344)">
+      <path
+         sodipodi:nodetypes="csc"
+         inkscape:connector-curvature="0"
+         id="path5213-6-8-4-9-9-9-4-6-4-2"
+         d="m 1215.6497,872.07607 c -92.2951,14.34989 -90.2875,-65.11743 -29.8514,-66.50842 51.6628,-1.18906 77.3999,68.69862 -5.9066,54.96341"
+         style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:12.8, 2.13333333;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-31-1-0-9)" />
+      <text
+         id="text34914-9-6-7"
+         y="832.58008"
+         x="1186.5371"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           y="832.58008"
+           x="1186.5371"
+           id="tspan34912-3-2-0"
+           sodipodi:role="line">Brighter</tspan><tspan
+           id="tspan7172"
+           y="852.58008"
+           x="1186.5371"
+           sodipodi:role="line">/ Faster</tspan></text>
+    </g>
+    <path
+       style="fill:none;stroke:#009d00;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:12.8, 2.13333333;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-367-0-3-6-6)"
+       d="m 1672.0601,1378.93 c -1.1407,-100.5282 126.1467,-39.1704 50.9443,11.7896"
+       id="path5213-6-8-4-9-9-9-29-9-0-6-9"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <g
+       id="g14623"
+       transform="translate(-13.294351,-29.307693)">
+      <text
+         id="text35803-5-7-3"
+         y="827.94098"
+         x="1277.6576"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#009d00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           y="827.94098"
+           x="1277.6576"
+           id="tspan35801-6-5-6"
+           sodipodi:role="line">Dimmer</tspan><tspan
+           id="tspan7174"
+           y="847.94098"
+           x="1277.6576"
+           sodipodi:role="line">/ Slower</tspan></text>
+      <path
+         sodipodi:nodetypes="csc"
+         inkscape:connector-curvature="0"
+         id="path5213-6-8-4-9-9-9-4-6-4-2-3"
+         d="m 1298.1704,855.8694 c 75.92,10.10449 72.6994,-54.50393 12.2633,-55.89492 -51.6628,-1.18906 -74.3675,75.06672 15.6104,66.18339"
+         style="fill:none;stroke:#009d00;stroke-width:2.1329999;stroke-miterlimit:4;stroke-dasharray:12.798, 2.133;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-31-1-0-9-9)" />
+    </g>
+    <path
+       style="fill:none;stroke:#009d00;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-367-3-02)"
+       d="m 1597.9772,563.34418 c 0.4636,-0.36597 -0.021,1.8809 -0.045,6.26246"
+       id="path5213-6-8-4-9-9-56-6-0"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#009d00;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-367-3-51)"
+       d="m 1577.5842,684.90662 c 0.4636,-0.36597 -1.5747,0.4784 -6.1098,2.54774"
+       id="path5213-6-8-4-9-9-56-6-8"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#009d00;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-367-3-50)"
+       d="m 1405.234,654.99099 c 0.4636,-0.36597 0.5015,-1.74928 0.3311,-4.86628"
+       id="path5213-6-8-4-9-9-56-6-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.80000019px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="1172.5502"
+       y="720.89923"
+       id="text3021-8-4-1-8-8-2-8-5-64-5"
+       inkscape:transform-center-x="-5.2422885"
+       inkscape:transform-center-y="10.020862"><tspan
+         sodipodi:role="line"
+         id="tspan3023-4-0-1-9-63-8-83-9-1-8"
+         x="1172.5502"
+         y="720.89923"
+         style="font-size:25.60000038px;line-height:1.25;stroke-width:1.06666672">Muggle</tspan></text>
+    <ellipse
+       style="fill:none;stroke:#000000;stroke-width:3.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path3639-4-4-9-1-4-2-6"
+       cx="880.98413"
+       cy="733.48511"
+       rx="67.643234"
+       ry="29.092394"
+       inkscape:transform-center-x="-4.2569368"
+       inkscape:transform-center-y="11.351831" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.33333397px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="1158.3502"
+       y="648.50262"
+       id="text3021-8-4-1-8-8-2-8-5-64-7"
+       inkscape:transform-center-x="-5.2422885"
+       inkscape:transform-center-y="10.020862"><tspan
+         sodipodi:role="line"
+         id="tspan3023-4-0-1-9-63-8-83-9-1-2"
+         x="1158.3502"
+         y="648.50262"
+         style="font-size:21.33333397px;line-height:1.25;stroke-width:1.06666672">Momentary</tspan></text>
+    <ellipse
+       style="fill:none;stroke:#000000;stroke-width:3.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path3639-4-4-9-1-4-2-4"
+       cx="875.37408"
+       cy="658.87897"
+       rx="67.643234"
+       ry="29.092394"
+       inkscape:transform-center-x="-4.2569368"
+       inkscape:transform-center-y="11.351831" />
+    <path
+       sodipodi:type="star"
+       style="fill:url(#radialGradient5882-9-2);fill-opacity:1;stroke:#000000;stroke-width:3.75277472;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path4327-0-3"
+       sodipodi:sides="9"
+       sodipodi:cx="-309.93027"
+       sodipodi:cy="215.58585"
+       sodipodi:r1="81.329819"
+       sodipodi:r2="68.11689"
+       sodipodi:arg1="0.026660495"
+       sodipodi:arg2="0.11055917"
+       inkscape:flatsided="false"
+       inkscape:rounded="0.037"
+       inkscape:randomized="-6.9388939e-18"
+       d="m -228.62935,217.75388 c 0.12785,0.52537 -13.40141,4.84463 -13.59991,5.34758 -0.63708,1.61421 -6.04498,44.84898 -6.81448,46.40442 -0.23976,0.48464 -13.38015,-4.90306 -13.85549,-4.64537 -1.52563,0.82704 -33.45909,30.47067 -35.04838,31.16758 -0.49518,0.21714 -7.09816,-12.35655 -7.62794,-12.4647 -1.70031,-0.34709 -45.21732,1.83481 -46.88275,1.3471 -0.51891,-0.15196 2.50513,-14.02828 2.16882,-14.45166 -1.07941,-1.35883 -35.81787,-27.65959 -36.78017,-29.10372 -0.29983,-0.44995 10.93625,-9.13602 10.95076,-9.67652 0.0466,-1.73476 -9.65884,-44.21176 -9.46774,-45.93658 0.0596,-0.53741 14.25017,0.0311 14.60872,-0.37364 1.15075,-1.29896 21.01967,-40.07675 22.27476,-41.2752 0.39105,-0.37341 10.89628,9.18365 11.43109,9.10408 1.71649,-0.25538 41.86284,-17.18939 43.59465,-17.3007 0.53958,-0.0347 2.4439,14.03907 2.90473,14.32189 1.47906,0.90771 43.11793,13.74108 44.51611,14.769 0.43564,0.32027 -7.152,12.32546 -6.98077,12.83833 0.54955,1.64606 24.19764,38.24195 24.60799,39.92811 z"
+       transform="matrix(0.92707315,0,0,0.39837284,1506.7537,557.00764)"
+       inkscape:transform-center-x="-3.8865684"
+       inkscape:transform-center-y="3.5998252e-06" />
+    <path
+       sodipodi:type="star"
+       style="opacity:1;fill:none;fill-opacity:0.99504945;stroke:#000000;stroke-width:6.38363266;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path18710"
+       sodipodi:sides="3"
+       sodipodi:cx="180.12621"
+       sodipodi:cy="633.72162"
+       sodipodi:r1="74.637772"
+       sodipodi:r2="62.512047"
+       sodipodi:arg1="0.20456675"
+       sodipodi:arg2="1.2517643"
+       inkscape:flatsided="false"
+       inkscape:rounded="0.337"
+       inkscape:randomized="-6.93889e-18"
+       d="m 253.20771,648.88376 c -4.74931,22.89166 -31.27534,36.8627 -53.47475,44.19551 -22.19942,7.33281 -51.8282,11.91057 -69.2783,-3.64828 -17.45011,-15.55885 -16.28638,-45.51659 -11.53707,-68.40825 4.74931,-22.89167 15.59924,-50.83982 37.79866,-58.17263 22.19941,-7.33281 47.56171,8.65388 65.01182,24.21274 17.4501,15.55885 36.22895,38.92924 31.47964,61.82091 z"
+       transform="matrix(0.95651011,0,0,0.42184838,1047.3385,446.51946)"
+       inkscape:transform-center-x="0.37162569"
+       inkscape:transform-center-y="0.78560035" />
+    <path
+       style="fill:none;stroke:#7777ff;stroke-width:2.1329999;stroke-miterlimit:4;stroke-dasharray:2.1329999, 2.1329999;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-88-9-4-4)"
+       d="m 1105.7807,594.68687 c -0.286,50.1308 -6.5453,119.74711 44.2016,125.06625"
+       id="path5213-6-8-4-9-9-1-3-0-0-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="text7289-7-6-2-0-9"
+       inkscape:transform-center-x="0.36232032"
+       inkscape:transform-center-y="-2.4072198"
+       x="4.0937777"
+       y="-2.4259422"
+       transform="translate(3.7169557,-2.2115172)"><textPath
+         xlink:href="#path5213-6-8-4-9-9-1-3-0-0-3"
+         id="textPath20021"><tspan
+   id="tspan7287-5-5-6-6-1">            6 Clicks</tspan></textPath></text>
+    <path
+       style="fill:none;stroke:none;stroke-width:1.32938921;stroke-miterlimit:4;stroke-dasharray:1.32938933, 1.32938933;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-88-9-4-0-4-9)"
+       d="m 1400.1241,365.79536 c 0,0 0.043,-10.40514 -0.024,5.00754"
+       id="path5213-6-8-4-9-9-1-3-0-0-6-4-9"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
   </g>
 </svg>
diff --git a/spaghetti-monster/anduril/anduril.txt b/spaghetti-monster/anduril/anduril.txt
index 2fb74bf..54f8b8c 100644
--- a/spaghetti-monster/anduril/anduril.txt
+++ b/spaghetti-monster/anduril/anduril.txt
@@ -9,7 +9,8 @@ From off:
   Blinkies:
   * 3 clicks: specials (battcheck, goodnight, beacon, tempcheck)
   * Click, click, hold: strobes
-    (bike flasher, party strobe, tactical strobe, lightning storm mode)
+    (candle mode, bike flasher, party strobe, tactical strobe,
+     lightning storm mode)
     (remembers which you last used)
 
   Other:
@@ -82,7 +83,12 @@ Tempcheck mode:
   - Hold: thermal calibration mode
 
 Thermal config mode:
-  * At buzz, click N times to set thermal limit to roughly 30 C + N.
+  * Setting 1: calibrate sensor:
+    At buzz, click N times for N degrees C.  For example, if the light 
+    is current at "room temperature" of 22 C, click 22 times.  Is 
+    intended to only be done once upon initial setup, or not at all.
+  * Setting 2: temperature limit:
+    At buzz, click N times to set thermal limit to roughly 30 C + N.
 
 Thermal calibration mode:
   - Hold until hot: set new ceiling value
-- 
cgit v1.2.3


From b5ecf384ef9c4217196e47dc192d5b936f2685fa Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Mon, 23 Apr 2018 21:44:45 -0600
Subject: Experiment: make ramp blinks configurable by blinking at every
 fixed-ramp step during the smooth ramp. (spoiler: it's annoying)

---
 spaghetti-monster/anduril/anduril.c | 37 +++++++++++++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 9d7e0d8..6323679 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -32,6 +32,7 @@
 #define BLINK_AT_CHANNEL_BOUNDARIES
 //#define BLINK_AT_RAMP_FLOOR
 #define BLINK_AT_RAMP_CEILING
+//#define BLINK_AT_STEPS
 #define BATTCHECK_VpT
 #define USE_LIGHTNING_MODE
 #define USE_CANDLE_MODE
@@ -426,6 +427,21 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
             delay_4ms(8/4);
         }
         #endif
+        #if defined(BLINK_AT_STEPS)
+        uint8_t foo = ramp_style;
+        ramp_style = 1;
+        uint8_t nearest = nearest_level((int16_t)actual_level);
+        ramp_style = foo;
+        // only blink once for each threshold
+        if ((memorized_level != actual_level) &&
+                    (ramp_style == 0) &&
+                    (memorized_level == nearest)
+                    )
+        {
+            set_level(0);
+            delay_4ms(8/4);
+        }
+        #endif
         set_level(memorized_level);
         return MISCHIEF_MANAGED;
     }
@@ -473,6 +489,21 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
             delay_4ms(8/4);
         }
         #endif
+        #if defined(BLINK_AT_STEPS)
+        uint8_t foo = ramp_style;
+        ramp_style = 1;
+        uint8_t nearest = nearest_level((int16_t)actual_level);
+        ramp_style = foo;
+        // only blink once for each threshold
+        if ((memorized_level != actual_level) &&
+                    (ramp_style == 0) &&
+                    (memorized_level == nearest)
+                    )
+        {
+            set_level(0);
+            delay_4ms(8/4);
+        }
+        #endif
         set_level(memorized_level);
         return MISCHIEF_MANAGED;
     }
@@ -564,7 +595,8 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
 
 
 uint8_t strobe_state(EventPtr event, uint16_t arg) {
-    // FIXME: re-order the strobes so candle and lightning are adjacent
+    // 'st' reduces ROM size by avoiding access to a volatile var
+    // (maybe I should just make it nonvolatile?)
     uint8_t st = strobe_type;
     #ifdef USE_CANDLE_MODE
     //#define MAX_CANDLE_LEVEL (RAMP_SIZE-8-6-4)
@@ -890,6 +922,7 @@ uint8_t momentary_state(EventPtr event, uint16_t arg) {
         set_level(0);
         empty_event_sequence();  // don't attempt to parse multiple clicks
         //go_to_standby = 1;  // sleep while light is off
+        // TODO: lighted button should use lockout config?
         return MISCHIEF_MANAGED;
     }
 
@@ -1298,7 +1331,7 @@ void low_voltage() {
     if (state == strobe_state) {
         set_state(steady_state, RAMP_SIZE/6);
     }
-    // in normal or muggle mode, step down by half or turn off
+    // in normal or muggle mode, step down or turn off
     else if ((state == steady_state) || (state == muggle_state)) {
         if (actual_level > 1) {
             uint8_t lvl = (actual_level >> 1) + (actual_level >> 2);
-- 
cgit v1.2.3


From fc04792a45b0707e90b6b6560cf30cf19b84adc1 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Mon, 23 Apr 2018 21:45:04 -0600
Subject: Added more stuff to do.

---
 spaghetti-monster/anduril/anduril.txt | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.txt b/spaghetti-monster/anduril/anduril.txt
index 54f8b8c..7ede740 100644
--- a/spaghetti-monster/anduril/anduril.txt
+++ b/spaghetti-monster/anduril/anduril.txt
@@ -105,11 +105,17 @@ Momentary mode:
 
 TODO:
   * save settings in eeprom
-  - decide on "hold until hot" or "click N times" for thermal config mode
+  * decide on "hold until hot" or "click N times" for thermal config mode
   * test thermal regulation on an actual light
   * improve thermal regulation
   - a way to blink out the firmware version?
-  - indicator LED support
-  - a way to configure indicator LED behavior?
+  * indicator LED support
+  * a way to configure indicator LED behavior?
   * add goodnight mode?
   * add lightning mode?
+  - muggle mode: smooth ramp
+  - candle mode timer, with three clicks to add 30 minutes
+  - candle mode: smoother adjustments?
+  - make sunset mode timer and brightness configurable?
+  - move all config menus to four clicks
+  - diagram updates for 3-click special actions
-- 
cgit v1.2.3


From 81a6faed1f8ddb4ce940d16851532797e532f7f0 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Mon, 23 Apr 2018 23:31:54 -0600
Subject: Converted muggle mode to a smooth ramp style.  Made it remember this
 in eeprom to persist across battery changes. This uses quite a bit of extra
 space, so I may need to refactor something else to make more room. Also fixed
 a bug where ramp style could get stuck at "discrete/stepped ramp" if eeprom
 got corrupted.

---
 spaghetti-monster/anduril/anduril.c | 158 ++++++++++++++++++++++++++++--------
 1 file changed, 126 insertions(+), 32 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 6323679..2a4a2f5 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -50,6 +50,8 @@
 #define USE_BATTCHECK
 #ifdef USE_MUGGLE_MODE
 #define MAX_CLICKS 6
+#define MUGGLE_FLOOR 22
+#define MUGGLE_CEILING (MAX_1x7135+20)
 #else
 #define MAX_CLICKS 5
 #endif
@@ -70,11 +72,11 @@
 // FIXME: detect this better, and assign offsets better, for various configs
 #define USE_EEPROM
 #ifdef USE_INDICATOR_LED
-#define EEPROM_BYTES 14
+#define EEPROM_BYTES 15
 #elif defined(USE_THERMAL_REGULATION)
-#define EEPROM_BYTES 13
+#define EEPROM_BYTES 14
 #else
-#define EEPROM_BYTES 11
+#define EEPROM_BYTES 12
 #endif
 #ifdef START_AT_MEMORIZED_LEVEL
 #define USE_EEPROM_WL
@@ -137,6 +139,7 @@ uint8_t momentary_state(EventPtr event, uint16_t arg);
 #ifdef USE_MUGGLE_MODE
 // muggle mode, super-simple, hard to exit
 uint8_t muggle_state(EventPtr event, uint16_t arg);
+uint8_t muggle_mode_active = 0;
 #endif
 
 // general helper function for config modes
@@ -365,7 +368,7 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
     }
     // 3 clicks: toggle smooth vs discrete ramping
     else if (event == EV_3clicks) {
-        ramp_style ^= 1;
+        ramp_style = !ramp_style;
         memorized_level = nearest_level(memorized_level);
         #ifdef USE_THERMAL_REGULATION
         target_level = memorized_level;
@@ -944,37 +947,118 @@ uint8_t momentary_state(EventPtr event, uint16_t arg) {
 
 #ifdef USE_MUGGLE_MODE
 uint8_t muggle_state(EventPtr event, uint16_t arg) {
-    //static uint8_t lvl = 0;
-    //uint8_t lvls[] = {MAX_1x7135/2, MAX_1x7135, MAX_1x7135+10};
+    static int8_t ramp_direction;
+    static int8_t muggle_off_mode;
 
-    if (event == EV_click1_press) {
-        /*
-        if (actual_level == 0) {
-            set_level(lvls[lvl]);
-            lvl = (lvl + 1) % sizeof(lvls);
+    // turn LED off when we first enter the mode
+    if (event == EV_enter_state) {
+        muggle_mode_active = 1;
+        save_config();
+
+        muggle_off_mode = 1;
+        ramp_direction = 1;
+        //memorized_level = MAX_1x7135;
+        memorized_level = (MUGGLE_FLOOR + MUGGLE_CEILING) / 2;
+        return MISCHIEF_MANAGED;
+    }
+    // initial press: moon hint
+    else if (event == EV_click1_press) {
+        if (muggle_off_mode)
+            set_level(MUGGLE_FLOOR);
+    }
+    // initial release: direct to memorized level
+    else if (event == EV_click1_release) {
+        if (muggle_off_mode)
+            set_level(memorized_level);
+    }
+    // if the user keeps pressing, turn off
+    else if (event == EV_click2_press) {
+        muggle_off_mode = 1;
+        set_level(0);
+    }
+    // 1 click: on/off
+    else if (event == EV_1click) {
+        muggle_off_mode ^= 1;
+        if (muggle_off_mode) {
+            set_level(0);
         }
-        else {  // turn off
+        /*
+        else {
+            set_level(memorized_level);
         }
         */
-        if (actual_level == 0) {
-            set_level(MAX_1x7135);
+        return MISCHIEF_MANAGED;
+    }
+    // hold: change brightness
+    else if (event == EV_click1_hold) {
+        // ramp at half speed
+        if (arg & 1) return MISCHIEF_MANAGED;
+
+        // if off, start at bottom
+        if (muggle_off_mode) {
+            muggle_off_mode = 0;
+            ramp_direction = 1;
+            set_level(MUGGLE_FLOOR);
         }
-        else {  // turn off
-            set_level(0);
+        else {
+            uint8_t m;
+            m = actual_level;
+            // ramp down if already at ceiling
+            if ((arg <= 1) && (m >= MUGGLE_CEILING)) ramp_direction = -1;
+            // ramp
+            m += ramp_direction;
+            if (m < MUGGLE_FLOOR)
+                m = MUGGLE_FLOOR;
+            if (m > MUGGLE_CEILING)
+                m = MUGGLE_CEILING;
+            memorized_level = m;
+            set_level(m);
         }
-        empty_event_sequence();
         return MISCHIEF_MANAGED;
     }
-
-    else if (event == EV_release) {
-        empty_event_sequence();  // don't attempt to parse multiple clicks
+    // 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 (memorized_level > MUGGLE_FLOOR)
+            memorized_level = actual_level - 1;
+        set_level(memorized_level);
+        return MISCHIEF_MANAGED;
+    }
+    */
+    // 6 clicks: exit muggle mode
+    else if (event == EV_6clicks) {
+        blink_confirm(1);
+        muggle_mode_active = 0;
+        save_config();
+        set_state(off_state, 0);
         return MISCHIEF_MANAGED;
     }
+    // tick: housekeeping
+    else if (event == EV_tick) {
+        // un-reverse after 1 second
+        if (arg == TICKS_PER_SECOND) ramp_direction = 1;
 
-    // Sleep, dammit!
-    else if ((event == EV_tick)  &&  (actual_level == 0)) {
-        if (arg > TICKS_PER_SECOND*1) {  // sleep after 1 second
-            go_to_standby = 1;  // sleep while light is off
+        // turn off, but don't go to the main "off" state
+        if (muggle_off_mode) {
+            if (arg > TICKS_PER_SECOND*1) {  // sleep after 1 second
+                go_to_standby = 1;  // sleep while light is off
+            }
+        }
+        return MISCHIEF_MANAGED;
+    }
+    // low voltage is handled specially in muggle mode
+    else if(event == EV_voltage_low) {
+        uint8_t lvl = (actual_level >> 1) + (actual_level >> 2);
+        if (lvl >= MUGGLE_FLOOR) {
+            set_level(lvl);
+        } else {
+            muggle_off_mode = 1;
         }
         return MISCHIEF_MANAGED;
     }
@@ -1279,12 +1363,15 @@ void load_config() {
         strobe_delays[1] = eeprom[8];
         bike_flasher_brightness = eeprom[9];
         beacon_seconds = eeprom[10];
+        #ifdef USE_MUGGLE_MODE
+        muggle_mode_active = eeprom[11];
+        #endif
         #ifdef USE_THERMAL_REGULATION
-        therm_ceil = eeprom[11];
-        therm_cal_offset = eeprom[12];
+        therm_ceil = eeprom[12];
+        therm_cal_offset = eeprom[13];
         #endif
         #ifdef USE_INDICATOR_LED
-        indicator_led_mode = eeprom[13];
+        indicator_led_mode = eeprom[14];
         #endif
     }
     #ifdef START_AT_MEMORIZED_LEVEL
@@ -1306,12 +1393,15 @@ void save_config() {
     eeprom[8] = strobe_delays[1];
     eeprom[9] = bike_flasher_brightness;
     eeprom[10] = beacon_seconds;
+    #ifdef USE_MUGGLE_MODE
+    eeprom[11] = muggle_mode_active;
+    #endif
     #ifdef USE_THERMAL_REGULATION
-    eeprom[11] = therm_ceil;
-    eeprom[12] = therm_cal_offset;
+    eeprom[12] = therm_ceil;
+    eeprom[13] = therm_cal_offset;
     #endif
     #ifdef USE_INDICATOR_LED
-    eeprom[13] = indicator_led_mode;
+    eeprom[14] = indicator_led_mode;
     #endif
 
     save_eeprom();
@@ -1332,7 +1422,8 @@ void low_voltage() {
         set_state(steady_state, RAMP_SIZE/6);
     }
     // in normal or muggle mode, step down or turn off
-    else if ((state == steady_state) || (state == muggle_state)) {
+    //else if ((state == steady_state) || (state == muggle_state)) {
+    else if (state == steady_state) {
         if (actual_level > 1) {
             uint8_t lvl = (actual_level >> 1) + (actual_level >> 2);
             set_level(lvl);
@@ -1376,7 +1467,10 @@ void setup() {
 
     load_config();
 
-    push_state(off_state, 0);
+    if (muggle_mode_active)
+        push_state(muggle_state, 0);
+    else
+        push_state(off_state, 0);
     #endif
 
 }
-- 
cgit v1.2.3


From e0f9fe6a2eae4a8ee803f4913ce6a5e595129235 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Tue, 24 Apr 2018 01:05:53 -0600
Subject: First pass at refactoring config modes to save space.  Also, moved
 all config menus to 4 clicks.

---
 spaghetti-monster/anduril/anduril.c   | 177 ++++++++++++++++++----------------
 spaghetti-monster/anduril/anduril.txt |   5 +-
 2 files changed, 95 insertions(+), 87 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 2a4a2f5..aea2a50 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -114,6 +114,11 @@
 
 // FSM states
 uint8_t off_state(EventPtr event, uint16_t arg);
+// simple numeric entry config menu
+uint8_t config_state_base(EventPtr event, uint16_t arg);
+#define MAX_CONFIG_VALUES 3
+uint8_t config_state_values[MAX_CONFIG_VALUES];
+volatile uint8_t config_state_done = 0;
 // ramping mode and its related config mode
 uint8_t steady_state(EventPtr event, uint16_t arg);
 uint8_t ramp_config_state(EventPtr event, uint16_t arg);
@@ -760,8 +765,8 @@ uint8_t tempcheck_state(EventPtr event, uint16_t arg) {
         set_state(battcheck_state, 0);
         return MISCHIEF_MANAGED;
     }
-    // 3 clicks: thermal config mode
-    else if (event == EV_3clicks) {
+    // 4 clicks: thermal config mode
+    else if (event == EV_4clicks) {
         set_state(thermal_config_state, 0);
         return MISCHIEF_MANAGED;
     }
@@ -785,8 +790,8 @@ uint8_t beacon_state(EventPtr event, uint16_t arg) {
         #endif
         return MISCHIEF_MANAGED;
     }
-    // 3 clicks: beacon config mode
-    else if (event == EV_3clicks) {
+    // 4 clicks: beacon config mode
+    else if (event == EV_4clicks) {
         set_state(beacon_config_state, 0);
         return MISCHIEF_MANAGED;
     }
@@ -1068,17 +1073,13 @@ uint8_t muggle_state(EventPtr event, uint16_t arg) {
 #endif
 
 
-uint8_t ramp_config_state(EventPtr event, uint16_t arg) {
+uint8_t config_state_base(EventPtr event, uint16_t arg) {
     static uint8_t config_step;
     static uint8_t num_config_steps;
     if (event == EV_enter_state) {
+        config_state_done = 0;
         config_step = 0;
-        if (ramp_style) {
-            num_config_steps = 3;
-        }
-        else {
-            num_config_steps = 2;
-        }
+        num_config_steps = arg;
         set_level(0);
         return MISCHIEF_MANAGED;
     }
@@ -1088,87 +1089,95 @@ uint8_t ramp_config_state(EventPtr event, uint16_t arg) {
             push_state(number_entry_state, config_step + 1);
         }
         else {
-            save_config();
+            config_state_done = 1;
             // TODO: blink out some sort of success pattern
-            // return to steady mode
-            set_state(steady_state, memorized_level);
         }
         return MISCHIEF_MANAGED;
     }
     // an option was set (return from number_entry_state)
     else if (event == EV_reenter_state) {
-        #if 0
-        // FIXME? this is a kludge which relies on the vars being consecutive
-        // in RAM and in the same order as declared
-        // ... and it doesn't work; it seems they're not consecutive  :(
-        volatile uint8_t *dest;
-        if (ramp_style) dest = (&ramp_discrete_floor) + config_step;
-        else dest = (&ramp_smooth_floor) + config_step;
-        if (number_entry_value)
-            *dest = number_entry_value;
-        #else
-        switch (config_step) {
-            case 0:
-                if (number_entry_value) {
-                    if (ramp_style) ramp_discrete_floor = number_entry_value;
-                    else ramp_smooth_floor = number_entry_value;
-                }
-                break;
-            case 1:
-                if (number_entry_value) {
-                    if (ramp_style) ramp_discrete_ceil = MAX_LEVEL + 1 - number_entry_value;
-                    else ramp_smooth_ceil = MAX_LEVEL + 1 - number_entry_value;
-                }
-                break;
-            case 2:
-                if (number_entry_value)
-                    ramp_discrete_steps = number_entry_value;
-                break;
-        }
-        #endif
+        config_state_values[config_step] = number_entry_value;
         config_step ++;
         return MISCHIEF_MANAGED;
     }
+    //return EVENT_NOT_HANDLED;
+    // eat all other events; don't pass any through to parent
+    return EVENT_HANDLED;
+}
+
+uint8_t ramp_config_state(EventPtr event, uint16_t arg) {
+    if (event == EV_enter_state) {
+        uint8_t num_config_steps;
+        num_config_steps = 2 + ramp_style;
+        return config_state_base(event, num_config_steps);
+    }
+    // let generic function handle everything except completion
+    else if (!config_state_done) {
+        return config_state_base(event, arg);
+    }
+    else if (event == EV_tick) {
+        // parse values
+        uint8_t val;
+        if (ramp_style) {  // discrete / stepped ramp
+
+            val = config_state_values[0];
+            if (val) { ramp_discrete_floor = val; }
+
+            val = config_state_values[1];
+            if (val) { ramp_discrete_ceil = MAX_LEVEL + 1 - val; }
+
+            val = config_state_values[2];
+            if (val) ramp_discrete_steps = val;
+
+        } else {  // smooth ramp
+
+            val = config_state_values[0];
+            if (val) { ramp_smooth_floor = val; }
+
+            val = config_state_values[1];
+            if (val) { ramp_smooth_ceil = MAX_LEVEL + 1 - val; }
+
+        }
+
+        // save values and return
+        save_config();
+        set_state(steady_state, memorized_level);
+        return MISCHIEF_MANAGED;
+    }
     return EVENT_NOT_HANDLED;
 }
 
 
 #ifdef USE_THERMAL_REGULATION
 uint8_t thermal_config_state(EventPtr event, uint16_t arg) {
-    static uint8_t config_step;
     if (event == EV_enter_state) {
-        set_level(0);
-        config_step = 0;
-        return MISCHIEF_MANAGED;
+        return config_state_base(event, 2);
+    }
+    // let generic function handle everything except completion
+    else if (!config_state_done) {
+        return config_state_base(event, arg);
     }
-    // advance forward through config steps
     else if (event == EV_tick) {
-        // ask the user for a number
-        if (config_step < 2) {
-            push_state(number_entry_state, config_step + 1);
+        // parse values
+        uint8_t val;
+
+        // calibrate room temperature
+        val = config_state_values[0];
+        if (val) {
+            int8_t rawtemp = (temperature >> 1) - therm_cal_offset;
+            therm_cal_offset = val - rawtemp;
         }
-        // return to original mode
-        else {
-            save_config();
-            set_state(tempcheck_state, 0);
-        }
-        return MISCHIEF_MANAGED;
-    }
-    // an option was set (return from number_entry_state)
-    else if (event == EV_reenter_state) {
-        if (number_entry_value) {
-            // calibrate room temperature
-            if (config_step == 0) {
-                int8_t rawtemp = (temperature >> 1) - therm_cal_offset;
-                therm_cal_offset = number_entry_value - rawtemp;
-            }
+
+        val = config_state_values[1];
+        if (val) {
             // set maximum heat limit
-            else {
-                therm_ceil = 30 + number_entry_value;
-            }
+            therm_ceil = 30 + val;
         }
         if (therm_ceil > MAX_THERM_CEIL) therm_ceil = MAX_THERM_CEIL;
-        config_step ++;
+
+        // save values and return
+        save_config();
+        set_state(tempcheck_state, 0);
         return MISCHIEF_MANAGED;
     }
     return EVENT_NOT_HANDLED;
@@ -1177,25 +1186,23 @@ uint8_t thermal_config_state(EventPtr event, uint16_t arg) {
 
 
 uint8_t beacon_config_state(EventPtr event, uint16_t arg) {
-    static uint8_t done = 0;
     if (event == EV_enter_state) {
-        set_level(0);
-        done = 0;
-        return MISCHIEF_MANAGED;
+        return config_state_base(event, 1);
     }
-    // advance forward through config steps
-    else if (event == EV_tick) {
-        // ask the user for a number
-        if (! done) push_state(number_entry_state, 0);
-        // return to original mode
-        else set_state(beacon_state, 0);
-        return MISCHIEF_MANAGED;
+    // let generic function handle everything except completion
+    else if (!config_state_done) {
+        return config_state_base(event, arg);
     }
-    // an option was set (return from number_entry_state)
-    else if (event == EV_reenter_state) {
-        if (number_entry_value) beacon_seconds = number_entry_value;
+    else if (event == EV_tick) {
+        // parse values
+        uint8_t val = config_state_values[0];
+        if (val) {
+            beacon_seconds = val;
+        }
+
+        // save values and return
         save_config();
-        done = 1;
+        set_state(beacon_state, 0);
         return MISCHIEF_MANAGED;
     }
     return EVENT_NOT_HANDLED;
diff --git a/spaghetti-monster/anduril/anduril.txt b/spaghetti-monster/anduril/anduril.txt
index 7ede740..6d27151 100644
--- a/spaghetti-monster/anduril/anduril.txt
+++ b/spaghetti-monster/anduril/anduril.txt
@@ -113,9 +113,10 @@ TODO:
   * a way to configure indicator LED behavior?
   * add goodnight mode?
   * add lightning mode?
-  - muggle mode: smooth ramp
+  * muggle mode: smooth ramp
+  + refactor to make config modes smaller
   - candle mode timer, with three clicks to add 30 minutes
   - candle mode: smoother adjustments?
   - make sunset mode timer and brightness configurable?
-  - move all config menus to four clicks
+  * move all config menus to four clicks
   - diagram updates for 3-click special actions
-- 
cgit v1.2.3


From d0d3ef50905cfdee2564c1e4ec6db3766510cf15 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Tue, 24 Apr 2018 01:40:25 -0600
Subject: Second pass at making config modes smaller.  Seems much better now.

---
 spaghetti-monster/anduril/anduril.c   | 159 +++++++++++++++-------------------
 spaghetti-monster/anduril/anduril.txt |   2 +-
 2 files changed, 69 insertions(+), 92 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index aea2a50..be9404d 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -115,10 +115,11 @@
 // FSM states
 uint8_t off_state(EventPtr event, uint16_t arg);
 // simple numeric entry config menu
-uint8_t config_state_base(EventPtr event, uint16_t arg);
+uint8_t config_state_base(EventPtr event, uint16_t arg,
+                          uint8_t num_config_steps,
+                          void (*savefunc)());
 #define MAX_CONFIG_VALUES 3
 uint8_t config_state_values[MAX_CONFIG_VALUES];
-volatile uint8_t config_state_done = 0;
 // ramping mode and its related config mode
 uint8_t steady_state(EventPtr event, uint16_t arg);
 uint8_t ramp_config_state(EventPtr event, uint16_t arg);
@@ -335,7 +336,11 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
     }
 
     // turn LED on when we first enter the mode
-    if (event == EV_enter_state) {
+    if ((event == EV_enter_state) || (event == EV_reenter_state)) {
+        // if we just got back from config mode, go back to memorized level
+        if (event == EV_reenter_state) {
+            arg = memorized_level;
+        }
         // remember this level, unless it's moon or turbo
         if ((arg > mode_min) && (arg < mode_max))
             memorized_level = arg;
@@ -392,7 +397,7 @@ uint8_t steady_state(EventPtr event, uint16_t arg) {
     }
     // 4 clicks: configure this ramp mode
     else if (event == EV_4clicks) {
-        set_state(ramp_config_state, 0);
+        push_state(ramp_config_state, 0);
         return MISCHIEF_MANAGED;
     }
     // hold: change brightness (brighter)
@@ -767,7 +772,7 @@ uint8_t tempcheck_state(EventPtr event, uint16_t arg) {
     }
     // 4 clicks: thermal config mode
     else if (event == EV_4clicks) {
-        set_state(thermal_config_state, 0);
+        push_state(thermal_config_state, 0);
         return MISCHIEF_MANAGED;
     }
     return EVENT_NOT_HANDLED;
@@ -792,7 +797,7 @@ uint8_t beacon_state(EventPtr event, uint16_t arg) {
     }
     // 4 clicks: beacon config mode
     else if (event == EV_4clicks) {
-        set_state(beacon_config_state, 0);
+        push_state(beacon_config_state, 0);
         return MISCHIEF_MANAGED;
     }
     return EVENT_NOT_HANDLED;
@@ -1073,13 +1078,13 @@ uint8_t muggle_state(EventPtr event, uint16_t arg) {
 #endif
 
 
-uint8_t config_state_base(EventPtr event, uint16_t arg) {
+// ask the user for a sequence of numbers, then save them and return to caller
+uint8_t config_state_base(EventPtr event, uint16_t arg,
+                          uint8_t num_config_steps,
+                          void (*savefunc)()) {
     static uint8_t config_step;
-    static uint8_t num_config_steps;
     if (event == EV_enter_state) {
-        config_state_done = 0;
         config_step = 0;
-        num_config_steps = arg;
         set_level(0);
         return MISCHIEF_MANAGED;
     }
@@ -1089,8 +1094,10 @@ uint8_t config_state_base(EventPtr event, uint16_t arg) {
             push_state(number_entry_state, config_step + 1);
         }
         else {
-            config_state_done = 1;
             // TODO: blink out some sort of success pattern
+            savefunc();
+            //set_state(retstate, retval);
+            pop_state();
         }
         return MISCHIEF_MANAGED;
     }
@@ -1105,107 +1112,77 @@ uint8_t config_state_base(EventPtr event, uint16_t arg) {
     return EVENT_HANDLED;
 }
 
-uint8_t ramp_config_state(EventPtr event, uint16_t arg) {
-    if (event == EV_enter_state) {
-        uint8_t num_config_steps;
-        num_config_steps = 2 + ramp_style;
-        return config_state_base(event, num_config_steps);
-    }
-    // let generic function handle everything except completion
-    else if (!config_state_done) {
-        return config_state_base(event, arg);
-    }
-    else if (event == EV_tick) {
-        // parse values
-        uint8_t val;
-        if (ramp_style) {  // discrete / stepped ramp
-
-            val = config_state_values[0];
-            if (val) { ramp_discrete_floor = val; }
+void ramp_config_save() {
+    // parse values
+    uint8_t val;
+    if (ramp_style) {  // discrete / stepped ramp
 
-            val = config_state_values[1];
-            if (val) { ramp_discrete_ceil = MAX_LEVEL + 1 - val; }
+        val = config_state_values[0];
+        if (val) { ramp_discrete_floor = val; }
 
-            val = config_state_values[2];
-            if (val) ramp_discrete_steps = val;
+        val = config_state_values[1];
+        if (val) { ramp_discrete_ceil = MAX_LEVEL + 1 - val; }
 
-        } else {  // smooth ramp
+        val = config_state_values[2];
+        if (val) ramp_discrete_steps = val;
 
-            val = config_state_values[0];
-            if (val) { ramp_smooth_floor = val; }
+    } else {  // smooth ramp
 
-            val = config_state_values[1];
-            if (val) { ramp_smooth_ceil = MAX_LEVEL + 1 - val; }
+        val = config_state_values[0];
+        if (val) { ramp_smooth_floor = val; }
 
-        }
+        val = config_state_values[1];
+        if (val) { ramp_smooth_ceil = MAX_LEVEL + 1 - val; }
 
-        // save values and return
-        save_config();
-        set_state(steady_state, memorized_level);
-        return MISCHIEF_MANAGED;
     }
-    return EVENT_NOT_HANDLED;
 }
 
+uint8_t ramp_config_state(EventPtr event, uint16_t arg) {
+    uint8_t num_config_steps;
+    num_config_steps = 2 + ramp_style;
+    return config_state_base(event, arg,
+                             num_config_steps, ramp_config_save);
+}
 
-#ifdef USE_THERMAL_REGULATION
-uint8_t thermal_config_state(EventPtr event, uint16_t arg) {
-    if (event == EV_enter_state) {
-        return config_state_base(event, 2);
-    }
-    // let generic function handle everything except completion
-    else if (!config_state_done) {
-        return config_state_base(event, arg);
-    }
-    else if (event == EV_tick) {
-        // parse values
-        uint8_t val;
 
-        // calibrate room temperature
-        val = config_state_values[0];
-        if (val) {
-            int8_t rawtemp = (temperature >> 1) - therm_cal_offset;
-            therm_cal_offset = val - rawtemp;
-        }
+#ifdef USE_THERMAL_REGULATION
+void thermal_config_save() {
+    // parse values
+    uint8_t val;
 
-        val = config_state_values[1];
-        if (val) {
-            // set maximum heat limit
-            therm_ceil = 30 + val;
-        }
-        if (therm_ceil > MAX_THERM_CEIL) therm_ceil = MAX_THERM_CEIL;
+    // calibrate room temperature
+    val = config_state_values[0];
+    if (val) {
+        int8_t rawtemp = (temperature >> 1) - therm_cal_offset;
+        therm_cal_offset = val - rawtemp;
+    }
 
-        // save values and return
-        save_config();
-        set_state(tempcheck_state, 0);
-        return MISCHIEF_MANAGED;
+    val = config_state_values[1];
+    if (val) {
+        // set maximum heat limit
+        therm_ceil = 30 + val;
     }
-    return EVENT_NOT_HANDLED;
+    if (therm_ceil > MAX_THERM_CEIL) therm_ceil = MAX_THERM_CEIL;
+}
+
+uint8_t thermal_config_state(EventPtr event, uint16_t arg) {
+    return config_state_base(event, arg,
+                             2, thermal_config_save);
 }
 #endif
 
 
-uint8_t beacon_config_state(EventPtr event, uint16_t arg) {
-    if (event == EV_enter_state) {
-        return config_state_base(event, 1);
-    }
-    // let generic function handle everything except completion
-    else if (!config_state_done) {
-        return config_state_base(event, arg);
+void beacon_config_save() {
+    // parse values
+    uint8_t val = config_state_values[0];
+    if (val) {
+        beacon_seconds = val;
     }
-    else if (event == EV_tick) {
-        // parse values
-        uint8_t val = config_state_values[0];
-        if (val) {
-            beacon_seconds = val;
-        }
+}
 
-        // save values and return
-        save_config();
-        set_state(beacon_state, 0);
-        return MISCHIEF_MANAGED;
-    }
-    return EVENT_NOT_HANDLED;
+uint8_t beacon_config_state(EventPtr event, uint16_t arg) {
+    return config_state_base(event, arg,
+                             1, beacon_config_save);
 }
 
 
diff --git a/spaghetti-monster/anduril/anduril.txt b/spaghetti-monster/anduril/anduril.txt
index 6d27151..7efbf04 100644
--- a/spaghetti-monster/anduril/anduril.txt
+++ b/spaghetti-monster/anduril/anduril.txt
@@ -114,7 +114,7 @@ TODO:
   * add goodnight mode?
   * add lightning mode?
   * muggle mode: smooth ramp
-  + refactor to make config modes smaller
+  * refactor to make config modes smaller
   - candle mode timer, with three clicks to add 30 minutes
   - candle mode: smoother adjustments?
   - make sunset mode timer and brightness configurable?
-- 
cgit v1.2.3


From 83be9c40b0a8919dfaba14024943a28fcec672bc Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Tue, 1 May 2018 16:41:20 -0600
Subject: updated Anduril diagram based on recent UI changes

---
 spaghetti-monster/anduril/anduril-ui.png | Bin 237749 -> 238915 bytes
 spaghetti-monster/anduril/anduril.svg    | 288 ++++++++++++++++++++++++-------
 2 files changed, 223 insertions(+), 65 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril-ui.png b/spaghetti-monster/anduril/anduril-ui.png
index 2776696..191dbd1 100644
Binary files a/spaghetti-monster/anduril/anduril-ui.png and b/spaghetti-monster/anduril/anduril-ui.png differ
diff --git a/spaghetti-monster/anduril/anduril.svg b/spaghetti-monster/anduril/anduril.svg
index b72e2f8..ff9878a 100644
--- a/spaghetti-monster/anduril/anduril.svg
+++ b/spaghetti-monster/anduril/anduril.svg
@@ -1737,22 +1737,6 @@
          style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
          inkscape:connector-curvature="0" />
     </marker>
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker14034-2"
-       style="overflow:visible"
-       inkscape:isstock="true"
-       inkscape:collect="always">
-      <path
-         inkscape:connector-curvature="0"
-         id="path14032-9"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         transform="matrix(0.4,0,0,0.4,4,0)" />
-    </marker>
     <marker
        inkscape:stockid="Arrow1Mend"
        orient="auto"
@@ -2325,6 +2309,100 @@
          style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
          inkscape:connector-curvature="0" />
     </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker14034-2-9"
+       style="overflow:visible"
+       inkscape:isstock="true"
+       inkscape:collect="always">
+      <path
+         inkscape:connector-curvature="0"
+         id="path14032-9-7"
+         d="M 0,0 5,-5 -12.5,0 5,5 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-597-9-5"
+       style="overflow:visible">
+      <path
+         id="path3856-76-6-3"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-88-3"
+       style="overflow:visible">
+      <path
+         id="path3856-868-1"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-88-3-9"
+       style="overflow:visible">
+      <path
+         id="path3856-868-1-6"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-88-3-9-3"
+       style="overflow:visible">
+      <path
+         id="path3856-868-1-6-3"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-88-3-9-3-4"
+       style="overflow:visible">
+      <path
+         id="path3856-868-1-6-3-8"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-88-9-4-4-4"
+       style="overflow:visible">
+      <path
+         id="path3856-868-6-1-0-3"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -2333,7 +2411,7 @@
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.2060783"
+     inkscape:zoom="1.2050864"
      inkscape:cx="341.22418"
      inkscape:cy="504.11322"
      inkscape:document-units="px"
@@ -2341,7 +2419,7 @@
      showgrid="false"
      showguides="true"
      gridtolerance="1"
-     inkscape:window-width="2548"
+     inkscape:window-width="2457"
      inkscape:window-height="1415"
      inkscape:window-x="0"
      inkscape:window-y="0"
@@ -2593,7 +2671,7 @@
          style="fill:none;stroke:#ff0000;stroke-width:2.39758635;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
     <path
-       style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:4.26666667, 4.26666667;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-09)"
+       style="fill:none;stroke:#7777ff;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:2.13333344, 2.13333343999999991;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-09)"
        d="m 1513.2522,717.92736 c 2.42,16.34201 29.9911,22.87705 72.4182,-3.30651"
        id="path5213-6-8-4-9-9-8-4"
        inkscape:connector-curvature="0"
@@ -2629,7 +2707,7 @@
          style="fill:none;stroke:#000000;stroke-width:2.39758635;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
     <path
-       style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:4.26666667, 4.26666667;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-09-2)"
+       style="fill:none;stroke:#7777ff;stroke-width:2.1329999;stroke-miterlimit:4;stroke-dasharray:2.1329999,2.1329999;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-09-2)"
        d="m 1655.5374,617.2342 c 16.7016,16.23216 46.3164,-11.31808 11.0065,-81.1781"
        id="path5213-6-8-4-9-9-8-4-4"
        inkscape:connector-curvature="0"
@@ -2888,12 +2966,6 @@
        d="m 1319.7047,381.98134 h 37.7525"
        id="path15687-9-5"
        inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:4.26666689, 4.26666689;stroke-dashoffset:4.05333376;stroke-opacity:1;marker-start:url(#marker14034-2);marker-end:url(#Arrow1Mend-597-9)"
-       d="m 1314.7557,244.15455 c -101.312,-129.32592 -99.5899,149.91799 -0.4764,14.48744"
-       id="path5213-6-8-4-9-9-8-7-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
@@ -2925,6 +2997,52 @@
          y="802.48492"
          style="font-size:24px;line-height:1.25;stroke-width:1.06666672"
          id="tspan39590" /></text>
+    <g
+       transform="translate(9.0949204,-123.27684)"
+       id="g16522-3">
+      <text
+         inkscape:transform-center-y="-2.0513889"
+         inkscape:transform-center-x="1.8963668"
+         transform="rotate(-0.20350505)"
+         id="text7289-7-6-21-8-8"
+         y="915.03876"
+         x="1617.4175"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#7777ff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           y="915.03876"
+           x="1617.4175"
+           id="tspan7287-5-5-7-5-6"
+           sodipodi:role="line"> 4 Clicks</tspan></text>
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path5213-6-8-4-9-9-1-3-8-4-0"
+         d="m 1620.8968,904.32938 c -2.5427,0.005 -34.933,0.0197 -38.794,0"
+         style="fill:none;stroke:#7777ff;stroke-width:2.1329999;stroke-miterlimit:4;stroke-dasharray:2.1329999, 2.1329999;stroke-dashoffset:5.11919975;stroke-opacity:1;marker-end:url(#Arrow1Mend-88-3-9-3)" />
+    </g>
+    <g
+       transform="translate(9.0949217,89.635331)"
+       id="g16522-3-8">
+      <text
+         inkscape:transform-center-y="-2.0513889"
+         inkscape:transform-center-x="1.8963668"
+         transform="rotate(-0.20350505)"
+         id="text7289-7-6-21-8-8-8"
+         y="915.03876"
+         x="1617.4175"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#7777ff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           y="915.03876"
+           x="1617.4175"
+           id="tspan7287-5-5-7-5-6-9"
+           sodipodi:role="line"> 4 Clicks</tspan></text>
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path5213-6-8-4-9-9-1-3-8-4-0-7"
+         d="m 1620.8968,904.32938 c -2.5427,0.005 -34.933,0.0197 -38.794,0"
+         style="fill:none;stroke:#7777ff;stroke-width:2.1329999;stroke-miterlimit:4;stroke-dasharray:2.1329999, 2.1329999;stroke-dashoffset:5.11919975;stroke-opacity:1;marker-end:url(#Arrow1Mend-88-3-9-3-4)" />
+    </g>
     <rect
        style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect5159-4-9"
@@ -3173,19 +3291,6 @@
          y="377.28925"
          id="tspan3613-9-8-3-7"
          style="font-size:17.06666756px;line-height:1.25;fill:#009d00;fill-opacity:1;stroke-width:1.06666672">Click, Hold</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="1279.8917"
-       y="-10.637094"
-       id="text7289-7-6"
-       transform="rotate(20.271471)"
-       inkscape:transform-center-x="1.5789001"
-       inkscape:transform-center-y="-2.3416108"><tspan
-         sodipodi:role="line"
-         id="tspan7287-5-5"
-         x="1279.8917"
-         y="-10.637094">4 Clicks</tspan></text>
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:58.66666794px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
@@ -3265,32 +3370,6 @@
        id="path5213-6-8-4-9-9-56-7-1"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.90419513px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="text56250"
-       x="122.7574"
-       y="24.531532"
-       transform="matrix(0.85679646,0,0,0.85679646,183.47218,36.673981)"><textPath
-         xlink:href="#path5213-6-8-4-9-9-8-7-3"
-         id="textPath56258"
-         style="font-size:18.66666603px;stroke-width:0.90419513px"><tspan
-   id="tspan56248"
-   style="font-size:18.66666603px;stroke-width:0.90419513px">      Smooth / Stepped</tspan></textPath></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="1074.9415"
-       y="156.70654"
-       id="text56273"><tspan
-         sodipodi:role="line"
-         id="tspan56271"
-         x="1074.9415"
-         y="156.70654">Smooth /</tspan><tspan
-         sodipodi:role="line"
-         x="1074.9415"
-         y="179.20654"
-         id="tspan56275">Stepped</tspan></text>
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
@@ -3814,5 +3893,84 @@
        id="path5213-6-8-4-9-9-1-3-0-0-6-4-9"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:4.26666689, 4.26666689;stroke-dashoffset:4.05333376;stroke-opacity:1;marker-start:url(#marker14034-2-9);marker-end:url(#Arrow1Mend-597-9-5)"
+       d="m 1159.7225,198.62656 c 67.9862,-0.44112 68.743,-36.42258 0.1793,-35.70399"
+       id="path5213-6-8-4-9-9-8-7-3-8"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <g
+       id="g18567"
+       transform="translate(13.62988,7.3367765)">
+      <text
+         id="text56273"
+         y="160.56241"
+         x="1067.6877"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           id="tspan56275"
+           y="160.56241"
+           x="1067.6877"
+           sodipodi:role="line">Smooth </tspan></text>
+      <ellipse
+         ry="14.669211"
+         rx="39.313492"
+         cy="154.67567"
+         cx="1101.8171"
+         id="path11546"
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#010109;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
+    <g
+       id="g16522"
+       transform="translate(9.094912)">
+      <text
+         inkscape:transform-center-y="-2.0513889"
+         inkscape:transform-center-x="1.8963668"
+         transform="rotate(-0.20350505)"
+         id="text7289-7-6-21-8"
+         y="915.03876"
+         x="1617.4175"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#7777ff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           y="915.03876"
+           x="1617.4175"
+           id="tspan7287-5-5-7-5"
+           sodipodi:role="line"> 4 Clicks</tspan></text>
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path5213-6-8-4-9-9-1-3-8-4"
+         d="m 1620.8968,904.32938 c -2.5427,0.005 -34.933,0.0197 -38.794,0"
+         style="fill:none;stroke:#7777ff;stroke-width:2.1329999;stroke-miterlimit:4;stroke-dasharray:2.1329999, 2.1329999;stroke-dashoffset:5.11919975;stroke-opacity:1;marker-end:url(#Arrow1Mend-88-3-9)" />
+    </g>
+    <g
+       id="g18572"
+       transform="translate(-76.57207,43.516866)">
+      <rect
+         ry="3"
+         rx="3"
+         y="142.29279"
+         x="1152.8596"
+         height="25.367319"
+         width="78.318939"
+         id="rect11665"
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#010109;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <text
+         id="text56273-7"
+         y="160.56241"
+         x="1154.8745"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           id="tspan56275-6"
+           y="160.56241"
+           x="1154.8745"
+           sodipodi:role="line">Stepped</tspan></text>
+    </g>
+    <path
+       style="fill:none;stroke:#7777ff;stroke-width:2.1329999;stroke-miterlimit:4;stroke-dasharray:2.1329999, 2.1329999;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-88-9-4-4-4)"
+       d="m 1105.4067,642.42175 c 0.045,-2.13304 0.1257,-3.76647 -0.02,-8.64889"
+       id="path5213-6-8-4-9-9-1-3-0-0-3-0"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
   </g>
 </svg>
-- 
cgit v1.2.3


From a93c243386fe48595a981e0fb8bca4f6b3d518a8 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Tue, 1 May 2018 16:49:13 -0600
Subject: Added missing ifdef for muggle mode behavior at boot.

---
 spaghetti-monster/anduril/anduril.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index be9404d..8e298b9 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -1451,9 +1451,11 @@ void setup() {
 
     load_config();
 
+    #ifdef USE_MUGGLE_MODE
     if (muggle_mode_active)
         push_state(muggle_state, 0);
     else
+    #endif
         push_state(off_state, 0);
     #endif
 
-- 
cgit v1.2.3


From d030518a314e838a0386182fbdfb65b56322cb6f Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Tue, 1 May 2018 19:52:39 -0600
Subject: Use separate voltage adjustment value for pin7 readings.

---
 spaghetti-monster/fsm-adc.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/fsm-adc.h b/spaghetti-monster/fsm-adc.h
index 1b16d01..6256e2c 100644
--- a/spaghetti-monster/fsm-adc.h
+++ b/spaghetti-monster/fsm-adc.h
@@ -32,8 +32,12 @@
 #endif
 // MCU sees voltage 0.X volts lower than actual, add X/2 to readings
 #ifndef VOLTAGE_FUDGE_FACTOR
+#ifdef USE_VOLTAGE_DIVIDER
+#define VOLTAGE_FUDGE_FACTOR 0
+#else
 #define VOLTAGE_FUDGE_FACTOR 5
 #endif
+#endif
 volatile uint8_t voltage;
 volatile uint8_t adcint_enable;  // kludge, because adc auto-retrigger won't turn off
 void low_voltage();
-- 
cgit v1.2.3


From 850b0d57143b0d052c61abb237e4ca9fd9f02f3b Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Tue, 1 May 2018 19:53:31 -0600
Subject: Added BLF GT 150-level ramp.  Is a bit of a mess though.

---
 spaghetti-monster/fsm-ramping.h | 37 ++++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/fsm-ramping.h b/spaghetti-monster/fsm-ramping.h
index 1657e4a..86742f6 100644
--- a/spaghetti-monster/fsm-ramping.h
+++ b/spaghetti-monster/fsm-ramping.h
@@ -60,17 +60,32 @@ void gradual_tick();
     PROGMEM const uint8_t pwm2_levels[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,5,7,10,13,16,19,23,26,30,34,38,42,47,51,56,61,66,72,77,83,89,95,101,108,115,122,129,136,144,152,160,168,177,186,195,204,214,224,234,244,255 };
     #define MAX_1x7135 33
   #elif RAMP_LENGTH == 150
-    // ../../bin/level_calc.py 2 150 7135 4 0.33 150 FET 1 10 1500
-    //PROGMEM const uint8_t pwm1_levels[] = { 4,4,4,5,5,5,6,6,7,7,8,9,10,11,12,13,14,15,17,18,20,21,23,25,27,30,32,34,37,40,43,46,49,52,56,59,63,67,71,76,80,85,90,95,100,106,112,118,124,130,137,144,151,158,166,173,181,190,198,207,216,225,235,245,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0 };
-    //PROGMEM const uint8_t pwm2_levels[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,3,4,5,7,8,9,11,12,14,15,17,19,20,22,24,25,27,29,31,33,35,37,39,41,43,45,48,50,52,55,57,59,62,64,67,70,72,75,78,81,84,87,90,93,96,99,102,105,109,112,115,119,122,126,129,133,137,141,144,148,152,156,160,165,169,173,177,182,186,191,195,200,205,209,214,219,224,229,234,239,244,250,255 };
-    // ../../bin/level_calc.py 1 65 7135 1 0.8 150
-    // ... mixed with this:
-    // ../../bin/level_calc.py 2 150 7135 4 0.33 150 FET 1 10 1500
-    PROGMEM const uint8_t pwm1_levels[] = { 1,1,2,2,3,3,4,4,5,6,7,8,9,10,12,13,14,15,17,19,20,22,24,26,29,31,34,36,39,42,45,48,51,55,59,62,66,70,75,79,84,89,93,99,104,110,115,121,127,134,140,147,154,161,168,176,184,192,200,209,217,226,236,245,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0 };
-    PROGMEM const uint8_t pwm2_levels[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,3,4,5,7,8,9,11,12,14,15,17,19,20,22,24,25,27,29,31,33,35,37,39,41,43,45,48,50,52,55,57,59,62,64,67,70,72,75,78,81,84,87,90,93,96,99,102,105,109,112,115,119,122,126,129,133,137,141,144,148,152,156,160,165,169,173,177,182,186,191,195,200,205,209,214,219,224,229,234,239,244,250,255 };
-    #define MAX_1x7135 65
-    #define HALFSPEED_LEVEL 14
-    #define QUARTERSPEED_LEVEL 5
+    #ifdef FSM_BLF_GT_DRIVER
+      // First 60 values: level_calc.py 1 60 7135 4 5.0 255
+      // Remainder: all 255 (buck driver at 100% duty cycle)
+      PROGMEM const uint8_t pwm1_levels[] = { 4,5,6,6,7,8,9,11,12,13,15,16,18,19,21,23,25,27,30,32,34,37,40,43,46,49,52,55,59,63,66,70,75,79,83,88,93,98,103,108,114,119,125,131,137,144,150,157,164,171,179,186,194,202,210,219,228,236,246,255,
+          255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255 };
+      // First 60 values: all 25 (buck driver at 10% power)
+      // Remainder: values 61-150 of level_calc.py 1 150 7135 1 3 3000
+      PROGMEM const uint8_t pwm2_levels[] = { 25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,
+          26,27,28,29,30,31,32,33,35,36,37,38,40,41,42,44,45,47,48,50,51,53,54,56,58,59,61,63,65,67,69,70,72,74,76,79,81,83,85,87,89,92,94,96,99,101,104,106,109,112,114,117,120,123,125,128,131,134,137,140,143,147,150,153,156,160,163,167,170,174,177,181,184,188,192,196,200,204,208,212,216,220,224,228,233,237,241,246,250,255 };
+      #define POWER_80PX 138  // 2.0 Amps out of maximum 2.5 Amps
+      #define MAX_1x7135 60   // where it switches from PWM to current control
+      #define HALFSPEED_LEVEL 17
+      #define QUARTERSPEED_LEVEL 6
+    #else
+      // ../../bin/level_calc.py 2 150 7135 4 0.33 150 FET 1 10 1500
+      //PROGMEM const uint8_t pwm1_levels[] = { 4,4,4,5,5,5,6,6,7,7,8,9,10,11,12,13,14,15,17,18,20,21,23,25,27,30,32,34,37,40,43,46,49,52,56,59,63,67,71,76,80,85,90,95,100,106,112,118,124,130,137,144,151,158,166,173,181,190,198,207,216,225,235,245,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0 };
+      //PROGMEM const uint8_t pwm2_levels[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,3,4,5,7,8,9,11,12,14,15,17,19,20,22,24,25,27,29,31,33,35,37,39,41,43,45,48,50,52,55,57,59,62,64,67,70,72,75,78,81,84,87,90,93,96,99,102,105,109,112,115,119,122,126,129,133,137,141,144,148,152,156,160,165,169,173,177,182,186,191,195,200,205,209,214,219,224,229,234,239,244,250,255 };
+      // ../../bin/level_calc.py 1 65 7135 1 0.8 150
+      // ... mixed with this:
+      // ../../bin/level_calc.py 2 150 7135 4 0.33 150 FET 1 10 1500
+      PROGMEM const uint8_t pwm1_levels[] = { 1,1,2,2,3,3,4,4,5,6,7,8,9,10,12,13,14,15,17,19,20,22,24,26,29,31,34,36,39,42,45,48,51,55,59,62,66,70,75,79,84,89,93,99,104,110,115,121,127,134,140,147,154,161,168,176,184,192,200,209,217,226,236,245,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0 };
+      PROGMEM const uint8_t pwm2_levels[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,3,4,5,7,8,9,11,12,14,15,17,19,20,22,24,25,27,29,31,33,35,37,39,41,43,45,48,50,52,55,57,59,62,64,67,70,72,75,78,81,84,87,90,93,96,99,102,105,109,112,115,119,122,126,129,133,137,141,144,148,152,156,160,165,169,173,177,182,186,191,195,200,205,209,214,219,224,229,234,239,244,250,255 };
+      #define MAX_1x7135 65
+      #define HALFSPEED_LEVEL 14
+      #define QUARTERSPEED_LEVEL 5
+    #endif
   #endif
 #elif PWM_CHANNELS == 3
   #if RAMP_LENGTH == 50
-- 
cgit v1.2.3


From f62a4852be155cfb96231ee3272e082080895bf9 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Tue, 1 May 2018 19:54:19 -0600
Subject: Made voltage ADC readings work on pin7 if USE_VOLTAGE_DIVIDER is
 defined.

---
 spaghetti-monster/fsm-adc.c | 48 ++++++++++++++++++++++++++++++++++++---------
 1 file changed, 39 insertions(+), 9 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/fsm-adc.c b/spaghetti-monster/fsm-adc.c
index c6f5d2a..6e9f19b 100644
--- a/spaghetti-monster/fsm-adc.c
+++ b/spaghetti-monster/fsm-adc.c
@@ -20,13 +20,25 @@
 #ifndef FSM_ADC_C
 #define FSM_ADC_C
 
+#ifdef USE_VOLTAGE_DIVIDER
+// 1.1V / pin7
+#define ADMUX_VOLTAGE ADMUX_VOLTAGE_DIVIDER
+#else
+// VCC / 1.1V reference
+#define ADMUX_VOLTAGE ADMUX_VCC
+#endif
+
 inline void ADC_on()
 {
     // read voltage on VCC by default
+    ADMUX = ADMUX_VOLTAGE;
+    #ifdef USE_VOLTAGE_DIVIDER
+    // disable digital input on divider pin to reduce power consumption
+    DIDR0 |= (1 << VOLTAGE_ADC_DIDR);
+    #else
     // disable digital input on VCC pin to reduce power consumption
     //DIDR0 |= (1 << ADC_DIDR);  // FIXME: unsure how to handle for VCC pin
-    // VCC / 1.1V reference
-    ADMUX = ADMUX_VCC;
+    #endif
     // enable, start, prescale
     ADCSRA = (1 << ADEN) | (1 << ADSC) | ADC_PRSCL;
 }
@@ -35,6 +47,16 @@ inline void ADC_off() {
     ADCSRA &= ~(1<<ADEN); //ADC off
 }
 
+#ifdef USE_VOLTAGE_DIVIDER
+static inline uint8_t calc_voltage_divider(uint16_t value) {
+    // use 9.7 fixed-point to get sufficient precision
+    uint16_t adc_per_volt = ((ADC_44<<7) - (ADC_22<<7)) / (44-22);
+    // incoming value is 14.2 fixed-point, so shift it 2 bits less
+    uint8_t result = ((value<<5) / adc_per_volt) + VOLTAGE_FUDGE_FACTOR;
+    return result;
+}
+#endif
+
 // Each full cycle runs 7.8X per second with just voltage enabled,
 // or 3.9X per second with voltage and temperature.
 #if defined(USE_LVP) && defined(USE_THERMAL_REGULATION)
@@ -109,14 +131,22 @@ ISR(ADC_vect) {
             total += measurement;
             total = total >> 2;
 
+            #ifdef USE_VOLTAGE_DIVIDER
+            voltage = calc_voltage_divider(total);
+            #else
             voltage = (uint16_t)(1.1*1024*10)/total + VOLTAGE_FUDGE_FACTOR;
+            #endif
         }
         #else  // no USE_LVP_AVG
-        // calculate actual voltage: volts * 10
-        // ADC = 1.1 * 1024 / volts
-        // volts = 1.1 * 1024 / ADC
-        //voltage = (uint16_t)(1.1*1024*10)/measurement + VOLTAGE_FUDGE_FACTOR;
-        voltage = ((uint16_t)(2*1.1*1024*10)/measurement + VOLTAGE_FUDGE_FACTOR) >> 1;
+            #ifdef USE_VOLTAGE_DIVIDER
+            voltage = calc_voltage_divider(measurement);
+            #else
+            // calculate actual voltage: volts * 10
+            // ADC = 1.1 * 1024 / volts
+            // volts = 1.1 * 1024 / ADC
+            //voltage = (uint16_t)(1.1*1024*10)/measurement + VOLTAGE_FUDGE_FACTOR;
+            voltage = ((uint16_t)(2*1.1*1024*10)/measurement + VOLTAGE_FUDGE_FACTOR) >> 1;
+            #endif
         #endif
         // if low, callback EV_voltage_low / EV_voltage_critical
         //         (but only if it has been more than N ticks since last call)
@@ -287,14 +317,14 @@ ISR(ADC_vect) {
     // set the correct type of measurement for next time
     #ifdef USE_THERMAL_REGULATION
         #ifdef USE_LVP
-        if (adc_step < 2) ADMUX = ADMUX_VCC;
+        if (adc_step < 2) ADMUX = ADMUX_VOLTAGE;
         else ADMUX = ADMUX_THERM;
         #else
         ADMUX = ADMUX_THERM;
         #endif
     #else
         #ifdef USE_LVP
-        ADMUX = ADMUX_VCC;
+        ADMUX = ADMUX_VOLTAGE;
         #endif
     #endif
 }
-- 
cgit v1.2.3


From 6a3a10faa447b0d9f53d2fe2e38fccab6d7cc439 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Tue, 1 May 2018 19:54:43 -0600
Subject: Added BLF GT support to Anduril.

---
 spaghetti-monster/anduril/anduril.c | 52 ++++++++++++++++++++++++++++++-------
 1 file changed, 42 insertions(+), 10 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 8e298b9..36d29ac 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -23,6 +23,7 @@
 #define FSM_EMISAR_D4_DRIVER
 //#define FSM_BLF_Q8_DRIVER
 //#define FSM_FW3A_DRIVER
+//#define FSM_BLF_GT_DRIVER
 
 #define USE_LVP
 #define USE_THERMAL_REGULATION
@@ -62,10 +63,25 @@
 #ifdef FSM_BLF_Q8_DRIVER
 #define USE_INDICATOR_LED
 #define VOLTAGE_FUDGE_FACTOR 7  // add 0.35V
+
 #elif defined(FSM_EMISAR_D4_DRIVER)
 #define VOLTAGE_FUDGE_FACTOR 5  // add 0.25V
+
 #elif defined(FSM_FW3A_DRIVER)
 #define VOLTAGE_FUDGE_FACTOR 5  // add 0.25V
+
+#elif defined(FSM_BLF_GT_DRIVER)
+#define USE_INDICATOR_LED
+#undef BLINK_AT_CHANNEL_BOUNDARIES
+#undef BLINK_AT_RAMP_CEILING
+#undef BLINK_AT_RAMP_FLOOR
+//#undef USE_SET_LEVEL_GRADUALLY
+#define RAMP_SMOOTH_FLOOR 1
+#define RAMP_SMOOTH_CEIL POWER_80PX
+#define RAMP_DISCRETE_FLOOR 1
+#define RAMP_DISCRETE_CEIL POWER_80PX
+#define RAMP_DISCRETE_STEPS 7
+
 #endif
 
 // try to auto-detect how many eeprom bytes
@@ -162,20 +178,36 @@ void save_config();
 void save_config_wl();
 #endif
 
+// default ramp options if not overridden earlier per-driver
+#ifndef RAMP_SMOOTH_FLOOR
+  #define RAMP_SMOOTH_FLOOR 1
+#endif
+#ifndef RAMP_SMOOTH_CEIL
+  #if PWM_CHANNELS == 3
+    #define RAMP_SMOOTH_CEIL MAX_Nx7135
+  #else
+    #define RAMP_SMOOTH_CEIL MAX_LEVEL - 30
+  #endif
+#endif
+#ifndef RAMP_DISCRETE_FLOOR
+  #define RAMP_DISCRETE_FLOOR 20
+#endif
+#ifndef RAMP_DISCRETE_CEIL
+  #define RAMP_DISCRETE_CEIL RAMP_SMOOTH_CEIL
+#endif
+#ifndef RAMP_DISCRETE_STEPS
+  #define RAMP_DISCRETE_STEPS 7
+#endif
+
 // brightness control
 uint8_t memorized_level = MAX_1x7135;
 // smooth vs discrete ramping
 volatile uint8_t ramp_style = 0;  // 0 = smooth, 1 = discrete
-volatile uint8_t ramp_smooth_floor = 1;
-#if PWM_CHANNELS == 3
-volatile uint8_t ramp_smooth_ceil = MAX_Nx7135;
-volatile uint8_t ramp_discrete_ceil = MAX_Nx7135;
-#else
-volatile uint8_t ramp_smooth_ceil = MAX_LEVEL - 30;
-volatile uint8_t ramp_discrete_ceil = MAX_LEVEL - 30;
-#endif
-volatile uint8_t ramp_discrete_floor = 20;
-volatile uint8_t ramp_discrete_steps = 7;
+volatile uint8_t ramp_smooth_floor = RAMP_SMOOTH_FLOOR;
+volatile uint8_t ramp_smooth_ceil = RAMP_SMOOTH_CEIL;
+volatile uint8_t ramp_discrete_floor = RAMP_DISCRETE_FLOOR;
+volatile uint8_t ramp_discrete_ceil = RAMP_DISCRETE_CEIL;
+volatile uint8_t ramp_discrete_steps = RAMP_DISCRETE_STEPS;
 uint8_t ramp_discrete_step_size;  // don't set this
 
 #ifdef USE_INDICATOR_LED
-- 
cgit v1.2.3


From dc7d6b3724ca8e153a035eacddb95541986e39d5 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sun, 6 May 2018 17:51:39 -0600
Subject: Added "votive candle mode", a.k.a. candle mode timer. Off by default,
 but click three times to add 30m to the timer. Maximum timer length about 4.5
 hours.

---
 spaghetti-monster/anduril/anduril-ui.png | Bin 238915 -> 244079 bytes
 spaghetti-monster/anduril/anduril.c      |  48 +++++++++-
 spaghetti-monster/anduril/anduril.svg    | 157 ++++++++++++++++++++++++++++++-
 spaghetti-monster/anduril/anduril.txt    | 126 ++++++++++++++-----------
 4 files changed, 275 insertions(+), 56 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril-ui.png b/spaghetti-monster/anduril/anduril-ui.png
index 191dbd1..b778a30 100644
Binary files a/spaghetti-monster/anduril/anduril-ui.png and b/spaghetti-monster/anduril/anduril-ui.png differ
diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 36d29ac..26db6d8 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -653,9 +653,15 @@ uint8_t strobe_state(EventPtr event, uint16_t arg) {
     static uint8_t candle_wave2_depth = 7;
     static uint8_t candle_wave3_depth = 4;
     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
     #endif
 
     if (event == EV_enter_state) {
+        #ifdef USE_CANDLE_MODE
+        candle_mode_timer = 0;  // in case any time was left over from earlier
+        #endif
         return MISCHIEF_MANAGED;
     }
     // 1 click: off
@@ -666,6 +672,9 @@ uint8_t strobe_state(EventPtr event, uint16_t arg) {
     // 2 clicks: rotate through strobe/flasher modes
     else if (event == EV_2clicks) {
         strobe_type = (st + 1) % NUM_STROBES;
+        #ifdef USE_CANDLE_MODE
+        candle_mode_timer = 0;  // in case any time was left over from earlier
+        #endif
         interrupt_nice_delays();
         save_config();
         return MISCHIEF_MANAGED;
@@ -728,6 +737,22 @@ uint8_t strobe_state(EventPtr event, uint16_t arg) {
         save_config();
         return MISCHIEF_MANAGED;
     }
+    #if defined(USE_CANDLE_MODE)
+    // 3 clicks: add 30m to candle timer
+    else if (event == EV_3clicks) {
+        // candle mode only
+        if (st == 4) {
+            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;
+    }
+    #endif
     #if defined(USE_LIGHTNING_MODE) || defined(USE_CANDLE_MODE)
     // clock tick: bump the random seed
     else if (event == EV_tick) {
@@ -736,12 +761,33 @@ uint8_t strobe_state(EventPtr event, uint16_t arg) {
         #endif
         #ifdef USE_CANDLE_MODE
         if (st == 4) {
+            // self-timer dims the light during the final minute
+            uint8_t subtract = 0;
+            if (candle_mode_timer == 1) {
+                subtract = ((candle_mode_brightness+20)
+                         * ((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) * 8) >> 8)
                 + ((triangle_wave(candle_wave2) * candle_wave2_depth) >> 8)
                 + ((triangle_wave(candle_wave3) * candle_wave3_depth) >> 8);
-            set_level(candle_mode_brightness + add);
+            int8_t brightness = candle_mode_brightness + add - subtract;
+            if (brightness < 0) { brightness = 0; }
+            set_level(brightness);
+
             // wave1: slow random LFO
             if ((arg & 1) == 0) candle_wave1 += pseudo_rand()&1;
             // wave2: medium-speed erratic LFO
diff --git a/spaghetti-monster/anduril/anduril.svg b/spaghetti-monster/anduril/anduril.svg
index ff9878a..9fbb7d1 100644
--- a/spaghetti-monster/anduril/anduril.svg
+++ b/spaghetti-monster/anduril/anduril.svg
@@ -22,6 +22,30 @@
    inkscape:export-ydpi="114.26005">
   <defs
      id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7690">
+      <stop
+         style="stop-color:#010109;stop-opacity:1;"
+         offset="0"
+         id="stop7686" />
+      <stop
+         style="stop-color:#010109;stop-opacity:0;"
+         offset="1"
+         id="stop7688" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7528">
+      <stop
+         style="stop-color:#010109;stop-opacity:1;"
+         offset="0"
+         id="stop7524" />
+      <stop
+         style="stop-color:#010109;stop-opacity:0;"
+         offset="1"
+         id="stop7526" />
+    </linearGradient>
     <marker
        inkscape:stockid="Arrow1Mstart"
        orient="auto"
@@ -2403,6 +2427,48 @@
          style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
          inkscape:connector-curvature="0" />
     </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend-88-1"
+       style="overflow:visible">
+      <path
+         id="path3856-868-78"
+         d="M -4.2666667,0 -6.4,2.1333333 1.0666667,0 -6.4,-2.1333333 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.42666668pt"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7528"
+       id="linearGradient7538"
+       x1="-868.78088"
+       y1="1372.24"
+       x2="-808.41711"
+       y2="1391.2367"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4884955,0,0,1.4560331,399.01813,-638.72217)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7528"
+       id="linearGradient7569"
+       x1="1352.9781"
+       y1="805.4386"
+       x2="1403.3633"
+       y2="835.65717"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3436662,0,0,1.3436662,-483.65524,-280.21446)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7690"
+       id="linearGradient7692"
+       x1="1393.2487"
+       y1="848.74982"
+       x2="1314.9019"
+       y2="761.10052"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -2419,7 +2485,7 @@
      showgrid="false"
      showguides="true"
      gridtolerance="1"
-     inkscape:window-width="2457"
+     inkscape:window-width="2459"
      inkscape:window-height="1415"
      inkscape:window-x="0"
      inkscape:window-y="0"
@@ -3972,5 +4038,94 @@
        id="path5213-6-8-4-9-9-1-3-0-0-3-0"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:4.26666689, 4.26666689;stroke-dashoffset:2.13333344;stroke-opacity:1;marker-end:url(#Arrow1Mend-88-1)"
+       d="m 1262.9626,853.74322 c 45.3646,10.29118 76.432,-7.96445 88.9489,-15.20313"
+       id="path5213-6-8-4-9-9-8-3-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.66666698px;line-height:110.00000238%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="1342.4323"
+       y="857.24713"
+       id="text39623-3"><tspan
+         sodipodi:role="line"
+         x="1342.4323"
+         y="857.24713"
+         id="tspan39625-1">+30 min</tspan></text>
+    <g
+       id="g7705">
+      <circle
+         r="22.470001"
+         cy="821.88452"
+         cx="1375.8579"
+         id="path7491"
+         style="opacity:1;fill:url(#linearGradient7569);fill-opacity:1;stroke:url(#linearGradient7692);stroke-width:1.715;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <ellipse
+         ry="20.7346"
+         rx="20.29092"
+         cy="821.88452"
+         cx="1375.8579"
+         id="path7491-8"
+         style="opacity:1;fill:#fcfcfd;fill-opacity:1;stroke:none;stroke-width:1.83983243;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         transform="rotate(-90)"
+         d="m -801.14121,1375.8579 a 20.743311,20.29092 0 0 1 -10.37166,17.5725 20.743311,20.29092 0 0 1 -20.74331,0 20.743311,20.29092 0 0 1 -10.37165,-17.5725"
+         sodipodi:open="true"
+         sodipodi:end="3.1415927"
+         sodipodi:start="0"
+         sodipodi:ry="20.29092"
+         sodipodi:rx="20.743311"
+         sodipodi:cy="1375.8579"
+         sodipodi:cx="-821.88452"
+         sodipodi:type="arc"
+         id="path7491-5"
+         style="opacity:1;fill:url(#linearGradient7538);fill-opacity:1;stroke:none;stroke-width:1.84021866;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path7493"
+         d="m 1355.307,821.88451 h 3.8436"
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#7b7b7b;stroke-width:1.3436662;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path7495"
+         d="m 1396.1468,821.88451 h -3.3507"
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#7b7b7b;stroke-width:1.3436662;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path7497"
+         d="m 1375.8579,801.14199 v 3.54788"
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#7b7b7b;stroke-width:1.3436662;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path7499"
+         d="m 1375.8579,842.61913 v -3.64646"
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#7b7b7b;stroke-width:1.3436662;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path7505"
+         d="m 1374.5713,821.88451 1.1658,17.72796 h 0.34 l 1.0673,-17.72796 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#010109;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.01549935;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path7594"
+         d="m 1392.31,822.12981 c 0,7.79405 -7.5434,14.85118 -14.018,14.85118 v 1.34367 c 7.4212,0 14.1074,-7.62913 14.1074,-16.19485 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#0b0b0b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.3436662;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path7594-3"
+         d="m 1388.7657,822.05276 c 0,5.76689 -5.5816,10.98852 -10.3722,10.98852 v 0.9942 c 5.4909,0 10.4382,-5.64487 10.4382,-11.98272 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#0b0b0b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99419165;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path7594-36"
+         d="m 1385.327,822.06555 c 0,3.80652 -3.6842,7.25313 -6.8462,7.25313 v 0.65624 c 3.6244,0 6.8899,-3.72599 6.8899,-7.90937 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#0b0b0b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.65623033;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    </g>
   </g>
 </svg>
diff --git a/spaghetti-monster/anduril/anduril.txt b/spaghetti-monster/anduril/anduril.txt
index 7efbf04..531609d 100644
--- a/spaghetti-monster/anduril/anduril.txt
+++ b/spaghetti-monster/anduril/anduril.txt
@@ -16,6 +16,7 @@ From off:
   Other:
   * 4 clicks: lock-out
   * 5 clicks: momentary mode (disconnect power to exit)
+  * 6 clicks: muggle mode
 
 In steady mode:
   * 1 click: off
@@ -42,57 +43,69 @@ Discrete ramp config mode:
     (click N times to make discrete mode have N stair-steps)
     (minimum 2, maximum 150)
 
-Bike flasher:
-  * 1 click: off
-  * 2 clicks: party strobe
-  * Hold: brighter
-  * Click, hold: dimmer
-
-Party / Tactical strobe modes:
-  * 1 click: off
-  * Hold: change speed (faster)
-  * Click, hold: change speed (slower)
-  * 2 clicks: next strobe mode
-    (bike flasher, party strobe, tactical strobe, lightning storm mode)
-    (TODO: random/police strobe?)
-
-Lightning storm mode:
-  * 1 click: off
-  * 2 clicks: bike flasher
-
-Battcheck mode:
-  * 1 click: off
-  * 2 clicks: goodnight mode
-
-Goodnight mode:
-  * 1 click: off
-  * 2 clicks: beacon mode
-
-Beacon mode:
-  * 1 click: off
-  * 2 clicks: tempcheck mode
-  * 3 clicks: configure time between pulses
-
-Beacon config mode:
-  * At buzz, click N times to set beacon frequency to N seconds.
-
-Tempcheck mode:
-  * 1 click: off
-  * 2 clicks: battcheck mode
-  * 3 clicks: thermal config mode
-  - Hold: thermal calibration mode
-
-Thermal config mode:
-  * Setting 1: calibrate sensor:
-    At buzz, click N times for N degrees C.  For example, if the light 
-    is current at "room temperature" of 22 C, click 22 times.  Is 
-    intended to only be done once upon initial setup, or not at all.
-  * Setting 2: temperature limit:
-    At buzz, click N times to set thermal limit to roughly 30 C + N.
-
-Thermal calibration mode:
-  - Hold until hot: set new ceiling value
-  - ... don't hold: blink out current ceiling value and exit
+"Strobe" group modes:
+
+  Candle mode:
+    * 1 click: off
+    * 2 clicks: next "strobe" group mode
+    * 3 clicks: add 30 minutes to the timer
+                (light will shut off when timer expires)
+                (default is no timer)
+    * Hold: brighter
+    * Click, hold: dimmer
+
+  Bike flasher:
+    * 1 click: off
+    * 2 clicks: next "strobe" group mode
+    * Hold: brighter
+    * Click, hold: dimmer
+
+  Party / Tactical strobe modes:
+    * 1 click: off
+    * Hold: change speed (faster)
+    * Click, hold: change speed (slower)
+    * 2 clicks: next "strobe" group mode
+      (TODO: random/police strobe?)
+
+  Lightning storm mode:
+    * 1 click: off
+    * 2 clicks: next "strobe" group mode
+
+"Blinky" group modes:
+
+  Battcheck mode:
+    * 1 click: off
+    * 2 clicks: goodnight mode
+
+  Goodnight mode:
+    * 1 click: off
+    * 2 clicks: beacon mode
+
+  Beacon mode:
+    * 1 click: off
+    * 2 clicks: tempcheck mode
+    * 3 clicks: configure time between pulses
+
+    Beacon config mode:
+      * At buzz, click N times to set beacon frequency to N seconds.
+
+  Tempcheck mode:
+    * 1 click: off
+    * 2 clicks: battcheck mode
+    * 3 clicks: thermal config mode
+    - Hold: thermal calibration mode
+
+    Thermal config mode:
+      * Setting 1: calibrate sensor:
+        At buzz, click N times for N degrees C.  For example, if the light 
+        is current at "room temperature" of 22 C, click 22 times.  Is 
+        intended to only be done once upon initial setup, or not at all.
+      * Setting 2: temperature limit:
+        At buzz, click N times to set thermal limit to roughly 30 C + N.
+
+    Thermal calibration mode:
+      - Hold until hot: set new ceiling value
+      - ... don't hold: blink out current ceiling value and exit
 
 Lockout mode:
   * Hold: momentary moon
@@ -103,6 +116,11 @@ Momentary mode:
   * Release button: Light off.
   * To exit, disconnect power.  (loosen/tighten the tailcap)
 
+Muggle mode:
+  * 1 click: On / off.
+  * Hold: Ramp up / down.
+  * 6 clicks: Exit muggle mode.
+
 TODO:
   * save settings in eeprom
   * decide on "hold until hot" or "click N times" for thermal config mode
@@ -115,8 +133,8 @@ TODO:
   * add lightning mode?
   * muggle mode: smooth ramp
   * refactor to make config modes smaller
-  - candle mode timer, with three clicks to add 30 minutes
-  - candle mode: smoother adjustments?
-  - make sunset mode timer and brightness configurable?
   * move all config menus to four clicks
+  * candle mode timer, with three clicks to add 30 minutes
   - diagram updates for 3-click special actions
+  - candle mode: smoother adjustments?
+  - make sunset mode timer and brightness configurable?
-- 
cgit v1.2.3