Skip to content

Commit

Permalink
updated waveshare Git URL
Browse files Browse the repository at this point in the history
updated Waveshare 1.02 in display method
  • Loading branch information
robweber committed Nov 2, 2023
1 parent 1f14b09 commit 238f9b5
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 13 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)

- changed valid Python versions from 3.7 < 3.11. Issues currently on 3.11 installs running on Raspberry Pi OS 12 (Bookworm)

### Fixed

- Updated Waveshare GitHub URL to https://github.com/waveshareteam/e-Paper/ in README and documentation
- Fixed Waveshare 1.02in as the `display()` method [has changed](https://github.com/waveshareteam/e-Paper/pull/283).

## Version 0.3.4

### Added
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ Below is a list of displays currently implemented in the library. The Omni Devic
| | [Inky wHAT Yellow/Black/White](https://shop.pimoroni.com/products/inky-what?variant=21441988558931) | inky.what_yellow | bw, yellow |
| | [Inky wHAT Black/White](https://shop.pimoroni.com/products/inky-what?variant=21214020436051) | inky.what_black | bw |
| Omni-EPD | Mock Display (emulates EPD with no hardware) | __omni_epd.mock__ | bw, color, palette |
| [Waveshare](https://github.com/waveshare/e-Paper) | [1.02inch E-Ink display module](https://www.waveshare.com/1.02inch-e-Paper-Module.htm) | waveshare_epd.epdlin02 | bw |
| [Waveshare](https://github.com/waveshareteam/e-Paper) | [1.02inch E-Ink display module](https://www.waveshare.com/1.02inch-e-Paper-Module.htm) | waveshare_epd.epdlin02 | bw |
| | [1.54inch E-Ink display module](https://www.waveshare.com/1.54inch-e-Paper-Module.htm) | waveshare_epd.epdlin54 <br> waveshare_epd.epdlin54_V2 | bw |
| | [1.54inch e-Paper Module B](https://www.waveshare.com/1.54inch-e-Paper-Module-B.htm) | waveshare_epd.epdlin54b <br> waveshare_epd.epdlin54b_V2 | bw, red |
| | [1.54inch e-Paper Module C ](https://www.waveshare.com/1.54inch-e-Paper-Module-C.htm) | waveshare_epd.epdlin54c | bw, yellow |
Expand Down Expand Up @@ -191,7 +191,7 @@ If installing Inky manually be sure that SPI and I2C are enabled via `sudo raspi

__Waveshare__

The [Waveshare device library](https://github.com/waveshare/e-Paper) requires that [SPI support](https://www.raspberrypi-spy.co.uk/2014/08/enabling-the-spi-interface-on-the-raspberry-pi/) be enabled on your system prior to use. The `waveshare-epd` module is automatically downloaded and installed as a dependency of this module.
The [Waveshare device library](https://github.com/waveshareteam/e-Paper) requires that [SPI support](https://www.raspberrypi-spy.co.uk/2014/08/enabling-the-spi-interface-on-the-raspberry-pi/) be enabled on your system prior to use. The `waveshare-epd` module is automatically downloaded and installed as a dependency of this module.

__IT8951__

Expand Down
22 changes: 11 additions & 11 deletions src/omni_epd/displays/waveshare_display.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def close(self):
class WaveshareBWDisplay(WaveshareDisplay):
"""
This is an abstraction for Waveshare EPD devices that are single color only
https://github.com/waveshare/e-Paper
https://github.com/waveshareteam/e-Paper
"""

# devices that use alternate init methods
Expand Down Expand Up @@ -144,7 +144,7 @@ class WaveshareTriColorDisplay(WaveshareDisplay):
"""
This class is for the Waveshare displays that support 3 colors
typically white/black/red or white/black/yellow
https://github.com/waveshare/e-Paper
https://github.com/waveshareteam/e-Paper
"""

max_colors = 3
Expand Down Expand Up @@ -228,7 +228,7 @@ class WaveshareQuadColorDisplay(WaveshareDisplay):
"""
This class is for the Waveshare displays that support 4 colors
white/black/yellow/red
https://github.com/waveshare/e-Paper
https://github.com/waveshareteam/e-Paper
"""
modes_available = ("bw", "red", "yellow", "4color")
max_colors = 4
Expand Down Expand Up @@ -280,8 +280,8 @@ class WaveshareGrayscaleDisplay(WaveshareDisplay):
"""
This class is for the Waveshare displays that support 4 shade grayscale
https://github.com/waveshare/e-Paper/blob/master/RaspberryPi_JetsonNano/python/lib/waveshare_epd/epd2in7.py
https://github.com/waveshare/e-Paper/blob/master/RaspberryPi_JetsonNano/python/lib/waveshare_epd/epd4in2.py
https://github.com/waveshareteam/e-Paper/blob/master/RaspberryPi_JetsonNano/python/lib/waveshare_epd/epd2in7.py
https://github.com/waveshareteam/e-Paper/blob/master/RaspberryPi_JetsonNano/python/lib/waveshare_epd/epd4in2.py
"""

modes_available = ("bw", "gray4")
Expand Down Expand Up @@ -329,7 +329,7 @@ class Waveshare3in7Display(WaveshareDisplay):
"""
This class is for the Waveshare displays that support 4 shade grayscale
https://github.com/waveshare/e-Paper/blob/master/RaspberryPi_JetsonNano/python/lib/waveshare_epd/epd3in7.py
https://github.com/waveshareteam/e-Paper/blob/master/RaspberryPi_JetsonNano/python/lib/waveshare_epd/epd3in7.py
"""

modes_available = ("gray4")
Expand Down Expand Up @@ -370,7 +370,7 @@ def clear(self):
class Waveshare102inDisplay(WaveshareDisplay):
"""
This class is for the Waveshare 1.02 in display only as it has some method calls that are different
https://github.com/waveshare/e-Paper/blob/master/RaspberryPi_JetsonNano/python/lib/waveshare_epd/epd1in02.py
https://github.com/waveshareteam/e-Paper/blob/master/RaspberryPi_JetsonNano/python/lib/waveshare_epd/epd1in02.py
"""

def __init__(self, deviceName, config):
Expand All @@ -391,7 +391,7 @@ def prepare(self):
self._device.Init()

def _display(self, image):
self._device.Display(self._device.getbuffer(image))
self._device.display(self._device.getbuffer(image))

def sleep(self):
# this differs from parent
Expand All @@ -405,9 +405,9 @@ def clear(self):
class WaveshareMultiColorDisplay(WaveshareDisplay):
"""
This class is for the Waveshare 7 color displays
https://github.com/waveshare/e-Paper/blob/master/RaspberryPi_JetsonNano/python/lib/waveshare_epd/epd5in65f.py
https://github.com/waveshare/e-Paper/blob/master/RaspberryPi_JetsonNano/python/lib/waveshare_epd/epd4in01f.py
https://github.com/waveshare/e-Paper/blob/master/RaspberryPi_JetsonNano/python/lib/waveshare_epd/epd7in3f.py
https://github.com/waveshareteam/e-Paper/blob/master/RaspberryPi_JetsonNano/python/lib/waveshare_epd/epd5in65f.py
https://github.com/waveshareteam/e-Paper/blob/master/RaspberryPi_JetsonNano/python/lib/waveshare_epd/epd4in01f.py
https://github.com/waveshareteam/e-Paper/blob/master/RaspberryPi_JetsonNano/python/lib/waveshare_epd/epd7in3f.py
"""

max_colors = 7
Expand Down

0 comments on commit 238f9b5

Please sign in to comment.