melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

🐛 Fix HAS_KILL && SOFT_RESET_ON_KILL soft reset button logic (#22269)

Browse Source
This commit is contained in:
Skruppy 2021-07-10 01:25:47 +02:00 committed by Scott Lahteine
parent 69b44c2309
commit eafb94e72d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/MarlinCore.cpp
View File

@ -890,11 +890,11 @@ void minkill(const bool steppers_off/*=false*/) {
#if EITHER(HAS_KILL, SOFT_RESET_ON_KILL) #if EITHER(HAS_KILL, SOFT_RESET_ON_KILL)
// Wait for both KILL and ENC to be released // Wait for both KILL and ENC to be released
while (TERN0(HAS_KILL, !kill_state()) || TERN0(SOFT_RESET_ON_KILL, !ui.button_pressed())) while (TERN0(HAS_KILL, kill_state()) || TERN0(SOFT_RESET_ON_KILL, ui.button_pressed()))
watchdog_refresh(); watchdog_refresh();
// Wait for either KILL or ENC press // Wait for either KILL or ENC to be pressed again
while (TERN1(HAS_KILL, kill_state()) && TERN1(SOFT_RESET_ON_KILL, ui.button_pressed())) while (TERN1(HAS_KILL, !kill_state()) && TERN1(SOFT_RESET_ON_KILL, !ui.button_pressed()))
watchdog_refresh(); watchdog_refresh();
// Reboot the board // Reboot the board