Skip to content

Commit 1391b82

Browse files
authored
Merge pull request #3567 from Sigma1912/2_9-Correct_bad_fix_for_2753
correct bad fix for 2753
2 parents f344ac4 + f6b704e commit 1391b82

2 files changed

Lines changed: 7 additions & 1 deletion

File tree

src/emc/rs274ngc/gcodemodule.cc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -778,6 +778,12 @@ static PyObject *parse_file(PyObject *self, PyObject *args) {
778778
result = pinterp->execute();
779779
}
780780

781+
if(initcode && RESULT_OK) {
782+
result = pinterp->read(initcode);
783+
if(!RESULT_OK) goto out_error;
784+
result = pinterp->execute();
785+
}
786+
781787
while(!interp_error && RESULT_OK) {
782788
error_line_offset = 1;
783789
result = pinterp->read();

src/emc/usr_intf/gremlin/gremlin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ def load(self,filename = None):
327327
canon.parameter_file = temp_parameter
328328

329329
unitcode = "G%d" % (20 + (s.linear_units == 1))
330-
initcode = self.inifile.find("RS274NGC", "RS274NGC_STARTUP_CODE") or ""
330+
initcode = ""
331331
result, seq = self.load_preview(filename, canon, unitcode, initcode)
332332
if result > gcode.MIN_ERROR:
333333
self.report_gcode_error(result, seq, filename)

0 commit comments

Comments
 (0)