aboutsummaryrefslogtreecommitdiff
path: root/spaghetti-monster/ramping-ui
diff options
context:
space:
mode:
authorSelene ToyKeeper2020-03-16 21:58:42 -0600
committerSelene ToyKeeper2020-03-16 21:58:42 -0600
commited3fcdb8f3363c4ccc87119c985d765bb3457515 (patch)
tree1712d6ecdfd9370573524149817adf893346f0ce /spaghetti-monster/ramping-ui
parentmerged from fsm, mostly to get thermal regulation updates (diff)
parentremoved more references to THERM_HARD_TURBO_DROP (diff)
downloadanduril-ed3fcdb8f3363c4ccc87119c985d765bb3457515.tar.gz
anduril-ed3fcdb8f3363c4ccc87119c985d765bb3457515.tar.bz2
anduril-ed3fcdb8f3363c4ccc87119c985d765bb3457515.zip
merged fsm branch, mostly to get new ADC code (thermal regulation and voltage monitoring)
Diffstat (limited to 'spaghetti-monster/ramping-ui')
-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