removed G92 tool offset code

[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 22f9037..56d0334 100644 (file)
--- a/src/modules/tools/toolmanager/ToolManager.cpp
+++ b/src/modules/tools/toolmanager/ToolManager.cpp
@@ -12,12 +12,17 @@ using namespace std;
 #include <vector>
 #include "ToolManager.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 "modules/robot/RobotPublicAccess.h"
 
 #define return_error_on_unhandled_gcode_checksum    CHECKSUM("return_error_on_unhandled_gcode")
@@ -83,13 +88,17 @@ void ToolManager::on_gcode_received(void *argument){
                     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;
+                    //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;
+                                       THEKERNEL->robot->setToolOffset(new_tool_offset[0], new_tool_offset[1], new_tool_offset[2]);
 
                     if(make_move){
+                                               stream->printf("BX Offset is:  %1.3f\n", new_tool_offset[0]);
+                                               bool ok = THEKERNEL->robot->setToolOffset(new_tool_offset[0], new_tool_offset[1], new_tool_offset[2]);
+
                         //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;