Skip to content

Commit 477a94c

Browse files
committed
Hot fix for rare lowering feed override bug.
[fix] Squashed a very rare bug when lowering the feedrate (or rapid) override. When in the very strict set of circumstances with acceleration settings, override step size, and current speed, an internal calculation would cause Grbl to crash. The fix was an overlooked equality statement that should have been a less than or equal, not a less than.
1 parent 921e5a9 commit 477a94c

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

doc/log/commit_log_v1.1.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
----------------
2+
Date: 2017-07-17
3+
Author: Sonny Jeon
4+
Subject: Clean up and new streaming script check-mode feature.
5+
6+
[new] The stream.py streaming script now has a check-mode option, where it will place Grbl in $C check mode automatically and then stream the g-code program. It's a very fast way to check if the g-code program has any errors.
7+
8+
[fix] The debug variable was not initialized if the debug option was enabled in config.h
9+
10+
[fix] Updated error_codes CSV file to the same format as the others.
11+
12+
113
----------------
214
Date: 2017-05-31
315
Author: chamnit

grbl/grbl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
// Grbl versioning system
2525
#define GRBL_VERSION "1.1f"
26-
#define GRBL_VERSION_BUILD "20170717"
26+
#define GRBL_VERSION_BUILD "20170731"
2727

2828
// Define standard libraries used by Grbl.
2929
#include <avr/io.h>

grbl/stepper.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -808,7 +808,7 @@ void st_prep_buffer()
808808
speed_var = pl_block->acceleration*time_var;
809809
mm_var = time_var*(prep.current_speed - 0.5*speed_var);
810810
mm_remaining -= mm_var;
811-
if ((mm_remaining < prep.accelerate_until) || (mm_var <= 0)) {
811+
if ((mm_remaining <= prep.accelerate_until) || (mm_var <= 0.0)) {
812812
// Cruise or cruise-deceleration types only for deceleration override.
813813
mm_remaining = prep.accelerate_until; // NOTE: 0.0 at EOB
814814
time_var = 2.0*(pl_block->millimeters-mm_remaining)/(prep.current_speed+prep.maximum_speed);

0 commit comments

Comments
 (0)