initial modification for 5 axis, two extruders only one active

[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 5f5998d..08d2643 100644 (file)
--- a/src/modules/tools/toolmanager/ToolManager.cpp
+++ b/src/modules/tools/toolmanager/ToolManager.cpp
@@ -56,10 +56,10 @@ void ToolManager::on_gcode_received(void *argument)
             if(new_tool != this->active_tool) {
                 // We must wait for an empty queue before we can disable the current extruder
                 THEKERNEL->conveyor->wait_for_empty_queue();
-                this->tools[active_tool]->disable();
+                this->tools[active_tool]->deselect();
                 this->active_tool = new_tool;
                 this->current_tool_name = this->tools[active_tool]->get_name();
-                this->tools[active_tool]->enable();
+                this->tools[active_tool]->select();
 
                 //send new_tool_offsets to robot
                 const float *new_tool_offset = tools[new_tool]->get_offset();
@@ -115,13 +115,13 @@ void ToolManager::on_set_public_data(void* argument)
 void ToolManager::add_tool(Tool* tool_to_add)
 {
     if(this->tools.size() == 0) {
-        tool_to_add->enable();
+        tool_to_add->select();
         this->current_tool_name = tool_to_add->get_name();
         //send new_tool_offsets to robot
         const float *new_tool_offset = tool_to_add->get_offset();
         THEROBOT->setToolOffset(new_tool_offset);
     } else {
-        tool_to_add->disable();
+        tool_to_add->deselect();
     }
     this->tools.push_back( tool_to_add );
 }