Added filament diameter configuration

Made firmware upload use the serial port preference

diff --git a/SkeinPyPy_NewUI/newui/configWizard.py b/SkeinPyPy_NewUI/newui/configWizard.py
index f81d7f23e51947f627a5d5ed4b34941fc7515e59..2dbeb904d31b645cb0aaed7003392c28c04262dc 100644 (file)
--- a/SkeinPyPy_NewUI/newui/configWizard.py
+++ b/SkeinPyPy_NewUI/newui/configWizard.py
@@ -138,7 +138,7 @@ class FirmwareUpgradePage(InfoPage):
 class UltimakerCheckupPage(InfoPage):\r
        def __init__(self, parent):\r
                super(UltimakerCheckupPage, self).__init__(parent, "Ultimaker Checkup")\r
-               self.AddText('It is a good idea to do a few sanity checks\nnow on your Ultimaker.\nBut you can skip these if you know your\nmachine is functional.')\r
+               self.AddText('It is a good idea to do a few sanity checks now on your Ultimaker.\nYou can skip these if you know your machine is functional.')\r
                b1, b2 = self.AddDualButton('Run checks', 'Skip checks')\r
                b1.Bind(wx.EVT_BUTTON, self.OnCheckClick)\r
                b2.Bind(wx.EVT_BUTTON, self.OnSkipClick)\r
@@ -239,7 +239,6 @@ class UltimakerCheckupPage(InfoPage):
                if line == False:\r
                        return -1\r
                return int(re.search('T:([0-9]*)', line).group(1))\r
-               \r
        \r
        def DoCommCommandAndWaitForReply(self, cmd, replyStart, reply):\r
                while True:\r
@@ -275,10 +274,19 @@ class UltimakerCalibrationPage(InfoPage):
                self.AddText("This calibration is needed for a proper extrusion amount.");\r
                self.AddSeperator()\r
                self.AddText("The following values are needed:");\r
-               self.AddText("* Number of steps per mm of filament extrusion");\r
                self.AddText("* Diameter of filament");\r
+               self.AddText("* Number of steps per mm of filament extrusion");\r
                self.AddSeperator()\r
-               self.AddText("The better you have calibrated these values, the better your prints will become.");\r
+               self.AddText("The better you have calibrated these values, the better your prints\nwill become.");\r
+               self.AddSeperator()\r
+               self.AddText("First we need the diameter of your filament:");\r
+               self.filamentDiameter = wx.TextCtrl(self, -1, settings.getProfileSetting('filament_diameter', '2.89'))\r
+               self.GetSizer().Add(self.filamentDiameter, 0, wx.LEFT, 5)\r
+               self.AddText("If you do not own digital Calipers that can measure\nat least 2 digits then use 2.89mm.\nWhich is the average diameter of most filament.");\r
+               self.AddText("Note: This value can be changed later at any time.");\r
+\r
+       def StoreData(self):\r
+               settings.putProfileSetting('filament_diameter', self.filamentDiameter.GetValue())\r
 \r
 class configWizard(wx.wizard.Wizard):\r
        def __init__(self):\r

diff --git a/SkeinPyPy_NewUI/newui/mainWindow.py b/SkeinPyPy_NewUI/newui/mainWindow.py
index c73f670673dfb5f37dcf43099cf62bbd6efd39d5..77ca4ca6138fe4a5649ef81e511b032b27e382ea 100644 (file)
--- a/SkeinPyPy_NewUI/newui/mainWindow.py
+++ b/SkeinPyPy_NewUI/newui/mainWindow.py
@@ -222,7 +222,7 @@ class mainWindow(configBase.configWindowBase):
                prefDialog.Show(True)
        
        def OnDefaultMarlinFirmware(self, e):
-               machineCom.InstallFirmware(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../firmware/default.hex"))
+               machineCom.InstallFirmware(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../firmware/default.hex"), settings.getPreference('serial_port', 'AUTO'))
 
        def OnCustomFirmware(self, e):
                dlg=wx.FileDialog(self, "Open firmware to upload", self.lastPath, style=wx.FD_OPEN|wx.FD_FILE_MUST_EXIST)
@@ -232,7 +232,7 @@ class mainWindow(configBase.configWindowBase):
                        if not(os.path.exists(filename)):
                                return
                        #For some reason my Ubuntu 10.10 crashes here.
-                       machineCom.InstallFirmware(filename)
+                       machineCom.InstallFirmware(filename, settings.getPreference('serial_port', 'AUTO'))
 
        def OnLoadSTL(self, e):
                dlg=wx.FileDialog(self, "Open file to print", self.lastPath, style=wx.FD_OPEN|wx.FD_FILE_MUST_EXIST)