diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2018-07-26 09:44:45 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2018-07-26 09:44:45 -0400 |
| commit | 273a98d39a88a372c8a2c816622e7df1f777e77d (patch) | |
| tree | 2e8d4253f901a093d745127d97fd2464098d9266 /klippy/extras/display | |
| parent | 7a9553b38a39398226d95b7569a0b889b8cdb10a (diff) | |
| download | kutter-273a98d39a88a372c8a2c816622e7df1f777e77d.tar.gz kutter-273a98d39a88a372c8a2c816622e7df1f777e77d.tar.xz kutter-273a98d39a88a372c8a2c816622e7df1f777e77d.zip | |
pins: Explicitly pass can_invert and can_pullup to lookup_pin()
Don't pass pin_type to lookup_pin() - instead, if a pin can be
inverted or can have a pullup, then the caller must explicitly specify
that when calling lookup_pin(). This simplifies the code for the
cases where it is not valid to invert or pullup.
Explicitly pass the pin_type to setup_pin() and have ppins.setup_pin()
apply default pullup and invert flags.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/extras/display')
| -rw-r--r-- | klippy/extras/display/hd44780.py | 4 | ||||
| -rw-r--r-- | klippy/extras/display/st7920.py | 4 | ||||
| -rw-r--r-- | klippy/extras/display/uc1701.py | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/klippy/extras/display/hd44780.py b/klippy/extras/display/hd44780.py index 6f1ebaab..69fdcbb8 100644 --- a/klippy/extras/display/hd44780.py +++ b/klippy/extras/display/hd44780.py @@ -23,15 +23,13 @@ class HD44780: self.printer = config.get_printer() # pin config ppins = self.printer.lookup_object('pins') - pins = [ppins.lookup_pin('digital_out', config.get(name + '_pin')) + pins = [ppins.lookup_pin(config.get(name + '_pin')) for name in ['rs', 'e', 'd4', 'd5', 'd6', 'd7']] mcu = None for pin_params in pins: if mcu is not None and pin_params['chip'] != mcu: raise ppins.error("hd44780 all pins must be on same mcu") mcu = pin_params['chip'] - if pin_params['invert']: - raise ppins.error("hd44780 can not invert pin") self.pins = [pin_params['pin'] for pin_params in pins] self.mcu = mcu self.oid = self.mcu.create_oid() diff --git a/klippy/extras/display/st7920.py b/klippy/extras/display/st7920.py index eebc3428..006b23f0 100644 --- a/klippy/extras/display/st7920.py +++ b/klippy/extras/display/st7920.py @@ -17,15 +17,13 @@ class ST7920: printer = config.get_printer() # pin config ppins = printer.lookup_object('pins') - pins = [ppins.lookup_pin('digital_out', config.get(name + '_pin')) + pins = [ppins.lookup_pin(config.get(name + '_pin')) for name in ['cs', 'sclk', 'sid']] mcu = None for pin_params in pins: if mcu is not None and pin_params['chip'] != mcu: raise ppins.error("st7920 all pins must be on same mcu") mcu = pin_params['chip'] - if pin_params['invert']: - raise ppins.error("st7920 can not invert pin") self.pins = [pin_params['pin'] for pin_params in pins] self.mcu = mcu self.oid = self.mcu.create_oid() diff --git a/klippy/extras/display/uc1701.py b/klippy/extras/display/uc1701.py index f76af041..c2b86540 100644 --- a/klippy/extras/display/uc1701.py +++ b/klippy/extras/display/uc1701.py @@ -17,15 +17,13 @@ class UC1701: printer = config.get_printer() # pin config ppins = printer.lookup_object('pins') - pins = [ppins.lookup_pin('digital_out', config.get(name + '_pin')) + pins = [ppins.lookup_pin(config.get(name + '_pin')) for name in ['cs','a0']] mcu = None for pin_params in pins: if mcu is not None and pin_params['chip'] != mcu: raise ppins.error("uc1701 all pins must be on same mcu") mcu = pin_params['chip'] - if pin_params['invert']: - raise ppins.error("uc1701 can not invert pin") self.pins = [pin_params['pin'] for pin_params in pins] self.mcu = mcu self.spi_oid = self.mcu.create_oid() |