Some M600 and Filament Runout Fixes.
This commit is contained in:
@@ -282,7 +282,8 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load
|
|||||||
#if EITHER(HAS_LCD_MENU, DWIN_CREALITY_LCD_ENHANCED)
|
#if EITHER(HAS_LCD_MENU, DWIN_CREALITY_LCD_ENHANCED)
|
||||||
ui.pause_show_message(PAUSE_MESSAGE_OPTION); // Also sets PAUSE_RESPONSE_WAIT_FOR
|
ui.pause_show_message(PAUSE_MESSAGE_OPTION); // Also sets PAUSE_RESPONSE_WAIT_FOR
|
||||||
#else
|
#else
|
||||||
pause_menu_response = PAUSE_RESPONSE_WAIT_FOR;
|
//pause_menu_response = PAUSE_RESPONSE_WAIT_FOR;
|
||||||
|
pause_menu_response = PAUSE_RESPONSE_RESUME_PRINT;
|
||||||
#endif
|
#endif
|
||||||
while (pause_menu_response == PAUSE_RESPONSE_WAIT_FOR) idle_no_sleep();
|
while (pause_menu_response == PAUSE_RESPONSE_WAIT_FOR) idle_no_sleep();
|
||||||
}
|
}
|
||||||
|
@@ -237,10 +237,12 @@ void AnycubicTouchscreenClass::Setup() {
|
|||||||
|
|
||||||
#if ENABLED(ANYCUBIC_FILAMENT_RUNOUT_SENSOR)
|
#if ENABLED(ANYCUBIC_FILAMENT_RUNOUT_SENSOR)
|
||||||
if ((READ(FILAMENT_RUNOUT_PIN) == true) && FilamentSensorEnabled) {
|
if ((READ(FILAMENT_RUNOUT_PIN) == true) && FilamentSensorEnabled) {
|
||||||
|
/*
|
||||||
#ifndef ANYCUBIC_TFT_DEBUG
|
#ifndef ANYCUBIC_TFT_DEBUG
|
||||||
HARDWARE_SERIAL_PROTOCOLPGM("J15"); //J15 FILAMENT LACK
|
HARDWARE_SERIAL_PROTOCOLPGM("J15"); //J15 FILAMENT LACK
|
||||||
HARDWARE_SERIAL_ENTER();
|
HARDWARE_SERIAL_ENTER();
|
||||||
#endif
|
#endif
|
||||||
|
*/
|
||||||
#ifdef ANYCUBIC_TFT_DEBUG
|
#ifdef ANYCUBIC_TFT_DEBUG
|
||||||
SERIAL_ECHOLNPGM("TFT Serial Debug: Filament runout... J15");
|
SERIAL_ECHOLNPGM("TFT Serial Debug: Filament runout... J15");
|
||||||
#endif
|
#endif
|
||||||
@@ -1394,6 +1396,15 @@ void AnycubicTouchscreenClass::StateHandler() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* TODO: Refactoring of the filamentsensor-Stuff.
|
||||||
|
*
|
||||||
|
* Every cycle a timer should be reset if the sensor reads "filament is present"
|
||||||
|
* If the timer is not reset within a period of time, the filament runout state
|
||||||
|
* should be triggered.
|
||||||
|
*/
|
||||||
|
|
||||||
void AnycubicTouchscreenClass::FilamentRunout() {
|
void AnycubicTouchscreenClass::FilamentRunout() {
|
||||||
if (FilamentSensorEnabled == true) {
|
if (FilamentSensorEnabled == true) {
|
||||||
#if ENABLED(ANYCUBIC_FILAMENT_RUNOUT_SENSOR)
|
#if ENABLED(ANYCUBIC_FILAMENT_RUNOUT_SENSOR)
|
||||||
|
Reference in New Issue
Block a user