From 492fdf3281aa7bbcb5aa37b10420766b433e8d34 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Tue, 19 Nov 2019 00:21:15 -0700
Subject: fixed ADC cycles running 2X as fast as intended

---
 spaghetti-monster/fsm-adc.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'spaghetti-monster/fsm-adc.c')

diff --git a/spaghetti-monster/fsm-adc.c b/spaghetti-monster/fsm-adc.c
index c859539..ccf1ca2 100644
--- a/spaghetti-monster/fsm-adc.c
+++ b/spaghetti-monster/fsm-adc.c
@@ -108,12 +108,12 @@ static inline uint8_t calc_voltage_divider(uint16_t value) {
 }
 #endif
 
-// Each full cycle runs 7.8X per second with just voltage enabled,
-// or 3.9X per second with voltage and temperature.
+// Each full cycle runs 15.6X per second with just voltage enabled,
+// or 7.8X per second with voltage and temperature.
 #if defined(USE_LVP) && defined(USE_THERMAL_REGULATION)
-#define ADC_CYCLES_PER_SECOND 4
-#else
 #define ADC_CYCLES_PER_SECOND 8
+#else
+#define ADC_CYCLES_PER_SECOND 16
 #endif
 
 #ifdef USE_THERMAL_REGULATION
@@ -322,13 +322,13 @@ static inline void ADC_temperature_handler() {
         // if it's time to rotate the thermal history, do it
         history_step ++;
         #if (THERMAL_UPDATE_SPEED == 4)  // new value every 4s
-        #define THERM_HISTORY_STEP_MAX 15
+        #define THERM_HISTORY_STEP_MAX ((2*ADC_CYCLES_PER_SECOND)-1)
         #elif (THERMAL_UPDATE_SPEED == 2)  // new value every 2s
-        #define THERM_HISTORY_STEP_MAX 7
+        #define THERM_HISTORY_STEP_MAX (ADC_CYCLES_PER_SECOND-1)
         #elif (THERMAL_UPDATE_SPEED == 1)  // new value every 1s
-        #define THERM_HISTORY_STEP_MAX 3
+        #define THERM_HISTORY_STEP_MAX ((ADC_CYCLES_PER_SECOND/2)-1)
         #elif (THERMAL_UPDATE_SPEED == 0)  // new value every 0.5s
-        #define THERM_HISTORY_STEP_MAX 1
+        #define THERM_HISTORY_STEP_MAX ((ADC_CYCLES_PER_SECOND/4)-1)
         #endif
         if (0 == (history_step & THERM_HISTORY_STEP_MAX)) {
             // rotate measurements and add a new one
-- 
cgit v1.2.3


From 134c6de1eea4aee9a609a3057091d21109a833d5 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Tue, 19 Nov 2019 00:36:50 -0700
Subject: reduced build size by a few bytes

---
 spaghetti-monster/fsm-adc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'spaghetti-monster/fsm-adc.c')

diff --git a/spaghetti-monster/fsm-adc.c b/spaghetti-monster/fsm-adc.c
index ccf1ca2..4ee2018 100644
--- a/spaghetti-monster/fsm-adc.c
+++ b/spaghetti-monster/fsm-adc.c
@@ -21,7 +21,7 @@
 #define FSM_ADC_C
 
 
-inline void set_admux_therm() {
+static inline void set_admux_therm() {
     #if (ATTINY == 25) || (ATTINY == 45) || (ATTINY == 85) || (ATTINY == 1634)
         ADMUX = ADMUX_THERM;
     #elif (ATTINY == 841)
-- 
cgit v1.2.3