From 1d2061c9353aec7871016b9126185722fef43b97 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 17 Sep 2017 00:38:39 -0500 Subject: [PATCH] Move M115 to cpp --- Marlin/src/Marlin.cpp | 2 -- Marlin/src/gcode/gcode.cpp | 7 +++---- Marlin/src/gcode/host/{M115.h => M115.cpp} | 5 ++++- 3 files changed, 7 insertions(+), 7 deletions(-) rename Marlin/src/gcode/host/{M115.h => M115.cpp} (97%) diff --git a/Marlin/src/Marlin.cpp b/Marlin/src/Marlin.cpp index afbd07b369..01aa52b179 100644 --- a/Marlin/src/Marlin.cpp +++ b/Marlin/src/Marlin.cpp @@ -355,8 +355,6 @@ bool pin_is_protected(const int8_t pin) { return false; } -#include "gcode/host/M115.h" - #include "gcode/lcd/M117.h" #include "gcode/host/M118.h" diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp index f378679005..d0f8ad4b4e 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_M115(); extern void gcode_M117(); extern void gcode_M118(); extern void gcode_M119(); @@ -496,9 +495,9 @@ void GcodeSuite::process_next_command() { case 92: M92(); break; // M92: Set the steps-per-unit for one or more axes case 114: M114(); break; // M114: Report current position - case 115: // M115: Report capabilities - gcode_M115(); - break; + + case 115: M115(); break; // M115: Report capabilities + case 117: // M117: Set LCD message text, if possible gcode_M117(); break; diff --git a/Marlin/src/gcode/host/M115.h b/Marlin/src/gcode/host/M115.cpp similarity index 97% rename from Marlin/src/gcode/host/M115.h rename to Marlin/src/gcode/host/M115.cpp index a58a474ee2..e509ae6a95 100644 --- a/Marlin/src/gcode/host/M115.h +++ b/Marlin/src/gcode/host/M115.cpp @@ -20,10 +20,13 @@ * */ +#include "../gcode.h" +#include "../../inc/MarlinConfig.h" + /** * M115: Capabilities string */ -void gcode_M115() { +void GcodeSuite::M115() { SERIAL_PROTOCOLLNPGM(MSG_M115_REPORT); #if ENABLED(EXTENDED_CAPABILITIES_REPORT)