From 3e70b73a1fb21f76267ffb68957656bee42cfccc Mon Sep 17 00:00:00 2001 From: DRracer Date: Mon, 27 Jan 2020 19:02:15 +0100 Subject: [PATCH 1/3] Remove unnecessary delay in lcd_selftest, which occured there as a result of merge. --- Firmware/ultralcd.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 5d291f35c..df9000c4f 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -7547,13 +7547,10 @@ bool lcd_selftest() #ifdef TMC2130 FORCE_HIGH_POWER_START; #endif // TMC2130 + FORCE_BL_ON_START; #if !IR_SENSOR_ANALOG _delay(2000); #endif //!IR_SENSOR_ANALOG - - FORCE_BL_ON_START; - - _delay(2000); KEEPALIVE_STATE(IN_HANDLER); #if IR_SENSOR_ANALOG bool bAction; From fd42361236060319313f56a3a02652a7726baff2 Mon Sep 17 00:00:00 2001 From: DRracer Date: Fri, 31 Jan 2020 16:55:40 +0100 Subject: [PATCH 2/3] Update ultralcd.cpp do delay(2000) everytime, even if IR_SENSOR_ANALOG --- Firmware/ultralcd.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index dc93fe53a..1045f831b 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -7554,9 +7554,7 @@ bool lcd_selftest() FORCE_HIGH_POWER_START; #endif // TMC2130 FORCE_BL_ON_START; -#if !IR_SENSOR_ANALOG _delay(2000); -#endif //!IR_SENSOR_ANALOG KEEPALIVE_STATE(IN_HANDLER); _progress = lcd_selftest_screen(TestScreen::ExtruderFan, _progress, 3, true, 2000); From d6522a643c3a9169681f6a345645942e752543ef Mon Sep 17 00:00:00 2001 From: DRracer Date: Fri, 31 Jan 2020 16:57:18 +0100 Subject: [PATCH 3/3] Update ultralcd.cpp indent --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 1045f831b..03a1d44a2 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -7554,7 +7554,7 @@ bool lcd_selftest() FORCE_HIGH_POWER_START; #endif // TMC2130 FORCE_BL_ON_START; - _delay(2000); + _delay(2000); KEEPALIVE_STATE(IN_HANDLER); _progress = lcd_selftest_screen(TestScreen::ExtruderFan, _progress, 3, true, 2000);