diff options
| author | Selene ToyKeeper | 2019-11-13 18:33:23 -0700 |
|---|---|---|
| committer | Selene ToyKeeper | 2019-11-13 18:33:23 -0700 |
| commit | 3fbd6973fcaa805e4ac1cae4d56a8c84985caf89 (patch) | |
| tree | db7a4edccfb2d9023168044289c0c9be968e2d58 | |
| parent | merged Emisar D4S V2 support branch (diff) | |
| download | anduril-3fbd6973fcaa805e4ac1cae4d56a8c84985caf89.tar.gz anduril-3fbd6973fcaa805e4ac1cae4d56a8c84985caf89.tar.bz2 anduril-3fbd6973fcaa805e4ac1cae4d56a8c84985caf89.zip | |
fixed some compile issues related to delay_4ms()
| -rw-r--r-- | spaghetti-monster/darkhorse/darkhorse.c | 1 | ||||
| -rw-r--r-- | spaghetti-monster/fsm-events.c | 2 | ||||
| -rw-r--r-- | spaghetti-monster/meteor/meteor.c | 1 | ||||
| -rw-r--r-- | tk-delay.h | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/spaghetti-monster/darkhorse/darkhorse.c b/spaghetti-monster/darkhorse/darkhorse.c index e613f55..4058c2f 100644 --- a/spaghetti-monster/darkhorse/darkhorse.c +++ b/spaghetti-monster/darkhorse/darkhorse.c @@ -21,7 +21,6 @@ #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 diff --git a/spaghetti-monster/fsm-events.c b/spaghetti-monster/fsm-events.c index f35607d..3e9a12d 100644 --- a/spaghetti-monster/fsm-events.c +++ b/spaghetti-monster/fsm-events.c @@ -20,6 +20,8 @@ #ifndef FSM_EVENTS_C #define FSM_EVENTS_C +#include <util/delay_basic.h> + void empty_event_sequence() { current_event = EV_none; diff --git a/spaghetti-monster/meteor/meteor.c b/spaghetti-monster/meteor/meteor.c index 5e925e2..7d854a1 100644 --- a/spaghetti-monster/meteor/meteor.c +++ b/spaghetti-monster/meteor/meteor.c @@ -22,7 +22,6 @@ #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 @@ -48,12 +48,14 @@ void _delay_zero() { } #endif #ifdef USE_DELAY_4MS +#ifndef delay_4ms #define delay_4ms _delay_4ms void _delay_4ms(uint8_t n) // because it saves a bit of ROM space to do it this way { while(n-- > 0) _delay_loop_2(BOGOMIPS*4); } #endif +#endif #ifdef USE_DELAY_S #define delay_s _delay_s void _delay_s() // because it saves a bit of ROM space to do it this way |