aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSelene ToyKeeper2018-01-24 19:43:00 -0700
committerSelene ToyKeeper2018-01-24 19:43:00 -0700
commit5ee5845d4614cb8285cdf0bf529c26bec7ce7217 (patch)
tree646316e085d06ca544a5f0d162badbc003949492
parentThermal regulation adjustments... (diff)
downloadanduril-5ee5845d4614cb8285cdf0bf529c26bec7ce7217.tar.gz
anduril-5ee5845d4614cb8285cdf0bf529c26bec7ce7217.tar.bz2
anduril-5ee5845d4614cb8285cdf0bf529c26bec7ce7217.zip
FSM: added ability to adjust temperature calibration in UI (lower-case therm_cal_offset var).
Diffstat (limited to '')
-rw-r--r--spaghetti-monster/fsm-adc.c2
-rw-r--r--spaghetti-monster/fsm-adc.h7
2 files changed, 5 insertions, 4 deletions
diff --git a/spaghetti-monster/fsm-adc.c b/spaghetti-monster/fsm-adc.c
index d863b94..c6f5d2a 100644
--- a/spaghetti-monster/fsm-adc.c
+++ b/spaghetti-monster/fsm-adc.c
@@ -150,7 +150,7 @@ ISR(ADC_vect) {
// temperature
else if (adc_step == 3) {
// Convert ADC units to Celsius (ish)
- int16_t temp = measurement - 275 + THERM_CAL_OFFSET;
+ int16_t temp = measurement - 275 + THERM_CAL_OFFSET + therm_cal_offset;
// prime on first execution
if (reset_thermal_history) {
diff --git a/spaghetti-monster/fsm-adc.h b/spaghetti-monster/fsm-adc.h
index 5ffbb73..1b16d01 100644
--- a/spaghetti-monster/fsm-adc.h
+++ b/spaghetti-monster/fsm-adc.h
@@ -66,11 +66,12 @@ void battcheck();
#ifndef THERM_CAL_OFFSET
#define THERM_CAL_OFFSET 0
#endif
-// temperature now, in C (ish)
+// temperature now, in C (ish) * 2 (14.1 fixed-point)
volatile int16_t temperature;
-// temperature in a few seconds, in C (ish) * 4 (13.2 fixed-point)
+// temperature in a few seconds, in C (ish) * 2 (14.1 fixed-point)
volatile int16_t projected_temperature; // Fight the future!
-volatile uint8_t therm_ceil = DEFAULT_THERM_CEIL;
+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;