Mirrors_Framework/grblHAL
1
0
Fork 0
mirror of https://github.com/grblHAL/core.git synced 2026-09-22 11:29:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for missing conversion to mm from inches for some canned cycle parameters.

Browse Source
This commit is contained in:
Terje Io
2021-05-18 13:14:41 +02:00
parent 0d27ba4d1f
commit cad8d28ca8
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gcode.c
+5 -4
View File
@@ -1821,9 +1821,10 @@ status_code_t gc_execute_block(char *block, char *message)
FAIL(Status_NonPositiveValue); // [L <= 0]
if(value_words.r)
gc_state.canned.retract_position = gc_block.values.r + (gc_block.modal.distance_incremental
? gc_state.position[plane.axis_linear]
: gc_get_block_offset(&gc_block, plane.axis_linear));
gc_state.canned.retract_position = gc_block.values.r * (gc_block.modal.units_imperial ? MM_PER_INCH : 1.0f) +
(gc_block.modal.distance_incremental
? gc_state.position[plane.axis_linear]
: gc_get_block_offset(&gc_block, plane.axis_linear));
idx = N_AXIS;
do {
@@ -1871,7 +1872,7 @@ status_code_t gc_execute_block(char *block, char *message)
if(value_words.q) {
if(gc_block.values.q <= 0.0f)
FAIL(Status_NegativeValue); // [Q <= 0]
gc_state.canned.delta = gc_block.values.q;
gc_state.canned.delta = gc_block.values.q * (gc_block.modal.units_imperial ? MM_PER_INCH : 1.0f);
value_words.q = Off; // Remove single-meaning value word.
} else if(gc_parser_flags.canned_cycle_change)
FAIL(Status_GcodeValueWordMissing);
grbl.h
+1 -1
View File
@@ -34,7 +34,7 @@
#else
#define GRBL_VERSION "1.1f"
#endif
#define GRBL_VERSION_BUILD "20210513"
#define GRBL_VERSION_BUILD "20210517"
// The following symbols are set here if not already set by the compiler or in config.h
// Do NOT change here!