Extend stack_overflow_protection for lcd_move_e and _lcd_level_bed #3126
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -862,7 +862,8 @@ static void lcd_move_e( | |||
| if (encoderPosition != 0) { | |||
| current_position[E_AXIS] += float((int)encoderPosition) * move_menu_scale; | |||
| encoderPosition = 0; | |||
| line_to_current(E_AXIS); | |||
| if (movesplanned() <= 3) | |||
| line_to_current(E_AXIS); | |||
| lcdDrawUpdate = 1; | |||
| } | |||
There was a problem hiding this comment.
As this is, it will drop moves, and those moves will stay dropped when the LCD times out and returns to the info screen. However, it turns out there is an easy solution here to avoid dropping any moves:
if (encoderPosition != 0 && movesplanned() <= 3) {
current_position[E_AXIS] += float((int)encoderPosition) * move_menu_scale;
line_to_current(E_AXIS);
encoderPosition = 0;
lcdDrawUpdate = 1;
}This holds onto the encoder position and doesn't reset it, so the next time this is invoked, the move will still be pending. With this change you can throw away the line_to_current call with LCD_CLICKED below.
| @@ -2249,13 +2253,15 @@ char* ftostr52(const float& x) { | |||
| if (min_software_endstops) NOLESS(current_position[Z_AXIS], Z_MIN_POS); | |||
| if (max_software_endstops) NOMORE(current_position[Z_AXIS], Z_MAX_POS); | |||
| encoderPosition = 0; | |||
| line_to_current(Z_AXIS); | |||
| if (movesplanned() <= 3) | |||
| line_to_current(Z_AXIS); | |||
| lcdDrawUpdate = 2; | |||
| } | |||
There was a problem hiding this comment.
Same idea here…
if (encoderPosition != 0 && movesplanned() <= 3) {
refresh_cmd_timeout();
current_position[Z_AXIS] += float((int)encoderPosition) * MBL_Z_STEP;
if (min_software_endstops) NOLESS(current_position[Z_AXIS], Z_MIN_POS);
if (max_software_endstops) NOMORE(current_position[Z_AXIS], Z_MAX_POS);
line_to_current(Z_AXIS);
encoderPosition = 0;
lcdDrawUpdate = 2;
}
|
The same technique I suggest can also be applied to the other move routines. You can amend this PR and add those also. |
Blue-Marlin
force-pushed
the
stackoverflow-with-e
branch
from
08db379 to
893bc70
Compare
Extend stack_overflow_protection for lcd_move_e() and _lcd_level_bed() with a refined method of 3050.
Blue-Marlin
force-pushed
the
stackoverflow-with-e
branch
from
893bc70 to
c73f1b2
Compare
thinkyhead
added a commit
that referenced
this pull request
Mar 14, 2016
Extend stack_overflow_protection for lcd_move_e and _lcd_level_bed
This was referenced Mar 19, 2016
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Extend stack_overflow_protection for lcd_move_e() and _lcd_level_bed() with
a refined method of #3050.
Simple, small, local, elegant.
Fix for one of AnatoliyKube's problems in #3054 (comment) (if i solved his language riddle correct)