diff --git a/Marlin/src/gcode/feature/runout/M591.cpp b/Marlin/src/gcode/feature/runout/M591.cpp index e213f16ab8..adb1bb8599 100644 --- a/Marlin/src/gcode/feature/runout/M591.cpp +++ b/Marlin/src/gcode/feature/runout/M591.cpp @@ -63,16 +63,20 @@ void GcodeSuite::M591() { } } else { - SERIAL_ECHO_START(); - SERIAL_ECHOPGM("Filament runout "); - serialprint_onoff(runout.enabled[active_extruder]); - SERIAL_ECHOPGM(" ; Distance ", runout.runout_distance(active_extruder), "mm"); - SERIAL_ECHOPGM(" ; Mode ", runout.mode[active_extruder]); - #if ENABLED(HOST_ACTION_COMMANDS) - SERIAL_ECHOPGM(" ; Host handling "); - serialprint_onoff(runout.host_handling); + #if DISABLED(SLIM_LCD_MENUS) + SERIAL_ECHO_START(); + SERIAL_ECHOPGM("Filament runout "); + serialprint_onoff(runout.enabled[active_extruder]); + SERIAL_ECHOPGM(" ; Distance ", runout.runout_distance(active_extruder), "mm"); + SERIAL_ECHOPGM(" ; Mode ", runout.mode[active_extruder]); + #if ENABLED(HOST_ACTION_COMMANDS) + SERIAL_ECHOPGM(" ; Host handling "); + serialprint_onoff(runout.host_handling); + #endif + SERIAL_EOL(); + #else + M591_report(false); #endif - SERIAL_EOL(); } } diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp index e39233134d..2cedf2ebde 100644 --- a/Marlin/src/lcd/menu/menu_advanced.cpp +++ b/Marlin/src/lcd/menu/menu_advanced.cpp @@ -100,7 +100,7 @@ void menu_backlash(); #endif -#if HAS_FILAMENT_SENSOR +#if HAS_FILAMENT_SENSOR && DISABLED(SLIM_LCD_MENUS) void set_runout_mode_none(const uint8_t e) { runout.mode[e] = RM_NONE; runout.setup(); } void set_runout_mode_high(const uint8_t e) { runout.mode[e] = RM_OUT_ON_HIGH; runout.setup(); } @@ -201,7 +201,7 @@ void menu_backlash(); #endif #endif - #if HAS_FILAMENT_SENSOR + #if HAS_FILAMENT_SENSOR && DISABLED(SLIM_LCD_MENUS) SUBMENU(MSG_RUNOUT_MODE, menu_runout_config); #endif diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp index 029b7af594..de79aae672 100644 --- a/Marlin/src/module/endstops.cpp +++ b/Marlin/src/module/endstops.cpp @@ -684,18 +684,23 @@ void __O2 Endstops::report_states() { const RunoutMode rm = runout.mode[i - 1]; const uint8_t state = runout.out_state(i - 1); - SERIAL_ECHOPGM(STR_FILAMENT); - if (i > 1) SERIAL_CHAR(' ', '0' + i); - SERIAL_ECHOPGM(": "); - if (rm == RM_NONE) - SERIAL_ECHOLNPGM(STR_OFF); - else if (rm == RM_MOTION_SENSOR) { - SERIAL_ECHOPGM("MOTION : "); - print_es_state(extDigitalRead(pin) == outval); - } - else - SERIAL_ECHOLNPGM_P(extDigitalRead(pin) == outval ? PSTR("OUT") : PSTR("PRESENT")); + #if DISABLED(SLIM_LCD_MENUS) + SERIAL_ECHOPGM(STR_FILAMENT); + if (i > 1) SERIAL_CHAR(' ', '0' + i); + SERIAL_ECHOPGM(": "); + if (rm == RM_NONE) + SERIAL_ECHOLNPGM(STR_OFF); + else if (rm == RM_MOTION_SENSOR) { + SERIAL_ECHOPGM("MOTION : "); + print_es_state(extDigitalRead(pin) == outval); + } + else + SERIAL_ECHOLNPGM_P(extDigitalRead(pin) == outval ? PSTR("OUT") : PSTR("PRESENT")); + #else + print_es_state(extDigitalRead(pin) == outval, F(STR_FILAMENT)); + #endif } + #endif TERN_(BLTOUCH, bltouch._reset_SW_mode());