SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Move M48 to cpp

Browse source
This commit is contained in:
Scott Lahteine 2017-09-16 04:13:55 -05:00
parent be8d913484
commit fc52fc72ac
3 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/Marlin.cpp
View file

@ -370,10 +370,6 @@ bool pin_is_protected(const int8_t pin) {
return false; return false;
} }
#if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)
#include "gcode/calibrate/M48.h"
#endif
#include "gcode/stats/M75.h" #include "gcode/stats/M75.h"
#include "gcode/stats/M76.h" #include "gcode/stats/M76.h"
#include "gcode/stats/M77.h" #include "gcode/stats/M77.h"

16
Marlin/src/gcode/calibrate/M48.h → Marlin/src/gcode/calibrate/M48.cpp
View file

@ -20,6 +20,18 @@
* *
*/ */
#include "../../inc/MarlinConfig.h"
#if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)
#include "../gcode.h"
#include "../../module/motion.h"
#include "../../module/probe.h"
#if DISABLED(DELTA)
#include "../../feature/bedlevel/bedlevel.h"
#endif
/** /**
* M48: Z probe repeatability measurement function. * M48: Z probe repeatability measurement function.
* *
@ -38,7 +50,7 @@
* Any information generated by a prior G29 Bed leveling command will be lost and need to be * Any information generated by a prior G29 Bed leveling command will be lost and need to be
* regenerated. * regenerated.
*/ */
void gcode_M48() { void GcodeSuite::M48() {
if (axis_unhomed_error()) return; if (axis_unhomed_error()) return;
@ -271,3 +283,5 @@ void gcode_M48() {
report_current_position(); report_current_position();
} }
#endif // Z_MIN_PROBE_REPEATABILITY_TEST

7
Marlin/src/gcode/gcode.cpp
View file

@ -117,7 +117,6 @@ void GcodeSuite::dwell(millis_t time) {
// Placeholders for non-migrated codes // Placeholders for non-migrated codes
// //
extern void gcode_M18_M84(); extern void gcode_M18_M84();
extern void gcode_M48();
extern void gcode_M75(); extern void gcode_M75();
extern void gcode_M76(); extern void gcode_M76();
extern void gcode_M77(); extern void gcode_M77();
@ -438,10 +437,8 @@ void GcodeSuite::process_next_command() {
#endif #endif
#if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST) #if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)
case 48: // M48: Z probe repeatability test case 48: M48(); break; // M48: Z probe repeatability test
gcode_M48(); #endif
break;
#endif // Z_MIN_PROBE_REPEATABILITY_TEST
#if ENABLED(UBL_G26_MESH_VALIDATION) #if ENABLED(UBL_G26_MESH_VALIDATION)
case 49: M49(); break; // M49: Turn on or off G26 debug flag for verbose output case 49: M49(); break; // M49: Turn on or off G26 debug flag for verbose output