Replace const bool with #define for consistency
This commit is contained in:
parent
06f2282f82
commit
d7ce5d271b
|
@ -708,7 +708,7 @@
|
||||||
// It is assumed that when logic high = filament available
|
// It is assumed that when logic high = filament available
|
||||||
// when logic low = filament ran out
|
// when logic low = filament ran out
|
||||||
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
||||||
const bool FIL_RUNOUT_INVERTING = false; // set to true to invert the logic of the sensor.
|
#define FIL_RUNOUT_INVERTING false // set to true to invert the logic of the sensor.
|
||||||
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
||||||
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -9488,7 +9488,7 @@ void disable_all_steppers() {
|
||||||
void manage_inactivity(bool ignore_stepper_queue/*=false*/) {
|
void manage_inactivity(bool ignore_stepper_queue/*=false*/) {
|
||||||
|
|
||||||
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
||||||
if ((IS_SD_PRINTING || print_job_timer.isRunning()) && !(READ(FIL_RUNOUT_PIN) ^ FIL_RUNOUT_INVERTING))
|
if ((IS_SD_PRINTING || print_job_timer.isRunning()) && (READ(FIL_RUNOUT_PIN) == FIL_RUNOUT_INVERTING))
|
||||||
handle_filament_runout();
|
handle_filament_runout();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -708,7 +708,7 @@
|
||||||
// It is assumed that when logic high = filament available
|
// It is assumed that when logic high = filament available
|
||||||
// when logic low = filament ran out
|
// when logic low = filament ran out
|
||||||
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
||||||
const bool FIL_RUNOUT_INVERTING = false; // set to true to invert the logic of the sensor.
|
#define FIL_RUNOUT_INVERTING false // set to true to invert the logic of the sensor.
|
||||||
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
||||||
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -691,7 +691,7 @@
|
||||||
// It is assumed that when logic high = filament available
|
// It is assumed that when logic high = filament available
|
||||||
// when logic low = filament ran out
|
// when logic low = filament ran out
|
||||||
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
||||||
const bool FIL_RUNOUT_INVERTING = false; // set to true to invert the logic of the sensor.
|
#define FIL_RUNOUT_INVERTING false // set to true to invert the logic of the sensor.
|
||||||
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
||||||
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -691,7 +691,7 @@
|
||||||
// It is assumed that when logic high = filament available
|
// It is assumed that when logic high = filament available
|
||||||
// when logic low = filament ran out
|
// when logic low = filament ran out
|
||||||
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
||||||
const bool FIL_RUNOUT_INVERTING = false; // set to true to invert the logic of the sensor.
|
#define FIL_RUNOUT_INVERTING false // set to true to invert the logic of the sensor.
|
||||||
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
||||||
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -700,7 +700,7 @@
|
||||||
// It is assumed that when logic high = filament available
|
// It is assumed that when logic high = filament available
|
||||||
// when logic low = filament ran out
|
// when logic low = filament ran out
|
||||||
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
||||||
const bool FIL_RUNOUT_INVERTING = false; // set to true to invert the logic of the sensor.
|
#define FIL_RUNOUT_INVERTING false // set to true to invert the logic of the sensor.
|
||||||
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
||||||
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -702,7 +702,7 @@
|
||||||
// It is assumed that when logic high = filament available
|
// It is assumed that when logic high = filament available
|
||||||
// when logic low = filament ran out
|
// when logic low = filament ran out
|
||||||
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
||||||
const bool FIL_RUNOUT_INVERTING = false; // set to true to invert the logic of the sensor.
|
#define FIL_RUNOUT_INVERTING false // set to true to invert the logic of the sensor.
|
||||||
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
||||||
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -725,7 +725,7 @@
|
||||||
// It is assumed that when logic high = filament available
|
// It is assumed that when logic high = filament available
|
||||||
// when logic low = filament ran out
|
// when logic low = filament ran out
|
||||||
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
||||||
const bool FIL_RUNOUT_INVERTING = false; // set to true to invert the logic of the sensor.
|
#define FIL_RUNOUT_INVERTING false // set to true to invert the logic of the sensor.
|
||||||
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
||||||
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -708,7 +708,7 @@
|
||||||
// It is assumed that when logic high = filament available
|
// It is assumed that when logic high = filament available
|
||||||
// when logic low = filament ran out
|
// when logic low = filament ran out
|
||||||
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
||||||
const bool FIL_RUNOUT_INVERTING = false; // set to true to invert the logic of the sensor.
|
#define FIL_RUNOUT_INVERTING false // set to true to invert the logic of the sensor.
|
||||||
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
||||||
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -708,7 +708,7 @@
|
||||||
// It is assumed that when logic high = filament available
|
// It is assumed that when logic high = filament available
|
||||||
// when logic low = filament ran out
|
// when logic low = filament ran out
|
||||||
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
||||||
const bool FIL_RUNOUT_INVERTING = false; // set to true to invert the logic of the sensor.
|
#define FIL_RUNOUT_INVERTING false // set to true to invert the logic of the sensor.
|
||||||
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
||||||
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -708,7 +708,7 @@
|
||||||
// It is assumed that when logic high = filament available
|
// It is assumed that when logic high = filament available
|
||||||
// when logic low = filament ran out
|
// when logic low = filament ran out
|
||||||
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
||||||
const bool FIL_RUNOUT_INVERTING = false; // set to true to invert the logic of the sensor.
|
#define FIL_RUNOUT_INVERTING false // set to true to invert the logic of the sensor.
|
||||||
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
||||||
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -706,7 +706,7 @@
|
||||||
// It is assumed that when logic high = filament available
|
// It is assumed that when logic high = filament available
|
||||||
// when logic low = filament ran out
|
// when logic low = filament ran out
|
||||||
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
||||||
const bool FIL_RUNOUT_INVERTING = false; // set to true to invert the logic of the sensor.
|
#define FIL_RUNOUT_INVERTING false // set to true to invert the logic of the sensor.
|
||||||
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
||||||
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -723,7 +723,7 @@
|
||||||
// It is assumed that when logic high = filament available
|
// It is assumed that when logic high = filament available
|
||||||
// when logic low = filament ran out
|
// when logic low = filament ran out
|
||||||
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
||||||
const bool FIL_RUNOUT_INVERTING = false; // set to true to invert the logic of the sensor.
|
#define FIL_RUNOUT_INVERTING false // set to true to invert the logic of the sensor.
|
||||||
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
||||||
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -729,7 +729,7 @@
|
||||||
// It is assumed that when logic high = filament available
|
// It is assumed that when logic high = filament available
|
||||||
// when logic low = filament ran out
|
// when logic low = filament ran out
|
||||||
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
||||||
const bool FIL_RUNOUT_INVERTING = false; // set to true to invert the logic of the sensor.
|
#define FIL_RUNOUT_INVERTING false // set to true to invert the logic of the sensor.
|
||||||
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
||||||
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -700,7 +700,7 @@
|
||||||
// It is assumed that when logic high = filament available
|
// It is assumed that when logic high = filament available
|
||||||
// when logic low = filament ran out
|
// when logic low = filament ran out
|
||||||
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
||||||
const bool FIL_RUNOUT_INVERTING = false; // set to true to invert the logic of the sensor.
|
#define FIL_RUNOUT_INVERTING false // set to true to invert the logic of the sensor.
|
||||||
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
||||||
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -708,7 +708,7 @@
|
||||||
// It is assumed that when logic high = filament available
|
// It is assumed that when logic high = filament available
|
||||||
// when logic low = filament ran out
|
// when logic low = filament ran out
|
||||||
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
||||||
const bool FIL_RUNOUT_INVERTING = false; // set to true to invert the logic of the sensor.
|
#define FIL_RUNOUT_INVERTING false // set to true to invert the logic of the sensor.
|
||||||
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
||||||
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -800,7 +800,7 @@
|
||||||
// It is assumed that when logic high = filament available
|
// It is assumed that when logic high = filament available
|
||||||
// when logic low = filament ran out
|
// when logic low = filament ran out
|
||||||
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
||||||
const bool FIL_RUNOUT_INVERTING = false; // set to true to invert the logic of the sensor.
|
#define FIL_RUNOUT_INVERTING false // set to true to invert the logic of the sensor.
|
||||||
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
||||||
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -794,7 +794,7 @@
|
||||||
// It is assumed that when logic high = filament available
|
// It is assumed that when logic high = filament available
|
||||||
// when logic low = filament ran out
|
// when logic low = filament ran out
|
||||||
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
||||||
const bool FIL_RUNOUT_INVERTING = false; // set to true to invert the logic of the sensor.
|
#define FIL_RUNOUT_INVERTING false // set to true to invert the logic of the sensor.
|
||||||
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
||||||
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -797,7 +797,7 @@
|
||||||
// It is assumed that when logic high = filament available
|
// It is assumed that when logic high = filament available
|
||||||
// when logic low = filament ran out
|
// when logic low = filament ran out
|
||||||
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
||||||
const bool FIL_RUNOUT_INVERTING = false; // set to true to invert the logic of the sensor.
|
#define FIL_RUNOUT_INVERTING false // set to true to invert the logic of the sensor.
|
||||||
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
||||||
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -798,7 +798,7 @@
|
||||||
// It is assumed that when logic high = filament available
|
// It is assumed that when logic high = filament available
|
||||||
// when logic low = filament ran out
|
// when logic low = filament ran out
|
||||||
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
||||||
const bool FIL_RUNOUT_INVERTING = false; // set to true to invert the logic of the sensor.
|
#define FIL_RUNOUT_INVERTING false // set to true to invert the logic of the sensor.
|
||||||
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
||||||
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -800,7 +800,7 @@
|
||||||
// It is assumed that when logic high = filament available
|
// It is assumed that when logic high = filament available
|
||||||
// when logic low = filament ran out
|
// when logic low = filament ran out
|
||||||
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
||||||
const bool FIL_RUNOUT_INVERTING = false; // set to true to invert the logic of the sensor.
|
#define FIL_RUNOUT_INVERTING false // set to true to invert the logic of the sensor.
|
||||||
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
||||||
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -711,7 +711,7 @@
|
||||||
// It is assumed that when logic high = filament available
|
// It is assumed that when logic high = filament available
|
||||||
// when logic low = filament ran out
|
// when logic low = filament ran out
|
||||||
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
||||||
const bool FIL_RUNOUT_INVERTING = false; // set to true to invert the logic of the sensor.
|
#define FIL_RUNOUT_INVERTING false // set to true to invert the logic of the sensor.
|
||||||
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
||||||
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -704,7 +704,7 @@
|
||||||
// It is assumed that when logic high = filament available
|
// It is assumed that when logic high = filament available
|
||||||
// when logic low = filament ran out
|
// when logic low = filament ran out
|
||||||
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
||||||
const bool FIL_RUNOUT_INVERTING = false; // set to true to invert the logic of the sensor.
|
#define FIL_RUNOUT_INVERTING false // set to true to invert the logic of the sensor.
|
||||||
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
|
||||||
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
#define FILAMENT_RUNOUT_SCRIPT "M600"
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue