From a660cd1a09be8960a992801a4bd628c6a50f701d Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Thu, 16 Mar 2017 04:06:34 -0600 Subject: Added _delay_4ms() stuff, to save space on projects which need a few bytes more than they need millisecond delay precision. (may break other projects unless I add a different way to enable the code, beware) --- tk-delay.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) 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 +#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 22b5b44f50d456078366e8033db6254697f53950 Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Fri, 17 Mar 2017 21:38:33 -0600 Subject: Updated voltage calibration values. Upgraded from regular strobe to police strobe. --- tk-calibration.h | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/tk-calibration.h b/tk-calibration.h index c2ab801..617c809 100644 --- a/tk-calibration.h +++ b/tk-calibration.h @@ -25,31 +25,31 @@ // These values were measured using RMM's FET+7135. // See battcheck/readings.txt for reference values. // the ADC values we expect for specific voltages -#define ADC_44 194 -#define ADC_43 189 +#define ADC_44 192 +#define ADC_43 188 #define ADC_42 184 -#define ADC_41 178 -#define ADC_40 173 -#define ADC_39 168 -#define ADC_38 163 -#define ADC_37 158 -#define ADC_36 152 -#define ADC_35 147 -#define ADC_34 142 -#define ADC_33 137 -#define ADC_32 131 -#define ADC_31 126 -#define ADC_30 121 -#define ADC_29 116 -#define ADC_28 111 -#define ADC_27 105 -#define ADC_26 100 -#define ADC_25 95 -#define ADC_24 90 -#define ADC_23 84 -#define ADC_22 79 -#define ADC_21 74 -#define ADC_20 69 +#define ADC_41 179 +#define ADC_40 175 +#define ADC_39 171 +#define ADC_38 167 +#define ADC_37 162 +#define ADC_36 158 +#define ADC_35 154 +#define ADC_34 150 +#define ADC_33 145 +#define ADC_32 141 +#define ADC_31 137 +#define ADC_30 133 +#define ADC_29 129 +#define ADC_28 124 +#define ADC_27 120 +#define ADC_26 116 +#define ADC_25 112 +#define ADC_24 107 +#define ADC_23 103 +#define ADC_22 99 +#define ADC_21 95 +#define ADC_20 91 #define ADC_100p ADC_42 // the ADC value for 100% full (resting) #define ADC_75p ADC_40 // the ADC value for 75% full (resting) -- cgit v1.2.3