Add warning of using a shell thickness that is not a multiple of the nozzle size.

diff --git a/Cura/gui/firmwareInstall.py b/Cura/gui/firmwareInstall.py
index 0b101c82a4fde09d5489f79115cf310fef71041e..6c2b60c19502d605fbe909b38c494c9b583891ea 100644 (file)
--- a/Cura/gui/firmwareInstall.py
+++ b/Cura/gui/firmwareInstall.py
@@ -251,7 +251,7 @@ class AutoUpdateFirmware(wx.Dialog):
                                time.sleep(0.5)
                                self.OnInstall()
                                try:
-                                       self._serial = serial.Serial(self.port, 250000)
+                                       self._serial = serial.Serial(self.port, 115200)
                                except:
                                        pass
                        time.sleep(0.5)

diff --git a/Cura/util/validators.py b/Cura/util/validators.py
index c1052d6ad0f2d81f44740e3844e07692c291fa0e..070f0d64425e6a2d07d66f7dcc617f37357fe26b 100644 (file)
--- a/Cura/util/validators.py
+++ b/Cura/util/validators.py
@@ -141,7 +141,9 @@ class wallThicknessValidator(object):
                        lineWidth = wallThickness / lineCount
                        lineWidthAlt = wallThickness / (lineCount + 1)
                        if lineWidth >= nozzleSize * 1.5 and lineWidthAlt <= nozzleSize * 0.85:
-                               return WARNING, 'Current selected wall thickness results in a line thickness of ' + str(lineWidthAlt) + 'mm which is not recommended with your nozzle of ' + str(nozzleSize) + 'mm'
+                               return WARNING, 'Current selected shell thickness results in a line thickness of ' + str(lineWidthAlt) + 'mm which is not recommended with your nozzle of ' + str(nozzleSize) + 'mm'
+                       if abs((lineCount * nozzleSize) - wallThickness) > 0.01 and abs(((lineCount + 1) * nozzleSize) - wallThickness) > 0.01:
+                               return WARNING, 'Currently selected shell thickness is not a multiple of the nozzle size. While this prints fine, it does not give optimal results.'
                        return SUCCESS, ''
                except ValueError:
                        #We already have an error by the int/float validator in this case.