zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Update G-code injection, sub-commands (#14418)

Browse source
This commit is contained in:
InsanityAutomation 2019-06-27 16:07:45 -04:00 committed by Scott Lahteine
parent decfe3424f
commit ce656e2a26
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Marlin/src/Marlin.cpp
View file

@ -502,19 +502,16 @@ void manage_inactivity(const bool ignore_stepper_queue/*=false*/) {
#endif #endif
#if HAS_HOME #if HAS_HOME
// Check to see if we have to home, use poor man's debouncer // Handle a standalone HOME button
// --------------------------------------------------------- constexpr millis_t HOME_DEBOUNCE_DELAY = 1000UL;
static int homeDebounceCount = 0; // poor man's debouncing count static millis_t next_home_key_ms; // = 0
const int HOME_DEBOUNCE_DELAY = 2500; if (!IS_SD_PRINTING() && !READ(HOME_PIN)) { // HOME_PIN goes LOW when pressed
if (!IS_SD_PRINTING() && !READ(HOME_PIN)) { const millis_t ms = millis();
if (!homeDebounceCount) { if (ELAPSED(ms, next_home_key_ms)) {
queue.inject_P(PSTR("G28")); next_home_key_ms = ms + HOME_DEBOUNCE_DELAY;
LCD_MESSAGEPGM(MSG_AUTO_HOME); LCD_MESSAGEPGM(MSG_AUTO_HOME);
queue.enqueue_now_P(PSTR("G28"));
} }
if (homeDebounceCount < HOME_DEBOUNCE_DELAY)
homeDebounceCount++;
else
homeDebounceCount = 0;
} }
#endif #endif

2
Marlin/src/gcode/bedlevel/abl/G29.cpp
View file

@ -966,7 +966,7 @@ G29_TYPE GcodeSuite::G29() {
#ifdef Z_PROBE_END_SCRIPT #ifdef Z_PROBE_END_SCRIPT
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Z Probe End Script: ", Z_PROBE_END_SCRIPT); if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Z Probe End Script: ", Z_PROBE_END_SCRIPT);
planner.synchronize(); planner.synchronize();
queue.inject_P(PSTR(Z_PROBE_END_SCRIPT)); process_subcommands_now_P(PSTR(Z_PROBE_END_SCRIPT));
#endif #endif
// Auto Bed Leveling is complete! Enable if possible. // Auto Bed Leveling is complete! Enable if possible.