Merge pull request from massar/wv1_4.00

Update waveshare v1 driver to "4.00" aka "2019.07.31"
This commit is contained in:
evilsocket 2019-10-02 19:05:06 +02:00 committed by GitHub
commit f449498d67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 344 additions and 256 deletions
sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/waveshare/v1

@ -1,218 +1,225 @@
# //***************************************************************************** # *****************************************************************************
# * | File : epd2in13.py # * | File : epd2in13.py
# * | Author : Waveshare team # * | Author : Waveshare team
# * | Function : Electronic paper driver # * | Function : Electronic paper driver
# * | Info : # * | Info :
# *---------------- # *----------------
# * | This version: V3.1 # * | This version: V4.0
# * | Date : 2019-03-20 # * | Date : 2019-06-20
# * | Info : python3 demo # # | Info : python demo
# * fix: TurnOnDisplay() # -----------------------------------------------------------------------------
# ******************************************************************************// # Permission is hereby granted, free of charge, to any person obtaining a copy
# Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documnetation files (the "Software"), to deal
# of this software and associated documnetation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights
# in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# to use, copy, modify, merge, publish, distribute, sublicense, and//or sell # copies of the Software, and to permit persons to whom the Software is
# copies of the Software, and to permit persons to whom the Software is # furished to do so, subject to the following conditions:
# furished to do so, subject to the following conditions: #
# # The above copyright notice and this permission notice shall be included in
# The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software.
# all copies or substantial portions of the Software. #
# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER # LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# 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
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE.
# THE SOFTWARE. #
#
import logging
from . import epdconfig from . import epdconfig
from PIL import Image import numpy as np
import RPi.GPIO as GPIO
# import numpy as np # Display resolution
EPD_WIDTH = 122
# Display resolution EPD_HEIGHT = 250
EPD_WIDTH = 122
EPD_HEIGHT = 250 class EPD:
def __init__(self):
class EPD: self.reset_pin = epdconfig.RST_PIN
def __init__(self): self.dc_pin = epdconfig.DC_PIN
self.reset_pin = epdconfig.RST_PIN self.busy_pin = epdconfig.BUSY_PIN
self.dc_pin = epdconfig.DC_PIN self.cs_pin = epdconfig.CS_PIN
self.busy_pin = epdconfig.BUSY_PIN self.width = EPD_WIDTH
self.width = EPD_WIDTH self.height = EPD_HEIGHT
self.height = EPD_HEIGHT
lut_full_update = [ lut_full_update = [
0x22, 0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA, 0x11, 0x22, 0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA, 0x11,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E,
0x01, 0x00, 0x00, 0x00, 0x00, 0x00 0x01, 0x00, 0x00, 0x00, 0x00, 0x00
] ]
lut_partial_update = [ lut_partial_update = [
0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x0F, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
] ]
# Hardware reset # Hardware reset
def reset(self): def reset(self):
epdconfig.digital_write(self.reset_pin, GPIO.HIGH) epdconfig.digital_write(self.cs_pin, 0)
epdconfig.delay_ms(200) epdconfig.digital_write(self.reset_pin, 1)
epdconfig.digital_write(self.reset_pin, GPIO.LOW) # module reset epdconfig.delay_ms(200)
epdconfig.delay_ms(200) epdconfig.digital_write(self.reset_pin, 0)
epdconfig.digital_write(self.reset_pin, GPIO.HIGH) epdconfig.delay_ms(10)
epdconfig.delay_ms(200) epdconfig.digital_write(self.reset_pin, 1)
epdconfig.delay_ms(200)
def send_command(self, command): epdconfig.digital_write(self.cs_pin, 1)
epdconfig.digital_write(self.dc_pin, GPIO.LOW)
epdconfig.spi_writebyte([command]) def send_command(self, command):
epdconfig.digital_write(self.cs_pin, 0)
def send_data(self, data): epdconfig.digital_write(self.dc_pin, 0)
epdconfig.digital_write(self.dc_pin, GPIO.HIGH) epdconfig.spi_writebyte([command])
epdconfig.spi_writebyte([data]) epdconfig.digital_write(self.cs_pin, 1)
def wait_until_idle(self): def send_data(self, data):
# print("busy") epdconfig.digital_write(self.cs_pin, 0)
while(epdconfig.digital_read(self.busy_pin) == 1): # 0: idle, 1: busy epdconfig.digital_write(self.dc_pin, 1)
epdconfig.delay_ms(100) epdconfig.spi_writebyte([data])
# print("free busy") epdconfig.digital_write(self.cs_pin, 1)
def TurnOnDisplay(self): def ReadBusy(self):
self.send_command(0x22) # DISPLAY_UPDATE_CONTROL_2 while(epdconfig.digital_read(self.busy_pin) == 1): # 0: idle, 1: busy
self.send_data(0xC4) epdconfig.delay_ms(100)
self.send_command(0x20) # MASTER_ACTIVATION
self.send_command(0xFF) # TERMINATE_FRAME_READ_WRITE def TurnOnDisplay(self):
self.wait_until_idle() self.send_command(0x22) # DISPLAY_UPDATE_CONTROL_2
self.send_data(0xC4)
def init(self, lut): self.send_command(0x20) # MASTER_ACTIVATION
if (epdconfig.module_init() != 0): self.send_command(0xFF) # TERMINATE_FRAME_READ_WRITE
return -1
# EPD hardware init start logging.debug("e-Paper busy")
self.reset() self.ReadBusy()
self.send_command(0x01) # DRIVER_OUTPUT_CONTROL logging.debug("e-Paper busy release")
self.send_data((EPD_HEIGHT - 1) & 0xFF)
self.send_data(((EPD_HEIGHT - 1) >> 8) & 0xFF) def init(self, lut):
self.send_data(0x00) # GD = 0 SM = 0 TB = 0 if (epdconfig.module_init() != 0):
return -1
self.send_command(0x0C) # BOOSTER_SOFT_START_CONTROL # EPD hardware init start
self.send_data(0xD7) self.reset()
self.send_data(0xD6) self.send_command(0x01) # DRIVER_OUTPUT_CONTROL
self.send_data(0x9D) self.send_data((EPD_HEIGHT - 1) & 0xFF)
self.send_data(((EPD_HEIGHT - 1) >> 8) & 0xFF)
self.send_command(0x2C) # WRITE_VCOM_REGISTER self.send_data(0x00) # GD = 0 SM = 0 TB = 0
self.send_data(0xA8) # VCOM 7C
self.send_command(0x0C) # BOOSTER_SOFT_START_CONTROL
self.send_command(0x3A) # SET_DUMMY_LINE_PERIOD self.send_data(0xD7)
self.send_data(0x1A) # 4 dummy lines per gate self.send_data(0xD6)
self.send_data(0x9D)
self.send_command(0x3B) # SET_GATE_TIME
self.send_data(0x08) # 2us per line self.send_command(0x2C) # WRITE_VCOM_REGISTER
self.send_data(0xA8) # VCOM 7C
self.send_command(0X3C) # BORDER_WAVEFORM_CONTROL
self.send_data(0x03) self.send_command(0x3A) # SET_DUMMY_LINE_PERIOD
self.send_data(0x1A) # 4 dummy lines per gate
self.send_command(0X11) # DATA_ENTRY_MODE_SETTING
self.send_data(0x03) # X increment; Y increment self.send_command(0x3B) # SET_GATE_TIME
self.send_data(0x08) # 2us per line
# WRITE_LUT_REGISTER
self.send_command(0x32) self.send_command(0X3C) # BORDER_WAVEFORM_CONTROL
for count in range(30): self.send_data(0x03)
self.send_data(lut[count])
self.send_command(0X11) # DATA_ENTRY_MODE_SETTING
return 0 self.send_data(0x03) # X increment; Y increment
## # WRITE_LUT_REGISTER
# @brief: specify the memory area for data R//W self.send_command(0x32)
## for count in range(30):
def SetWindows(self, x_start, y_start, x_end, y_end): self.send_data(lut[count])
self.send_command(0x44) # SET_RAM_X_ADDRESS_START_END_POSITION
self.send_data((x_start >> 3) & 0xFF) return 0
self.send_data((x_end >> 3) & 0xFF)
self.send_command(0x45) # SET_RAM_Y_ADDRESS_START_END_POSITION ##
self.send_data(y_start & 0xFF) # @brief: specify the memory area for data R/W
self.send_data((y_start >> 8) & 0xFF) ##
self.send_data(y_end & 0xFF) def SetWindows(self, x_start, y_start, x_end, y_end):
self.send_data((y_end >> 8) & 0xFF) self.send_command(0x44) # SET_RAM_X_ADDRESS_START_END_POSITION
self.send_data((x_start >> 3) & 0xFF)
## self.send_data((x_end >> 3) & 0xFF)
# @brief: specify the start point for data R//W self.send_command(0x45) # SET_RAM_Y_ADDRESS_START_END_POSITION
## self.send_data(y_start & 0xFF)
def SetCursor(self, x, y): self.send_data((y_start >> 8) & 0xFF)
self.send_command(0x4E) # SET_RAM_X_ADDRESS_COUNTER self.send_data(y_end & 0xFF)
# x point must be the multiple of 8 or the last 3 bits will be ignored self.send_data((y_end >> 8) & 0xFF)
self.send_data((x >> 3) & 0xFF)
self.send_command(0x4F) # SET_RAM_Y_ADDRESS_COUNTER ##
self.send_data(y & 0xFF) # @brief: specify the start point for data R/W
self.send_data((y >> 8) & 0xFF) ##
self.wait_until_idle() def SetCursor(self, x, y):
self.send_command(0x4E) # SET_RAM_X_ADDRESS_COUNTER
def getbuffer(self, image): # x point must be the multiple of 8 or the last 3 bits will be ignored
if self.width%8 == 0: self.send_data((x >> 3) & 0xFF)
linewidth = self.width//8 self.send_command(0x4F) # SET_RAM_Y_ADDRESS_COUNTER
else: self.send_data(y & 0xFF)
linewidth = self.width//8 + 1 self.send_data((y >> 8) & 0xFF)
self.ReadBusy()
buf = [0xFF] * (linewidth * self.height)
image_monocolor = image.convert('1') def getbuffer(self, image):
imwidth, imheight = image_monocolor.size if self.width%8 == 0:
pixels = image_monocolor.load() linewidth = int(self.width/8)
else:
if(imwidth == self.width and imheight == self.height): linewidth = int(self.width/8) + 1
# print("Vertical")
for y in range(imheight): buf = [0xFF] * (linewidth * self.height)
for x in range(imwidth): image_monocolor = image.convert('1')
if pixels[x, y] == 0: imwidth, imheight = image_monocolor.size
# x = imwidth - x pixels = image_monocolor.load()
buf[x // 8 + y * linewidth] &= ~(0x80 >> (x % 8))
elif(imwidth == self.height and imheight == self.width): if(imwidth == self.width and imheight == self.height):
# print("Horizontal") for y in range(imheight):
for y in range(imheight): for x in range(imwidth):
for x in range(imwidth): if pixels[x, y] == 0:
newx = y # x = imwidth - x
newy = self.height - x - 1 buf[int(x / 8) + y * linewidth] &= ~(0x80 >> (x % 8))
if pixels[x, y] == 0: elif(imwidth == self.height and imheight == self.width):
# newy = imwidth - newy - 1 for y in range(imheight):
buf[newx // 8 + newy*linewidth] &= ~(0x80 >> (y % 8)) for x in range(imwidth):
return buf newx = y
newy = self.height - x - 1
if pixels[x, y] == 0:
def display(self, image): # newy = imwidth - newy - 1
if self.width%8 == 0: buf[int(newx / 8) + newy*linewidth] &= ~(0x80 >> (y % 8))
linewidth = self.width//8 return buf
else:
linewidth = self.width//8 + 1
def display(self, image):
self.SetWindows(0, 0, EPD_WIDTH, EPD_HEIGHT); if self.width%8 == 0:
for j in range(0, self.height): linewidth = int(self.width/8)
self.SetCursor(0, j); else:
self.send_command(0x24); linewidth = int(self.width/8) + 1
for i in range(0, linewidth):
self.send_data(image[i + j * linewidth]) self.SetWindows(0, 0, self.width, self.height);
self.TurnOnDisplay() for j in range(0, self.height):
self.SetCursor(0, j);
def Clear(self, color): self.send_command(0x24);
if self.width%8 == 0: for i in range(0, linewidth):
linewidth = self.width//8 self.send_data(image[i + j * linewidth])
else: self.TurnOnDisplay()
linewidth = self.width//8 + 1
def Clear(self, color):
self.SetWindows(0, 0, EPD_WIDTH, EPD_HEIGHT); if self.width%8 == 0:
for j in range(0, self.height): linewidth = int(self.width/8)
self.SetCursor(0, j); else:
self.send_command(0x24); linewidth = int(self.width/8) + 1
for i in range(0, linewidth):
self.send_data(color) self.SetWindows(0, 0, self.width, self.height);
self.TurnOnDisplay() for j in range(0, self.height):
self.SetCursor(0, j);
def sleep(self): self.send_command(0x24);
self.send_command(0x10) #enter deep sleep for i in range(0, linewidth):
# self.send_data(0x01) self.send_data(color)
epdconfig.delay_ms(100) self.TurnOnDisplay()
### END OF FILE ### def sleep(self):
self.send_command(0x10) #enter deep sleep
self.send_data(0x01)
epdconfig.delay_ms(100)
epdconfig.module_exit()
### END OF FILE ###

@ -1,19 +1,13 @@
# /***************************************************************************** # /*****************************************************************************
# * | File : EPD_1in54.py # * | File : epdconfig.py
# * | Author : Waveshare team # * | Author : Waveshare team
# * | Function : Hardware underlying interface # * | Function : Hardware underlying interface
# * | Info : # * | Info :
# *---------------- # *----------------
# * | This version: V2.0 # * | This version: V1.0
# * | Date : 2018-11-01 # * | Date : 2019-06-21
# * | Info : # * | Info :
# * 1.Remove: # ******************************************************************************
# digital_write(self, pin, value)
# digital_read(self, pin)
# delay_ms(self, delaytime)
# set_lut(self, lut)
# self.lut = self.lut_full_update
# ******************************************************************************/
# Permission is hereby granted, free of charge, to any person obtaining a copy # Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documnetation files (the "Software"), to deal # of this software and associated documnetation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights # in the Software without restriction, including without limitation the rights
@ -33,41 +27,128 @@
# THE SOFTWARE. # THE SOFTWARE.
# #
import os
import spidev import logging
import RPi.GPIO as GPIO import sys
import time import time
# Pin definition
RST_PIN = 17
DC_PIN = 25
CS_PIN = 8
BUSY_PIN = 24
# SPI device, bus = 0, device = 0 class RaspberryPi:
SPI = spidev.SpiDev(0, 0) # Pin definition
RST_PIN = 17
DC_PIN = 25
CS_PIN = 8
BUSY_PIN = 24
def digital_write(pin, value): def __init__(self):
GPIO.output(pin, value) import spidev
import RPi.GPIO
def digital_read(pin): self.GPIO = RPi.GPIO
return GPIO.input(BUSY_PIN)
def delay_ms(delaytime): # SPI device, bus = 0, device = 0
time.sleep(delaytime / 1000.0) self.SPI = spidev.SpiDev(0, 0)
def spi_writebyte(data): def digital_write(self, pin, value):
SPI.writebytes(data) self.GPIO.output(pin, value)
def digital_read(self, pin):
return self.GPIO.input(self.BUSY_PIN)
def delay_ms(self, delaytime):
time.sleep(delaytime / 1000.0)
def spi_writebyte(self, data):
self.SPI.writebytes(data)
def module_init(self):
self.GPIO.setmode(self.GPIO.BCM)
self.GPIO.setwarnings(False)
self.GPIO.setup(self.RST_PIN, self.GPIO.OUT)
self.GPIO.setup(self.DC_PIN, self.GPIO.OUT)
self.GPIO.setup(self.CS_PIN, self.GPIO.OUT)
self.GPIO.setup(self.BUSY_PIN, self.GPIO.IN)
self.SPI.max_speed_hz = 4000000
self.SPI.mode = 0b00
return 0
def module_exit(self):
logging.debug("spi end")
self.SPI.close()
logging.debug("close 5V, Module enters 0 power consumption ...")
self.GPIO.output(self.RST_PIN, 0)
self.GPIO.output(self.DC_PIN, 0)
self.GPIO.cleanup()
class JetsonNano:
# Pin definition
RST_PIN = 17
DC_PIN = 25
CS_PIN = 8
BUSY_PIN = 24
def __init__(self):
import ctypes
find_dirs = [
os.path.dirname(os.path.realpath(__file__)),
'/usr/local/lib',
'/usr/lib',
]
self.SPI = None
for find_dir in find_dirs:
so_filename = os.path.join(find_dir, 'sysfs_software_spi.so')
if os.path.exists(so_filename):
self.SPI = ctypes.cdll.LoadLibrary(so_filename)
break
if self.SPI is None:
raise RuntimeError('Cannot find sysfs_software_spi.so')
import Jetson.GPIO
self.GPIO = Jetson.GPIO
def digital_write(self, pin, value):
self.GPIO.output(pin, value)
def digital_read(self, pin):
return self.GPIO.input(self.BUSY_PIN)
def delay_ms(self, delaytime):
time.sleep(delaytime / 1000.0)
def spi_writebyte(self, data):
self.SPI.SYSFS_software_spi_transfer(data[0])
def module_init(self):
self.GPIO.setmode(self.GPIO.BCM)
self.GPIO.setwarnings(False)
self.GPIO.setup(self.RST_PIN, self.GPIO.OUT)
self.GPIO.setup(self.DC_PIN, self.GPIO.OUT)
self.GPIO.setup(self.CS_PIN, self.GPIO.OUT)
self.GPIO.setup(self.BUSY_PIN, self.GPIO.IN)
self.SPI.SYSFS_software_spi_begin()
return 0
def module_exit(self):
logging.debug("spi end")
self.SPI.SYSFS_software_spi_end()
logging.debug("close 5V, Module enters 0 power consumption ...")
self.GPIO.output(self.RST_PIN, 0)
self.GPIO.output(self.DC_PIN, 0)
self.GPIO.cleanup()
if os.path.exists('/sys/bus/platform/drivers/gpiomem-bcm2835'):
implementation = RaspberryPi()
else:
implementation = JetsonNano()
for func in [x for x in dir(implementation) if not x.startswith('_')]:
setattr(sys.modules[__name__], func, getattr(implementation, func))
def module_init():
GPIO.setmode(GPIO.BCM)
GPIO.setwarnings(False)
GPIO.setup(RST_PIN, GPIO.OUT)
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
return 0;
### END OF FILE ### ### END OF FILE ###