bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Move M114 to cpp

Browse Source
This commit is contained in:
Scott Lahteine
2017-09-17 00:36:30 -05:00
parent 5d2681a105
commit 81b8fbf4d6
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Marlin/src/Marlin.cpp
View File

@@ -355,7 +355,6 @@ bool pin_is_protected(const int8_t pin) {
return false; return false;
} }
#include "gcode/host/M114.h"
#include "gcode/host/M115.h" #include "gcode/host/M115.h"
#include "gcode/lcd/M117.h" #include "gcode/lcd/M117.h"

5
Marlin/src/gcode/gcode.cpp
View File

@@ -116,7 +116,6 @@ void GcodeSuite::dwell(millis_t time) {
// //
// Placeholders for non-migrated codes // Placeholders for non-migrated codes
// //
extern void gcode_M114();
extern void gcode_M115(); extern void gcode_M115();
extern void gcode_M117(); extern void gcode_M117();
extern void gcode_M118(); extern void gcode_M118();
@@ -496,9 +495,7 @@ void GcodeSuite::process_next_command() {
case 92: M92(); break; // M92: Set the steps-per-unit for one or more axes case 92: M92(); break; // M92: Set the steps-per-unit for one or more axes
case 114: // M114: Report current position case 114: M114(); break; // M114: Report current position
gcode_M114();
break;
case 115: // M115: Report capabilities case 115: // M115: Report capabilities
gcode_M115(); gcode_M115();
break; break;

8
Marlin/src/gcode/host/M114.h → Marlin/src/gcode/host/M114.cpp
View File

@@ -20,6 +20,12 @@
* *
*/ */
#include "../../inc/MarlinConfig.h"
#include "../gcode.h"
#include "../../module/motion.h"
#include "../../module/stepper.h"
#ifdef M114_DETAIL #ifdef M114_DETAIL
void report_xyze(const float pos[XYZE], const uint8_t n = 4, const uint8_t precision = 3) { void report_xyze(const float pos[XYZE], const uint8_t n = 4, const uint8_t precision = 3) {
@@ -99,7 +105,7 @@
/** /**
* M114: Report current position to host * M114: Report current position to host
*/ */
void gcode_M114() { void GcodeSuite::M114() {
#ifdef M114_DETAIL #ifdef M114_DETAIL
if (parser.seen('D')) { if (parser.seen('D')) {