projects
/
bbctrl-firmware
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bebea7a
)
Disable outputs and jog on estop. #170
author
Joseph Coffland
<joseph@cauldrondevelopment.com>
Tue, 27 Nov 2018 05:38:44 +0000
(21:38 -0800)
committer
Joseph Coffland
<joseph@cauldrondevelopment.com>
Tue, 27 Nov 2018 05:38:44 +0000
(21:38 -0800)
src/avr/src/estop.c
patch
|
blob
|
history
diff --git
a/src/avr/src/estop.c
b/src/avr/src/estop.c
index 20559fac66510812bc109ed8a305ede6f7239900..67fcecbd41f724b23868c496fac3810c81f874fa 100644
(file)
--- a/
src/avr/src/estop.c
+++ b/
src/avr/src/estop.c
@@
-34,6
+34,7
@@
#include "config.h"
#include "state.h"
#include "outputs.h"
+#include "jog.h"
#include "exec.h"
#include <avr/eeprom.h>
@@
-89,9
+90,11
@@
void estop_trigger(stat_t reason) {
// Set fault signal
outputs_set_active(FAULT_PIN, true);
- // Hard stop
the motors and the spindle
+ // Hard stop
peripherals
st_shutdown();
spindle_estop();
+ jog_stop();
+ outputs_stop();
// Set machine state
state_estop();