From 561b63872004372f50d9da3d8dc7fd0de6d472ce Mon Sep 17 00:00:00 2001
From: SammysHP <sven@sammyshp.de>
Date: Tue, 13 Aug 2024 16:43:33 +0200
Subject: [PATCH] Protect voltage readout against modification from ISR

An ADC conversion between the two blink_num() calls could potentially
update the voltage in a way the the second digit rolls over and the
resulting number doesn't make sense.

Fixes ToyKeeper/anduril#91
---
 fsm/adc.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/fsm/adc.c b/fsm/adc.c
index e0bacb61..8f496dcd 100644
--- a/fsm/adc.c
+++ b/fsm/adc.c
@@ -427,16 +427,18 @@ PROGMEM const uint8_t voltage_blinks[] = {
 };
 #endif
 void battcheck() {
+    // protect against modification from ISR and also reduce code size
+    const uint8_t volt = voltage;
     #ifdef BATTCHECK_VpT
-        blink_num(voltage / dV);
+        blink_num(volt / dV);
         #ifdef USE_EXTRA_BATTCHECK_DIGIT
             // 0.02V precision, 0 1 2 3 4 remainder -> .00 .02 .04 .06 .08V
-            blink_num((voltage % dV) * (10/dV));
+            blink_num((volt % dV) * (10/dV));
         #endif
     #else
         uint8_t i;
         for(i=0;
-            voltage >= pgm_read_byte(voltage_blinks + i);
+            volt >= pgm_read_byte(voltage_blinks + i);
             i++) {}
         #ifdef DONT_DELAY_AFTER_BATTCHECK
             blink_digit(i);