Fixed some more problems with first run wizard. Made print window X/Y/Z move buttons...

diff --git a/Cura/avr_isp/stk500v2.py b/Cura/avr_isp/stk500v2.py
index e076e669c2e1238e214b1c1c1efd75a54c3394dd..58991b59c69e238be97d2d8b233da8b5a46cabf0 100644 (file)
--- a/Cura/avr_isp/stk500v2.py
+++ b/Cura/avr_isp/stk500v2.py
@@ -24,6 +24,7 @@ class Stk500v2(ispBase.IspBase):
                \r
                #Reset the controller\r
                self.serial.setDTR(1)\r
+               time.sleep(0.1)\r
                self.serial.setDTR(0)\r
                time.sleep(0.2)\r
                \r

diff --git a/Cura/gui/configWizard.py b/Cura/gui/configWizard.py
index 50f849896cf838dba6ea26c7c4433df11353b6dd..5efd6339375d510725c5dd43bb288ed6586d1f8a 100644 (file)
--- a/Cura/gui/configWizard.py
+++ b/Cura/gui/configWizard.py
@@ -375,8 +375,9 @@ class UltimakerCalibrateStepsPerEPage(InfoPage):
                currentEValue = float(self.stepsPerEInput.GetValue())\r
                self.comm = machineCom.MachineCom()\r
                if not self.comm.isOpen():\r
-                       wx.CallAfter(self.AddProgressText, "Error: Failed to open serial port to machine")\r
-                       wx.CallAfter(self.AddProgressText, "If this keeps happening, try disconnecting and reconnecting the USB cable")\r
+                       wx.MessageBox("Error: Failed to open serial port to machine\nIf this keeps happening, try disconnecting and reconnecting the USB cable", 'Printer error', wx.OK | wx.ICON_INFORMATION)\r
+                       self.heatButton.Enable(True)\r
+                       self.extrudeButton.Enable(True)\r
                        return\r
                while True:\r
                        line = self.comm.readline()\r
@@ -400,14 +401,19 @@ class UltimakerCalibrateStepsPerEPage(InfoPage):
                threading.Thread(target=self.OnHeatRun).start()\r
        \r
        def OnHeatRun(self):\r
+               self.heatButton.Enable(False)\r
+               self.extrudeButton.Enable(False)\r
                self.comm = machineCom.MachineCom()\r
                if not self.comm.isOpen():\r
-                       wx.CallAfter(self.AddProgressText, "Error: Failed to open serial port to machine")\r
-                       wx.CallAfter(self.AddProgressText, "If this keeps happening, try disconnecting and reconnecting the USB cable")\r
+                       wx.MessageBox("Error: Failed to open serial port to machine\nIf this keeps happening, try disconnecting and reconnecting the USB cable", 'Printer error', wx.OK | wx.ICON_INFORMATION)\r
+                       self.heatButton.Enable(True)\r
+                       self.extrudeButton.Enable(True)\r
                        return\r
                while True:\r
                        line = self.comm.readline()\r
                        if line == '':\r
+                               self.heatButton.Enable(True)\r
+                               self.extrudeButton.Enable(True)\r
                                return\r
                        if line.startswith('start'):\r
                                break\r
@@ -419,6 +425,8 @@ class UltimakerCalibrateStepsPerEPage(InfoPage):
                self.sendGCommand('M104 S0')\r
                time.sleep(1)\r
                self.comm.close()\r
+               self.heatButton.Enable(True)\r
+               self.extrudeButton.Enable(True)\r
        \r
        def sendGCommand(self, cmd):\r
                self.comm.sendCommand(cmd) #Disable cold extrusion protection\r

diff --git a/Cura/gui/machineCom.py b/Cura/gui/machineCom.py
index 73837d48adf2e3023c27714527dba26c102f9c72..6e6e7e431526660a2f75d9f9eed27bbab634c66c 100644 (file)
--- a/Cura/gui/machineCom.py
+++ b/Cura/gui/machineCom.py
@@ -156,10 +156,12 @@ class MachineCom():
                                        print "Connecting to: %s %i" % (port, baudrate)
                                        programmer.connect(port)
                                        programmer.close()
+                                       time.sleep(1)
                                        self.serial = Serial(port, baudrate, timeout=2)
                                        break
-                               except ispBase.IspError:
+                               except ispBase.IspError as (e):
                                        print "Error while connecting to %s %i" % (port, baudrate)
+                                       print e
                                        pass
                                except:
                                        print "Unexpected error while connecting to serial port:" + port, sys.exc_info()[0]

diff --git a/Cura/gui/printWindow.py b/Cura/gui/printWindow.py
index 5f68556d778726ebae66f77f57094ae12c7d7954..d03a556a2a6232b2db2aaebba9be67b891fa7014 100644 (file)
--- a/Cura/gui/printWindow.py
+++ b/Cura/gui/printWindow.py
@@ -65,6 +65,7 @@ class PrintCommandButton(buttons.GenBitmapButton):
                self.Bind(wx.EVT_BUTTON, self.OnClick)\r
 \r
        def OnClick(self, e):\r
+               self.parent.sendCommand("G91")\r
                self.parent.sendCommand(self.command)\r
                e.Skip()\r
 \r
@@ -134,6 +135,8 @@ class printWindow(wx.Frame):
                sizer.Add(PrintCommandButton(self, 'G1 X-10 F6000', 'print-move-x-10.png'), pos=(3,1))\r
                sizer.Add(PrintCommandButton(self, 'G1 X-1 F6000', 'print-move-x-1.png'), pos=(3,2))\r
 \r
+               sizer.Add(PrintCommandButton(self, 'G28 X0 Y0', 'exit.png'), pos=(3,3))\r
+\r
                sizer.Add(PrintCommandButton(self, 'G1 X1 F6000', 'print-move-x1.png'), pos=(3,4))\r
                sizer.Add(PrintCommandButton(self, 'G1 X10 F6000', 'print-move-x10.png'), pos=(3,5))\r
                sizer.Add(PrintCommandButton(self, 'G1 X100 F6000', 'print-move-x100.png'), pos=(3,6))\r
@@ -142,9 +145,9 @@ class printWindow(wx.Frame):
                sizer.Add(PrintCommandButton(self, 'G1 Z1 F200', 'object-max-size.png'), pos=(1,6))\r
                sizer.Add(PrintCommandButton(self, 'G1 Z0.1 F200', 'object-max-size.png'), pos=(2,6))\r
 \r
-               sizer.Add(PrintCommandButton(self, 'G1 Z0.1 F200', 'object-max-size.png'), pos=(4,6))\r
-               sizer.Add(PrintCommandButton(self, 'G1 Z1 F200', 'object-max-size.png'), pos=(5,6))\r
-               sizer.Add(PrintCommandButton(self, 'G1 Z10 F200', 'object-max-size.png'), pos=(6,6))\r
+               sizer.Add(PrintCommandButton(self, 'G1 Z-0.1 F200', 'object-max-size.png'), pos=(4,6))\r
+               sizer.Add(PrintCommandButton(self, 'G1 Z-1 F200', 'object-max-size.png'), pos=(5,6))\r
+               sizer.Add(PrintCommandButton(self, 'G1 Z-10 F200', 'object-max-size.png'), pos=(6,6))\r
 \r
                self.sizer.AddGrowableRow(3)\r
                self.sizer.AddGrowableCol(0)\r