From: daid <daid303@gmail.com>
Date: Fri, 1 Jun 2012 10:14:20 +0000 (+0200)
Subject: Fix printer interface images for frozen build. Do not report an unknown gcode for... 
X-Git-Tag: 12.07~44^2~5
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d6fb3e7f9180f958526241eb175f3fa47d314909;p=cura.git

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

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