From 7b49797be1da97f54e9df3a1b0342ab20d7f02d5 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Wed, 27 Mar 2024 07:13:26 -0600
Subject: increased voltage precision from 0.025V to 0.02V (so 0 to 255 now
 goes from 0.00V to 5.10V)

---
 arch/attiny1634.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'arch/attiny1634.c')

diff --git a/arch/attiny1634.c b/arch/attiny1634.c
index e29d1c3..314ca52 100644
--- a/arch/attiny1634.c
+++ b/arch/attiny1634.c
@@ -97,30 +97,30 @@ inline uint16_t mcu_adc_result() {
 
 inline uint8_t mcu_vdd_raw2cooked(uint16_t measurement) {
     // In : 65535 * 1.1 / Vbat
-    // Out: uint8_t: Vbat * 40
+    // Out: uint8_t: Vbat * 50
     // 1.1 = ADC Vref
     #if 0
     // 1024 = how much ADC resolution we're using (10 bits)
     // (12 bits available, but it costs an extra 84 bytes of ROM to calculate)
-    uint8_t vbat40 = (uint16_t)(40 * 1.1 * 1024) / (measurement >> 6);
+    uint8_t vbat = (uint16_t)(10 * dV * 1.1 * 1024) / (measurement >> 6);
     #else
     // ... spend the extra 84 bytes of ROM for better precision
     // 4096 = how much ADC resolution we're using (12 bits)
-    uint8_t vbat40 = (uint32_t)(40 * 1.1 * 4096) / (measurement >> 4);
+    uint8_t vbat = (uint32_t)(10 * dV * 1.1 * 4096) / (measurement >> 4);
     #endif
-    return vbat40;
+    return vbat;
 }
 
 
 #ifdef USE_VOLTAGE_DIVIDER
 inline uint8_t mcu_vdivider_raw2cooked(uint16_t measurement) {
     // In : 4095 * Vdiv / 1.1V
-    // Out: uint8_t: Vbat * 40
+    // Out: uint8_t: Vbat * 50
     // Vdiv = Vbat / 4.3  (typically)
     // 1.1 = ADC Vref
     const uint16_t adc_per_volt =
             (((uint16_t)ADC_44 << 4) - ((uint16_t)ADC_22 << 4))
-            / (4 * (44-22));
+            / (dV * (44-22));
     uint8_t result = measurement / adc_per_volt;
     return result;
 }
-- 
cgit v1.2.3