SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Configurable kill pin state

Browse source 
Co-Authored-By: AbdullahGheith <abdullahgheith@users.noreply.github.com>
This commit is contained in:
Scott Lahteine 2020-05-05 03:31:03 -05:00
parent 3fd8ef52c5
commit 852a8d6685
3 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Marlin/src/MarlinCore.cpp
View file

@ -245,8 +245,12 @@ millis_t max_inactive_time, // = 0
void setup_killpin() {
#if HAS_KILL
#if KILL_PIN_STATE
SET_INPUT_PULLDOWN(KILL_PIN);
#else
SET_INPUT_PULLUP(KILL_PIN);
#endif
#endif
}
void setup_powerhold() {
@ -496,7 +500,7 @@ inline void manage_inactivity(const bool ignore_stepper_queue=false) {
// -------------------------------------------------------------------------------
static int killCount = 0; // make the inactivity button a bit less responsive
const int KILL_DELAY = 750;
if (!READ(KILL_PIN))
if (kill_state())
killCount++;
else if (killCount > 0)
killCount--;
@ -770,10 +774,10 @@ void minkill(const bool steppers_off/*=false*/) {
#if HAS_KILL
// Wait for kill to be released
while (!READ(KILL_PIN)) watchdog_refresh();
while (kill_state()) watchdog_refresh();
// Wait for kill to be pressed
while (READ(KILL_PIN)) watchdog_refresh();
while (!kill_state()) watchdog_refresh();
void (*resetFunc)() = 0; // Declare resetFunc() at address 0
resetFunc(); // Jump to address 0

7
Marlin/src/MarlinCore.h
View file

@ -110,6 +110,13 @@ void protected_pin_err();
inline void suicide() { OUT_WRITE(SUICIDE_PIN, SUICIDE_PIN_INVERTING); }
#endif
#if HAS_KILL
#ifndef KILL_PIN_STATE
#define KILL_PIN_STATE LOW
#endif
inline bool kill_state() { return READ(KILL_PIN) == KILL_PIN_STATE; }
#endif
#if ENABLED(G29_RETRY_AND_RECOVER)
void event_probe_recover();
void event_probe_failure();

3
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
View file

@ -1683,8 +1683,9 @@
SERIAL_EOL();
#if HAS_KILL
SERIAL_ECHOLNPAIR("Kill pin on :", int(KILL_PIN), " state:", READ(KILL_PIN));
SERIAL_ECHOLNPAIR("Kill pin on :", int(KILL_PIN), " state:", int(kill_state()));
#endif
SERIAL_EOL();
serial_delay(50);