Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/emc/rs274ngc/interp_internal.cc
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,8 @@ int Interp::enhance_block(block_pointer block, //!< pointer to a block to be c
|| (settings->motion_mode == G_80)) && (block->g_modes[GM_TOOL_LENGTH_OFFSET] != G_43_1)
&& (block->g_modes[GM_TOOL_LENGTH_OFFSET] != G_43_2),
NCE_CANNOT_USE_AXIS_VALUES_WITHOUT_A_G_CODE_THAT_USES_THEM);
if (block->g_modes[GM_TOOL_LENGTH_OFFSET] != G_43_1) {
if (block->g_modes[GM_TOOL_LENGTH_OFFSET] != G_43_1
&& block->g_modes[GM_TOOL_LENGTH_OFFSET] != G_43_2) {
block->motion_to_be = settings->motion_mode;
}
} else if (!axis_flag && !polar_flag && ijk_flag && (settings->motion_mode == G_2 || settings->motion_mode == G_3)) {
Expand Down
2 changes: 2 additions & 0 deletions tests/interp/machine-coord-params/expected
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@
N..... MESSAGE("0.000000 0.000000 0.000000")
N..... MESSAGE("1.000000 2.000000 3.000000")
N..... MESSAGE("1.000000 2.000000 3.000000")
N..... MESSAGE("1.000000 2.000000 3.000000")
N..... MESSAGE("1.000000 2.000000 3.000000")
N..... MESSAGE("1.000000 1.000000")
N..... MESSAGE("3.000000 3.000000")
8 changes: 8 additions & 0 deletions tests/interp/machine-coord-params/test.ngc
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,14 @@ g53 g0 x1 y2 z3
(debug,#5021 #5022 #5023)
g49

; nor do G43.2 axis words move it, in G0 or in G1 mode
g43.2 x0 y0
(debug,#5021 #5022 #5023)
g1 f100 x1
g43.2 z2
(debug,#5021 #5022 #5023)
g49

; numbered set agrees with the named set
g53 g0 x1 y2 z3
(debug,#5021 #<_abs_x>)
Expand Down