aboutsummaryrefslogtreecommitdiff
path: root/spaghetti-monster/fsm-adc.c
diff options
context:
space:
mode:
Diffstat (limited to 'spaghetti-monster/fsm-adc.c')
-rw-r--r--spaghetti-monster/fsm-adc.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/spaghetti-monster/fsm-adc.c b/spaghetti-monster/fsm-adc.c
index 96c4af3..4766786 100644
--- a/spaghetti-monster/fsm-adc.c
+++ b/spaghetti-monster/fsm-adc.c
@@ -227,6 +227,8 @@ void adc_deferred() {
#endif
}
#endif
+
+ if (adc_reset) adc_reset --;
}
@@ -245,7 +247,7 @@ static inline void ADC_voltage_handler() {
uint16_t measurement;
// latest ADC value
- if (go_to_standby || (adc_smooth[0] < 255)) {
+ if (adc_reset) { // while asleep, or just after waking, don't lowpass
measurement = adc_raw[0];
adc_smooth[0] = measurement; // no lowpass while asleep
}
@@ -318,10 +320,7 @@ static inline void ADC_temperature_handler() {
static uint16_t temperature_history[NUM_TEMP_HISTORY_STEPS];
static int8_t warning_threshold = 0;
- if (reset_thermal_history) { // wipe out old data
- // don't keep resetting
- reset_thermal_history = 0;
-
+ if (adc_reset) { // wipe out old data
// ignore average, use latest sample
uint16_t foo = adc_raw[1];
adc_smooth[1] = foo;