HCoop
/
clinton
/
Smoothieware.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
10ee205
)
G28 cancels suspend
author
Jim Morris
<morris@wolfman.com>
Tue, 5 Jan 2016 18:57:35 +0000
(10:57 -0800)
committer
Jim Morris
<morris@wolfman.com>
Tue, 5 Jan 2016 18:57:35 +0000
(10:57 -0800)
src/modules/utils/player/Player.cpp
patch
|
blob
|
blame
|
history
diff --git
a/src/modules/utils/player/Player.cpp
b/src/modules/utils/player/Player.cpp
index
cb7f319
..
e7ba2ee
100644
(file)
--- a/
src/modules/utils/player/Player.cpp
+++ b/
src/modules/utils/player/Player.cpp
@@
-208,6
+208,18
@@
void Player::on_gcode_received(void *argument)
} else if (gcode->m == 601) { // resume print
this->resume_command("", gcode->stream);
}
+
+ }else if(gcode->has_g) {
+ if(gcode->g == 28) { // homing cancels suspend
+ if(this->suspended) {
+ // clean up
+ this->suspended= false;
+ THEKERNEL->robot->pop_state();
+ this->saved_temperatures.clear();
+ this->was_playing_file= false;
+ this->suspend_loops= 0;
+ }
+ }
}
}