From f9ce5f4d2ca847b342ae708de3a7f1a75a33fe1e Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Thu, 16 Mar 2017 06:44:32 -0600
Subject: Added _delay_4ms() thing from new smaller biscotti.  Will need it for
 crescendo.

---
 tk-delay.h | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'tk-delay.h')

diff --git a/tk-delay.h b/tk-delay.h
index 324077a..e62aa4c 100644
--- a/tk-delay.h
+++ b/tk-delay.h
@@ -23,6 +23,7 @@
 #ifdef OWN_DELAY
 #include "tk-attiny.h"
 #include <util/delay_basic.h>
+#ifdef USE_DELAY_MS
 // Having own _delay_ms() saves some bytes AND adds possibility to use variables as input
 void _delay_ms(uint16_t n)
 {
@@ -37,15 +38,27 @@ void _delay_ms(uint16_t n)
     while(n-- > 0) _delay_loop_2(BOGOMIPS);
     //#endif
 }
+#endif
 #ifdef USE_FINE_DELAY
 void _delay_zero() {
     _delay_loop_2(BOGOMIPS/3);
 }
 #endif
+#ifdef USE_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
 #ifdef USE_DELAY_S
 void _delay_s()  // because it saves a bit of ROM space to do it this way
 {
+  #ifdef USE_DELAY_MS
     _delay_ms(1000);
+  #endif
+  #ifdef USE_DELAY_4MS
+    _delay_4ms(250);
+  #endif
 }
 #endif
 #else
-- 
cgit v1.2.3


From e9165e8ca3d6aaa9e3b3b5795e4a4ca15523226f Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sat, 18 Mar 2017 23:00:28 -0600
Subject: Made tk-delay.h allow use of both _delay_ms() and _delay_4ms().

---
 tk-delay.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'tk-delay.h')

diff --git a/tk-delay.h b/tk-delay.h
index e62aa4c..78cb188 100644
--- a/tk-delay.h
+++ b/tk-delay.h
@@ -53,11 +53,12 @@ void _delay_4ms(uint8_t n)  // because it saves a bit of ROM space to do it this
 #ifdef USE_DELAY_S
 void _delay_s()  // because it saves a bit of ROM space to do it this way
 {
-  #ifdef USE_DELAY_MS
-    _delay_ms(1000);
-  #endif
   #ifdef USE_DELAY_4MS
     _delay_4ms(250);
+  #else
+    #ifdef USE_DELAY_MS
+    _delay_ms(1000);
+    #endif
   #endif
 }
 #endif
-- 
cgit v1.2.3