From a911215b0ef44e721dbc4cc18f833c486009e3e0 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 16 Sep 2017 23:27:06 -0500 Subject: [PATCH] Move M82_M83 to cpp --- Marlin/src/Marlin.cpp | 2 -- Marlin/src/gcode/gcode.cpp | 11 +++-------- Marlin/src/gcode/units/{M82_M83.h => M82_M83.cpp} | 6 ++++-- 3 files changed, 7 insertions(+), 12 deletions(-) rename Marlin/src/gcode/units/{M82_M83.h => M82_M83.cpp} (86%) diff --git a/Marlin/src/Marlin.cpp b/Marlin/src/Marlin.cpp index 4b1ac1df7d..79d7ca0bde 100644 --- a/Marlin/src/Marlin.cpp +++ b/Marlin/src/Marlin.cpp @@ -359,8 +359,6 @@ bool pin_is_protected(const int8_t pin) { return false; } -#include "gcode/units/M82_M83.h" - #include "gcode/control/M18_M84.h" #include "gcode/control/M85.h" diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp index dc47ff426a..84793f3919 100644 --- a/Marlin/src/gcode/gcode.cpp +++ b/Marlin/src/gcode/gcode.cpp @@ -117,8 +117,6 @@ void GcodeSuite::dwell(millis_t time) { // Placeholders for non-migrated codes // extern void gcode_M18_M84(); -extern void gcode_M82(); -extern void gcode_M83(); extern void gcode_M85(); extern void gcode_M92(); extern void gcode_M100(); @@ -495,12 +493,9 @@ void GcodeSuite::process_next_command() { case 81: M81(); break; // M81: Turn off Power, including Power Supply, if possible - case 82: // M82: Set E axis normal mode (same as other axes) - gcode_M82(); - break; - case 83: // M83: Set E axis relative mode - gcode_M83(); - break; + case 82: M82(); break; // M82: Set E axis normal mode (same as other axes) + case 83: M83(); break; // M83: Set E axis relative mode + case 18: // M18 => M84 case 84: // M84: Disable all steppers or set timeout gcode_M18_M84(); diff --git a/Marlin/src/gcode/units/M82_M83.h b/Marlin/src/gcode/units/M82_M83.cpp similarity index 86% rename from Marlin/src/gcode/units/M82_M83.h rename to Marlin/src/gcode/units/M82_M83.cpp index e0d5409add..b68d6a28ee 100644 --- a/Marlin/src/gcode/units/M82_M83.h +++ b/Marlin/src/gcode/units/M82_M83.cpp @@ -20,12 +20,14 @@ * */ +#include "../gcode.h" + /** * M82: Set E codes absolute (default) */ -void gcode_M82() { gcode.axis_relative_modes[E_AXIS] = false; } +void GcodeSuite::M82() { axis_relative_modes[E_AXIS] = false; } /** * M83: Set E codes relative while in Absolute Coordinates (G90) mode */ -void gcode_M83() { gcode.axis_relative_modes[E_AXIS] = true; } +void GcodeSuite::M83() { axis_relative_modes[E_AXIS] = true; }