diff options
| author | Selene ToyKeeper | 2019-05-14 01:41:32 -0600 |
|---|---|---|
| committer | Selene ToyKeeper | 2019-05-14 01:41:32 -0600 |
| commit | 6adfea8f7c4b7b37ce79153ce4873baf73e627d5 (patch) | |
| tree | 5f189e9ef78d1fc1c51791122bdd1d43f7599d7f | |
| parent | fixed bug where click-click-hold from off to strobes would also activate tint... (diff) | |
| download | anduril-6adfea8f7c4b7b37ce79153ce4873baf73e627d5.tar.gz anduril-6adfea8f7c4b7b37ce79153ce4873baf73e627d5.tar.bz2 anduril-6adfea8f7c4b7b37ce79153ce4873baf73e627d5.zip | |
moved triangle_wave into fsm-misc, because I need it for power correction in tint ramping
| -rw-r--r-- | spaghetti-monster/anduril/anduril.c | 12 | ||||
| -rw-r--r-- | spaghetti-monster/fsm-misc.c | 7 | ||||
| -rw-r--r-- | spaghetti-monster/fsm-misc.h | 3 |
3 files changed, 16 insertions, 6 deletions
diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c index 6057bf0..75c22e3 100644 --- a/spaghetti-monster/anduril/anduril.c +++ b/spaghetti-monster/anduril/anduril.c @@ -185,6 +185,12 @@ typedef enum { #define USE_PSEUDO_RAND #endif +#if defined(USE_CANDLE_MODE) +#ifndef USE_TRIANGLE_WAVE +#define USE_TRIANGLE_WAVE +#endif +#endif + #include "spaghetti-monster.h" @@ -1235,12 +1241,6 @@ uint8_t candle_mode_state(Event event, uint16_t arg) { } return EVENT_NOT_HANDLED; } - -uint8_t triangle_wave(uint8_t phase) { - uint8_t result = phase << 1; - if (phase > 127) result = 255 - result; - return result; -} #endif // #ifdef USE_CANDLE_MODE diff --git a/spaghetti-monster/fsm-misc.c b/spaghetti-monster/fsm-misc.c index e61fe00..9f953fa 100644 --- a/spaghetti-monster/fsm-misc.c +++ b/spaghetti-monster/fsm-misc.c @@ -146,5 +146,12 @@ void indicator_led_auto() { */ #endif // USE_INDICATOR_LED +#ifdef USE_TRIANGLE_WAVE +uint8_t triangle_wave(uint8_t phase) { + uint8_t result = phase << 1; + if (phase > 127) result = 255 - result; + return result; +} +#endif #endif diff --git a/spaghetti-monster/fsm-misc.h b/spaghetti-monster/fsm-misc.h index 4e0eb4f..6e41b6c 100644 --- a/spaghetti-monster/fsm-misc.h +++ b/spaghetti-monster/fsm-misc.h @@ -46,5 +46,8 @@ uint8_t blink(uint8_t num, uint8_t speed); void indicator_led(uint8_t lvl); #endif +#ifdef USE_TRIANGLE_WAVE +uint8_t triangle_wave(uint8_t phase); +#endif #endif |