From 9db5d21837c1b867626d62272f959c9d764c9f48 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 15 Sep 2017 23:27:30 -0500
Subject: [PATCH] Move G30 to cpp

---
 Marlin/src/Marlin.cpp                     |  7 ++-----
 Marlin/src/gcode/gcode.cpp                |  3 +--
 Marlin/src/gcode/probe/{G30.h => G30.cpp} | 13 ++++++++++++-
 3 files changed, 15 insertions(+), 8 deletions(-)
 rename Marlin/src/gcode/probe/{G30.h => G30.cpp} (88%)

diff --git a/Marlin/src/Marlin.cpp b/Marlin/src/Marlin.cpp
index e2fded4ad5..195a8700c5 100644
--- a/Marlin/src/Marlin.cpp
+++ b/Marlin/src/Marlin.cpp
@@ -357,11 +357,8 @@ void suicide() {
  ***************** GCode Handlers *****************
  **************************************************/
 
-#if HAS_BED_PROBE
-  #include "gcode/probe/G30.h"
-  #if ENABLED(Z_PROBE_SLED)
-    #include "gcode/probe/G31_G32.h"
-  #endif
+#if ENABLED(Z_PROBE_SLED)
+  #include "gcode/probe/G31_G32.h"
 #endif
 
 #if ENABLED(G38_PROBE_TARGET)
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 43776191bf..ab94884ccb 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_G30();
 extern void gcode_G31();
 extern void gcode_G32();
 extern void gcode_G38(bool is_38_2);
@@ -362,7 +361,7 @@ void GcodeSuite::process_next_command() {
       #if HAS_BED_PROBE
 
         case 30: // G30 Single Z probe
-          gcode_G30();
+          G30();
           break;
 
         #if ENABLED(Z_PROBE_SLED)
diff --git a/Marlin/src/gcode/probe/G30.h b/Marlin/src/gcode/probe/G30.cpp
similarity index 88%
rename from Marlin/src/gcode/probe/G30.h
rename to Marlin/src/gcode/probe/G30.cpp
index 80cab18153..e84b520158 100644
--- a/Marlin/src/gcode/probe/G30.h
+++ b/Marlin/src/gcode/probe/G30.cpp
@@ -20,6 +20,15 @@
  *
  */
 
+#include "../../inc/MarlinConfig.h"
+
+#if HAS_BED_PROBE
+
+#include "../gcode.h"
+#include "../../module/motion.h"
+#include "../../module/probe.h"
+#include "../../feature/bedlevel/bedlevel.h"
+
 /**
  * G30: Do a single Z probe at the current XY
  *
@@ -29,7 +38,7 @@
  *   Y   Probe Y position (default current Y)
  *   S0  Leave the probe deployed
  */
-void gcode_G30() {
+void GcodeSuite::G30() {
   const float xpos = parser.linearval('X', current_position[X_AXIS] + X_PROBE_OFFSET_FROM_EXTRUDER),
               ypos = parser.linearval('Y', current_position[Y_AXIS] + Y_PROBE_OFFSET_FROM_EXTRUDER);
 
@@ -54,3 +63,5 @@ void gcode_G30() {
 
   report_current_position();
 }
+
+#endif // HAS_BED_PROBE