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