Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a kill-screen #4254

Merged
merged 1 commit into from
Jul 10, 2016
Merged

Add a kill-screen #4254

merged 1 commit into from
Jul 10, 2016

Conversation

AnHardt
Copy link
Contributor

@AnHardt AnHardt commented Jul 10, 2016

@@ -8265,13 +8265,17 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) {
}

void kill(const char* lcd_msg) {
SERIAL_ERROR_START;
SERIAL_ERRORLNPGM(MSG_ERR_KILLED);

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved in front. Can need a interrupt now.

@thinkyhead thinkyhead merged commit f9e08b1 into MarlinFirmware:RCBugFix Jul 10, 2016
@AnHardt AnHardt deleted the killscreen branch July 10, 2016 09:13
@jbrazio jbrazio modified the milestone: 1.1.0 Jul 18, 2016
@thinkyhead thinkyhead mentioned this pull request Jul 25, 2016
drewmoseley pushed a commit to drewmoseley/Marlin that referenced this pull request Feb 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants