aboutsummaryrefslogtreecommitdiff
path: root/spaghetti-monster/ramping-ui/ramping-ui.c
diff options
context:
space:
mode:
authorSelene ToyKeeper2020-03-16 03:57:19 -0600
committerSelene ToyKeeper2020-03-16 03:57:19 -0600
commit15fe735df7edf31ac388c2ffd65020216e1a70aa (patch)
tree8f8b1668ccb555dc4825ccbd9f4ac0487401b5cf /spaghetti-monster/ramping-ui/ramping-ui.c
parentadded FETless KR4 build target, calibrated other KR4 therm faster level better (diff)
parentmerged adc-rework branch, which rewrote all ADC code (voltage, temperature, a... (diff)
downloadanduril-15fe735df7edf31ac388c2ffd65020216e1a70aa.tar.gz
anduril-15fe735df7edf31ac388c2ffd65020216e1a70aa.tar.bz2
anduril-15fe735df7edf31ac388c2ffd65020216e1a70aa.zip
merged fsm branch (to get adc-rework branch with new thermal regulation)
Diffstat (limited to 'spaghetti-monster/ramping-ui/ramping-ui.c')
-rw-r--r--spaghetti-monster/ramping-ui/ramping-ui.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/spaghetti-monster/ramping-ui/ramping-ui.c b/spaghetti-monster/ramping-ui/ramping-ui.c
index 18f488d..5eb7d8f 100644
--- a/spaghetti-monster/ramping-ui/ramping-ui.c
+++ b/spaghetti-monster/ramping-ui/ramping-ui.c
@@ -22,7 +22,6 @@
#define USE_THERMAL_REGULATION
#define DEFAULT_THERM_CEIL 32
#define USE_DELAY_MS
-#define USE_DELAY_4MS
#define USE_DELAY_ZERO
#define USE_RAMPING
#define USE_BATTCHECK
@@ -353,7 +352,7 @@ void loop() {
battcheck();
}
else if (current_state == tempcheck_state) {
- blink_num(projected_temperature>>2);
+ blink_num(temperature);
nice_delay_ms(1000);
}
#endif