Skip to content

Commit

Permalink
Best practices & code cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
aceisace committed Dec 18, 2023
1 parent ad06106 commit e710964
Show file tree
Hide file tree
Showing 29 changed files with 1,241 additions and 1,228 deletions.
1 change: 0 additions & 1 deletion inkycal/custom/inkycal_exceptions.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#!python3
"""
Inkycal custom Exceptions
"""
Expand Down
1 change: 0 additions & 1 deletion inkycal/display/drivers/10_in_3.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#!python3
"""
10.3" driver class
Copyright by aceinnolab
Expand Down
4 changes: 1 addition & 3 deletions inkycal/display/drivers/7_in_8.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
#!python3
"""
7.8" parallel driver class
Copyright by aceinnolab
"""
from subprocess import run

from inkycal.custom import image_folder, top_level
from os.path import exists
from PIL import Image

# Display resolution
EPD_WIDTH = 1872
Expand Down
4 changes: 1 addition & 3 deletions inkycal/display/drivers/9_in_7.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
#!python3
"""
9.7" driver class
Copyright by aceinnolab
"""
from subprocess import run

from inkycal.custom import image_folder, top_level
from os.path import exists
from PIL import Image

# Display resolution
EPD_WIDTH = 1200
Expand Down
131 changes: 66 additions & 65 deletions inkycal/display/drivers/epd5in83b_V2.py
Original file line number Diff line number Diff line change
@@ -1,42 +1,43 @@
# *****************************************************************************
# * | File : epd5in83b_V2.py
# * | Author : Waveshare team
# * | Function : Electronic paper driver
# * | Info :
# *----------------
# * | This version: V1.1
# * | Date : 2022-08-10
# # | Info : python demo
# -----------------------------------------------------------------------------
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documnetation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
#

"""
* | File : epd5in83b_V2.py
* | Author : Waveshare team
* | Function : Electronic paper driver
* | Info :
*----------------
* | This version: V1.1
* | Date : 2022-08-10
# | Info : python demo
-----------------------------------------------------------------------------
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
"""

import logging

from . import epdconfig

# Display resolution
EPD_WIDTH = 648
EPD_HEIGHT = 480
EPD_WIDTH = 648
EPD_HEIGHT = 480

logger = logging.getLogger(__name__)


class EPD:
def __init__(self):
self.reset_pin = epdconfig.RST_PIN
Expand All @@ -49,11 +50,11 @@ def __init__(self):
# Hardware reset
def reset(self):
epdconfig.digital_write(self.reset_pin, 1)
epdconfig.delay_ms(200)
epdconfig.delay_ms(200)
epdconfig.digital_write(self.reset_pin, 0)
epdconfig.delay_ms(1)
epdconfig.digital_write(self.reset_pin, 1)
epdconfig.delay_ms(200)
epdconfig.delay_ms(200)

def send_command(self, command):
epdconfig.digital_write(self.dc_pin, 0)
Expand All @@ -73,74 +74,74 @@ def send_data2(self, data):
epdconfig.digital_write(self.cs_pin, 0)
epdconfig.spi_writebyte2(data)
epdconfig.digital_write(self.cs_pin, 1)

def ReadBusy(self):
logger.debug("e-Paper busy")
self.send_command(0X71)
while(epdconfig.digital_read(self.busy_pin) == 0): # 0: idle, 1: busy
while (epdconfig.digital_read(self.busy_pin) == 0): # 0: idle, 1: busy
self.send_command(0X71)
epdconfig.delay_ms(200)
logger.debug("e-Paper busy release")

def init(self):
if (epdconfig.module_init() != 0):
return -1

self.reset()

self.send_command(0x01) #POWER SETTING
self.send_data (0x07)
self.send_data (0x07) #VGH=20V,VGL=-20V
self.send_data (0x3f) #VDH=15V
self.send_data (0x3f) #VDL=-15V
self.send_command(0x01) # POWER SETTING
self.send_data(0x07)
self.send_data(0x07) # VGH=20V,VGL=-20V
self.send_data(0x3f) # VDH=15V
self.send_data(0x3f) # VDL=-15V

self.send_command(0x04) #POWER ON
epdconfig.delay_ms(100)
self.ReadBusy() #waiting for the electronic paper IC to release the idle signal
self.send_command(0x04) # POWER ON
epdconfig.delay_ms(100)
self.ReadBusy() # waiting for the electronic paper IC to release the idle signal

self.send_command(0X00) #PANNEL SETTING
self.send_data(0x0F) #KW-3f KWR-2F BWROTP 0f BWOTP 1f
self.send_command(0X00) # PANNEL SETTING
self.send_data(0x0F) # KW-3f KWR-2F BWROTP 0f BWOTP 1f

self.send_command(0x61) #tres
self.send_data (0x02) #source 648
self.send_data (0x88)
self.send_data (0x01) #gate 480
self.send_data (0xe0)
self.send_command(0x61) # tres
self.send_data(0x02) # source 648
self.send_data(0x88)
self.send_data(0x01) # gate 480
self.send_data(0xe0)

self.send_command(0X15)
self.send_data(0x00)

self.send_command(0X50) #VCOM AND DATA INTERVAL SETTING
self.send_command(0X50) # VCOM AND DATA INTERVAL SETTING
self.send_data(0x11)
self.send_data(0x07)

self.send_command(0X60) #TCON SETTING
self.send_command(0X60) # TCON SETTING
self.send_data(0x22)

return 0

def getbuffer(self, image):
# logger.debug("bufsiz = ",int(self.width/8) * self.height)
buf = [0xFF] * (int(self.width/8) * self.height)
buf = [0xFF] * (int(self.width / 8) * self.height)
image_monocolor = image.convert('1')
imwidth, imheight = image_monocolor.size
pixels = image_monocolor.load()
# logger.debug("imwidth = %d, imheight = %d",imwidth,imheight)
if(imwidth == self.width and imheight == self.height):
if (imwidth == self.width and imheight == self.height):
logger.debug("Vertical")
for y in range(imheight):
for x in range(imwidth):
# Set the bits for the column of pixels at the current position.
if pixels[x, y] == 0:
buf[int((x + y * self.width) / 8)] &= ~(0x80 >> (x % 8))
elif(imwidth == self.height and imheight == self.width):
elif (imwidth == self.height and imheight == self.width):
logger.debug("Horizontal")
for y in range(imheight):
for x in range(imwidth):
newx = y
newy = self.height - x - 1
if pixels[x, y] == 0:
buf[int((newx + newy*self.width) / 8)] &= ~(0x80 >> (y % 8))
buf[int((newx + newy * self.width) / 8)] &= ~(0x80 >> (y % 8))
return buf

def display(self, imageblack, imagered):
Expand All @@ -150,13 +151,13 @@ def display(self, imageblack, imagered):

if (imageblack != None):
self.send_command(0X10)
self.send_data2(imageblack)
self.send_data2(imageblack)
if (imagered != None):
self.send_command(0X13)
self.send_data2(buf)

self.send_command(0x12)
epdconfig.delay_ms(200)
epdconfig.delay_ms(200)
self.ReadBusy()

def Clear(self):
Expand All @@ -166,15 +167,15 @@ def Clear(self):
self.send_data2([0x00] * int(self.width * self.height / 8))

self.send_command(0x12)
epdconfig.delay_ms(200)
epdconfig.delay_ms(200)
self.ReadBusy()

def sleep(self):
self.send_command(0X02) # power off
self.send_command(0X02) # power off
self.ReadBusy()
self.send_command(0X07) # deep sleep
self.send_command(0X07) # deep sleep
self.send_data(0xA5)

epdconfig.delay_ms(2000)
epdconfig.module_exit()
### END OF FILE ###
Loading

0 comments on commit e710964

Please sign in to comment.