Skip to content

Commit 0190b05

Browse files
committed
Fixes errors that I seem to have inadvertently introduced while preparing the final PR for 0673e3f :
Fix wrong logic (current version sets the flag when an offset value is unequal zero) Check tool table offsets not the currently active tool offsets Also Initialization for the flag in interp_setup
1 parent 80bd55c commit 0190b05

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
@@ -140,6 +140,7 @@ setup::setup() :
140140
tool_table{},
141141
traverse_rate (0.0),
142142
orient_offset (0.0),
143+
g43_with_zero_offset(false),
143144

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

0 commit comments

Comments
 (0)