From 143b2896e0693442f642e2dc5e3fd2f05c2019c8 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 12 Nov 2018 21:29:46 -0600
Subject: [PATCH] Add M412 to enable/disable filament runout detection (#12406)
---
Marlin/src/gcode/feature/runout/M412.cpp | 45 ++++++++++++++++++++++
Marlin/src/gcode/gcode.cpp | 4 ++
Marlin/src/gcode/gcode.h | 7 +++-
Marlin/src/lcd/menu/menu_configuration.cpp | 2 +-
4 files changed, 56 insertions(+), 2 deletions(-)
create mode 100644 Marlin/src/gcode/feature/runout/M412.cpp
diff --git a/Marlin/src/gcode/feature/runout/M412.cpp b/Marlin/src/gcode/feature/runout/M412.cpp
new file mode 100644
index 0000000000..577f9d705d
--- /dev/null
+++ b/Marlin/src/gcode/feature/runout/M412.cpp
@@ -0,0 +1,45 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../../inc/MarlinConfig.h"
+
+#if ENABLED(FILAMENT_RUNOUT_SENSOR)
+
+#include "../../gcode.h"
+#include "../../../feature/runout.h"
+
+/**
+ * M412: Enable / Disable filament runout detection
+ */
+void GcodeSuite::M412() {
+ if (parser.seen('S')) {
+ runout.reset();
+ runout.enabled = parser.value_bool();
+ }
+ else {
+ SERIAL_ECHO_START();
+ SERIAL_ECHOPGM("Filament runout ");
+ serialprintln_onoff(runout.enabled);
+ }
+}
+
+#endif // FILAMENT_RUNOUT_SENSOR
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 1281f4519e..e6bec1f854 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -568,6 +568,10 @@ void GcodeSuite::process_parsed_command(
case 407: M407(); break; // M407: Display measured filament diameter
#endif
+ #if ENABLED(FILAMENT_RUNOUT_SENSOR)
+ case 412: M412(); break; // M412: Enable/Disable filament runout detection
+ #endif
+
#if HAS_LEVELING
case 420: M420(); break; // M420: Enable/Disable Bed Leveling
#endif
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index cb29abed56..9ef63d1111 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -78,7 +78,7 @@
* M3 - Turn laser/spindle on, set spindle/laser speed/power, set rotation to clockwise
* M4 - Turn laser/spindle on, set spindle/laser speed/power, set rotation to counter-clockwise
* M5 - Turn laser/spindle off
- * M12 - Set up closed loop control system. More features coming soon. (Requires EXTERNAL_CLOSED_LOOP_CONTROLLER)
+ * M12 - Set up closed loop control system. (Requires EXTERNAL_CLOSED_LOOP_CONTROLLER)
* M17 - Enable/Power all stepper motors
* M18 - Disable all stepper motors; same as M84
* M20 - List SD card. (Requires SDSUPPORT)
@@ -196,6 +196,7 @@
* M406 - Disable Filament Sensor flow control. (Requires FILAMENT_WIDTH_SENSOR)
* M407 - Display measured filament diameter in millimeters. (Requires FILAMENT_WIDTH_SENSOR)
* M410 - Quickstop. Abort all planned moves.
+ * M412 - Enable / Disable filament runout detection. (Requires FILAMENT_RUNOUT_SENSOR)
* M420 - Enable/Disable Leveling (with current values) S1=enable S0=disable (Requires MESH_BED_LEVELING or ABL)
* M421 - Set a single Z coordinate in the Mesh Leveling grid. X<units> Y<units> Z<units> (Requires MESH_BED_LEVELING, AUTO_BED_LEVELING_BILINEAR, or AUTO_BED_LEVELING_UBL)
* M422 - Set Z Stepper automatic alignment position using probe. X<units> Y<units> A<axis> (Requires Z_STEPPER_AUTO_ALIGN)
@@ -708,6 +709,10 @@ private:
static void M407();
#endif
+ #if ENABLED(FILAMENT_RUNOUT_SENSOR)
+ static void M412();
+ #endif
+
#if HAS_LEVELING
static void M420();
static void M421();
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index b6348519f6..ea2a1c3c00 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -347,7 +347,7 @@ void menu_configuration() {
#endif
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
- MENU_ITEM_EDIT(bool, MSG_RUNOUT_SENSOR_ENABLE, &runout.enabled);
+ MENU_ITEM_EDIT_CALLBACK(bool, MSG_RUNOUT_SENSOR_ENABLE, &runout.enabled, runout.reset);
#endif
#if DISABLED(SLIM_LCD_MENUS)
--
GitLab