aboutsummaryrefslogtreecommitdiff
path: root/spaghetti-monster/fsm-standby.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/fsm-standby.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/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
}