diff options
| author | Selene ToyKeeper | 2017-08-30 23:07:55 -0600 |
|---|---|---|
| committer | Selene ToyKeeper | 2017-08-30 23:07:55 -0600 |
| commit | 15d5b2cbe807029c7493691a1877a1898d100455 (patch) | |
| tree | e13b8410d5d694f5256bbb3c62c534a9262c3745 /spaghetti-monster | |
| parent | Updated anduril.txt to match current code. (diff) | |
| download | anduril-15d5b2cbe807029c7493691a1877a1898d100455.tar.gz anduril-15d5b2cbe807029c7493691a1877a1898d100455.tar.bz2 anduril-15d5b2cbe807029c7493691a1877a1898d100455.zip | |
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.
Diffstat (limited to 'spaghetti-monster')
| -rw-r--r-- | spaghetti-monster/anduril.c | 2 | ||||
| -rw-r--r-- | spaghetti-monster/baton.c | 2 | ||||
| -rw-r--r-- | spaghetti-monster/darkhorse.c | 2 | ||||
| -rw-r--r-- | spaghetti-monster/fsm-main.c | 4 | ||||
| -rw-r--r-- | spaghetti-monster/momentary.c | 3 | ||||
| -rw-r--r-- | spaghetti-monster/ramping-ui.c | 2 |
6 files changed, 10 insertions, 5 deletions
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 |