Mirrors_Framework/g2
1
0
Fork 0
mirror of https://github.com/synthetos/g2.git synced 2026-09-22 19:43:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes and regressions for G28/G30 operating in absolute_distance_mode; Most of the files are the change from ABSOLUTE_MODE to ABSOLUTE_DISTANCE_MODE and similar for INCREMENTAL_MODE.

Browse Source
This commit is contained in:
Alden Hart
2017-01-02 10:24:29 -05:00
parent 06abe79c64
commit ab09b8906f
21 changed files with 57 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
g2core/plan_arc.cpp
+2 -2
View File
@@ -175,7 +175,7 @@ stat_t cm_arc_feed(const float target[], const bool target_f[], // target en
}
}
else { // test that center format absolute distance mode arcs have both offsets specified
if (cm.gm.arc_distance_mode == ABSOLUTE_MODE) {
if (cm.gm.arc_distance_mode == ABSOLUTE_DISTANCE_MODE) {
if (!(offset_f[arc.plane_axis_0] && offset_f[arc.plane_axis_1])) { // if one or both offsets are missing
return (STAT_ARC_OFFSETS_MISSING_FOR_SELECTED_PLANE);
}
@@ -222,7 +222,7 @@ stat_t cm_arc_feed(const float target[], const bool target_f[], // target en
arc.offset[OFS_J] = _to_millimeters(offset[OFS_J]);
arc.offset[OFS_K] = _to_millimeters(offset[OFS_K]);
if (arc.gm.arc_distance_mode == ABSOLUTE_MODE) { // adjust offsets if in absolute mode
if (arc.gm.arc_distance_mode == ABSOLUTE_DISTANCE_MODE) { // adjust offsets if in absolute mode
arc.offset[OFS_I] -= arc.position[AXIS_X];
arc.offset[OFS_J] -= arc.position[AXIS_Y];
arc.offset[OFS_K] -= arc.position[AXIS_Z];