From e487900069368003c7feb1d23ba7c73fe4f1ee7f Mon Sep 17 00:00:00 2001
From: Skruppy <skruppy@onmars.eu>
Date: Sat, 10 Jul 2021 01:25:47 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20HAS=5FKILL=20&&=20SOFT=5FR?=
=?UTF-8?q?ESET=5FON=5FKILL=20soft=20reset=20button=20logic=20(#22269)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Marlin/src/MarlinCore.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 18965bcbb9c..51ed99f9758 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -890,11 +890,11 @@ void minkill(const bool steppers_off/*=false*/) {
#if EITHER(HAS_KILL, SOFT_RESET_ON_KILL)
// 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();
- // Wait for either KILL or ENC press
- while (TERN1(HAS_KILL, kill_state()) && TERN1(SOFT_RESET_ON_KILL, ui.button_pressed()))
+ // Wait for either KILL or ENC to be pressed again
+ while (TERN1(HAS_KILL, !kill_state()) && TERN1(SOFT_RESET_ON_KILL, !ui.button_pressed()))
watchdog_refresh();
// Reboot the board