aboutsummaryrefslogtreecommitdiff
path: root/tk-delay.h
diff options
context:
space:
mode:
authorSelene ToyKeeper2019-11-24 16:21:40 -0700
committerSelene ToyKeeper2019-11-24 16:21:40 -0700
commit30510a7948815f3092b8a2eff3321ad85ed5c480 (patch)
tree4a1b68628c779bf4092a64ae027917529d03e158 /tk-delay.h
parentmerged changes from fsm branch, including version check and stuck-button safety (diff)
parentadded -fwhole-program gcc flag, suggested by Agro. Signficantly reduces ROM ... (diff)
downloadanduril-30510a7948815f3092b8a2eff3321ad85ed5c480.tar.gz
anduril-30510a7948815f3092b8a2eff3321ad85ed5c480.tar.bz2
anduril-30510a7948815f3092b8a2eff3321ad85ed5c480.zip
merged from upstream fsm branch to get a whole bunch of kernel-level improvements
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