From 04376975ce3e0ef677890708ddf18e0e5f97b27e Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 16 Sep 2017 00:37:35 -0500 Subject: [PATCH] Move G92 to cpp --- Marlin/src/Marlin.cpp | 2 -- Marlin/src/gcode/gcode.cpp | 5 ++--- Marlin/src/gcode/geometry/{G92.h => G92.cpp} | 10 +++++++++- 3 files changed, 11 insertions(+), 6 deletions(-) rename Marlin/src/gcode/geometry/{G92.h => G92.cpp} (90%) diff --git a/Marlin/src/Marlin.cpp b/Marlin/src/Marlin.cpp index d5fe37c05..3e2ea7714 100644 --- a/Marlin/src/Marlin.cpp +++ b/Marlin/src/Marlin.cpp @@ -357,8 +357,6 @@ void suicide() { ***************** GCode Handlers ***************** **************************************************/ -#include "gcode/geometry/G92.h" - #if HAS_RESUME_CONTINUE #include "gcode/lcd/M0_M1.h" #endif diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp index 7698523ac..be5fe3d4f 100644 --- a/Marlin/src/gcode/gcode.cpp +++ b/Marlin/src/gcode/gcode.cpp @@ -116,7 +116,6 @@ void GcodeSuite::dwell(millis_t time) { // // Placeholders for non-migrated codes // -extern void gcode_G92(); extern void gcode_M0_M1(); extern void gcode_M3_M4(bool is_M3); extern void gcode_M5(); @@ -394,8 +393,8 @@ void GcodeSuite::process_next_command() { relative_mode = true; break; - case 92: // G92 - gcode_G92(); + case 92: // G92 - Set current axis position(s) + G92(); break; #if HAS_MESH diff --git a/Marlin/src/gcode/geometry/G92.h b/Marlin/src/gcode/geometry/G92.cpp similarity index 90% rename from Marlin/src/gcode/geometry/G92.h rename to Marlin/src/gcode/geometry/G92.cpp index 98569248d..ae2d92962 100644 --- a/Marlin/src/gcode/geometry/G92.h +++ b/Marlin/src/gcode/geometry/G92.cpp @@ -20,10 +20,18 @@ * */ +#include "../gcode.h" +#include "../../module/motion.h" +#include "../../module/stepper.h" + +#if ENABLED(I2C_POSITION_ENCODERS) + #include "../../feature/I2CPositionEncoder.h" +#endif + /** * G92: Set current position to given X Y Z E */ -void gcode_G92() { +void GcodeSuite::G92() { bool didXYZ = false, didE = parser.seenval('E');