From 7c99014c9dbca48481b2f8ab061e2b4b19f8c1e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 12 Jan 2025 18:49:27 +0000 Subject: [PATCH] fsensor: Use isReady instead of isEnabled isEnabled() returns true if the filament sensor state machine is in error state. In most situations we don't want that. It is sufficient to check if the filament sensor state machine is in Ready state. --- Firmware/ultralcd.cpp | 4 ++-- Firmware/util.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 64ae8e530..733999dcc 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4380,7 +4380,7 @@ static void sheets_menu() static void nozzle_change() { #ifdef FILAMENT_SENSOR - if (fsensor.isEnabled() && fsensor.getFilamentPresent()) { + if (fsensor.isReady() && fsensor.getFilamentPresent()) { lcd_show_fullscreen_message_and_wait_P(_T(MSG_UNLOAD_FILAMENT_REPEAT)); lcd_return_to_status(); return; @@ -5348,7 +5348,7 @@ static void lcd_main_menu() #endif //MMU_HAS_CUTTER } else { #ifdef FILAMENT_SENSOR - if (fsensor.isEnabled()) { + if (fsensor.isReady()) { if (!fsensor.getAutoLoadEnabled()) { MENU_ITEM_SUBMENU_P(_T(MSG_LOAD_FILAMENT), lcd_LoadFilament); } diff --git a/Firmware/util.cpp b/Firmware/util.cpp index e9bd9017b..8611ac27b 100644 --- a/Firmware/util.cpp +++ b/Firmware/util.cpp @@ -379,7 +379,7 @@ bool filament_presence_check() { goto done; } - if (fsensor.isEnabled() && !fsensor.getFilamentPresent()) { + if (fsensor.isReady() && !fsensor.getFilamentPresent()) { if (oCheckFilament == ClCheckMode::_None) { goto done; }