From c0aacf8d1161aa7ce341a3332252f623062e2a1a Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sat, 3 Oct 2015 16:49:41 -0600
Subject: Added volts+tenths and 8-bar battery check styles. Reworked how
 voltage definitions work, and added one for each tenth of a volt. Set default
 calibration for RMM attiny25V driver. Made battcheck.py output all tenths in
 a wide range. Changed bistro to use x**3 curve for better mode spacing.
 Changed bistro's blink() to be compatible with volts+tenths code. Tried to
 fit volts_tenths into blf-a6 for attiny13a but failed. Made blf-a6 compatible
 with 8-bar battery check style.

---
 tk-calibration.h | 42 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 34 insertions(+), 8 deletions(-)

(limited to 'tk-calibration.h')

diff --git a/tk-calibration.h b/tk-calibration.h
index 37edf76..2b5ff9f 100644
--- a/tk-calibration.h
+++ b/tk-calibration.h
@@ -24,14 +24,40 @@
 /********************** Voltage ADC calibration **************************/
 // These values were measured using RMM's FET+7135.
 // See battcheck/readings.txt for reference values.
-#define ADC_42          195 // the ADC value we expect for 4.20 volts
-#define ADC_100         195 // the ADC value for 100% full (4.2V resting)
-#define ADC_75          186 // the ADC value for 75% full (4.0V resting)
-#define ADC_50          176 // the ADC value for 50% full (3.8V resting)
-#define ADC_25          162 // the ADC value for 25% full (3.5V resting)
-#define ADC_0           138 // the ADC value for 0% full (3.0V resting)
-#define ADC_LOW         129 // When do we start ramping down (2.8V)
-#define ADC_CRIT        124 // When do we shut the light off (2.7V)
+// the ADC values we expect for specific voltages
+#define ADC_44     205
+#define ADC_43     201
+#define ADC_42     196
+#define ADC_41     191
+#define ADC_40     187
+#define ADC_39     182
+#define ADC_38     177
+#define ADC_37     172
+#define ADC_36     168
+#define ADC_35     163
+#define ADC_34     158
+#define ADC_33     153
+#define ADC_32     149
+#define ADC_31     144
+#define ADC_30     139
+#define ADC_29     134
+#define ADC_28     130
+#define ADC_27     125
+#define ADC_26     120
+#define ADC_25     116
+#define ADC_24     111
+#define ADC_23     106
+#define ADC_22     101
+#define ADC_21     97
+#define ADC_20     92
+
+#define ADC_100p   ADC_42  // the ADC value for 100% full (resting)
+#define ADC_75p    ADC_40  // the ADC value for 75% full (resting)
+#define ADC_50p    ADC_38  // the ADC value for 50% full (resting)
+#define ADC_25p    ADC_35  // the ADC value for 25% full (resting)
+#define ADC_0p     ADC_30  // the ADC value for 0% full (resting)
+#define ADC_LOW    ADC_28  // When do we start ramping down
+#define ADC_CRIT   ADC_27  // When do we shut the light off
 
 
 /********************** Offtime capacitor calibration ********************/
-- 
cgit v1.2.3