From 63765eb522fef02f1fb45992aca01cf1e5c35d6f Mon Sep 17 00:00:00 2001
From: Arjen Hiemstra <ahiemstra@heimr.nl>
Date: Fri, 16 Oct 2015 17:40:36 +0200
Subject: [PATCH 01/14] Properly position groups and nodes once ungrouped

CURA-273 #Review
---
 cura/CuraApplication.py | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index f1d92be9b6..a66dcd606c 100644
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -471,17 +471,20 @@ class CuraApplication(QtApplication):
         group_decorator = GroupDecorator()
         group_node.addDecorator(group_decorator)
         group_node.setParent(self.getController().getScene().getRoot())
-        
+        center = Selection.getSelectionCenter()
+        group_node.setPosition(center)
+        group_node.setCenterPosition(center)
+
         for node in Selection.getAllSelectedObjects():
+            world = node.getWorldPosition()
             node.setParent(group_node)
-        group_node.setCenterPosition(group_node.getBoundingBox().center)
-        #group_node.translate(Vector(0,group_node.getBoundingBox().center.y,0))
-        group_node.translate(group_node.getBoundingBox().center)
+            node.setPosition(world - center)
+
         for node in group_node.getChildren():
             Selection.remove(node)
-        
+
         Selection.add(group_node)
-    
+
     @pyqtSlot()
     def ungroupSelected(self):
         ungrouped_nodes = []
@@ -492,12 +495,11 @@ class CuraApplication(QtApplication):
                 for child in node.getChildren():
                     if type(child) is SceneNode:
                         children_to_move.append(child)
-                       
+
                 for child in children_to_move:
+                    position = child.getWorldPosition()
                     child.setParent(node.getParent())
-                    print(node.getPosition())
-                    child.translate(node.getPosition())
-                    child.setPosition(child.getPosition().scale(node.getScale()))
+                    child.setPosition(position - node.getParent().getWorldPosition())
                     child.scale(node.getScale())
                     child.rotate(node.getOrientation())
 

From d0d7ef39fbdecd75666fa96159dc9e757a8e1b9b Mon Sep 17 00:00:00 2001
From: Arjen Hiemstra <ahiemstra@heimr.nl>
Date: Tue, 20 Oct 2015 15:16:11 +0200
Subject: [PATCH 02/14] Bump version

---
 cura/CuraApplication.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index a66dcd606c..b0bbc05ca9 100644
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -61,7 +61,7 @@ class CuraApplication(QtApplication):
         if not hasattr(sys, "frozen"):
             Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)), ".."))
 
-        super().__init__(name = "cura", version = "15.09.90")
+        super().__init__(name = "cura", version = "15.09.91")
 
         self.setWindowIcon(QIcon(Resources.getPath(Resources.Images, "cura-icon.png")))
 

From ae5e41e5c22acc2da7adef4a61171eb03df5e779 Mon Sep 17 00:00:00 2001
From: Nicanor Romero Venier <nicanor.romerovenier@bq.com>
Date: Wed, 21 Oct 2015 09:13:53 +0200
Subject: [PATCH 03/14] Update for BQ printers profiles

Update in the values of temperature, speeds and skirt minimal lenght.
---
 resources/machines/bq_hephestos_2.json | 8 ++++----
 resources/machines/bq_witbox_2.json    | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/resources/machines/bq_hephestos_2.json b/resources/machines/bq_hephestos_2.json
index 7fb2a82f5a..eb79fec1d7 100644
--- a/resources/machines/bq_hephestos_2.json
+++ b/resources/machines/bq_hephestos_2.json
@@ -39,7 +39,7 @@
     "overrides": {
         "bottom_thickness": { "default": 1.2, "visible": true },
         "cool_fan_full_at_height": { "default": 0.8, "visible": false },
-        "speed_wall_0": { "default": 35.0, "visible": false },
+        "speed_wall_0": { "default": 30.0, "visible": false },
         "material_diameter": { "default": 1.75 },
         "layer_height_0": { "default": 0.2, "visible": true },
         "speed_layer_0": { "default": 35.0, "visible": true },
@@ -53,8 +53,8 @@
         "retraction_speed": { "default": 45.0, "visible": false },
         "skirt_gap": { "default": 7.0 },
         "skirt_line_count": { "default": 4 },
-        "speed_infill": { "default": 50.0, "visible": true },
-        "material_print_temperature": { "default": 220.0, "visible": true },
+        "speed_infill": { "default": 60.0, "visible": true },
+        "material_print_temperature": { "default": 210.0, "visible": true },
         "speed_topbottom": { "default": 35.0, "visible": false },
         "top_thickness": { "default": 1.2, "visible": false },
         "top_layers": { "default": 6, "visible": false },
@@ -66,6 +66,6 @@
         "support_enable": { "default": false },
         "speed_print": { "default": 50.0 },
         "skirt_speed": { "default": 35.0, "visible": false },
-        "skirt_minimal_length": { "default": 300.0, "visible": false }
+        "skirt_minimal_length": { "default": 30.0, "visible": false }
     }
 }
diff --git a/resources/machines/bq_witbox_2.json b/resources/machines/bq_witbox_2.json
index a6a0ca07ae..9325e4f531 100644
--- a/resources/machines/bq_witbox_2.json
+++ b/resources/machines/bq_witbox_2.json
@@ -39,7 +39,7 @@
     "overrides": {
         "bottom_thickness": { "default": 1.2, "visible": true },
         "cool_fan_full_at_height": { "default": 0.8, "visible": false },
-        "speed_wall_0": { "default": 35.0, "visible": false },
+        "speed_wall_0": { "default": 30.0, "visible": false },
         "material_diameter": { "default": 1.75 },
         "layer_height_0": { "default": 0.2, "visible": true },
         "speed_layer_0": { "default": 35.0, "visible": true },
@@ -53,8 +53,8 @@
         "retraction_speed": { "default": 45.0, "visible": false },
         "skirt_gap": { "default": 7.0 },
         "skirt_line_count": { "default": 4 },
-        "speed_infill": { "default": 50.0, "visible": true },
-        "material_print_temperature": { "default": 220.0, "visible": true },
+        "speed_infill": { "default": 60.0, "visible": true },
+        "material_print_temperature": { "default": 210.0, "visible": true },
         "speed_topbottom": { "default": 35.0, "visible": false },
         "top_thickness": { "default": 1.2, "visible": false },
         "top_layers": { "default": 6, "visible": false },
@@ -66,6 +66,6 @@
         "support_enable": { "default": false },
         "speed_print": { "default": 50.0 },
         "skirt_speed": { "default": 35.0, "visible": false },
-        "skirt_minimal_length": { "default": 300.0, "visible": false }
+        "skirt_minimal_length": { "default": 30.0, "visible": false }
     }
 }

From d0b5fe84b8fb6e039652ca0ffabfabfcaf853c79 Mon Sep 17 00:00:00 2001
From: Ghostkeeper <ghost_keeper+github@hotmail.com>
Date: Fri, 23 Oct 2015 12:16:05 +0200
Subject: [PATCH 04/14] Remove infill_sparse_combine setting

In discussion, we deemed infill_sparse_thickness more clear to the user and infill_sparse_combine superfluous, since it is really an intermediary value used by the engine to round the thickness up. So now it is actually computed in the engine. Accompanying this commit will be a commit to CuraEngine to remove the setting from the .json file.
---
 resources/machines/fdmprinter.json | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json
index 5f918bf047..f5dfa01640 100644
--- a/resources/machines/fdmprinter.json
+++ b/resources/machines/fdmprinter.json
@@ -496,17 +496,7 @@
                     "unit": "mm",
                     "type": "float",
                     "default": 0.1,
-                    "visible": false,
-                    "children": {
-                        "infill_sparse_combine": {
-                            "label": "Infill Layers",
-                            "description": "Amount of layers that are combined together to form sparse infill.",
-                            "type": "int",
-                            "default": 1,
-                            "visible": false,
-                            "inherit_function": "math.floor((   parent_value + 0.001) / layer_height)"
-                        }
-                    }
+                    "visible": false
                 },
                 "infill_before_walls": {
                     "label": "Infill Before Walls",

From 07c9ecc931e1b4c086ab1a8b8ddd028411fcff35 Mon Sep 17 00:00:00 2001
From: Arjen Hiemstra <ahiemstra@heimr.nl>
Date: Fri, 23 Oct 2015 14:03:43 +0200
Subject: [PATCH 05/14] Use a decorator to track Z offset

This makes it much easier to correct for Z offset after operations

CURA-196 #Ready-for-Review
---
 cura/CuraApplication.py  | 15 ++++++---------
 cura/PlatformPhysics.py  | 18 +++++++++++++++++-
 cura/ZOffsetDecorator.py | 13 +++++++++++++
 3 files changed, 36 insertions(+), 10 deletions(-)
 create mode 100644 cura/ZOffsetDecorator.py

diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index b0bbc05ca9..689ae888a6 100644
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -37,6 +37,7 @@ from . import CameraAnimation
 from . import PrintInformation
 from . import CuraActions
 from . import MultiMaterialDecorator
+from . import ZOffsetDecorator
 
 from PyQt5.QtCore import pyqtSlot, QUrl, Qt, pyqtSignal, pyqtProperty, QEvent, Q_ENUMS
 from PyQt5.QtGui import QColor, QIcon
@@ -342,14 +343,12 @@ class CuraApplication(QtApplication):
                 continue #Grouped nodes don't need resetting as their parent (the group) is resetted)
 
             nodes.append(node)
+
         if nodes:
             op = GroupedOperation()
             for node in nodes:
-                # Ensure that the object is above the build platform
-                move_distance = node.getBoundingBox().center.y
-                if move_distance <= 0:
-                    move_distance = -node.getBoundingBox().bottom
-                op.addOperation(SetTransformOperation(node, Vector(0,move_distance,0)))
+                node.removeDecorator(ZOffsetDecorator.ZOffsetDecorator)
+                op.addOperation(SetTransformOperation(node, Vector(0,0,0)))
 
             op.push()
     
@@ -371,10 +370,8 @@ class CuraApplication(QtApplication):
 
             for node in nodes:
                 # Ensure that the object is above the build platform
-                move_distance = node.getBoundingBox().center.y
-                if move_distance <= 0:
-                    move_distance = -node.getBoundingBox().bottom
-                op.addOperation(SetTransformOperation(node, Vector(0,move_distance,0), Quaternion(), Vector(1, 1, 1)))
+                node.removeDecorator(ZOffsetDecorator.ZOffsetDecorator)
+                op.addOperation(SetTransformOperation(node, Vector(0,0,0), Quaternion(), Vector(1, 1, 1)))
 
             op.push()
             
diff --git a/cura/PlatformPhysics.py b/cura/PlatformPhysics.py
index 2e4d77b77f..3933802135 100644
--- a/cura/PlatformPhysics.py
+++ b/cura/PlatformPhysics.py
@@ -17,6 +17,7 @@ from cura.ConvexHullDecorator import ConvexHullDecorator
 
 from . import PlatformPhysicsOperation
 from . import ConvexHullJob
+from . import ZOffsetDecorator
 
 import time
 import threading
@@ -69,8 +70,12 @@ class PlatformPhysics:
             # Move it downwards if bottom is above platform
             move_vector = Vector()
             if not (node.getParent() and node.getParent().callDecoration("isGroup")): #If an object is grouped, don't move it down
+                z_offset = node.callDecoration("getZOffset") if node.getDecorator(ZOffsetDecorator.ZOffsetDecorator) else 0
                 if bbox.bottom > 0:
-                    move_vector.setY(-bbox.bottom)
+                    move_vector.setY(-bbox.bottom + z_offset)
+                elif bbox.bottom < z_offset:
+                    move_vector.setY((-bbox.bottom) - z_offset)
+
             #if not Float.fuzzyCompare(bbox.bottom, 0.0):
             #   pass#move_vector.setY(-bbox.bottom)
 
@@ -149,5 +154,16 @@ class PlatformPhysics:
         self._enabled = False
 
     def _onToolOperationStopped(self, tool):
+        if tool.getPluginId() == "TranslateTool":
+            for node in Selection.getAllSelectedObjects():
+                if node.getBoundingBox().bottom < 0:
+                    if not node.getDecorator(ZOffsetDecorator.ZOffsetDecorator):
+                        node.addDecorator(ZOffsetDecorator.ZOffsetDecorator())
+
+                    node.callDecoration("setZOffset", node.getBoundingBox().bottom)
+                else:
+                    if node.getDecorator(ZOffsetDecorator.ZOffsetDecorator):
+                        node.removeDecorator(ZOffsetDecorator.ZOffsetDecorator)
+
         self._enabled = True
         self._onChangeTimerFinished()
diff --git a/cura/ZOffsetDecorator.py b/cura/ZOffsetDecorator.py
new file mode 100644
index 0000000000..54bf64b9a5
--- /dev/null
+++ b/cura/ZOffsetDecorator.py
@@ -0,0 +1,13 @@
+from UM.Scene.SceneNodeDecorator import SceneNodeDecorator
+
+##  A decorator that stores the amount an object has been moved below the platform.
+class ZOffsetDecorator(SceneNodeDecorator):
+    def __init__(self):
+        self._z_offset = 0
+
+    def setZOffset(self, offset):
+        print("setZOffset", offset)
+        self._z_offset = offset
+
+    def getZOffset(self):
+        return self._z_offset

From e7e833bfcf2474f7c3014e19f4ec897f1b476ba0 Mon Sep 17 00:00:00 2001
From: Arjen Hiemstra <ahiemstra@heimr.nl>
Date: Mon, 26 Oct 2015 13:00:10 +0100
Subject: [PATCH 06/14] Fix firmware update to properly report progress

CURA-274 #Ready-for-Review
---
 plugins/USBPrinting/PrinterConnection.py |  1 +
 plugins/USBPrinting/USBPrinterManager.py | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/plugins/USBPrinting/PrinterConnection.py b/plugins/USBPrinting/PrinterConnection.py
index b1ac8603cc..c78dcf1697 100644
--- a/plugins/USBPrinting/PrinterConnection.py
+++ b/plugins/USBPrinting/PrinterConnection.py
@@ -123,6 +123,7 @@ class PrinterConnection(OutputDevice, QObject, SignalEmitter):
     progressChanged = pyqtSignal()
     extruderTemperatureChanged = pyqtSignal()
     bedTemperatureChanged = pyqtSignal()
+    firmwareUpdateComplete = pyqtSignal()
 
     endstopStateChanged = pyqtSignal(str ,bool, arguments = ["key","state"])
 
diff --git a/plugins/USBPrinting/USBPrinterManager.py b/plugins/USBPrinting/USBPrinterManager.py
index 1249c454ff..9d9b0b4a02 100644
--- a/plugins/USBPrinting/USBPrinterManager.py
+++ b/plugins/USBPrinting/USBPrinterManager.py
@@ -54,6 +54,15 @@ class USBPrinterManager(QObject, SignalEmitter, OutputDevicePlugin, Extension):
     addConnectionSignal = Signal()
     printerConnectionStateChanged = pyqtSignal()
 
+    progressChanged = pyqtSignal()
+    @pyqtProperty(float, notify = progressChanged)
+    def progress(self):
+        progress = 0
+        for name, connection in self._printer_connections.items():
+            progress += connection.progress
+
+        return progress / len(self._printer_connections)
+
     def start(self):
         self._check_updates = True
         self._update_thread.start()
@@ -91,6 +100,7 @@ class USBPrinterManager(QObject, SignalEmitter, OutputDevicePlugin, Extension):
             try:
                 self._printer_connections[printer_connection].updateFirmware(Resources.getPath(CuraApplication.ResourceTypes.Firmware, self._getDefaultFirmwareName()))
             except FileNotFoundError:
+                Logger.log("w", "No firmware found for printer %s", printer_connection)
                 continue
 
     @pyqtSlot(str, result = bool)
@@ -154,6 +164,7 @@ class USBPrinterManager(QObject, SignalEmitter, OutputDevicePlugin, Extension):
         connection = PrinterConnection.PrinterConnection(serial_port)
         connection.connect()
         connection.connectionStateChanged.connect(self._onPrinterConnectionStateChanged)
+        connection.progressChanged.connect(self.progressChanged)
         self._printer_connections[serial_port] = connection
 
     def _onPrinterConnectionStateChanged(self, serial_port):
@@ -197,4 +208,4 @@ class USBPrinterManager(QObject, SignalEmitter, OutputDevicePlugin, Extension):
                 base_list = base_list + glob.glob("/dev/ttyUSB*") + glob.glob("/dev/ttyACM*") + glob.glob("/dev/cu.*") + glob.glob("/dev/tty.usb*") + glob.glob("/dev/rfcomm*") + glob.glob("/dev/serial/by-id/*")
         return list(base_list)
 
-    _instance = None
\ No newline at end of file
+    _instance = None

From 883cb08e545b65b5dbd3b909b691b73be3a36484 Mon Sep 17 00:00:00 2001
From: Tamara Hogenhout <t.hogenhout@ultimaker.com>
Date: Mon, 26 Oct 2015 13:58:43 +0100
Subject: [PATCH 07/14] moves the changelog from on-startup to the extensions
 menu

contributes to #CURA-243
---
 plugins/ChangeLogPlugin/ChangeLog.py | 5 +++--
 plugins/ChangeLogPlugin/__init__.py  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugins/ChangeLogPlugin/ChangeLog.py b/plugins/ChangeLogPlugin/ChangeLog.py
index d83466f0c6..4d4c3762f6 100644
--- a/plugins/ChangeLogPlugin/ChangeLog.py
+++ b/plugins/ChangeLogPlugin/ChangeLog.py
@@ -31,6 +31,7 @@ class ChangeLog(Extension, QObject,):
         self._change_logs = None
         Application.getInstance().engineCreatedSignal.connect(self._onEngineCreated)
         Preferences.getInstance().addPreference("general/latest_version_changelog_shown", "15.05.90") #First version of CURA with uranium
+        self.addMenuItem(catalog.i18nc("@item:inmenu", "Show Changelog"), self.showChangelog)
         #self.showChangelog()
 
     def getChangeLogs(self):
@@ -77,8 +78,8 @@ class ChangeLog(Extension, QObject,):
     def _onEngineCreated(self):
         if not self._version:
             return #We're on dev branch.
-        if self._version > Preferences.getInstance().getValue("general/latest_version_changelog_shown"):
-            self.showChangelog()
+        #if self._version > Preferences.getInstance().getValue("general/latest_version_changelog_shown"):
+            #self.showChangelog()
 
     def showChangelog(self):
         if not self._changelog_window:
diff --git a/plugins/ChangeLogPlugin/__init__.py b/plugins/ChangeLogPlugin/__init__.py
index 431a93c395..40c0621a63 100644
--- a/plugins/ChangeLogPlugin/__init__.py
+++ b/plugins/ChangeLogPlugin/__init__.py
@@ -9,7 +9,7 @@ catalog = i18nCatalog("cura")
 def getMetaData():
     return {
         "plugin": {
-            "name": catalog.i18nc("@label", "Change Log"),
+            "name": catalog.i18nc("@label", "Changelog"),
             "author": "Ultimaker",
             "version": "1.0",
             "description":  catalog.i18nc("@info:whatsthis", "Shows changes since latest checked version"),

From dab05e39a58a15e9ba40eb2c4fb04c01a7e69697 Mon Sep 17 00:00:00 2001
From: Tamara Hogenhout <t.hogenhout@ultimaker.com>
Date: Mon, 26 Oct 2015 14:41:34 +0100
Subject: [PATCH 08/14] Changes the color of the 'C' in one iconfile

fixes #CURA-241
---
 resources/images/cura-icon.png | Bin 2145 -> 2710 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/resources/images/cura-icon.png b/resources/images/cura-icon.png
index ecfe0d1e4efe064ae9e5154e423d15b303fa4dd2..8fd6f4169100dfed65c69ab9a36e2ad9e911a33d 100644
GIT binary patch
delta 2685
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

delta 2116
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


From d943bbee31e3a1635654aa80e1fca06de7f0bd4d Mon Sep 17 00:00:00 2001
From: Arjen Hiemstra <ahiemstra@heimr.nl>
Date: Mon, 26 Oct 2015 16:05:00 +0100
Subject: [PATCH 09/14] Properly default infill_sparse_thickness to
 layer_height`

Contributes to CURA-323
---
 resources/machines/fdmprinter.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json
index f5dfa01640..a28a96fd34 100644
--- a/resources/machines/fdmprinter.json
+++ b/resources/machines/fdmprinter.json
@@ -496,7 +496,8 @@
                     "unit": "mm",
                     "type": "float",
                     "default": 0.1,
-                    "visible": false
+                    "visible": false,
+                    "inherit_function": "layer_height"
                 },
                 "infill_before_walls": {
                     "label": "Infill Before Walls",

From a94961d28bebc9bfbc1c7981227f8a254896d7b3 Mon Sep 17 00:00:00 2001
From: Arjen Hiemstra <ahiemstra@heimr.nl>
Date: Mon, 26 Oct 2015 16:23:49 +0100
Subject: [PATCH 10/14] Remove full screen from menu and disable the shortcut
 key

Upstream is unfortunately riddled with bugs, so it is better to disable
full screen for now.

CURA-317 #Ready-for-Review
---
 resources/qml/Actions.qml | 1 -
 resources/qml/Cura.qml    | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml
index 2c42275e0d..59aa227cca 100644
--- a/resources/qml/Actions.qml
+++ b/resources/qml/Actions.qml
@@ -47,7 +47,6 @@ Item
     Action
     {
         id:toggleFullScreenAction
-        shortcut: StandardKey.FullScreen;
         text: catalog.i18nc("@action:inmenu","Toggle Fu&ll Screen");
         iconName: "view-fullscreen";
     }
diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index 6af5c316cc..696b37bdad 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -152,10 +152,6 @@ UM.MainWindow
                     onObjectRemoved: top_view_menu.removeItem(object)
                 }
                 ExclusiveGroup { id: view_menu_top_group; }
-
-                MenuSeparator { }
-
-                MenuItem { action: actions.toggleFullScreen; }
             }
             Menu
             {

From 8c629c511c17ced0ff91ce011d4ddb527ab4eeb6 Mon Sep 17 00:00:00 2001
From: Tim Kuipers <t.kuipers@ultimaker.com>
Date: Tue, 27 Oct 2015 16:49:43 +0100
Subject: [PATCH 11/14] JSON: temp flow settings

---
 resources/machines/RigidBot.json           |  2 ++
 resources/machines/RigidBotBig.json        |  2 ++
 resources/machines/fdmprinter.json         | 36 ++++++++++++++++++++++
 resources/machines/grr_neo.json            |  2 ++
 resources/machines/maker_starter.json      |  2 ++
 resources/machines/prusa_i3.json           |  2 ++
 resources/machines/ultimaker2.json         |  8 +++++
 resources/machines/ultimaker_original.json |  8 +++++
 8 files changed, 62 insertions(+)

diff --git a/resources/machines/RigidBot.json b/resources/machines/RigidBot.json
index 0f57e4e1bc..ccdd6475f8 100644
--- a/resources/machines/RigidBot.json
+++ b/resources/machines/RigidBot.json
@@ -18,6 +18,8 @@
         "machine_nozzle_size": { "default": 0.4,
 			"visible": true 
 		},
+        "machine_nozzle_heat_up_speed": { "default": 2.0 },
+        "machine_nozzle_cool_down_speed": { "default": 2.0 },
         "machine_head_shape_min_x": { "default": 0 },
         "machine_head_shape_min_y": { "default": 0 },
         "machine_head_shape_max_x": { "default": 0 },
diff --git a/resources/machines/RigidBotBig.json b/resources/machines/RigidBotBig.json
index f97d5845e4..b3f3f29728 100644
--- a/resources/machines/RigidBotBig.json
+++ b/resources/machines/RigidBotBig.json
@@ -16,6 +16,8 @@
         "machine_heated_bed": { "default": true },
 
         "machine_nozzle_size": { "default": 0.4},
+        "machine_nozzle_heat_up_speed": { "default": 2.0 },
+        "machine_nozzle_cool_down_speed": { "default": 2.0 },
         "machine_head_shape_min_x": { "default": 0 },
         "machine_head_shape_min_y": { "default": 0 },
         "machine_head_shape_max_x": { "default": 0 },
diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json
index c8b1393827..f836fdcc13 100644
--- a/resources/machines/fdmprinter.json
+++ b/resources/machines/fdmprinter.json
@@ -38,6 +38,8 @@
         "machine_nozzle_head_distance": { "default": 3, "SEE_machine_extruder_trains": true  },
         "machine_nozzle_expansion_angle": { "default": 45, "SEE_machine_extruder_trains": true  },
         "machine_heat_zone_length": { "default": 16, "SEE_machine_extruder_trains": true  },
+        "machine_nozzle_heat_up_speed": { "default": 2.0, "SEE_machine_extruder_trains": true  },
+        "machine_nozzle_cool_down_speed": { "default": 2.0, "SEE_machine_extruder_trains": true  },
         "machine_gcode_flavor": {
             "default": "RepRap"
         },
@@ -513,6 +515,13 @@
             "visible": true,
             "icon": "category_material",
             "settings": {
+                "material_flow_dependent_temperature": {
+                    "label": "Auto Temperature",
+                    "description": "Change the temperature each layer automatically with the average flow speed of that layer.",
+                    "type": "boolean",
+                    "default": true,
+                    "visible": true
+                },
                 "material_print_temperature": {
                     "label": "Printing Temperature",
                     "description": "The temperature used for printing. Set at 0 to pre-heat yourself. For PLA a value of 210C is usually used.\nFor ABS a value of 230C or higher is required.",
@@ -520,8 +529,35 @@
                     "type": "float",
                     "default": 210,
                     "min_value": "0",
+                    "max_value_warning": "260",
+                    "enabled": "not (material_flow_dependent_temperature)"
+                },
+                "material_flow_temp_graph": {
+                    "label": "Flow Temperature Graph",
+                    "description": "Data linking material flow (in mm³/s) to temperature (°C).",
+                    "unit": "",
+                    "type": "string",
+                    "default": "[[0.1,180],[20,230]]",
+                    "enabled": "material_flow_dependent_temperature"
+                },
+                "material_standby_temperature": {
+                    "label": "Standby Temperature",
+                    "description": "The temperature of the nozzle when another nozzle is currently used for printing.",
+                    "unit": "°C",
+                    "type": "float",
+                    "default": 150,
+                    "min_value": "0",
                     "max_value_warning": "260"
                 },
+                "material_extrusion_cool_down_speed": {
+                    "label": "Extrusion Cool Down Speed Modifier",
+                    "description": "The extra speed by which the nozzle cools when while extruding. The same value is used to signify the heat up speed lost when heating up while extruding.",
+                    "unit": "°C/s",
+                    "type": "float",
+                    "default": 0.5,
+                    "min_value": "0",
+                    "max_value_warning": "10.0"
+                },
                 "material_bed_temperature": {
                     "label": "Bed Temperature",
                     "description": "The temperature used for the heated printer bed. Set at 0 to pre-heat it yourself.",
diff --git a/resources/machines/grr_neo.json b/resources/machines/grr_neo.json
index 472062a097..488909c79c 100644
--- a/resources/machines/grr_neo.json
+++ b/resources/machines/grr_neo.json
@@ -16,6 +16,8 @@
         "machine_depth": { "default": 150 },
         "machine_center_is_zero": { "default": false },
         "machine_nozzle_size": { "default": 0.5 },
+        "machine_nozzle_heat_up_speed": { "default": 2.0 },
+        "machine_nozzle_cool_down_speed": { "default": 2.0 },
         "machine_head_shape_min_x": { "default": 75 },
         "machine_head_shape_min_y": { "default": 18 },
         "machine_head_shape_max_x": { "default": 18 },
diff --git a/resources/machines/maker_starter.json b/resources/machines/maker_starter.json
index 8ff7bbd7c0..7e4e08f175 100644
--- a/resources/machines/maker_starter.json
+++ b/resources/machines/maker_starter.json
@@ -17,6 +17,8 @@
 
         "machine_center_is_zero": { "default": false },
         "machine_nozzle_size": { "default": 0.4 },
+        "machine_nozzle_heat_up_speed": { "default": 2.0 },
+        "machine_nozzle_cool_down_speed": { "default": 2.0 },
         "machine_head_shape_min_x": { "default": 0 },
         "machine_head_shape_min_y": { "default": 0 },
         "machine_head_shape_max_x": { "default": 0 },
diff --git a/resources/machines/prusa_i3.json b/resources/machines/prusa_i3.json
index 4311bc1fc2..997a246601 100644
--- a/resources/machines/prusa_i3.json
+++ b/resources/machines/prusa_i3.json
@@ -16,6 +16,8 @@
         "machine_depth": { "default": 200 },
         "machine_center_is_zero": { "default": false },
         "machine_nozzle_size": { "default": 0.4 },
+        "machine_nozzle_heat_up_speed": { "default": 2.0 },
+        "machine_nozzle_cool_down_speed": { "default": 2.0 },
         "machine_head_shape_min_x": { "default": 75 },
         "machine_head_shape_min_y": { "default": 18 },
         "machine_head_shape_max_x": { "default": 18 },
diff --git a/resources/machines/ultimaker2.json b/resources/machines/ultimaker2.json
index 99f2247b0e..319e47cd57 100644
--- a/resources/machines/ultimaker2.json
+++ b/resources/machines/ultimaker2.json
@@ -16,6 +16,12 @@
             "machine_nozzle_size": {
                 "default": 0.4
             },
+            "machine_nozzle_heat_up_speed": { 
+                "default": 2.0 
+            },
+            "machine_nozzle_cool_down_speed": { 
+                "default": 2.0 
+            },
             "machine_nozzle_tip_outer_diameter": {
                 "default": 1
             },
@@ -61,6 +67,8 @@
         },
         "machine_center_is_zero": { "default": false },
         "machine_nozzle_size": { "default": 0.4 },
+        "machine_nozzle_heat_up_speed": { "default": 2.0 },
+        "machine_nozzle_cool_down_speed": { "default": 2.0 },
         "gantry_height": { "default": 55 },
         "machine_use_extruder_offset_to_offset_coords": { "default": true },
         "machine_gcode_flavor": { "default": "UltiGCode" },
diff --git a/resources/machines/ultimaker_original.json b/resources/machines/ultimaker_original.json
index 6ea8d65cee..4c94d5e4c4 100644
--- a/resources/machines/ultimaker_original.json
+++ b/resources/machines/ultimaker_original.json
@@ -21,6 +21,12 @@
             "machine_nozzle_size": {
                 "default": 0.4
             },
+            "machine_nozzle_heat_up_speed": { 
+                "default": 2.0 
+            },
+            "machine_nozzle_cool_down_speed": { 
+                "default": 2.0 
+            },
             "machine_nozzle_tip_outer_diameter": {
                 "default": 1
             },
@@ -41,6 +47,8 @@
         "machine_depth": { "default": 205 },
         "machine_center_is_zero": { "default": false },
         "machine_nozzle_size": { "default": 0.4 },
+        "machine_nozzle_heat_up_speed": { "default": 2.0 },
+        "machine_nozzle_cool_down_speed": { "default": 2.0 },
         "machine_head_with_fans_polygon":
         {
             "default": [

From a4a0dfdf89969235c424f304e5ef82efaa0f9c9e Mon Sep 17 00:00:00 2001
From: daid <daid303@gmail.com>
Date: Wed, 28 Oct 2015 15:05:07 +0100
Subject: [PATCH 12/14] Fix code style violations in the avr_isp

---
 plugins/USBPrinting/avr_isp/chipDB.py   | 18 ++---
 plugins/USBPrinting/avr_isp/intelHex.py | 36 +++++-----
 plugins/USBPrinting/avr_isp/ispBase.py  | 12 ++--
 plugins/USBPrinting/avr_isp/stk500v2.py | 88 ++++++++++++-------------
 4 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/plugins/USBPrinting/avr_isp/chipDB.py b/plugins/USBPrinting/avr_isp/chipDB.py
index ba9cf434d5..891b5a394a 100644
--- a/plugins/USBPrinting/avr_isp/chipDB.py
+++ b/plugins/USBPrinting/avr_isp/chipDB.py
@@ -5,21 +5,21 @@ This is a python 3 conversion of the code created by David Braam for the Cura pr
 """
 
 avrChipDB = {
-    'ATMega1280': {
-            'signature': [0x1E, 0x97, 0x03],
-            'pageSize': 128,
-            'pageCount': 512,
+    "ATMega1280": {
+            "signature": [0x1E, 0x97, 0x03],
+            "pageSize": 128,
+            "pageCount": 512,
     },
-    'ATMega2560': {
-            'signature': [0x1E, 0x98, 0x01],
-            'pageSize': 128,
-            'pageCount': 1024,
+    "ATMega2560": {
+            "signature": [0x1E, 0x98, 0x01],
+            "pageSize": 128,
+            "pageCount": 1024,
     },
 }
 
 def getChipFromDB(sig):
     for chip in avrChipDB.values():
-        if chip['signature'] == sig:
+        if chip["signature"] == sig:
             return chip
     return False
 
diff --git a/plugins/USBPrinting/avr_isp/intelHex.py b/plugins/USBPrinting/avr_isp/intelHex.py
index 822936ef1b..4444006b3d 100644
--- a/plugins/USBPrinting/avr_isp/intelHex.py
+++ b/plugins/USBPrinting/avr_isp/intelHex.py
@@ -11,36 +11,36 @@ def readHex(filename):
     Read an verify an intel hex file. Return the data as an list of bytes.
     """
     data = []
-    extraAddr = 0
+    extra_addr = 0
     f = io.open(filename, "r")
     for line in f:
         line = line.strip()
         if len(line) < 1:
             continue
-        if line[0] != ':':
+        if line[0] != ":":
             raise Exception("Hex file has a line not starting with ':'")
-        recLen = int(line[1:3], 16)
-        addr = int(line[3:7], 16) + extraAddr
-        recType = int(line[7:9], 16)
-        if len(line) != recLen * 2 + 11:
+        rec_len = int(line[1:3], 16)
+        addr = int(line[3:7], 16) + extra_addr
+        rec_type = int(line[7:9], 16)
+        if len(line) != rec_len * 2 + 11:
             raise Exception("Error in hex file: " + line)
-        checkSum = 0
-        for i in range(0, recLen + 5):
-            checkSum += int(line[i*2+1:i*2+3], 16)
-        checkSum &= 0xFF
-        if checkSum != 0:
+        check_sum = 0
+        for i in range(0, rec_len + 5):
+            check_sum += int(line[i*2+1:i*2+3], 16)
+        check_sum &= 0xFF
+        if check_sum != 0:
             raise Exception("Checksum error in hex file: " + line)
         
-        if recType == 0:#Data record
-            while len(data) < addr + recLen:
+        if rec_type == 0:#Data record
+            while len(data) < addr + rec_len:
                 data.append(0)
-            for i in range(0, recLen):
+            for i in range(0, rec_len):
                 data[addr + i] = int(line[i*2+9:i*2+11], 16)
-        elif recType == 1:	#End Of File record
+        elif rec_type == 1:	#End Of File record
             pass
-        elif recType == 2:	#Extended Segment Address Record
-            extraAddr = int(line[9:13], 16) * 16
+        elif rec_type == 2:	#Extended Segment Address Record
+            extra_addr = int(line[9:13], 16) * 16
         else:
-            print(recType, recLen, addr, checkSum, line)
+            print(rec_type, rec_len, addr, check_sum, line)
     f.close()
     return data
diff --git a/plugins/USBPrinting/avr_isp/ispBase.py b/plugins/USBPrinting/avr_isp/ispBase.py
index 1ba1317f91..8c816decbb 100644
--- a/plugins/USBPrinting/avr_isp/ispBase.py
+++ b/plugins/USBPrinting/avr_isp/ispBase.py
@@ -14,18 +14,18 @@ class IspBase():
     Base class for ISP based AVR programmers.
     Functions in this class raise an IspError when something goes wrong.
     """
-    def programChip(self, flashData):
+    def programChip(self, flash_data):
         """ Program a chip with the given flash data. """
-        self.curExtAddr = -1
+        self.cur_ext_addr = -1
         self.chip = chipDB.getChipFromDB(self.getSignature())
         if not self.chip:
             raise IspError("Chip with signature: " + str(self.getSignature()) + "not found")
         self.chipErase()
         
-        print("Flashing %i bytes" % len(flashData))
-        self.writeFlash(flashData)
-        print("Verifying %i bytes" % len(flashData))
-        self.verifyFlash(flashData)
+        print("Flashing %i bytes" % len(flash_data))
+        self.writeFlash(flash_data)
+        print("Verifying %i bytes" % len(flash_data))
+        self.verifyFlash(flash_data)
         print("Completed")
 
     def getSignature(self):
diff --git a/plugins/USBPrinting/avr_isp/stk500v2.py b/plugins/USBPrinting/avr_isp/stk500v2.py
index c0e3b0ec89..02d398ef58 100644
--- a/plugins/USBPrinting/avr_isp/stk500v2.py
+++ b/plugins/USBPrinting/avr_isp/stk500v2.py
@@ -19,10 +19,10 @@ class Stk500v2(ispBase.IspBase):
     def __init__(self):
         self.serial = None
         self.seq = 1
-        self.lastAddr = -1
-        self.progressCallback = None
+        self.last_addr = -1
+        self.progress_callback = None
         
-    def connect(self, port = 'COM22', speed = 115200):
+    def connect(self, port = "COM22", speed = 115200):
         if self.serial is not None:
             self.close()
         try:
@@ -82,49 +82,49 @@ class Stk500v2(ispBase.IspBase):
     
     def writeFlash(self, flash_data):
         #Set load addr to 0, in case we have more then 64k flash we need to enable the address extension
-        page_size = self.chip['pageSize'] * 2
-        flashSize = page_size * self.chip['pageCount']
+        page_size = self.chip["pageSize"] * 2
+        flash_size = page_size * self.chip["pageCount"]
         print("Writing flash")
-        if flashSize > 0xFFFF:
+        if flash_size > 0xFFFF:
             self.sendMessage([0x06, 0x80, 0x00, 0x00, 0x00])
         else:
             self.sendMessage([0x06, 0x00, 0x00, 0x00, 0x00])
         load_count = (len(flash_data) + page_size - 1) / page_size   
         for i in range(0, int(load_count)):
             recv = self.sendMessage([0x13, page_size >> 8, page_size & 0xFF, 0xc1, 0x0a, 0x40, 0x4c, 0x20, 0x00, 0x00] + flash_data[(i * page_size):(i * page_size + page_size)])
-            if self.progressCallback is not None:
+            if self.progress_callback is not None:
                 if self._has_checksum:
-                    self.progressCallback(i + 1, load_count)
+                    self.progress_callback(i + 1, load_count)
                 else:
-                    self.progressCallback(i + 1, load_count*2)
+                    self.progress_callback(i + 1, load_count*2)
     
-    def verifyFlash(self, flashData):
+    def verifyFlash(self, flash_data):
         if self._has_checksum:
-            self.sendMessage([0x06, 0x00, (len(flashData) >> 17) & 0xFF, (len(flashData) >> 9) & 0xFF, (len(flashData) >> 1) & 0xFF])
+            self.sendMessage([0x06, 0x00, (len(flash_data) >> 17) & 0xFF, (len(flash_data) >> 9) & 0xFF, (len(flash_data) >> 1) & 0xFF])
             res = self.sendMessage([0xEE])
             checksum_recv = res[2] | (res[3] << 8)
             checksum = 0
-            for d in flashData:
+            for d in flash_data:
                 checksum += d
             checksum &= 0xFFFF
             if hex(checksum) != hex(checksum_recv):
-                raise ispBase.IspError('Verify checksum mismatch: 0x%x != 0x%x' % (checksum & 0xFFFF, checksum_recv))
+                raise ispBase.IspError("Verify checksum mismatch: 0x%x != 0x%x" % (checksum & 0xFFFF, checksum_recv))
         else:
             #Set load addr to 0, in case we have more then 64k flash we need to enable the address extension
-            flashSize = self.chip['pageSize'] * 2 * self.chip['pageCount']
-            if flashSize > 0xFFFF:
+            flash_size = self.chip["pageSize"] * 2 * self.chip["pageCount"]
+            if flash_size > 0xFFFF:
                 self.sendMessage([0x06, 0x80, 0x00, 0x00, 0x00])
             else:
                 self.sendMessage([0x06, 0x00, 0x00, 0x00, 0x00])
 
-            loadCount = (len(flashData) + 0xFF) / 0x100
-            for i in range(0, int(loadCount)):
+            load_count = (len(flash_data) + 0xFF) / 0x100
+            for i in range(0, int(load_count)):
                 recv = self.sendMessage([0x14, 0x01, 0x00, 0x20])[2:0x102]
-                if self.progressCallback is not None:
-                    self.progressCallback(loadCount + i + 1, loadCount*2)
+                if self.progress_callback is not None:
+                    self.progress_callback(load_count + i + 1, load_count*2)
                 for j in range(0, 0x100):
-                    if i * 0x100 + j < len(flashData) and flashData[i * 0x100 + j] != recv[j]:
-                        raise ispBase.IspError('Verify error at: 0x%x' % (i * 0x100 + j))
+                    if i * 0x100 + j < len(flash_data) and flash_data[i * 0x100 + j] != recv[j]:
+                        raise ispBase.IspError("Verify error at: 0x%x" % (i * 0x100 + j))
 
     def sendMessage(self, data):
         message = struct.pack(">BBHB", 0x1B, self.seq, len(data), 0x0E)
@@ -138,12 +138,12 @@ class Stk500v2(ispBase.IspBase):
             self.serial.write(message)
             self.serial.flush()
         except SerialTimeoutException:
-            raise ispBase.IspError('Serial send timeout')
+            raise ispBase.IspError("Serial send timeout")
         self.seq = (self.seq + 1) & 0xFF
         return self.recvMessage()
     
     def recvMessage(self):
-        state = 'Start'
+        state = "Start"
         checksum = 0
         while True:
             s = self.serial.read()
@@ -152,31 +152,31 @@ class Stk500v2(ispBase.IspBase):
             b = struct.unpack(">B", s)[0]
             checksum ^= b
             #print(hex(b))
-            if state == 'Start':
+            if state == "Start":
                 if b == 0x1B:
-                    state = 'GetSeq'
+                    state = "GetSeq"
                     checksum = 0x1B
-            elif state == 'GetSeq':
-                state = 'MsgSize1'
-            elif state == 'MsgSize1':
-                msgSize = b << 8
-                state = 'MsgSize2'
-            elif state == 'MsgSize2':
-                msgSize |= b
-                state = 'Token'
-            elif state == 'Token':
+            elif state == "GetSeq":
+                state = "MsgSize1"
+            elif state == "MsgSize1":
+                msg_size = b << 8
+                state = "MsgSize2"
+            elif state == "MsgSize2":
+                msg_size |= b
+                state = "Token"
+            elif state == "Token":
                 if b != 0x0E:
-                    state = 'Start'
+                    state = "Start"
                 else:
-                    state = 'Data'
+                    state = "Data"
                     data = []
-            elif state == 'Data':
+            elif state == "Data":
                 data.append(b)
-                if len(data) == msgSize:
-                    state = 'Checksum'
-            elif state == 'Checksum':
+                if len(data) == msg_size:
+                    state = "Checksum"
+            elif state == "Checksum":
                 if checksum != 0:
-                    state = 'Start'
+                    state = "Start"
                 else:
                     return data
 
@@ -190,7 +190,7 @@ def portList():
             values = _winreg.EnumValue(key, i)
         except:
             return ret
-        if 'USBSER' in values[0]:
+        if "USBSER" in values[0]:
             ret.append(values[1])
         i+=1
     return ret
@@ -205,7 +205,7 @@ def runProgrammer(port, filename):
 def main():
     """ Entry point to call the stk500v2 programmer from the commandline. """
     import threading
-    if sys.argv[1] == 'AUTO':
+    if sys.argv[1] == "AUTO":
         print(portList())
         for port in portList():
             threading.Thread(target=runProgrammer, args=(port,sys.argv[2])).start()
@@ -216,5 +216,5 @@ def main():
         programmer.programChip(intelHex.readHex(sys.argv[2]))
         sys.exit(1)
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()

From 95a695545b1c3a8e222c0f71ad0a67c948c4a37b Mon Sep 17 00:00:00 2001
From: Adam Goldsmith <adam@adamgoldsmith.name>
Date: Wed, 28 Oct 2015 10:29:06 -0400
Subject: [PATCH 13/14] Fix unset text colors on bright backgrounds

Adds a text_default color for use where the background color is set to
something bright. This avoids falling back on the user's theme, in which
the default text color might be also be bright.
---
 resources/qml/ProfileSetup.qml   | 1 +
 resources/qml/SidebarHeader.qml  | 1 +
 resources/qml/SidebarSimple.qml  | 2 ++
 resources/qml/SidebarTooltip.qml | 1 +
 resources/themes/cura/theme.json | 1 +
 5 files changed, 6 insertions(+)

diff --git a/resources/qml/ProfileSetup.qml b/resources/qml/ProfileSetup.qml
index aa4a2b344a..d9869d62b7 100644
--- a/resources/qml/ProfileSetup.qml
+++ b/resources/qml/ProfileSetup.qml
@@ -81,6 +81,7 @@ Item{
             text: catalog.i18nc("@label","Global Profile:");
             width: parent.width/100*45
             font: UM.Theme.fonts.default;
+            color: UM.Theme.colors.text_default;
         }
 
 
diff --git a/resources/qml/SidebarHeader.qml b/resources/qml/SidebarHeader.qml
index 322b9b7a5a..2ce2e7975a 100644
--- a/resources/qml/SidebarHeader.qml
+++ b/resources/qml/SidebarHeader.qml
@@ -100,6 +100,7 @@ Item
             anchors.leftMargin: UM.Theme.sizes.default_margin.width
             anchors.verticalCenter: parent.verticalCenter
             font: UM.Theme.fonts.default;
+            color: UM.Theme.colors.text_default;
         }
 
         ToolButton {
diff --git a/resources/qml/SidebarSimple.qml b/resources/qml/SidebarSimple.qml
index 10b935bbcd..a16b0af225 100644
--- a/resources/qml/SidebarSimple.qml
+++ b/resources/qml/SidebarSimple.qml
@@ -33,6 +33,7 @@ Item
             //: Infill selection label
             text: catalog.i18nc("@label","Infill:");
             font: UM.Theme.fonts.default;
+            color: UM.Theme.colors.text_default;
             anchors.top: parent.top
             anchors.topMargin: UM.Theme.sizes.default_margin.height
             anchors.left: parent.left
@@ -166,6 +167,7 @@ Item
             //: Helpers selection label
             text: catalog.i18nc("@label:listbox","Helpers:");
             font: UM.Theme.fonts.default;
+            color: UM.Theme.colors.text_default;
         }
     }
     Rectangle {
diff --git a/resources/qml/SidebarTooltip.qml b/resources/qml/SidebarTooltip.qml
index 6e0ba74404..8b7cc1c0dc 100644
--- a/resources/qml/SidebarTooltip.qml
+++ b/resources/qml/SidebarTooltip.qml
@@ -47,5 +47,6 @@ Rectangle {
         }
         wrapMode: Text.Wrap;
         font: UM.Theme.fonts.default;
+        color: UM.Theme.colors.text_default;
     }
 }
diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json
index 63e04c6e6e..8130ec9bd0 100644
--- a/resources/themes/cura/theme.json
+++ b/resources/themes/cura/theme.json
@@ -50,6 +50,7 @@
     },
 
     "colors": {
+		"text_default": [0, 0, 0, 255],
         "sidebar": [255, 255, 255, 255],
         "lining": [208, 210, 211, 255],
 

From d5d88e23002067465a615c279087839adb760686 Mon Sep 17 00:00:00 2001
From: daid <daid303@gmail.com>
Date: Wed, 28 Oct 2015 15:51:06 +0100
Subject: [PATCH 14/14] Fix a few more style violations in the avr_isp code.

---
 plugins/USBPrinting/avr_isp/chipDB.py  | 4 ++--
 plugins/USBPrinting/avr_isp/ispBase.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/USBPrinting/avr_isp/chipDB.py b/plugins/USBPrinting/avr_isp/chipDB.py
index 891b5a394a..2da6586503 100644
--- a/plugins/USBPrinting/avr_isp/chipDB.py
+++ b/plugins/USBPrinting/avr_isp/chipDB.py
@@ -4,7 +4,7 @@ To support more chips add the relevant data to the avrChipDB list.
 This is a python 3 conversion of the code created by David Braam for the Cura project.
 """
 
-avrChipDB = {
+avr_chip_db = {
     "ATMega1280": {
             "signature": [0x1E, 0x97, 0x03],
             "pageSize": 128,
@@ -18,7 +18,7 @@ avrChipDB = {
 }
 
 def getChipFromDB(sig):
-    for chip in avrChipDB.values():
+    for chip in avr_chip_db.values():
         if chip["signature"] == sig:
             return chip
     return False
diff --git a/plugins/USBPrinting/avr_isp/ispBase.py b/plugins/USBPrinting/avr_isp/ispBase.py
index 8c816decbb..b5b5f8792e 100644
--- a/plugins/USBPrinting/avr_isp/ispBase.py
+++ b/plugins/USBPrinting/avr_isp/ispBase.py
@@ -45,13 +45,13 @@ class IspBase():
         """
         self.sendISP([0xAC, 0x80, 0x00, 0x00])
 
-    def writeFlash(self, flashData):
+    def writeFlash(self, flash_data):
         """
         Write the flash data, needs to be implemented in a subclass.
         """
         raise IspError("Called undefined writeFlash")
 
-    def verifyFlash(self, flashData):
+    def verifyFlash(self, flash_data):
         """
         Verify the flash data, needs to be implemented in a subclass.
         """