Runout sensor without SD Card
This commit is contained in:
parent
51c9c3fe2c
commit
315b4c2153
2 changed files with 21 additions and 10 deletions
|
@ -4403,6 +4403,8 @@ inline void gcode_M104() {
|
||||||
|
|
||||||
#if ENABLED(PRINTJOB_TIMER_AUTOSTART)
|
#if ENABLED(PRINTJOB_TIMER_AUTOSTART)
|
||||||
/**
|
/**
|
||||||
|
* Stop the timer at the end of print, starting is managed by
|
||||||
|
* 'heat and wait' M109.
|
||||||
* We use half EXTRUDE_MINTEMP here to allow nozzles to be put into hot
|
* We use half EXTRUDE_MINTEMP here to allow nozzles to be put into hot
|
||||||
* stand by mode, for instance in a dual extruder setup, without affecting
|
* stand by mode, for instance in a dual extruder setup, without affecting
|
||||||
* the running print timer.
|
* the running print timer.
|
||||||
|
@ -4411,12 +4413,6 @@ inline void gcode_M104() {
|
||||||
print_job_timer.stop();
|
print_job_timer.stop();
|
||||||
LCD_MESSAGEPGM(WELCOME_MSG);
|
LCD_MESSAGEPGM(WELCOME_MSG);
|
||||||
}
|
}
|
||||||
/**
|
|
||||||
* We do not check if the timer is already running because this check will
|
|
||||||
* be done for us inside the Stopwatch::start() method thus a running timer
|
|
||||||
* will not restart.
|
|
||||||
*/
|
|
||||||
else print_job_timer.start();
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (temp > thermalManager.degHotend(target_extruder)) LCD_MESSAGEPGM(MSG_HEATING);
|
if (temp > thermalManager.degHotend(target_extruder)) LCD_MESSAGEPGM(MSG_HEATING);
|
||||||
|
@ -4701,7 +4697,22 @@ inline void gcode_M109() {
|
||||||
|
|
||||||
LCD_MESSAGEPGM(MSG_BED_HEATING);
|
LCD_MESSAGEPGM(MSG_BED_HEATING);
|
||||||
bool no_wait_for_cooling = code_seen('S');
|
bool no_wait_for_cooling = code_seen('S');
|
||||||
if (no_wait_for_cooling || code_seen('R')) thermalManager.setTargetBed(code_value_temp_abs());
|
if (no_wait_for_cooling || code_seen('R')) {
|
||||||
|
thermalManager.setTargetBed(code_value_temp_abs());
|
||||||
|
#if ENABLED(PRINTJOB_TIMER_AUTOSTART)
|
||||||
|
if(code_value_temp_abs() > BED_MINTEMP) {
|
||||||
|
/**
|
||||||
|
* We start the timer when 'heating and waiting' command arrives, LCD
|
||||||
|
* functions never wait. Cooling down managed by extruders.
|
||||||
|
*
|
||||||
|
* We do not check if the timer is already running because this check will
|
||||||
|
* be done for us inside the Stopwatch::start() method thus a running timer
|
||||||
|
* will not restart.
|
||||||
|
*/
|
||||||
|
print_job_timer.start();
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
#if TEMP_BED_RESIDENCY_TIME > 0
|
#if TEMP_BED_RESIDENCY_TIME > 0
|
||||||
millis_t residency_start_ms = 0;
|
millis_t residency_start_ms = 0;
|
||||||
|
@ -8112,7 +8123,7 @@ void idle(
|
||||||
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 && !(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
|
||||||
|
|
||||||
|
|
|
@ -111,12 +111,12 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Filament Runout needs a pin and SD Support
|
* Filament Runout needs a pin and either SD Support or Auto print start detection
|
||||||
*/
|
*/
|
||||||
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
|
||||||
#if !HAS_FIL_RUNOUT
|
#if !HAS_FIL_RUNOUT
|
||||||
#error "FILAMENT_RUNOUT_SENSOR requires FIL_RUNOUT_PIN."
|
#error "FILAMENT_RUNOUT_SENSOR requires FIL_RUNOUT_PIN."
|
||||||
#elif DISABLED(SDSUPPORT)
|
#elif DISABLED(SDSUPPORT) && DISABLED(PRINTJOB_TIMER_AUTOSTART)
|
||||||
#error "FILAMENT_RUNOUT_SENSOR requires SDSUPPORT."
|
#error "FILAMENT_RUNOUT_SENSOR requires SDSUPPORT."
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
Reference in a new issue