HCoop
/
clinton
/
Smoothieware.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
added wait for empty queue back to toolchange
[clinton/Smoothieware.git]
/
src
/
modules
/
tools
/
toolmanager
/
ToolManager.cpp
diff --git
a/src/modules/tools/toolmanager/ToolManager.cpp
b/src/modules/tools/toolmanager/ToolManager.cpp
index
412e70a
..
9a39af2
100644
(file)
--- a/
src/modules/tools/toolmanager/ToolManager.cpp
+++ b/
src/modules/tools/toolmanager/ToolManager.cpp
@@
-67,6
+67,7
@@
void ToolManager::on_gcode_received(void *argument){
}
} else {
if(new_tool != this->active_tool){
+ THEKERNEL->conveyor->wait_for_empty_queue();
this->tools[active_tool]->disable();
this->active_tool = new_tool;
this->current_tool_name = this->tools[active_tool]->get_name();