aboutsummaryrefslogtreecommitdiff
path: root/tk-delay.h
diff options
context:
space:
mode:
authorSelene ToyKeeper2019-11-14 19:47:49 -0700
committerSelene ToyKeeper2019-11-14 19:47:49 -0700
commit5362c032fdca4b20af49db0409a03524a396b815 (patch)
tree1d437085b5b3472279167aee905385e39a4a1fe1 /tk-delay.h
parentmerged from fsm branch to get safety ramp-down and version check functions, a... (diff)
parentmerged irq-refactor branch, which fixes some small but long-standing issues: (diff)
downloadanduril-5362c032fdca4b20af49db0409a03524a396b815.tar.gz
anduril-5362c032fdca4b20af49db0409a03524a396b815.tar.bz2
anduril-5362c032fdca4b20af49db0409a03524a396b815.zip
merged fsm updates / irq-refactor branch, to get more stable voltage readings
(and otherwise get recent bugfixes)
Diffstat (limited to 'tk-delay.h')
-rw-r--r--tk-delay.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/tk-delay.h b/tk-delay.h
index 7b00ac0..29cf463 100644
--- a/tk-delay.h
+++ b/tk-delay.h
@@ -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