X-Git-Url: https://git.hcoop.net/clinton/Smoothieware.git/blobdiff_plain/ace0fc99b42685261020ceeca3e6876f3d2e326e..HEAD:/src/modules/tools/toolmanager/ToolManager.cpp
diff --git a/src/modules/tools/toolmanager/ToolManager.cpp b/src/modules/tools/toolmanager/ToolManager.cpp
dissimilarity index 68%
index d7fa8304..72e4985d 100644
--- a/src/modules/tools/toolmanager/ToolManager.cpp
+++ b/src/modules/tools/toolmanager/ToolManager.cpp
@@ -1,90 +1,132 @@
-/*
- This file is part of Smoothie (http://smoothieware.org/). The motion control part is heavily based on Grbl (https://github.com/simen/grbl).
- Smoothie is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- Smoothie is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- You should have received a copy of the GNU General Public License along with Smoothie. If not, see .
-*/
-
-#include "libs/Module.h"
-#include "libs/Kernel.h"
-#include
-using namespace std;
-#include
-#include "ToolManager.h"
-#include "Conveyor.h"
-
-ToolManager::ToolManager(){
- active_tool = 0;
-}
-
-void ToolManager::on_module_loaded(){
- this->register_for_event(ON_GCODE_RECEIVED);
-}
-
-void ToolManager::on_gcode_received(void *argument){
- Gcode *gcode = static_cast(argument);
-
- if( gcode->has_letter('T') ){
- int new_tool = gcode->get_value('T');
- bool make_move = false;
- if ( gcode->has_letter('F') ){
- make_move = true;
- }
- gcode->mark_as_taken();
- if(new_tool > (int)this->tools.size() || new_tool < 0){
- // invalid tool
- gcode->stream->printf(";;T%d invalid tool\r\n", new_tool);
- } else {
- if( gcode->has_letter('T') ){
- int new_tool = gcode->get_value('T');
- if(new_tool != this->active_tool){
- void *returned_data;
- bool ok = THEKERNEL->public_data->get_value( robot_checksum, current_position_checksum, &returned_data );
- if(ok){
- // save current position to return to after applying extruder offset
- float *pos = static_cast(returned_data);
- float current_pos[3];
- for(int i=0;i<3;i++){
- current_pos[i] = pos[i];
- }
- // update virtual tool position to the offset of the new tool and select it as active
- float new_pos[3];
- float *active_tool_offset = tools[this->active_tool]->get_offset();
- float *new_tool_offset = tools[new_tool]->get_offset();
- for(int i=0;i<3;i++){
- new_pos[i] = current_pos[i] - active_tool_offset[i] + new_tool_offset[i];
- }
-
- this->tools[active_tool]->disable();
- this->active_tool = new_tool;
- this->tools[active_tool]->enable();
-
- char buf[32];
- snprintf(buf, 31, "G92 X%g Y%g Z%g", new_pos[X_AXIS], new_pos[Y_AXIS], new_pos[Z_AXIS]);
- string s = buf;
- Gcode *g = new Gcode(s, gcode->stream);
- THEKERNEL->call_event(ON_GCODE_RECEIVED, g);
- delete g;
-
- if(make_move){
- //move to old position
- snprintf(buf, 31, "G0 X%g Y%g Z%g", current_pos[X_AXIS], current_pos[Y_AXIS], current_pos[Z_AXIS]);
- s = buf;
- g = new Gcode(s, gcode->stream);
- THEKERNEL->call_event(ON_GCODE_RECEIVED, g);
- delete g;
- }
- }
- }
- }
- }
- }
-}
-
-// Add a tool to the tool list
-void ToolManager::add_tool(Tool* tool_to_add){
- this->tools.push_back( tool_to_add );
-}
-
-
-
+/*
+ This file is part of Smoothie (http://smoothieware.org/). The motion control part is heavily based on Grbl (https://github.com/simen/grbl).
+ Smoothie is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ Smoothie is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License along with Smoothie. If not, see .
+*/
+
+#include "libs/Module.h"
+#include "libs/Kernel.h"
+#include "ToolManager.h"
+#include "Tool.h"
+#include "PublicDataRequest.h"
+#include "ToolManagerPublicAccess.h"
+#include "Config.h"
+#include "Robot.h"
+#include "ConfigValue.h"
+#include "Conveyor.h"
+#include "checksumm.h"
+#include "PublicData.h"
+#include "Gcode.h"
+
+#include "libs/SerialMessage.h"
+#include "libs/StreamOutput.h"
+#include "FileStream.h"
+
+#include
+
+ToolManager::ToolManager()
+{
+ active_tool = 0;
+ current_tool_name = CHECKSUM("hotend");
+}
+
+void ToolManager::on_module_loaded()
+{
+
+ this->register_for_event(ON_GCODE_RECEIVED);
+ this->register_for_event(ON_GET_PUBLIC_DATA);
+ this->register_for_event(ON_SET_PUBLIC_DATA);
+}
+
+void ToolManager::on_gcode_received(void *argument)
+{
+ Gcode *gcode = static_cast(argument);
+
+ if( gcode->has_letter('T') && !gcode->has_m) {
+ int new_tool = gcode->get_value('T');
+ char buff[32]; // should be big enough for any status
+ int n = snprintf(buff, sizeof(buff), "T%d,T%d switching ", this->active_tool, new_tool);
+ gcode->txt_after_ok.append(buff, n);
+ if(new_tool >= (int)this->tools.size() || new_tool < 0) {
+ // invalid tool
+ char buf[32]; // should be big enough for any status
+ int n = snprintf(buf, sizeof(buf), "T%d invalid tool ", new_tool);
+ gcode->txt_after_ok.append(buf, n);
+
+ } else {
+ if(new_tool != this->active_tool) {
+ // We must wait for an empty queue before we can disable the current extruder
+ THEKERNEL->conveyor->wait_for_idle();
+ this->tools[active_tool]->deselect();
+ this->active_tool = new_tool;
+ this->current_tool_name = this->tools[active_tool]->get_name();
+ this->tools[active_tool]->select();
+
+ //send new_tool_offsets to robot
+ const float *new_tool_offset = tools[new_tool]->get_offset();
+ THEROBOT->setToolOffset(new_tool_offset);
+ }
+ }
+ }
+}
+
+void ToolManager::on_get_public_data(void* argument)
+{
+ PublicDataRequest* pdr = static_cast(argument);
+
+ if(!pdr->starts_with(tool_manager_checksum)) return;
+
+ if(pdr->second_element_is(is_active_tool_checksum)) {
+
+ // check that we control the given tool
+ bool managed = false;
+ for(auto t : tools) {
+ uint16_t n = t->get_name();
+ if(pdr->third_element_is(n)) {
+ managed = true;
+ break;
+ }
+ }
+
+ // we are not managing this tool so do not answer
+ if(!managed) return;
+
+ pdr->set_data_ptr(&this->current_tool_name);
+ pdr->set_taken();
+
+ }else if(pdr->second_element_is(get_active_tool_checksum)) {
+ pdr->set_data_ptr(&this->active_tool);
+ pdr->set_taken();
+ }
+}
+
+void ToolManager::on_set_public_data(void* argument)
+{
+ PublicDataRequest* pdr = static_cast(argument);
+
+ if(!pdr->starts_with(tool_manager_checksum)) return;
+
+ // ok this is targeted at us, so change tools
+ //uint16_t tool_name= *static_cast(pdr->get_data_ptr());
+ // TODO: fire a tool change gcode
+ //pdr->set_taken();
+}
+
+// Add a tool to the tool list
+void ToolManager::add_tool(Tool* tool_to_add)
+{
+ if(this->tools.size() == 0) {
+ 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->deselect();
+ }
+ this->tools.push_back( tool_to_add );
+}
+
+
+