merged multi-channel branch with a major refactor and half a year of updates

1 files changed, 27 insertions, 27 deletions

diff --git a/spaghetti-monster/fsm-adc.h b/spaghetti-monster/fsm-adc.h
index db2bb7b..1bb67ed 100644
--- a/spaghetti-monster/fsm-adc.h
+++ b/spaghetti-monster/fsm-adc.h
@@ -1,25 +1,8 @@
-/*
- * fsm-adc.h: ADC (voltage, temperature) functions for SpaghettiMonster.
- *
- * Copyright (C) 2017 Selene ToyKeeper
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef FSM_ADC_H
-#define FSM_ADC_H
+// fsm-adc.h: ADC (voltage, temperature) functions for SpaghettiMonster.
+// Copyright (C) 2017-2023 Selene ToyKeeper
+// SPDX-License-Identifier: GPL-3.0-or-later
 
+#pragma once
 
 #if defined(USE_LVP) || defined(USE_THERMAL_REGULATION)
 // use raw value instead of lowpassed value for the next N measurements
@@ -49,6 +32,9 @@ volatile uint8_t adc_reset = 2;
 #endif
 #endif
 
+#ifdef TICK_DURING_STANDBY
+volatile uint8_t adc_active_now = 0;  // sleep LVP needs a different sleep mode
+#endif
 volatile uint8_t irq_adc = 0;  // ADC interrupt happened?
 uint8_t adc_sample_count = 0;  // skip the first sample; it's junk
 uint8_t adc_channel = 0;  // 0=voltage, 1=temperature
@@ -63,9 +49,14 @@ void adc_deferred();  // do the actual ADC-related calculations
 static inline void ADC_voltage_handler();
 uint8_t voltage = 0;
 #ifdef USE_VOLTAGE_CORRECTION
-// same 0.05V units as fudge factor,
-// but 7 is neutral, and the expected range is from 1 to 13
-uint8_t voltage_correction = 7;
+    #ifdef USE_CFG
+        #define VOLT_CORR cfg.voltage_correction
+    #else
+        // same 0.05V units as fudge factor,
+        // but 7 is neutral, and the expected range is from 1 to 13
+        uint8_t voltage_correction = 7;
+        #define VOLT_CORR voltage_correction
+    #endif
 #endif
 #ifdef USE_LVP
 void low_voltage();
@@ -98,8 +89,15 @@ void battcheck();
 #endif
 // temperature now, in C (ish)
 int16_t temperature;
-uint8_t therm_ceil = DEFAULT_THERM_CEIL;
-int8_t therm_cal_offset = 0;
+#ifdef USE_CFG
+    #define TH_CEIL cfg.therm_ceil
+    #define TH_CAL cfg.therm_cal_offset
+#else
+    #define TH_CEIL therm_ceil
+    #define TH_CAL therm_cal_offset
+    uint8_t therm_ceil = DEFAULT_THERM_CEIL;
+    int8_t therm_cal_offset = 0;
+#endif
 static inline void ADC_temperature_handler();
 #endif  // ifdef USE_THERMAL_REGULATION
 
@@ -108,5 +106,7 @@ inline void ADC_on();
 inline void ADC_off();
 inline void ADC_start_measurement();
 
-
+#ifdef TICK_DURING_STANDBY
+inline void adc_sleep_mode();
 #endif
+