Fix printer interface images for frozen build. Do not report an unknown gcode for...

diff --git a/Cura/gui/printWindow.py b/Cura/gui/printWindow.py
index dd14425a4e20e17cf238525622af89a78ef24a1d..39686ba473ccb2b189ee35a4793fc0796d1141dd 100644 (file)
--- a/Cura/gui/printWindow.py
+++ b/Cura/gui/printWindow.py
@@ -6,6 +6,7 @@ from wx.lib import buttons
 \r
 from gui import machineCom\r
 from gui import icon\r
+from gui import toolbarUtil\r
 from util import profile\r
 from util import gcodeInterpreter\r
 \r
@@ -53,7 +54,7 @@ class printProcessMonitor():
 \r
 class PrintCommandButton(buttons.GenBitmapButton):\r
        def __init__(self, parent, command, bitmapFilename, size=(20,20)):\r
-               self.bitmap = wx.Bitmap(os.path.join(os.path.split(__file__)[0], "../images", bitmapFilename))\r
+               self.bitmap = toolbarUtil.getBitmapImage(bitmapFilename)\r
                super(PrintCommandButton, self).__init__(parent.directControlPanel, -1, self.bitmap, size=size)\r
 \r
                self.command = command\r

diff --git a/Cura/util/gcodeInterpreter.py b/Cura/util/gcodeInterpreter.py
index 1678640bed7005aed739f8f7e3f496d57ad12098..b71505058a484c402657329815665ddda3e3bbaa 100644 (file)
--- a/Cura/util/gcodeInterpreter.py
+++ b/Cura/util/gcodeInterpreter.py
@@ -215,6 +215,8 @@ class gcode(object):
                                                pass
                                        elif M == 109:  #Set temperature, wait
                                                pass
+                                       elif M == 110:  #Reset N counter
+                                               pass
                                        elif M == 113:  #Extruder PWM (these should not be in the final GCode, but they are)
                                                pass
                                        else: