Skip to content

Commit 83f60a1

Browse files
authored
Merge pull request #3842 from Sigma1912/Fix_Allow_G43_for_tools_with_zero_offsets
Interpreter: Fix Allow G43 for tools with zero offsets
2 parents dd87f60 + 0190b05 commit 83f60a1

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

src/emc/rs274ngc/interp_convert.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6239,9 +6239,9 @@ int Interp::convert_tool_length_offset(int g_code, //!< g_code being execu
62396239
tool_offset.v = USER_TO_PROGRAM_LEN(settings->tool_table[idx].offset.v);
62406240
tool_offset.w = USER_TO_PROGRAM_LEN(settings->tool_table[idx].offset.w);
62416241
settings->g43_with_zero_offset =
6242-
(settings->tool_offset.tran.x || settings->tool_offset.tran.y || settings->tool_offset.tran.z ||
6243-
settings->tool_offset.a || settings->tool_offset.b || settings->tool_offset.c ||
6244-
settings->tool_offset.u || settings->tool_offset.v || settings->tool_offset.w);
6242+
!(tool_offset.tran.x || tool_offset.tran.y || tool_offset.tran.z ||
6243+
tool_offset.a || tool_offset.b || tool_offset.c ||
6244+
tool_offset.u || tool_offset.v || tool_offset.w);
62456245
} else if (g_code == G_43_1) {
62466246
tool_offset = settings->tool_offset;
62476247
idx = -1;

src/emc/rs274ngc/interp_setup.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ setup::setup() :
141141
tool_table{},
142142
traverse_rate (0.0),
143143
orient_offset (0.0),
144+
g43_with_zero_offset(false),
144145

145146
defining_sub(0),
146147
sub_name(NULL),

0 commit comments

Comments
 (0)