aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArksine <arksine.code@gmail.com>2018-06-28 11:55:07 -0400
committerKevinOConnor <kevin@koconnor.net>2018-06-28 13:11:44 -0400
commit640169310ff5be35ad31ff1869e7ebbfc9d334ee (patch)
tree243ed90f5268f6c6c5503590dc79ac77fc712d62
parent154397b92ca1964c0581ab4147dbc570d7175681 (diff)
downloadkutter-640169310ff5be35ad31ff1869e7ebbfc9d334ee.tar.gz
kutter-640169310ff5be35ad31ff1869e7ebbfc9d334ee.tar.xz
kutter-640169310ff5be35ad31ff1869e7ebbfc9d334ee.zip
display: fix for 128 x 64 pixel displays
Right justify fan speed and feed rate, keep progress centered. Signed-off-by: Eric Callahan <arksine.code@gmail.com>
-rw-r--r--klippy/extras/display/display.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/klippy/extras/display/display.py b/klippy/extras/display/display.py
index e358e92e..dcae962a 100644
--- a/klippy/extras/display/display.py
+++ b/klippy/extras/display/display.py
@@ -174,8 +174,7 @@ class PrinterLCD:
info = self.fan.get_status(eventtime)
self.animate_glyphs(eventtime, 10, 0, self.FAN1_GLYPH,
info['speed'] != 0.)
- align = '>'if self.lcd_type == 'uc1701' else '^'
- self.draw_percent(12, 0, 4, info['speed'], align)
+ self.draw_percent(12, 0, 4, info['speed'], '>')
# SD card print progress
progress = None
toolhead_info = self.toolhead.get_status(eventtime)
@@ -194,14 +193,13 @@ class PrinterLCD:
x, y, width = 0, 2, 10
else:
x, y, width = 10, 1, 6
- self.draw_percent(x, y, width, progress)
+ self.draw_percent(x, y, width, progress, '^')
self.draw_progress_bar(x, y, width, progress)
# G-Code speed factor
gcode_info = self.gcode.get_status(eventtime)
if extruder_count == 1:
self.draw_icon(10, 1, icons.feedrate_icon)
- align = '>'if self.lcd_type == 'uc1701' else '^'
- self.draw_percent(12, 1, 4, gcode_info['speed_factor'], align)
+ self.draw_percent(12, 1, 4, gcode_info['speed_factor'], '>')
# Printing time and status
printing_time = toolhead_info['printing_time']
remaining_time = None