diff --git a/Marlin/Conditionals.h b/Marlin/Conditionals.h index 3861f1301..62f08523f 100644 --- a/Marlin/Conditionals.h +++ b/Marlin/Conditionals.h @@ -634,7 +634,7 @@ #define HAS_SERVO_2 (PIN_EXISTS(SERVO2)) #define HAS_SERVO_3 (PIN_EXISTS(SERVO3)) #define HAS_FILAMENT_WIDTH_SENSOR (PIN_EXISTS(FILWIDTH)) - #define HAS_FILRUNOUT (PIN_EXISTS(FILRUNOUT)) + #define HAS_FIL_RUNOUT (PIN_EXISTS(FIL_RUNOUT)) #define HAS_HOME (PIN_EXISTS(HOME)) #define HAS_KILL (PIN_EXISTS(KILL)) #define HAS_SUICIDE (PIN_EXISTS(SUICIDE)) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 5769cac60..4f866d2a4 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -689,9 +689,9 @@ void setup_killpin() { #if ENABLED(FILAMENT_RUNOUT_SENSOR) void setup_filrunoutpin() { - pinMode(FILRUNOUT_PIN, INPUT); + pinMode(FIL_RUNOUT_PIN, INPUT); #if ENABLED(ENDSTOPPULLUP_FIL_RUNOUT) - WRITE(FILRUNOUT_PIN, HIGH); + WRITE(FIL_RUNOUT_PIN, HIGH); #endif } @@ -8151,7 +8151,7 @@ void idle( void manage_inactivity(bool ignore_stepper_queue/*=false*/) { #if ENABLED(FILAMENT_RUNOUT_SENSOR) - if (IS_SD_PRINTING && !(READ(FILRUNOUT_PIN) ^ FIL_RUNOUT_INVERTING)) + if (IS_SD_PRINTING && !(READ(FIL_RUNOUT_PIN) ^ FIL_RUNOUT_INVERTING)) handle_filament_runout(); #endif diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h index 5e349e4b2..2c567cfb9 100644 --- a/Marlin/SanityCheck.h +++ b/Marlin/SanityCheck.h @@ -128,8 +128,8 @@ * Filament Runout needs a pin and SD Support */ #if ENABLED(FILAMENT_RUNOUT_SENSOR) - #if !HAS_FILRUNOUT - #error "FILAMENT_RUNOUT_SENSOR requires FILRUNOUT_PIN." + #if !HAS_FIL_RUNOUT + #error "FILAMENT_RUNOUT_SENSOR requires FIL_RUNOUT_PIN." #elif DISABLED(SDSUPPORT) #error "FILAMENT_RUNOUT_SENSOR requires SDSUPPORT." #endif diff --git a/Marlin/pins_CNCONTROLS_12.h b/Marlin/pins_CNCONTROLS_12.h index 334251ef5..850455670 100644 --- a/Marlin/pins_CNCONTROLS_12.h +++ b/Marlin/pins_CNCONTROLS_12.h @@ -67,7 +67,7 @@ //common I/O //#define TEMP_CHAMBER_PIN 13 // ANALOG INPUT !! - #define FILRUNOUT_PIN 18 + #define FIL_RUNOUT_PIN 18 //#define PWM_1_PIN 12 //#define PWM_2_PIN 13 //#define SPARE_IO 17 diff --git a/Marlin/pins_RAMPS_14.h b/Marlin/pins_RAMPS_14.h index 48d64fe63..55e810aa6 100644 --- a/Marlin/pins_RAMPS_14.h +++ b/Marlin/pins_RAMPS_14.h @@ -99,7 +99,7 @@ #endif // define digital pin 4 for the filament runout sensor. Use the RAMPS 1.4 digital input 4 on the servos connector -#define FILRUNOUT_PIN 4 +#define FIL_RUNOUT_PIN 4 #if MB(RAMPS_14_EFF) || MB(RAMPS_13_EFF) || ENABLED(IS_RAMPS_EFB) #define FAN_PIN 9 // (Sprinter config)