From 483c2e00f16953f6305fb1f8b7479c2b09ada792 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Fri, 11 Sep 2015 16:41:05 -0600
Subject: Refactored blf-a6 a bunch to export code to includes and make attiny
portability a bit better. Moved MCU hardware options and pin layout to
tk-attiny.h. Moved voltage and OTC hardcoded values to tk-calibration.h.
Moved delay functions to tk-delay.h, and made it use BOGOMIPS instead of
DELAY_TWEAK. Moved voltage ADC and most of the battcheck code to
tk-voltage.h. Changed EEPLEN to EEPSIZE. Made 1.1V reference symbol
consistent across MCUs to avoid repeated #if/#else clauses.
---
tk-delay.h | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
create mode 100644 tk-delay.h
(limited to 'tk-delay.h')
diff --git a/tk-delay.h b/tk-delay.h
new file mode 100644
index 0000000..572d75e
--- /dev/null
+++ b/tk-delay.h
@@ -0,0 +1,51 @@
+#ifndef TK_DELAY_H
+#define TK_DELAY_H
+/*
+ * Smaller, more flexible replacement(s) for default _delay_ms() functions.
+ *
+ * Copyright (C) 2015 Selene ToyKeeper
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ */
+
+#ifdef OWN_DELAY
+#include "tk-attiny.h"
+#include
+// Having own _delay_ms() saves some bytes AND adds possibility to use variables as input
+void _delay_ms(uint16_t n)
+{
+ // TODO: make this take tenths of a ms instead of ms,
+ // for more precise timing?
+ #ifdef USE_FINE_DELAY
+ if (n==0) { _delay_loop_2(BOGOMIPS/3); }
+ else {
+ while(n-- > 0) _delay_loop_2(BOGOMIPS);
+ }
+ #else
+ while(n-- > 0) _delay_loop_2(BOGOMIPS);
+ #endif
+}
+#ifdef USE_DELAY_S
+void _delay_s() // because it saves a bit of ROM space to do it this way
+{
+ _delay_ms(BOGOMIPS);
+}
+#endif
+#else
+#include
+#endif
+
+
+#endif // TK_DELAY_H
--
cgit v1.2.3
From 3e059f81420fa9f8a471f3c728430d1b70a4c51d Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Fri, 11 Sep 2015 16:47:51 -0600
Subject: Oops, delay_s() should delay for 1000 ms, not BOGOMIPS ms.
---
tk-delay.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'tk-delay.h')
diff --git a/tk-delay.h b/tk-delay.h
index 572d75e..57bdded 100644
--- a/tk-delay.h
+++ b/tk-delay.h
@@ -40,7 +40,7 @@ void _delay_ms(uint16_t n)
#ifdef USE_DELAY_S
void _delay_s() // because it saves a bit of ROM space to do it this way
{
- _delay_ms(BOGOMIPS);
+ _delay_ms(1000);
}
#endif
#else
--
cgit v1.2.3
From 95d877541c2f136243bc676fa555e2e31c3d307a Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Mon, 5 Oct 2015 18:10:18 -0600
Subject: Replaced how USE_FILE_DELAY works. As a separate function, it seems
to produce smaller builds.
---
tk-delay.h | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
(limited to 'tk-delay.h')
diff --git a/tk-delay.h b/tk-delay.h
index 57bdded..324077a 100644
--- a/tk-delay.h
+++ b/tk-delay.h
@@ -28,15 +28,20 @@ void _delay_ms(uint16_t n)
{
// TODO: make this take tenths of a ms instead of ms,
// for more precise timing?
- #ifdef USE_FINE_DELAY
- if (n==0) { _delay_loop_2(BOGOMIPS/3); }
- else {
- while(n-- > 0) _delay_loop_2(BOGOMIPS);
- }
- #else
+ //#ifdef USE_FINE_DELAY
+ //if (n==0) { _delay_loop_2(BOGOMIPS/3); }
+ //else {
+ // while(n-- > 0) _delay_loop_2(BOGOMIPS);
+ //}
+ //#else
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_S
void _delay_s() // because it saves a bit of ROM space to do it this way
{
--
cgit v1.2.3