Merge branch 'SteamEngine' of github.com:daid/Cura into SteamEngine

2 files changed, 20 insertions, 23 deletions

diff --git a/Cura/gui/configWizard.py b/Cura/gui/configWizard.py
index 62f309b8ab..1956c9712c 100644
--- a/Cura/gui/configWizard.py
+++ b/Cura/gui/configWizard.py
@@ -265,19 +265,18 @@ class PrintrbotPage(InfoPage):
 			("Simple Makers Kit", 100, 100, 100, 0.4, 1.75, 208, 40, 70, 30, 1, True),
 			(":" + _("Older models"),),
 			("Original", 130, 130, 130, 0.5, 2.95, 208, 40, 70, 30, 1, False),
-			("Simple Maker's Edition v1", 100, 100, 100, 0.5, 1.75, 208, 40, 70, 30, 1, False),
-			("Simple Maker's Edition v2 (2013 Printrbot Simple)", 100, 100, 100, 0.5, 1.75, 208, 40, 70, 30, 1, False),
-			("Simple Maker's Edition v3 (2014 Printrbot Simple)", 100, 100, 100, 0.5, 1.75, 208, 40, 70, 30, 1, False),
-			("Simple Maker's Edition v4 (Model 1405)", 100, 100, 100, 0.5, 1.75, 208, 40, 70, 30, 1, False),
-			("Jr v1", 150, 100, 80, 0.5, 1.75, 208, 40, 70, 30, 1, False),
-			("Jr v2", 150, 150, 150, 0.5, 1.75, 208, 40, 70, 30, 1, False),
-			("LC v2", 150, 150, 150, 0.5, 1.75, 208, 40, 70, 30, 1, False),
-			("Plus v2", 200, 200, 200, 0.5, 1.75, 208, 40, 70, 30, 1, False),
-			("Plus v2.1", 200, 200, 200, 0.5, 1.75, 208, 40, 70, 30, 1, False),
-			("Plus v2.2 (Model 1404/140422)", 250, 250, 250, 0.5, 1.75, 208, 40, 70, 30, 1, False),
-			("Plus v2.3 (Model 140501)", 250, 250, 250, 0.5, 1.75, 208, 40, 70, 30, 1, False),
-			("Plus v2.4 (Model 140507)", 250, 250, 250, 0.5, 1.75, 208, 40, 70, 30, 1, False),
-			("Go v2 Large", 609, 305, 305, 0.5, 1.75, 208, 35, 70, 30, 1, False),
+			("Simple Maker's Edition v1", 100, 100, 100, 0.4, 1.75, 208, 40, 70, 30, 1, False),
+			("Simple Maker's Edition v2 (2013 Printrbot Simple)", 100, 100, 100, 0.4, 1.75, 208, 40, 70, 30, 1, False),
+			("Simple Maker's Edition v3 (2014 Printrbot Simple)", 100, 100, 100, 0.4, 1.75, 208, 40, 70, 30, 1, False),
+			("Jr v1", 115, 120, 80, 0.4, 1.75, 208, 40, 70, 30, 1, False),
+			("Jr v2", 150, 150, 150, 0.4, 1.75, 208, 40, 70, 30, 1, False),
+			("LC v1", 150, 150, 150, 0.4, 1.75, 208, 40, 70, 30, 1, False),
+			("LC v2", 150, 150, 150, 0.4, 1.75, 208, 40, 70, 30, 1, False),
+			("Plus v1", 200, 200, 200, 0.4, 1.75, 208, 40, 70, 30, 1, False),
+			("Plus v2", 200, 200, 200, 0.4, 1.75, 208, 40, 70, 30, 1, False),
+			("Plus v2.1", 185, 220, 200, 0.4, 1.75, 208, 40, 70, 30, 1, False),
+			("Plus v2.2 (Model 1404/140422/140501/140507)", 250, 250, 250, 0.4, 1.75, 208, 40, 70, 30, 1, True),
+			("Go v2 Large", 505, 306, 310, 0.4, 1.75, 208, 35, 70, 30, 1, True),
 		]
 
 		super(PrintrbotPage, self).__init__(parent, _("Printrbot Selection"))
@@ -329,13 +328,10 @@ G21        ;metric values
 G90        ;absolute positioning
 M82        ;set extruder to absolute mode
 M107       ;start with the fan off
-
 G28 X0 Y0  ;move X/Y to min endstops
 G28 Z0     ;move Z to min endstops
 G29        ;Run the auto bed leveling
-
 G1 Z15.0 F{travel_speed} ;move the platform down 15mm
-
 G92 E0                  ;zero the extruded length
 G1 F200 E3              ;extrude 3mm of feed stock
 G92 E0                  ;zero the extruded length again
@@ -390,9 +386,9 @@ class CustomRepRapInfoPage(InfoPage):
 		self.AddText(_("You will have to manually install Marlin or Sprinter firmware."))
 		self.AddSeperator()
 		self.machineName = self.AddLabelTextCtrl(_("Machine name"), "RepRap")
-		self.machineWidth = self.AddLabelTextCtrl(_("Machine width (mm)"), "80")
-		self.machineDepth = self.AddLabelTextCtrl(_("Machine depth (mm)"), "80")
-		self.machineHeight = self.AddLabelTextCtrl(_("Machine height (mm)"), "55")
+		self.machineWidth = self.AddLabelTextCtrl(_("Machine width X (mm)"), "80")
+		self.machineDepth = self.AddLabelTextCtrl(_("Machine depth Y (mm)"), "80")
+		self.machineHeight = self.AddLabelTextCtrl(_("Machine height Z (mm)"), "55")
 		self.nozzleSize = self.AddLabelTextCtrl(_("Nozzle size (mm)"), "0.5")
 		self.heatedBed = self.AddCheckbox(_("Heated bed"))
 		self.HomeAtCenter = self.AddCheckbox(_("Bed center is 0,0,0 (RoStock)"))
diff --git a/plugins/TweakAtZ.py b/plugins/TweakAtZ.py
index 245908eade..50db77ce89 100644
--- a/plugins/TweakAtZ.py
+++ b/plugins/TweakAtZ.py
@@ -1,4 +1,4 @@
-#Name: Tweak At Z 4.0
+#Name: Tweak At Z 4.0.1
 #Info: Change printing parameters at a given height
 #Help: TweakAtZ
 #Depend: GCode
@@ -42,8 +42,9 @@
 ##V4.0:   Progress bar, tweaking over multiple layers, M605&M606 implemented, reset after one layer option,
 ##        extruder three code removed, tweaking print speed, save call of Publisher class,
 ##        uses previous value from other plugins also on UltiGCode
+##V4.0.1: Bugfix for doubled G1 commands
 
-version = '4.0'
+version = '4.0.1'
 
 import re
 import wx
@@ -201,8 +202,8 @@ with open(filename, "w") as file:
 				if 'G1' in line and x != None and y != None and f != None and e != None and newZ==z:
 					file.write("G1 F%d X%1.3f Y%1.3f E%1.5f\n" % (int(f/100.0*float(printspeed)),getValue(line,'X'),
 																  getValue(line,'Y'),getValue(line,'E')))
-			else: #G1 command but not a print movement
-				file.write(line)
+                                else: #G1 command but not a print movement
+                                        file.write(line)
 			# no tweaking on retraction hops which have no x and y coordinate:
 			if (newZ != z) and (x is not None) and (y is not None):
 				z = newZ