aboutsummaryrefslogtreecommitdiff
path: root/spaghetti-monster/fsm-standby.c
diff options
context:
space:
mode:
authorSelene ToyKeeper2020-03-16 03:44:42 -0600
committerSelene ToyKeeper2020-03-16 03:44:42 -0600
commit2ac137648d6769ebf31eed9932bd868ca28c05e5 (patch)
tree05f9e239c55c1d851af32cbf5ab711d1b5261cb9 /spaghetti-monster/fsm-standby.c
parentmention the maximum allowed temperature in the manual (diff)
parentfixed a few things in ramping-ui, rampingiosv3, and werner's UI (diff)
downloadanduril-2ac137648d6769ebf31eed9932bd868ca28c05e5.tar.gz
anduril-2ac137648d6769ebf31eed9932bd868ca28c05e5.tar.bz2
anduril-2ac137648d6769ebf31eed9932bd868ca28c05e5.zip
merged adc-rework branch, which rewrote all ADC code (voltage, temperature, and everything touched by those)
and seems to greatly improve the thermal regulation
Diffstat (limited to 'spaghetti-monster/fsm-standby.c')
-rw-r--r--spaghetti-monster/fsm-standby.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/spaghetti-monster/fsm-standby.c b/spaghetti-monster/fsm-standby.c
index 9398f52..b002b91 100644
--- a/spaghetti-monster/fsm-standby.c
+++ b/spaghetti-monster/fsm-standby.c
@@ -73,8 +73,8 @@ void sleep_until_eswitch_pressed()
go_to_standby = 0;
}
if (irq_adc) { // ADC done measuring
- adcint_enable = 1;
- ADC_inner();
+ adc_deferred_enable = 1;
+ adc_deferred();
//ADC_off(); // takes care of itself
//irq_adc = 0; // takes care of itself
}