Browse Source

Move G31_G32 to cpp

pull/1/head
Scott Lahteine 7 years ago
parent
commit
b8adae0785
  1. 4
      Marlin/src/Marlin.cpp
  2. 6
      Marlin/src/gcode/gcode.cpp
  3. 13
      Marlin/src/gcode/probe/G31_G32.cpp

4
Marlin/src/Marlin.cpp

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

6
Marlin/src/gcode/gcode.cpp

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

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

@ -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
*/
void gcode_G31() { DEPLOY_PROBE(); }
void GcodeSuite::G31() { DEPLOY_PROBE(); }
/**
* G32: Stow the Z probe
*/
void gcode_G32() { STOW_PROBE(); }
void GcodeSuite::G32() { STOW_PROBE(); }
#endif // Z_PROBE_SLED
Loading…
Cancel
Save