Skip to content
Merged
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
1 change: 1 addition & 0 deletions src/emc/rs274ngc/interp_convert.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3047,6 +3047,7 @@ int Interp::convert_g(block_pointer block, //!< pointer to a block of RS27
}
if ((block->g_modes[GM_G92_IS_APPLIED] != -1) && ONCE(STEP_G92_IS_APPLIED)) {
status = convert_g92_is_applied(block->g_modes[GM_G92_IS_APPLIED], block, settings);
CHP(status);
}
if ((block->motion_to_be != -1) && ONCE(STEP_MOTION)){
status = convert_motion(block->motion_to_be, block, settings);
Expand Down
4 changes: 4 additions & 0 deletions tests/interp/g68-words/expected
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ g684-b: G68.2 takes no A, B, C, U, V or W: the plane is placed by X, Y and Z
g684-none: G68.4 needs an active tilted work plane to build on
g52-a: G52 in a tilted work plane takes only X, Y and Z
g92-plane: Cannot change G92 offsets while a tilted work plane (G68.2) is active
g921-plane: Cannot change G92 offsets while a tilted work plane (G68.2) is active
g922-plane: Cannot change G92 offsets while a tilted work plane (G68.2) is active
g923-plane: Cannot change G92 offsets while a tilted work plane (G68.2) is active
g921-comp: Cannot change axis offsets with cutter radius comp
g682-g52: Cancel the G52 in the tilted work plane (G52 X0 Y0 Z0) before G68.2 or G68.4
g684-g52: Cancel the G52 in the tilted work plane (G52 X0 Y0 Z0) before G68.2 or G68.4
g682-g52-0: ok
4 changes: 4 additions & 0 deletions tests/interp/g68-words/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ case_ g684-b $'G68.2 X1 J30\nG68.4 B2 I10'
case_ g684-none $'G68.4 I10'
case_ g52-a $'G68.2 X1 J30\nG52 X1 A2'
case_ g92-plane $'G68.2 X1 J30\nG92 X1'
case_ g921-plane $'G68.2 X1 J30\nG92.1'
case_ g922-plane $'G68.2 X1 J30\nG92.2'
case_ g923-plane $'G68.2 X1 J30\nG92.3'
case_ g921-comp $'G41.1 D2\nG92.1'
case_ g682-g52 $'G68.2 X1 J30\nG52 X1\nG68.2 X2 J30'
case_ g684-g52 $'G68.2 X1 J30\nG52 X1\nG68.4 I10'
case_ g682-g52-0 $'G68.2 X1 J30\nG52 X1\nG52 X0\nG68.2 X2 J30'
Expand Down
Loading