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

master
daid 2012-06-01 12:14:20 +02:00
parent a35116833d
commit d6fb3e7f91
2 changed files with 4 additions and 1 deletions

View File

@ -6,6 +6,7 @@ from wx.lib import buttons
from gui import machineCom from gui import machineCom
from gui import icon from gui import icon
from gui import toolbarUtil
from util import profile from util import profile
from util import gcodeInterpreter from util import gcodeInterpreter
@ -53,7 +54,7 @@ class printProcessMonitor():
class PrintCommandButton(buttons.GenBitmapButton): class PrintCommandButton(buttons.GenBitmapButton):
def __init__(self, parent, command, bitmapFilename, size=(20,20)): 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) super(PrintCommandButton, self).__init__(parent.directControlPanel, -1, self.bitmap, size=size)
self.command = command self.command = command

View File

@ -215,6 +215,8 @@ class gcode(object):
pass pass
elif M == 109: #Set temperature, wait elif M == 109: #Set temperature, wait
pass pass
elif M == 110: #Reset N counter
pass
elif M == 113: #Extruder PWM (these should not be in the final GCode, but they are) elif M == 113: #Extruder PWM (these should not be in the final GCode, but they are)
pass pass
else: else: