From cbf40f7ee9ea0cbc1192129920df5163deed1f6b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 16 Sep 2017 23:11:35 -0500
Subject: [PATCH] Move M145 to cpp
---
Marlin/src/Marlin.cpp | 4 ----
Marlin/src/gcode/gcode.cpp | 7 +------
Marlin/src/gcode/lcd/{M145.h => M145.cpp} | 11 ++++++++++-
3 files changed, 11 insertions(+), 11 deletions(-)
rename Marlin/src/gcode/lcd/{M145.h => M145.cpp} (91%)
diff --git a/Marlin/src/Marlin.cpp b/Marlin/src/Marlin.cpp
index 24c61f24a2..ce77844dae 100644
--- a/Marlin/src/Marlin.cpp
+++ b/Marlin/src/Marlin.cpp
@@ -369,10 +369,6 @@ bool pin_is_protected(const int8_t pin) {
return false;
}
-#if ENABLED(ULTIPANEL)
- #include "gcode/lcd/M145.h"
-#endif
-
#if ENABLED(TEMPERATURE_UNITS_SUPPORT)
#include "gcode/units/M149.h"
#endif
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index ffee424562..8622025007 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -131,7 +131,6 @@ extern void gcode_M118();
extern void gcode_M119();
extern void gcode_M120();
extern void gcode_M121();
-extern void gcode_M145();
extern void gcode_M149();
extern void gcode_M150();
extern void gcode_M163();
@@ -544,11 +543,7 @@ void GcodeSuite::process_next_command() {
break;
#if ENABLED(ULTIPANEL)
-
- case 145: // M145: Set material heatup parameters
- gcode_M145();
- break;
-
+ case 145: M145(); break; // M145: Set material heatup parameters
#endif
#if ENABLED(TEMPERATURE_UNITS_SUPPORT)
diff --git a/Marlin/src/gcode/lcd/M145.h b/Marlin/src/gcode/lcd/M145.cpp
similarity index 91%
rename from Marlin/src/gcode/lcd/M145.h
rename to Marlin/src/gcode/lcd/M145.cpp
index 3d203f1c33..3fda5bb047 100644
--- a/Marlin/src/gcode/lcd/M145.h
+++ b/Marlin/src/gcode/lcd/M145.cpp
@@ -20,6 +20,13 @@
*
*/
+#include "../../inc/MarlinConfig.h"
+
+#if ENABLED(ULTIPANEL)
+
+#include "../gcode.h"
+#include "../../lcd/ultralcd.h"
+
/**
* M145: Set the heatup state for a material in the LCD menu
*
@@ -28,7 +35,7 @@
* B<bed temp>
* F<fan speed>
*/
-void gcode_M145() {
+void GcodeSuite::M145() {
const uint8_t material = (uint8_t)parser.intval('S');
if (material >= COUNT(lcd_preheat_hotend_temp)) {
SERIAL_ERROR_START();
@@ -52,3 +59,5 @@ void gcode_M145() {
#endif
}
}
+
+#endif // ULTIPANEL
--
GitLab