Switch the order of extruders every layer when printing with dual extrusion.

diff --git a/Cura/gui/sliceProgessPanel.py b/Cura/gui/sliceProgessPanel.py
index 5e099b96cac9e68b6daf25b074a922900cd2a292..fce06a4bcda22d4b01291845ce967e99fbdb946d 100644 (file)
--- a/Cura/gui/sliceProgessPanel.py
+++ b/Cura/gui/sliceProgessPanel.py
@@ -225,9 +225,11 @@ class WorkerThread(threading.Thread):
                resultFile.write('T%d\n' % (currentExtruder))
                layerNr = -1
                hasLine = True
+               filesOrder = files[:]
                while hasLine:
                        hasLine = False
-                       for f in files:
+                       filesOrder.reverse()
+                       for f in filesOrder:
                                layerHasLine = False
                                for line in f:
                                        hasLine = True
@@ -242,7 +244,7 @@ class WorkerThread(threading.Thread):
                                                if nextExtruder != currentExtruder:
                                                        resultFile.write(';TYPE:CUSTOM\n')
                                                        profile.setTempOverride('extruder', nextExtruder)
-                                                       resultFile.write(profile.getAlterationFileContents('switchExtruder.gcode'))
+                                                       resultFile.write(profile.getAlterationFileContents('switchExtruder.gcode') + '\n')
                                                        profile.resetTempOverride()
                                                        currentExtruder = nextExtruder
                                                layerHasLine = True

diff --git a/Cura/util/sliceRun.py b/Cura/util/sliceRun.py
index d065abc1b895d388f13aa8c574a452fbb90b1e45..6afeb4a9c6064f19f82b4c0cfd03b2718adb73f4 100644 (file)
--- a/Cura/util/sliceRun.py
+++ b/Cura/util/sliceRun.py
@@ -26,6 +26,7 @@ sliceStepTimeFactor = {
        'dwindle': 1.0,
        'comb': 23.7805759907,
        'cool': 27.148763895,
+       'hop': 1.0,
        'dimension': 90.4914340973
 }