diff options
| author | Selene ToyKeeper | 2020-03-16 03:19:42 -0600 |
|---|---|---|
| committer | Selene ToyKeeper | 2020-03-16 03:19:42 -0600 |
| commit | 49f1b5ccd2033109814b99ea4650375e8f33a6be (patch) | |
| tree | 40b185f4198630a1a9377c6282db5f9e690f9cbc /spaghetti-monster/fsm-adc.h | |
| parent | increased blink speed slightly, and added a library function to blink out 16-... (diff) | |
| download | anduril-49f1b5ccd2033109814b99ea4650375e8f33a6be.tar.gz anduril-49f1b5ccd2033109814b99ea4650375e8f33a6be.tar.bz2 anduril-49f1b5ccd2033109814b99ea4650375e8f33a6be.zip | |
merged some misc fixes from pakutrai, cleaned up comments, removed unused symbols
Diffstat (limited to 'spaghetti-monster/fsm-adc.h')
| -rw-r--r-- | spaghetti-monster/fsm-adc.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/spaghetti-monster/fsm-adc.h b/spaghetti-monster/fsm-adc.h index 6283b2c..241dee4 100644 --- a/spaghetti-monster/fsm-adc.h +++ b/spaghetti-monster/fsm-adc.h @@ -52,7 +52,9 @@ void adc_deferred(); // do the actual ADC-related calculations static inline void ADC_voltage_handler(); volatile uint8_t voltage = 0; +#ifdef USE_LVP void low_voltage(); +#endif #ifdef USE_BATTCHECK void battcheck(); @@ -67,10 +69,6 @@ void battcheck(); #ifdef USE_THERMAL_REGULATION -// default 1 seconds between thermal regulation events -#ifndef THERMAL_WARNING_SECONDS -#define THERMAL_WARNING_SECONDS 1 -#endif // try to keep temperature below 45 C #ifndef DEFAULT_THERM_CEIL #define DEFAULT_THERM_CEIL 45 @@ -83,14 +81,10 @@ void battcheck(); #ifndef THERM_CAL_OFFSET #define THERM_CAL_OFFSET 0 #endif -// temperature now, in C (ish) * 2 (14.1 fixed-point) +// temperature now, in C (ish) volatile int16_t temperature; -// temperature in a few seconds, in C (ish) * 2 (14.1 fixed-point) -volatile int16_t projected_temperature; // Fight the future! uint8_t therm_ceil = DEFAULT_THERM_CEIL; int8_t therm_cal_offset = 0; -//void low_temperature(); -//void high_temperature(); volatile uint8_t reset_thermal_history = 1; static inline void ADC_temperature_handler(); #endif // ifdef USE_THERMAL_REGULATION |