From f8e8fcb978e3c2eab7eb001566593aefa04c3fab Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 10 Oct 2017 02:35:20 -0500 Subject: [PATCH] Move FILAMENT_RUNOUT_SENSOR to a feature --- Marlin/src/Marlin.cpp | 20 ++++------------ Marlin/src/Marlin.h | 4 ---- Marlin/src/feature/pause.cpp | 4 ++++ Marlin/src/feature/runout.cpp | 44 +++++++++++++++++++++++++++++++++++ Marlin/src/feature/runout.h | 34 +++++++++++++++++++++++++++ 5 files changed, 86 insertions(+), 20 deletions(-) create mode 100644 Marlin/src/feature/runout.cpp create mode 100644 Marlin/src/feature/runout.h diff --git a/Marlin/src/Marlin.cpp b/Marlin/src/Marlin.cpp index aefa4021e..7bc4d246e 100644 --- a/Marlin/src/Marlin.cpp +++ b/Marlin/src/Marlin.cpp @@ -126,6 +126,10 @@ #include "feature/pause.h" #endif +#if ENABLED(FILAMENT_RUNOUT_SENSOR) + #include "feature/runout.h" +#endif + #if ENABLED(TEMP_STAT_LEDS) #include "feature/leds/tempstat.h" #endif @@ -179,10 +183,6 @@ volatile bool wait_for_heatup = true; millis_t max_inactive_time = 0, stepper_inactive_time = (DEFAULT_STEPPER_DEACTIVE_TIME) * 1000UL; -#if ENABLED(FILAMENT_RUNOUT_SENSOR) - static bool filament_ran_out = false; -#endif - #if ENABLED(ADVANCED_PAUSE_FEATURE) AdvancedPauseMenuResponse advanced_pause_menu_response; #endif @@ -307,18 +307,6 @@ void quickstop_stepper() { SYNC_PLAN_POSITION_KINEMATIC(); } -#if ENABLED(FILAMENT_RUNOUT_SENSOR) - - void handle_filament_runout() { - if (!filament_ran_out) { - filament_ran_out = true; - enqueue_and_echo_commands_P(PSTR(FILAMENT_RUNOUT_SCRIPT)); - stepper.synchronize(); - } - } - -#endif // FILAMENT_RUNOUT_SENSOR - void enable_all_steppers() { enable_X(); enable_Y(); diff --git a/Marlin/src/Marlin.h b/Marlin/src/Marlin.h index 27c908b13..505fa6cce 100644 --- a/Marlin/src/Marlin.h +++ b/Marlin/src/Marlin.h @@ -166,10 +166,6 @@ void kill(const char*); void quickstop_stepper(); -#if ENABLED(FILAMENT_RUNOUT_SENSOR) - void handle_filament_runout(); -#endif - extern bool Running; inline bool IsRunning() { return Running; } inline bool IsStopped() { return !Running; } diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp index 025352ab4..6f5e32ab0 100644 --- a/Marlin/src/feature/pause.cpp +++ b/Marlin/src/feature/pause.cpp @@ -37,6 +37,10 @@ #include "../module/printcounter.h" #include "../module/temperature.h" +#if ENABLED(FILAMENT_RUNOUT_SENSOR) + #include "../feature/runout.h" +#endif + #if ENABLED(ULTIPANEL) #include "../lcd/ultralcd.h" #endif diff --git a/Marlin/src/feature/runout.cpp b/Marlin/src/feature/runout.cpp new file mode 100644 index 000000000..8bc90947e --- /dev/null +++ b/Marlin/src/feature/runout.cpp @@ -0,0 +1,44 @@ +/** + * 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 . + * + */ + +/** + * feature/runout.cpp - Runout sensor support + */ + +#include "../inc/MarlinConfig.h" + +#if ENABLED(FILAMENT_RUNOUT_SENSOR) + +#include "../module/stepper.h" +#include "../gcode/queue.h" + +bool filament_ran_out = false; + +void handle_filament_runout() { + if (!filament_ran_out) { + filament_ran_out = true; + enqueue_and_echo_commands_P(PSTR(FILAMENT_RUNOUT_SCRIPT)); + stepper.synchronize(); + } +} + +#endif // FILAMENT_RUNOUT_SENSOR diff --git a/Marlin/src/feature/runout.h b/Marlin/src/feature/runout.h new file mode 100644 index 000000000..36e5b086c --- /dev/null +++ b/Marlin/src/feature/runout.h @@ -0,0 +1,34 @@ +/** + * 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 . + * + */ + +/** + * feature/runout.h - Runout sensor support + */ + +#ifndef _RUNOUT_H_ +#define _RUNOUT_H_ + +extern bool filament_ran_out; + +void handle_filament_runout(); + +#endif // _RUNOUT_H_