giuliof
/
flatcam
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- started to work on support for G91 in Gcode (relative coordinates)

This commit is contained in:
Marius Stanciu 2019-09-04 09:38:29 +03:00 committed by Marius
parent d909b98130
commit 28e31eb312
2 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -9,6 +9,10 @@ CAD program, and create G-Code for Isolation routing.
=================================================
4.09.2019
- started to work on support for G91 in Gcode (relative coordinates)
3.09.2019
- in NCC tool there is now a depth of cut parameter named 'Cut Z' which will dictate how deep the tool will enter into the PCB material

23
camlib.py
View File

@ -4054,10 +4054,7 @@ class Excellon(Geometry):
else:
diam = (self.toolless_diam + (int(current_tool) - 1) / 100) / 25.4
spec = {
"C": diam,
}
spec['solid_geometry'] = []
spec = {"C": diam, 'solid_geometry': []}
self.tools[name] = spec
log.debug("Tool definition out of header: %s %s" % (name, spec))
@ -4394,15 +4391,7 @@ class Excellon(Geometry):
if match:
name = str(int(match.group(1)))
spec = {
"C": float(match.group(2)),
# "F": float(match.group(3)),
# "S": float(match.group(4)),
# "B": float(match.group(5)),
# "H": float(match.group(6)),
# "Z": float(match.group(7))
}
spec['solid_geometry'] = []
spec = {"C": float(match.group(2)), 'solid_geometry': []}
self.tools[name] = spec
log.debug(" Tool definition: %s %s" % (name, spec))
continue
@ -4505,7 +4494,8 @@ class Excellon(Geometry):
except Exception as e:
log.error("Excellon PARSING FAILED. Line %d: %s" % (line_num, eline))
msg = _("[ERROR_NOTCL] An internal error has ocurred. See shell.\n")
msg += _('[ERROR] Excellon Parser error.\nParsing Failed. Line {l_nr}: {line}\n').format(l_nr=line_num, line=eline)
msg += _('[ERROR] Excellon Parser error.\nParsing Failed. Line {l_nr}: {line}\n').format(l_nr=line_num,
line=eline)
msg += traceback.format_exc()
self.app.inform.emit(msg)
@ -5050,6 +5040,7 @@ class CNCjob(Geometry):
self.feedminutecode = "G94"
self.absolutecode = "G90"
self.relativecode = "G91"
self.gcode = ""
self.gcode_parsed = None
@ -5372,7 +5363,9 @@ class CNCjob(Geometry):
self.tooldia = exobj.tools[tool]["C"]
# ###############################################
# Create the data.
# ############ Create the data. #################
# ###############################################
node_list = []
locations = create_data_array()
tsp_size = len(locations)