diff --git a/Calendar/Epd7in5Adapter.py b/Calendar/Epd7in5Adapter.py index 9ccc692..4e73871 100644 --- a/Calendar/Epd7in5Adapter.py +++ b/Calendar/Epd7in5Adapter.py @@ -3,7 +3,7 @@ from settings import display_colours from PIL import Image, ImageDraw class Epd7in5Adapter (EpdAdapter): - def __init__ (): + def __init__ (self): super(Epd7in5Adapter, self).__init__(640, 384) def display_frame (self, frame_buffer): diff --git a/Calendar/Epd7in5bAdapter.py b/Calendar/Epd7in5bAdapter.py index 7b0b49b..235e889 100644 --- a/Calendar/Epd7in5bAdapter.py +++ b/Calendar/Epd7in5bAdapter.py @@ -3,7 +3,7 @@ from settings import display_colours from PIL import Image, ImageDraw class Epd7in5bAdapter (EpdAdapter): - def __init__ (): + def __init__ (self): super(Epd7in5bAdapter, self).__init__(640, 384) def display_frame (self, frame_buffer): diff --git a/Calendar/EpdAdapter.py b/Calendar/EpdAdapter.py index 565c84f..c38fbae 100644 --- a/Calendar/EpdAdapter.py +++ b/Calendar/EpdAdapter.py @@ -72,7 +72,7 @@ class EpdAdapter (DisplayAdapter): print('Converting image to data and sending it to the display') print('This may take a while...' + '\n') - prepared_image = design.get_image().rotate(270, expand=1) + prepared_image = design.rotate(270, expand=1) self.display_frame(self.get_frame_buffer(prepared_image)) # Powering off the E-Paper until the next loop @@ -135,12 +135,12 @@ class EpdAdapter (DisplayAdapter): time.sleep(delaytime / 1000.0) def spi_transfer (self, data): - SPI.writebytes(data) + self.SPI.writebytes(data) def epd_init (self): # SPI device, bus = 0, device = 0 - SPI = spidev.SpiDev(0, 0) - #SPI.no_cs = True + self.SPI = spidev.SpiDev(0, 0) + #self.SPI.no_cs = True GPIO.setmode(GPIO.BCM) GPIO.setwarnings(False) @@ -148,8 +148,8 @@ class EpdAdapter (DisplayAdapter): GPIO.setup(DC_PIN, GPIO.OUT) GPIO.setup(CS_PIN, GPIO.OUT) GPIO.setup(BUSY_PIN, GPIO.IN) - SPI.max_speed_hz = 2000000 - SPI.mode = 0b00 + self.SPI.max_speed_hz = 2000000 + self.SPI.mode = 0b00 return 0 def sleep (self):