diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2019-12-18 12:23:09 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2019-12-18 12:30:20 -0500 |
| commit | 0a86190bae46a22a493f447075ab7713fd6ae9ed (patch) | |
| tree | 07457fbf365ac45598f0127c6e17c46ba68009d0 /klippy | |
| parent | 7532e4ccea6f89e31d0d2f7f2f7e8ddac64abd46 (diff) | |
| download | kutter-0a86190bae46a22a493f447075ab7713fd6ae9ed.tar.gz kutter-0a86190bae46a22a493f447075ab7713fd6ae9ed.tar.xz kutter-0a86190bae46a22a493f447075ab7713fd6ae9ed.zip | |
display: Revert "display: Add ST7567 display support (#1540)"
This reverts commit 1b92af60784ea811a7ca04dfbce75224874cf84a.
The standard "uc1701" lcd_type can now be used in place of the custom
"st7567" lcd_type.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy')
| -rw-r--r-- | klippy/extras/display/display.py | 3 | ||||
| -rw-r--r-- | klippy/extras/display/uc1701.py | 34 |
2 files changed, 1 insertions, 36 deletions
diff --git a/klippy/extras/display/display.py b/klippy/extras/display/display.py index 908c89ab..c1a02725 100644 --- a/klippy/extras/display/display.py +++ b/klippy/extras/display/display.py @@ -11,8 +11,7 @@ import menu LCD_chips = { 'st7920': st7920.ST7920, 'hd44780': hd44780.HD44780, - 'uc1701': uc1701.UC1701, 'ssd1306': uc1701.SSD1306, - 'st7567': uc1701.ST7567, 'sh1106': uc1701.SH1106, + 'uc1701': uc1701.UC1701, 'ssd1306': uc1701.SSD1306, 'sh1106': uc1701.SH1106, } M73_TIMEOUT = 5. diff --git a/klippy/extras/display/uc1701.py b/klippy/extras/display/uc1701.py index da932884..f19d9f97 100644 --- a/klippy/extras/display/uc1701.py +++ b/klippy/extras/display/uc1701.py @@ -2,7 +2,6 @@ # # Copyright (C) 2018-2019 Kevin O'Connor <kevin@koconnor.net> # Copyright (C) 2018 Eric Callahan <arksine.code@gmail.com> -# Copyright (C) 2019 Dmitry Budaev <condemil@gmail.com> # # This file may be distributed under the terms of the GNU GPLv3 license. import logging @@ -187,39 +186,6 @@ class UC1701(DisplayBase): self.send([0xA4]) # normal display self.flush() -# The ST7567 is a "4-wire" SPI display device -class ST7567(DisplayBase): - def __init__(self, config): - DisplayBase.__init__(self, SPI4wire(config, "a0_pin")) - self.contrast = config.getint('contrast', 60, minval=0, maxval=63) - ppins = config.get_printer().lookup_object('pins') - rs_pin = config.get('rs_pin') - self.reset_pin = ppins.setup_pin('digital_out', rs_pin) - self.reset_pin.setup_start_value(start_value=1., shutdown_value=0., - is_static=False) - def init(self): - # Send init commands - init_cmds = [0xE2, # System reset - 0x40, # Set display to start at line 0 - 0xA0, # Set SEG direction - 0xC8, # Set COM Direction - 0xA2, # Set Bias = 1/9 - 0x2F, # Boost, regulator, follower on - 0xF8, # Set booster ratio - 0x00, # Booster ratio value (4x) - 0x23, # Set regulation ratio (3) - 0x81, # Set Electronic Volume - self.contrast, # Electronic Volume value - # 0xAC, # Set static indicator off - # 0x00, # NOP - 0xA6, # Disable Inverse - 0xAF] # Set display enable - self.send(init_cmds) - self.send([0xA5]) # display all - self.send([0xA4]) # normal display - self.flush() - logging.info("st7567 initialized") - # The SSD1306 supports both i2c and "4-wire" spi class SSD1306(DisplayBase): def __init__(self, config, columns=128): |