From cafa8b8ce33cf75fc0ec8cfc2693945a9b9072e5 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 17 Apr 2016 23:16:49 -0700 Subject: [PATCH] Rename filament runout items --- Marlin/Marlin.h | 2 +- Marlin/Marlin_main.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h index 353cf50a4..45bf62247 100644 --- a/Marlin/Marlin.h +++ b/Marlin/Marlin.h @@ -226,7 +226,7 @@ void kill(const char*); void Stop(); #if ENABLED(FILAMENT_RUNOUT_SENSOR) - void filrunout(); + void handle_filament_runout(); #endif /** diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 1f4863d1f..63cee0323 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -446,7 +446,7 @@ static uint8_t target_extruder; #endif #if ENABLED(FILAMENT_RUNOUT_SENSOR) - static bool filrunoutEnqueued = false; + static bool filament_ran_out = false; #endif static bool send_ok[BUFSIZE]; @@ -6105,7 +6105,7 @@ inline void gcode_M503() { #endif #if ENABLED(FILAMENT_RUNOUT_SENSOR) - filrunoutEnqueued = false; + filament_ran_out = false; #endif } @@ -7741,7 +7741,7 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) { #if HAS_FILRUNOUT if (IS_SD_PRINTING && !(READ(FILRUNOUT_PIN) ^ FIL_RUNOUT_INVERTING)) - filrunout(); + handle_filament_runout(); #endif if (commands_in_queue < BUFSIZE) get_available_commands(); @@ -7924,9 +7924,9 @@ void kill(const char* lcd_msg) { #if ENABLED(FILAMENT_RUNOUT_SENSOR) - void filrunout() { - if (!filrunoutEnqueued) { - filrunoutEnqueued = true; + void handle_filament_runout() { + if (!filament_ran_out) { + filament_ran_out = true; enqueue_and_echo_commands_P(PSTR(FILAMENT_RUNOUT_SCRIPT)); st_synchronize(); }