From 359c44712718b506166f159d9ec6a3c769180a9d Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sat, 16 Nov 2019 22:44:34 +0200 Subject: [PATCH 1/3] Do not check for fanError if it is not enabled on resume Fix typos --- Firmware/ultralcd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 2ed8d5de..a6f92f47 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6652,6 +6652,7 @@ static void lcd_test_menu() static bool fan_error_selftest() { #ifdef FANCHECK + if (!fans_check_enabled) return 0; fanSpeed = 255; #ifdef FAN_SOFT_PWM @@ -6682,9 +6683,8 @@ static bool fan_error_selftest() return 1; } #endif +#endif //FANCHECK return 0; - -#endif //FANCHECK } //! @brief Resume paused print From 14104e7bf98b5bf28d6db64585a65bf40b55196a Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sun, 17 Nov 2019 10:44:11 +0200 Subject: [PATCH 2/3] Clear error flag when fanError is disabled --- Firmware/ultralcd.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index a6f92f47..fdb1e954 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2270,6 +2270,7 @@ static void lcd_support_menu() void lcd_set_fan_check() { fans_check_enabled = !fans_check_enabled; eeprom_update_byte((unsigned char *)EEPROM_FAN_CHECK_ENABLED, fans_check_enabled); + if (fans_check_enabled == false) fan_check_error = EFCE_OK; //reset error if fanCheck is disabled during error. Allows resuming print. } #ifdef MMU_HAS_CUTTER From b077303156aec0a5a775654334aa405ba36aacc2 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sun, 17 Nov 2019 11:10:13 +0200 Subject: [PATCH 3/3] Fix compile error --- Firmware/ultralcd.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index fdb1e954..3bc94b81 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2270,7 +2270,9 @@ static void lcd_support_menu() void lcd_set_fan_check() { fans_check_enabled = !fans_check_enabled; eeprom_update_byte((unsigned char *)EEPROM_FAN_CHECK_ENABLED, fans_check_enabled); +#ifdef FANCHECK if (fans_check_enabled == false) fan_check_error = EFCE_OK; //reset error if fanCheck is disabled during error. Allows resuming print. +#endif //FANCHECK } #ifdef MMU_HAS_CUTTER