Move extruder switching GCode to profile instead of hardcoded.

This commit is contained in:
daid 2012-05-07 17:42:46 +02:00
parent fb935e49fe
commit 7f57669280
3 changed files with 13 additions and 5 deletions

View file

@ -9,6 +9,8 @@ class alterationPanel(wx.Panel):
wx.Panel.__init__(self, parent,-1)
self.alterationFileList = ['start.gcode', 'end.gcode', 'support_start.gcode', 'support_end.gcode', 'nextobject.gcode', 'replace.csv']
if int(profile.getPreference('extruder_amount')) > 1:
self.alterationFileList.append('switchExtruder.gcode')
self.currentFile = None
#self.textArea = wx.TextCtrl(self, style=wx.TE_MULTILINE|wx.TE_DONTWRAP|wx.TE_PROCESS_TAB)

View file

@ -190,11 +190,10 @@ class WorkerThread(threading.Thread):
resultFile.write(';LAYER:%d\n' % (layerNr))
resultFile.write(';EXTRUDER:%d\n' % (nextExtruder))
if nextExtruder != currentExtruder:
resultFile.write("G1 E-5 F5000\n")
resultFile.write("G92 E0\n")
resultFile.write("T%d\n" % (nextExtruder))
resultFile.write("G1 E5 F5000\n")
resultFile.write("G92 E0\n")
resultFile.write(';TYPE:CUSTOM\n')
profile.setTempOverride('extruder', nextExtruder)
resultFile.write(profile.getAlterationFileContents('switchExtruder.gcode'))
profile.resetTempOverride()
currentExtruder = nextExtruder
layerHasLine = True
resultFile.write(line)

View file

@ -122,6 +122,13 @@ G92 E0
G1 Z0 F{max_z_speed}
""",
#######################################################################################
'switchExtruder.gcode': """;Switch between the current extruder and the next extruder, when printing with multiple extruders.
G1 E-5 F5000
G92 E0
T{extruder}
G1 E5 F5000
G92 E0
""",
}
preferencesDefaultSettings = {
'wizardDone': 'False',