q3k/OctoPrint
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added tool switching GCode. Made the E value reset after each layer for multiple extruder support.

Browse source
This commit is contained in:
daid 2012-04-25 13:34:25 +02:00
parent 42cd0fcf74
commit 3770dea42c
6 changed files with 35 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Cura/cura_sf/fabmetheus_utilities/settings.py
View file

@ -125,8 +125,8 @@ def getProfileInformation():
'SVG_Viewer': DEFSET,
},'preface': {
'Meta': DEFSET,
'Set_Positioning_to_Absolute': DEFSET,
'Set_Units_to_Millimeters': DEFSET,
'Set_Positioning_to_Absolute': "False",
'Set_Units_to_Millimeters': "False",
'Start_at_Home': DEFSET,
'Turn_Extruder_Off_at_Shut_Down': DEFSET,
'Turn_Extruder_Off_at_Start_Up': DEFSET,
@ -446,7 +446,7 @@ def getAlterationLines(fileName):
return archive.getTextLines(getAlterationFile(fileName))
def getAlterationFile(fileName):
return unicode(profile.getAlterationFileContents(fileName)).encode("utf-8")
return profile.getAlterationFileContents(fileName)
####################################
## Configuration settings classes ##

4
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py
View file

@ -387,6 +387,10 @@ class DimensionSkein:
elif firstWord == '(<layer>':
self.layerIndex += 1
settings.printProgress(self.layerIndex, 'dimension')
elif firstWord == '(</layer>)':
if self.totalExtrusionDistance > 0.0 and not self.repository.relativeExtrusionDistance.value:
self.distanceFeedRate.addLine('G92 E0')
self.totalExtrusionDistance = 0.0
elif firstWord == 'M101':
if self.addRetraction:
self.addLinearMoveExtrusionDistanceLine(self.restartDistance * self.retractionRatio)

2
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/gcode_small.py
View file

@ -92,6 +92,8 @@ class GcodeSmallSkein:
return
if firstWord[0] == '(':
return
if firstWord == 'M108' or firstWord == 'M113':
return
if firstWord != 'G1':
self.output.write(line + '\n')
return

6
Cura/gui/projectPlanner.py
View file

@ -707,11 +707,11 @@ class ProjectSliceProgressWindow(wx.Frame):
if action == self.actionList[0]:
resultFile.write(';TYPE:CUSTOM\n')
resultFile.write(profile.getAlterationFileContents('start.gcode').encode('utf-8'))
resultFile.write(profile.getAlterationFileContents('start.gcode'))
else:
#reset the extrusion length, and move to the next object center.
resultFile.write(';TYPE:CUSTOM\n')
resultFile.write(profile.getAlterationFileContents('nextobject.gcode').encode('utf-8'))
resultFile.write(profile.getAlterationFileContents('nextobject.gcode'))
resultFile.write(';PRINTNR:%d\n' % self.actionList.index(action))
profile.loadGlobalProfileFromString(oldProfile)
@ -727,7 +727,7 @@ class ProjectSliceProgressWindow(wx.Frame):
wx.CallAfter(self.progressGauge2.SetValue, self.actionList.index(action) + 1)
resultFile.write(';TYPE:CUSTOM\n')
resultFile.write(profile.getAlterationFileContents('end.gcode').encode('utf-8'))
resultFile.write(profile.getAlterationFileContents('end.gcode'))
resultFile.close()
self.abort = True
wx.CallAfter(self.abortButton.SetLabel, 'Close')

27
Cura/gui/sliceProgessPanel.py
View file

@ -43,7 +43,7 @@ class sliceProgessPanel(wx.Panel):
self.statusText = wx.StaticText(self, -1, "Starting...")
self.progressGauge = wx.Gauge(self, -1)
self.progressGauge.SetRange(10000)
self.progressGauge.SetRange(10000 * len(filelist))
self.abortButton = wx.Button(self, -1, "X", style=wx.BU_EXACTFIT)
self.sizer.Add(self.statusText, 2, flag=wx.ALIGN_CENTER )
self.sizer.Add(self.progressGauge, 2)
@ -60,8 +60,10 @@ class sliceProgessPanel(wx.Panel):
cmdList = []
oldProfile = profile.getGlobalProfileString()
for filename in self.filelist:
print filename, self.filelist.index(filename)
if self.filelist.index(filename) > 0:
profile.putProfileSetting('fan_enabled', 'False')
profile.putProfileSetting('skirt_lines', '0')
if len(self.filelist) > 1:
profile.putProfileSetting('add_start_end_gcode', 'False')
profile.putProfileSetting('gcode_extension', 'multi_extrude_tmp')
@ -146,7 +148,7 @@ class WorkerThread(threading.Thread):
maxValue = int(progress[2])
wx.CallAfter(self.notifyWindow.SetProgress, progress[0], int(progress[1]), maxValue)
else:
print line
#print line
self.progressLog.append(line)
wx.CallAfter(self.notifyWindow.statusText.SetLabel, line)
if self.notifyWindow.abort:
@ -172,25 +174,40 @@ class WorkerThread(threading.Thread):
files = []
resultFile = open(self.filelist[0][:self.filelist[0].rfind('.')]+'_export.gcode', "w")
resultFile.write(';TYPE:CUSTOM\n')
resultFile.write(unicode(profile.getAlterationFileContents('start.gcode')).encode('utf-8'))
resultFile.write(profile.getAlterationFileContents('start.gcode'))
for filename in self.filelist:
files.append(open(filename[:filename.rfind('.')]+'_export.multi_extrude_tmp', "r"))
currentExtruder = 0
layerNr = -1
hasLine = True
while hasLine:
hasLine = False
for f in files:
layerHasLine = False
for line in f:
resultFile.write(line)
hasLine = True
if line.startswith(';LAYER:'):
break
if not layerHasLine:
nextExtruder = files.index(f)
resultFile.write(';LAYER:%d\n' % (layerNr))
resultFile.write(';EXTRUDER:%d\n' % (nextExtruder))
if nextExtruder != currentExtruder:
resultFile.write("G1 E-2 F3000\n")
resultFile.write("T%d\n" % (nextExtruder))
resultFile.write("G1 E2 F3000\n")
resultFile.write("M92 E0\n")
currentExtruder = nextExtruder
layerHasLine = True
resultFile.write(line)
layerNr += 1
for f in files:
f.close()
for filename in self.filelist:
os.remove(filename[:filename.rfind('.')]+'_export.multi_extrude_tmp')
resultFile.write(';TYPE:CUSTOM\n')
resultFile.write(unicode(profile.getAlterationFileContents('end.gcode')).encode('utf-8'))
resultFile.write(profile.getAlterationFileContents('end.gcode'))
resultFile.close()
class LogWindow(wx.Frame):

2
Cura/util/profile.py
View file

@ -343,5 +343,5 @@ def getAlterationFileContents(filename):
#Always remove the extruder on/off M codes. These are no longer needed in 5D printing.
prefix = 'M101\nM103\n'
return prefix + re.sub("\{[^\}]*\}", replaceTagMatch, alterationContents)
return unicode(prefix + re.sub("\{[^\}]*\}", replaceTagMatch, alterationContents).rstrip() + '\n').encode('utf-8')