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

Move G27 to cpp

Browse source
This commit is contained in:
Scott Lahteine 2017-09-15 23:22:58 -05:00
parent a1ee1628e5
commit 13136376ee
3 changed files with 13 additions and 7 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(NOZZLE_PARK_FEATURE)
#include "gcode/feature/pause/G27.h"
#endif
#if HAS_BED_PROBE #if HAS_BED_PROBE
#include "gcode/probe/G30.h" #include "gcode/probe/G30.h"
#if ENABLED(Z_PROBE_SLED) #if ENABLED(Z_PROBE_SLED)

13
Marlin/src/gcode/feature/pause/G27.h → Marlin/src/gcode/feature/pause/G27.cpp
View file

@ -20,11 +20,22 @@
* *
*/ */
#include "../../../inc/MarlinConfig.h"
#if ENABLED(NOZZLE_PARK_FEATURE)
#include "../../gcode.h"
#include "../../../libs/nozzle.h"
#include "../../../module/motion.h"
/** /**
* G27: Park the nozzle * G27: Park the nozzle
*/ */
void gcode_G27() { void GcodeSuite::G27() {
// Don't allow nozzle parking without homing first // Don't allow nozzle parking without homing first
if (axis_unhomed_error()) return; if (axis_unhomed_error()) return;
Nozzle::park(parser.ushortval('P')); Nozzle::park(parser.ushortval('P'));
} }
#endif // NOZZLE_PARK_FEATURE

3
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_G27();
extern void gcode_G30(); extern void gcode_G30();
extern void gcode_G31(); extern void gcode_G31();
extern void gcode_G32(); extern void gcode_G32();
@ -345,7 +344,7 @@ void GcodeSuite::process_next_command() {
#if ENABLED(NOZZLE_PARK_FEATURE) #if ENABLED(NOZZLE_PARK_FEATURE)
case 27: // G27: Nozzle Park case 27: // G27: Nozzle Park
gcode_G27(); G27();
break; break;
#endif // NOZZLE_PARK_FEATURE #endif // NOZZLE_PARK_FEATURE