chrissewell/pwnagotchi
1
0
Fork 0
mirror of https://github.com/jayofelony/pwnagotchi.git synced 2025-07-01 18:37:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: fixed bogus support for waveshare lcd displays (fixes #364)

Browse Source
This commit is contained in:
Simone Margaritelli
2019-10-23 15:37:12 +02:00
parent a78a4b0b3e
commit 277906a673
3 changed files with 53 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pwnagotchi/ui/hw/libs/waveshare/lcdhat/ST7789.py
View File

@ -25,6 +25,7 @@ class ST7789(object):
self._spi.max_speed_hz = 40000000 self._spi.max_speed_hz = 40000000
""" Write register address and data """ """ Write register address and data """
def command(self, cmd): def command(self, cmd):
GPIO.output(self._dc, GPIO.LOW) GPIO.output(self._dc, GPIO.LOW)
self._spi.writebytes([cmd]) self._spi.writebytes([cmd])

55
pwnagotchi/ui/hw/libs/waveshare/lcdhat/config.py
View File

@ -7,15 +7,8 @@
# * | Date : 2019-10-18 # * | Date : 2019-10-18
# * | Info : # * | Info :
# ******************************************************************************/ # ******************************************************************************/
import RPi.GPIO as GPIO
import time
from smbus import SMBus
import spidev import spidev
import ctypes
# import spidev
# Pin definition # Pin definition
RST_PIN = 27 RST_PIN = 27
DC_PIN = 25 DC_PIN = 25
@ -26,51 +19,3 @@ Device_I2C = 0
Device = Device_SPI Device = Device_SPI
spi = spidev.SpiDev(0, 0) spi = spidev.SpiDev(0, 0)
def digital_write(pin, value):
GPIO.output(pin, value)
def digital_read(pin):
return GPIO.input(BUSY_PIN)
def delay_ms(delaytime):
time.sleep(delaytime / 1000.0)
def spi_writebyte(data):
# SPI.writebytes(data)
spi.writebytes([data[0]])
def i2c_writebyte(reg, value):
bus.write_byte_data(address, reg, value)
# time.sleep(0.01)
def module_init():
# print("module_init")
GPIO.setmode(GPIO.BCM)
GPIO.setwarnings(False)
GPIO.setup(RST_PIN, GPIO.OUT)
GPIO.setup(DC_PIN, GPIO.OUT)
# SPI.max_speed_hz = 2000000
# SPI.mode = 0b00
# i2c_writebyte(0xff,0xff)
# spi.SYSFS_software_spi_begin()
# spi.SYSFS_software_spi_setDataMode(0);
# spi.SYSFS_software_spi_setClockDivider(1);
#spi.max_speed_hz = 2000000
#spi.mode = 0b00
GPIO.output(BL_PIN, 1)
GPIO.output(DC_PIN, 0)
return 0
def module_exit():
spi.SYSFS_software_spi_end()
GPIO.output(RST_PIN, 0)
GPIO.output(DC_PIN, 0)
### END OF FILE ###

21
pwnagotchi/ui/hw/libs/waveshare/lcdhat/epd.py
View File

@ -1,28 +1,21 @@
from . import ST7789 from . import ST7789
from . import config from . import config
# Display resolution
EPD_WIDTH = 240
EPD_HEIGHT = 240
disp = ST7789.ST7789(config.spi,config.RST_PIN, config.DC_PIN, config.BL_PIN)
class EPD(object): class EPD(object):
def __init__(self): def __init__(self):
self.reset_pin = config.RST_PIN self.reset_pin = config.RST_PIN
self.dc_pin = config.DC_PIN self.dc_pin = config.DC_PIN
#self.busy_pin = config.BUSY_PIN self.width = 240
#self.cs_pin = config.CS_PIN self.height = 240
self.width = EPD_WIDTH self.st7789 = ST7789.ST7789(config.spi, config.RST_PIN, config.DC_PIN, config.BL_PIN)
self.height = EPD_HEIGHT
def init(self): def init(self):
disp.Init() self.st7789.Init()
def Clear(self): def clear(self):
disp.clear() self.st7789.clear()
def display(self, image): def display(self, image):
rgb_im = image.convert('RGB') rgb_im = image.convert('RGB')
disp.ShowImage(rgb_im,0,0) self.st7789.ShowImage(rgb_im, 0, 0)