melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move G31_G32 to cpp

Browse Source
This commit is contained in:
Scott Lahteine 2017-09-15 23:31:06 -05:00
parent 9db5d21837
commit b8adae0785
3 changed files with 13 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

@ -357,10 +357,6 @@ void suicide() {
***************** GCode Handlers ***************** ***************** GCode Handlers *****************
**************************************************/ **************************************************/
#if ENABLED(Z_PROBE_SLED)
#include "gcode/probe/G31_G32.h"
#endif
#if ENABLED(G38_PROBE_TARGET) #if ENABLED(G38_PROBE_TARGET)
#include "gcode/probe/G38.h" #include "gcode/probe/G38.h"
#endif #endif

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

@ -116,8 +116,6 @@ void GcodeSuite::dwell(millis_t time) {
// //
// Placeholders for non-migrated codes // Placeholders for non-migrated codes
// //
extern void gcode_G31();
extern void gcode_G32();
extern void gcode_G38(bool is_38_2); extern void gcode_G38(bool is_38_2);
extern void gcode_G42(); extern void gcode_G42();
extern void gcode_G92(); extern void gcode_G92();
@ -367,11 +365,11 @@ void GcodeSuite::process_next_command() {
#if ENABLED(Z_PROBE_SLED) #if ENABLED(Z_PROBE_SLED)
case 31: // G31: dock the sled case 31: // G31: dock the sled
gcode_G31(); G31();
break; break;
case 32: // G32: undock the sled case 32: // G32: undock the sled
gcode_G32(); G32();
break; break;
#endif // Z_PROBE_SLED #endif // Z_PROBE_SLED

13
Marlin/src/gcode/probe/G31_G32.h → Marlin/src/gcode/probe/G31_G32.cpp
View File

@ -20,12 +20,21 @@
* *
*/ */
#include "../../inc/MarlinConfig.h"
#if ENABLED(Z_PROBE_SLED)
#include "../gcode.h"
#include "../../module/probe.h"
/** /**
* G31: Deploy the Z probe * G31: Deploy the Z probe
*/ */
void gcode_G31() { DEPLOY_PROBE(); } void GcodeSuite::G31() { DEPLOY_PROBE(); }
/** /**
* G32: Stow the Z probe * G32: Stow the Z probe
*/ */
void gcode_G32() { STOW_PROBE(); } void GcodeSuite::G32() { STOW_PROBE(); }
#endif // Z_PROBE_SLED