3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

icons: Add the bed to the bed heating animations 

It isn't necessary to use the st7920's xor capabilities when drawing
the bed heating animations.  This makes it easier to use the icons for
other displays.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2018-09-20 11:10:51 -04:00 committed by KevinOConnor
parent 3d4ee9e962
commit 2857255ef1
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
klippy/extras/display/display.py
View File

@ -9,7 +9,10 @@ import logging
import hd44780, st7920, uc1701, icons import hd44780, st7920, uc1701, icons
import menu import menu
LCD_chips = { 'st7920': st7920.ST7920, 'hd44780': hd44780.HD44780, 'uc1701' : uc1701.UC1701 } LCD_chips = {
'st7920': st7920.ST7920, 'hd44780': hd44780.HD44780,
'uc1701' : uc1701.UC1701
}
M73_TIMEOUT = 5. M73_TIMEOUT = 5.
class PrinterLCD: class PrinterLCD:
@ -46,8 +49,8 @@ class PrinterLCD:
self.gcode.register_command('M73', self.cmd_M73) self.gcode.register_command('M73', self.cmd_M73)
self.gcode.register_command('M117', self.cmd_M117) self.gcode.register_command('M117', self.cmd_M117)
# Load glyphs # Load glyphs
self.load_glyph(self.BED1_GLYPH, icons.heat1_icon) self.load_glyph(self.BED1_GLYPH, icons.bed_heat1_icon)
self.load_glyph(self.BED2_GLYPH, icons.heat2_icon) self.load_glyph(self.BED2_GLYPH, icons.bed_heat2_icon)
self.load_glyph(self.FAN1_GLYPH, icons.fan1_icon) self.load_glyph(self.FAN1_GLYPH, icons.fan1_icon)
self.load_glyph(self.FAN2_GLYPH, icons.fan2_icon) self.load_glyph(self.FAN2_GLYPH, icons.fan2_icon)
# Start screen update timer # Start screen update timer
@ -172,10 +175,11 @@ class PrinterLCD:
extruder_count = 2 extruder_count = 2
if self.heater_bed is not None: if self.heater_bed is not None:
info = self.heater_bed.get_status(eventtime) info = self.heater_bed.get_status(eventtime)
self.draw_icon(0, extruder_count, icons.bed_icon)
if info['target']: if info['target']:
self.animate_glyphs(eventtime, 0, extruder_count, self.animate_glyphs(eventtime, 0, extruder_count,
self.BED1_GLYPH, True) self.BED1_GLYPH, True)
else:
self.draw_icon(0, extruder_count, icons.bed_icon)
self.draw_heater(2, extruder_count, info) self.draw_heater(2, extruder_count, info)
# Fan speed # Fan speed
if self.fan is not None: if self.fan is not None:

12
klippy/extras/display/icons.py
View File

@ -42,7 +42,7 @@ bed_icon = [
0b0000000000000000 0b0000000000000000
] ]
heat1_icon = [ bed_heat1_icon = [
0b0000000000000000, 0b0000000000000000,
0b0000000000000000, 0b0000000000000000,
0b0010001000100000, 0b0010001000100000,
@ -55,13 +55,13 @@ heat1_icon = [
0b0001000100010000, 0b0001000100010000,
0b0000100010001000, 0b0000100010001000,
0b0000000000000000, 0b0000000000000000,
0b0000000000000000, 0b0111111111111110,
0b0000000000000000, 0b0111111111111110,
0b0000000000000000, 0b0000000000000000,
0b0000000000000000 0b0000000000000000
] ]
heat2_icon = [ bed_heat2_icon = [
0b0000000000000000, 0b0000000000000000,
0b0000000000000000, 0b0000000000000000,
0b0000100010001000, 0b0000100010001000,
@ -74,8 +74,8 @@ heat2_icon = [
0b0000100010001000, 0b0000100010001000,
0b0001000100010000, 0b0001000100010000,
0b0000000000000000, 0b0000000000000000,
0b0000000000000000, 0b0111111111111110,
0b0000000000000000, 0b0111111111111110,
0b0000000000000000, 0b0000000000000000,
0b0000000000000000 0b0000000000000000
] ]