From 93cc3a8492e6c5848f4c50a9cb42322db7695714 Mon Sep 17 00:00:00 2001 From: teemuatlut Date: Thu, 22 Feb 2018 20:26:14 +0200 Subject: [PATCH] Make used methods public --- Marlin/src/feature/runout.h | 64 ++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/Marlin/src/feature/runout.h b/Marlin/src/feature/runout.h index 3c9d312111..692a36210f 100644 --- a/Marlin/src/feature/runout.h +++ b/Marlin/src/feature/runout.h @@ -35,45 +35,45 @@ #include "../inc/MarlinConfig.h" class FilamentRunoutSensor { + public: + FilamentRunoutSensor() {} - FilamentRunoutSensor() {} + static void setup(); - static bool filament_ran_out; - static void setup(); + FORCE_INLINE static void reset() { filament_ran_out = false; } - FORCE_INLINE static reset() { filament_ran_out = false; } + FORCE_INLINE static void run() { + if ((IS_SD_PRINTING || print_job_timer.isRunning()) && check() && !filament_ran_out) { + filament_ran_out = true; + enqueue_and_echo_commands_P(PSTR(FILAMENT_RUNOUT_SCRIPT)); + stepper.synchronize(); + } + } + private: + static bool filament_ran_out; - FORCE_INLINE static bool check() { - #if NUM_RUNOUT_SENSORS < 2 - // A single sensor applying to all extruders - return READ(FIL_RUNOUT_PIN) == FIL_RUNOUT_INVERTING; - #else - // Read the sensor for the active extruder - switch (active_extruder) { - case 0: return READ(FIL_RUNOUT_PIN) == FIL_RUNOUT_INVERTING; - case 1: return READ(FIL_RUNOUT2_PIN) == FIL_RUNOUT_INVERTING; - #if NUM_RUNOUT_SENSORS > 2 - case 2: return READ(FIL_RUNOUT3_PIN) == FIL_RUNOUT_INVERTING; - #if NUM_RUNOUT_SENSORS > 3 - case 3: return READ(FIL_RUNOUT4_PIN) == FIL_RUNOUT_INVERTING; - #if NUM_RUNOUT_SENSORS > 4 - case 4: return READ(FIL_RUNOUT5_PIN) == FIL_RUNOUT_INVERTING; + FORCE_INLINE static bool check() { + #if NUM_RUNOUT_SENSORS < 2 + // A single sensor applying to all extruders + return READ(FIL_RUNOUT_PIN) == FIL_RUNOUT_INVERTING; + #else + // Read the sensor for the active extruder + switch (active_extruder) { + case 0: return READ(FIL_RUNOUT_PIN) == FIL_RUNOUT_INVERTING; + case 1: return READ(FIL_RUNOUT2_PIN) == FIL_RUNOUT_INVERTING; + #if NUM_RUNOUT_SENSORS > 2 + case 2: return READ(FIL_RUNOUT3_PIN) == FIL_RUNOUT_INVERTING; + #if NUM_RUNOUT_SENSORS > 3 + case 3: return READ(FIL_RUNOUT4_PIN) == FIL_RUNOUT_INVERTING; + #if NUM_RUNOUT_SENSORS > 4 + case 4: return READ(FIL_RUNOUT5_PIN) == FIL_RUNOUT_INVERTING; + #endif #endif #endif - #endif - } - #endif - return false; - } - - FORCE_INLINE static void run() { - if ((IS_SD_PRINTING || print_job_timer.isRunning()) && check() && !filament_ran_out) { - filament_ran_out = true; - enqueue_and_echo_commands_P(PSTR(FILAMENT_RUNOUT_SCRIPT)); - stepper.synchronize(); + } + #endif + return false; } - } - }; extern FilamentRunoutSensor runout;