kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge branch 'master' into fixes/simulation

Browse Source
This commit is contained in:
Daniel Wood
2020-03-03 17:49:43 +00:00
committed by GitHub
parent 0b38aba152 162c51a392
commit aa2a19b830
179 changed files with 17899 additions and 24078 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/Mod/Path/PathScripts/post/linuxcnc_post.py
View File

@@ -185,6 +185,14 @@ def export(objectslist, filename, argstring):
for obj in objectslist:
# Skip inactive operations
if hasattr(obj, 'Active'):
if not obj.Active:
continue
if hasattr(obj, 'Base') and hasattr(obj.Base, 'Active'):
if not obj.Base.Active:
continue
# fetch machine details
job = PathUtils.findParentJob(obj)
@@ -210,16 +218,22 @@ def export(objectslist, filename, argstring):
for line in PRE_OPERATION.splitlines(True):
gcode += linenumber() + line
# get coolant mode
coolantMode = 'None'
if hasattr(obj, "CoolantMode") or hasattr(obj, 'Base') and hasattr(obj.Base, "CoolantMode"):
if hasattr(obj, "CoolantMode"):
coolantMode = obj.CoolantMode
else:
coolantMode = obj.Base.CoolantMode
# turn coolant on if required
if hasattr(obj, "CoolantMode"):
coolantMode = obj.CoolantMode
if OUTPUT_COMMENTS:
if not coolantMode == 'None':
gcode += linenumber() + '(Coolant On:' + coolantMode + ')\n'
if coolantMode == 'Flood':
gcode += linenumber() + 'M8' + '\n'
if coolantMode == 'Mist':
gcode += linenumber() + 'M7' + '\n'
if OUTPUT_COMMENTS:
if not coolantMode == 'None':
gcode += linenumber() + '(Coolant On:' + coolantMode + ')\n'
if coolantMode == 'Flood':
gcode += linenumber() + 'M8' + '\n'
if coolantMode == 'Mist':
gcode += linenumber() + 'M7' + '\n'
# process the operation gcode
gcode += parse(obj)
@@ -231,12 +245,10 @@ def export(objectslist, filename, argstring):
gcode += linenumber() + line
# turn coolant off if required
if hasattr(obj, "CoolantMode"):
coolantMode = obj.CoolantMode
if not coolantMode == 'None':
if OUTPUT_COMMENTS:
gcode += linenumber() + '(Coolant Off:' + coolantMode + ')\n'
gcode += linenumber() +'M9' + '\n'
if not coolantMode == 'None':
if OUTPUT_COMMENTS:
gcode += linenumber() + '(Coolant Off:' + coolantMode + ')\n'
gcode += linenumber() +'M9' + '\n'
# do the post_amble
if OUTPUT_COMMENTS:
@@ -354,8 +366,8 @@ def parse(pathobj):
# Check for Tool Change:
if command == 'M6':
# if OUTPUT_COMMENTS:
# out += linenumber() + "(begin toolchange)\n"
# stop the spindle
out += linenumber() + "M5\n"
for line in TOOL_CHANGE.splitlines(True):
out += linenumber() + line

7
src/Mod/Path/PathTests/TestPathToolController.py
View File

@@ -47,6 +47,7 @@ class TestPathToolController(PathTestBase):
tc.Label = 'ToolController'
tc.ToolNumber = 7
tc.VertFeed = '3 in/s'
tc.VertFeed = round(tc.VertFeed, 1)
tc.HorizFeed = '10 mm/s'
tc.VertRapid = 40
tc.HorizRapid = 28
@@ -59,9 +60,9 @@ class TestPathToolController(PathTestBase):
self.assertEqual(attrs['label'], 'ToolController')
self.assertEqual(attrs['nr'], 7)
self.assertEqual(attrs['vfeed'], '76.2 mm/s')
self.assertEqual(attrs['hfeed'], '10 mm/s')
self.assertEqual(attrs['vrapid'], '40 mm/s')
self.assertEqual(attrs['hrapid'], '28 mm/s')
self.assertEqual(attrs['hfeed'], '10.0 mm/s')
self.assertEqual(attrs['vrapid'], '40.0 mm/s')
self.assertEqual(attrs['hrapid'], '28.0 mm/s')
self.assertEqual(attrs['dir'], 'Reverse')
self.assertEqual(attrs['speed'], 12000)
self.assertEqual(attrs['tool'], t.templateAttrs())