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 string parameter to kill() #2130

Merged
merged 3 commits into from
May 20, 2015
Merged

Add a string parameter to kill() #2130

merged 3 commits into from
May 20, 2015

Conversation

AnHardt
Copy link
Member

@AnHardt AnHardt commented May 20, 2015

Makes the output on the LCD adjustable.

Replaces #2126

Makes the output on the LCD adjustable.
@AnHardt AnHardt mentioned this pull request May 20, 2015
@AnHardt AnHardt closed this May 20, 2015
@AnHardt AnHardt deleted the kill2 branch May 20, 2015 19:01
@AnHardt AnHardt restored the kill2 branch May 20, 2015 19:02
@AnHardt AnHardt reopened this May 20, 2015
AnHardt added a commit that referenced this pull request May 20, 2015
Add a string parameter to kill()
@AnHardt AnHardt merged commit 4113762 into MarlinFirmware:Development May 20, 2015
@AnHardt AnHardt deleted the kill2 branch May 20, 2015 21:37
@thinkyhead
Copy link
Member

Could also just pass a bool and print when it's true, making it true by default.

@@ -6373,11 +6373,13 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) {
check_axes_activity();
}

void kill()
{
void kill(const char *lcd_msg) {
Copy link
Member

Choose a reason for hiding this comment

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

void kill(bool withMessage=true) {
  ...
  if (withMessage) lcd_setalertstatuspgm(PSTR(MSG_KILLED));
  ...
}

@AnHardt AnHardt restored the kill2 branch May 22, 2015 17:40
@AnHardt AnHardt deleted the kill2 branch June 2, 2015 23:32
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.

2 participants