From d3a8dc85c3939c619fcac1e20a48531e627d5a23 Mon Sep 17 00:00:00 2001 From: Andreas Kupfer Date: Tue, 1 Oct 2019 22:03:52 +0200 Subject: [PATCH 1/6] add support for 3 colored Waveshare-Display --- .../scripts/pwnagotchi/ui/display.py | 36 +++- .../pwnagotchi/scripts/pwnagotchi/ui/view.py | 21 ++- .../pwnagotchi/ui/waveshare/v1/epd2in13bc.py | 159 ++++++++++++++++++ .../pwnagotchi/ui/waveshare/v1/epdconfig.py | 157 ++++++++++++----- 4 files changed, 323 insertions(+), 50 deletions(-) create mode 100644 sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/waveshare/v1/epd2in13bc.py diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/display.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/display.py index 4c693a6..1064c51 100644 --- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/display.py +++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/display.py @@ -1,5 +1,6 @@ import _thread from threading import Lock +from PIL import Image import shutil import core @@ -127,12 +128,21 @@ class Display(View): elif self._is_waveshare1(): core.log("initializing waveshare v1 display") - from pwnagotchi.ui.waveshare.v1.epd2in13 import EPD - self._display = EPD() - self._display.init(self._display.lut_full_update) - self._display.Clear(0xFF) - self._display.init(self._display.lut_partial_update) - self._render_cb = self._waveshare_render + if self._display_color == 'black': + from pwnagotchi.ui.waveshare.v1.epd2in13 import EPD + # core.log("display module started") + self._display = EPD() + self._display.init(self._display.lut_full_update) + self._display.Clear(0xFF) + self._display.init(self._display.lut_partial_update) + self._render_cb = self._waveshare_render + + else: + from pwnagotchi.ui.waveshare.v1.epd2in13bc import EPD + self._display = EPD() + self._display.init() + self._display.Clear() + self._render_cb = self._waveshare_bc_render elif self._is_waveshare2(): core.log("initializing waveshare v2 display") @@ -194,6 +204,20 @@ class Display(View): elif self._is_waveshare2(): self._display.displayPartial(buf) + def _waveshare_bc_render(self): + buf_black = self._display.getbuffer(self.canvas) + emptyImage = Image.new('1', (self._display.height, self._display.width), 255) + buf_red = self._display.getbuffer(emptyImage) + if self.full_refresh_trigger >= 0 and self.full_refresh_count == self.full_refresh_trigger: + self._display.Clear() + self._display.display(buf_black,buf_red) + self._display.sleep() + if self.full_refresh_trigger >= 0 and self.full_refresh_count == self.full_refresh_trigger: + self.full_refresh_count = 0 + elif self.full_refresh_trigger >= 0: + self.full_refresh_count += 1 + + def _on_view_rendered(self, img): # core.log("display::_on_view_rendered") VideoHandler.render(img) diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/view.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/view.py index 19e7999..0d76b7e 100644 --- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/view.py +++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/view.py @@ -43,13 +43,22 @@ def setup_display_specifics(config): elif config['ui']['display']['type'] in ('ws_1', 'ws1', 'waveshare_1', 'waveshare1', 'ws_2', 'ws2', 'waveshare_2', 'waveshare2'): - fonts.setup(10, 9, 10, 35) + if config['ui']['display']['color'] == 'black': + fonts.setup(10, 9, 10, 35) - width = 250 - height = 122 - face_pos = (0, 40) - name_pos = (125, 20) - status_pos = (125, 35) + width = 250 + height = 122 + face_pos = (0, 40) + name_pos = (125, 20) + status_pos = (125, 35) + else: + fonts.setup(10, 8, 10, 25) + + width = 212 + height = 104 + face_pos = (0, int(height / 4)) + name_pos = (int(width / 2) - 15, int(height * .15)) + status_pos = (int(width / 2) - 15, int(height * .30)) return width, height, face_pos, name_pos, status_pos diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/waveshare/v1/epd2in13bc.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/waveshare/v1/epd2in13bc.py new file mode 100644 index 0000000..a94c7ff --- /dev/null +++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/waveshare/v1/epd2in13bc.py @@ -0,0 +1,159 @@ +# ***************************************************************************** +# * | File : epd2in13bc.py +# * | Author : Waveshare team +# * | Function : Electronic paper driver +# * | Info : +# *---------------- +# * | This version: V4.0 +# * | Date : 2019-06-20 +# # | 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. +# + +import logging +from . import epdconfig + +# Display resolution +EPD_WIDTH = 104 +EPD_HEIGHT = 212 + +class EPD: + def __init__(self): + self.reset_pin = epdconfig.RST_PIN + self.dc_pin = epdconfig.DC_PIN + self.busy_pin = epdconfig.BUSY_PIN + self.cs_pin = epdconfig.CS_PIN + self.width = EPD_WIDTH + self.height = EPD_HEIGHT + + # Hardware reset + def reset(self): + epdconfig.digital_write(self.reset_pin, 1) + epdconfig.delay_ms(200) + epdconfig.digital_write(self.reset_pin, 0) + epdconfig.delay_ms(10) + epdconfig.digital_write(self.reset_pin, 1) + epdconfig.delay_ms(200) + + def send_command(self, command): + epdconfig.digital_write(self.dc_pin, 0) + epdconfig.digital_write(self.cs_pin, 0) + epdconfig.spi_writebyte([command]) + epdconfig.digital_write(self.cs_pin, 1) + + def send_data(self, data): + epdconfig.digital_write(self.dc_pin, 1) + epdconfig.digital_write(self.cs_pin, 0) + epdconfig.spi_writebyte([data]) + epdconfig.digital_write(self.cs_pin, 1) + + def ReadBusy(self): + logging.debug("e-Paper busy") + while(epdconfig.digital_read(self.busy_pin) == 0): # 0: idle, 1: busy + epdconfig.delay_ms(100) + logging.debug("e-Paper busy release") + + def init(self): + if (epdconfig.module_init() != 0): + return -1 + + self.reset() + + self.send_command(0x06) # BOOSTER_SOFT_START + self.send_data(0x17) + self.send_data(0x17) + self.send_data(0x17) + + self.send_command(0x04) # POWER_ON + self.ReadBusy() + + self.send_command(0x00) # PANEL_SETTING + self.send_data(0x8F) + + self.send_command(0x50) # VCOM_AND_DATA_INTERVAL_SETTING + self.send_data(0xF0) + + self.send_command(0x61) # RESOLUTION_SETTING + self.send_data(self.width & 0xff) + self.send_data(self.height >> 8) + self.send_data(self.height & 0xff) + return 0 + + def getbuffer(self, image): + # logging.debug("bufsiz = ",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() + # logging.debug("imwidth = %d, imheight = %d",imwidth,imheight) + if(imwidth == self.width and imheight == self.height): + logging.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): + logging.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)) + return buf + + def display(self, imageblack, imagered): + self.send_command(0x10) + for i in range(0, int(self.width * self.height / 8)): + self.send_data(imageblack[i]) + self.send_command(0x92) + + self.send_command(0x13) + for i in range(0, int(self.width * self.height / 8)): + self.send_data(imagered[i]) + self.send_command(0x92) + + self.send_command(0x12) # REFRESH + self.ReadBusy() + + def Clear(self): + self.send_command(0x10) + for i in range(0, int(self.width * self.height / 8)): + self.send_data(0xFF) + self.send_command(0x92) + + self.send_command(0x13) + for i in range(0, int(self.width * self.height / 8)): + self.send_data(0xFF) + self.send_command(0x92) + + self.send_command(0x12) # REFRESH + self.ReadBusy() + + def sleep(self): + self.send_command(0x02) # POWER_OFF + self.ReadBusy() + self.send_command(0x07) # DEEP_SLEEP + self.send_data(0xA5) # check code + +# epdconfig.module_exit() +### END OF FILE ### + diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/waveshare/v1/epdconfig.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/waveshare/v1/epdconfig.py index 78ff647..76d8ca9 100644 --- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/waveshare/v1/epdconfig.py +++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/waveshare/v1/epdconfig.py @@ -1,19 +1,13 @@ # /***************************************************************************** -# * | File : EPD_1in54.py +# * | File : epdconfig.py # * | Author : Waveshare team # * | Function : Hardware underlying interface # * | Info : # *---------------- -# * | This version: V2.0 -# * | Date : 2018-11-01 +# * | This version: V1.0 +# * | Date : 2019-06-21 # * | 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 # of this software and associated documnetation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights @@ -33,41 +27,128 @@ # THE SOFTWARE. # - -import spidev -import RPi.GPIO as GPIO +import os +import logging +import sys import time -# Pin definition -RST_PIN = 17 -DC_PIN = 25 -CS_PIN = 8 -BUSY_PIN = 24 -# SPI device, bus = 0, device = 0 -SPI = spidev.SpiDev(0, 0) +class RaspberryPi: + # Pin definition + RST_PIN = 17 + DC_PIN = 25 + CS_PIN = 8 + BUSY_PIN = 24 -def digital_write(pin, value): - GPIO.output(pin, value) + def __init__(self): + import spidev + import RPi.GPIO -def digital_read(pin): - return GPIO.input(BUSY_PIN) + self.GPIO = RPi.GPIO -def delay_ms(delaytime): - time.sleep(delaytime / 1000.0) + # SPI device, bus = 0, device = 0 + self.SPI = spidev.SpiDev(0, 0) -def spi_writebyte(data): - SPI.writebytes(data) + 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.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 ### From 1b813f41f503547f410e9421b0d474e5cfaea7d4 Mon Sep 17 00:00:00 2001 From: "Michael V. Swisher" Date: Thu, 3 Oct 2019 01:25:07 -0700 Subject: [PATCH 2/6] Removing refresh trigger handler since it prevented pwnagotchi ui from displaying --- .../scripts/pwnagotchi/ui/display.py | 12 ++----- .../pwnagotchi/ui/waveshare/v1/epd2in13bc.py | 35 +++++++++---------- 2 files changed, 19 insertions(+), 28 deletions(-) diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/display.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/display.py index 1064c51..66f2e36 100644 --- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/display.py +++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/display.py @@ -207,15 +207,9 @@ class Display(View): def _waveshare_bc_render(self): buf_black = self._display.getbuffer(self.canvas) emptyImage = Image.new('1', (self._display.height, self._display.width), 255) - buf_red = self._display.getbuffer(emptyImage) - if self.full_refresh_trigger >= 0 and self.full_refresh_count == self.full_refresh_trigger: - self._display.Clear() - self._display.display(buf_black,buf_red) - self._display.sleep() - if self.full_refresh_trigger >= 0 and self.full_refresh_count == self.full_refresh_trigger: - self.full_refresh_count = 0 - elif self.full_refresh_trigger >= 0: - self.full_refresh_count += 1 + buf_color = self._display.getbuffer(emptyImage) + self._display.display(buf_black,buf_color) + def _on_view_rendered(self, img): diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/waveshare/v1/epd2in13bc.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/waveshare/v1/epd2in13bc.py index a94c7ff..c22da4b 100644 --- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/waveshare/v1/epd2in13bc.py +++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/waveshare/v1/epd2in13bc.py @@ -29,6 +29,9 @@ import logging from . import epdconfig +from PIL import Image +import RPi.GPIO as GPIO +# import numpy as np # Display resolution EPD_WIDTH = 104 @@ -45,35 +48,33 @@ class EPD: # Hardware reset def reset(self): - epdconfig.digital_write(self.reset_pin, 1) + epdconfig.digital_write(self.reset_pin, GPIO.HIGH) epdconfig.delay_ms(200) - epdconfig.digital_write(self.reset_pin, 0) - epdconfig.delay_ms(10) - epdconfig.digital_write(self.reset_pin, 1) + epdconfig.digital_write(self.reset_pin, GPIO.LOW) # module reset + epdconfig.delay_ms(200) + epdconfig.digital_write(self.reset_pin, GPIO.HIGH) epdconfig.delay_ms(200) def send_command(self, command): - epdconfig.digital_write(self.dc_pin, 0) - epdconfig.digital_write(self.cs_pin, 0) + epdconfig.digital_write(self.dc_pin, GPIO.LOW) + epdconfig.digital_write(self.cs_pin, GPIO.LOW) epdconfig.spi_writebyte([command]) - epdconfig.digital_write(self.cs_pin, 1) + epdconfig.digital_write(self.cs_pin, GPIO.HIGH) def send_data(self, data): - epdconfig.digital_write(self.dc_pin, 1) - epdconfig.digital_write(self.cs_pin, 0) + epdconfig.digital_write(self.dc_pin, GPIO.HIGH) + epdconfig.digital_write(self.cs_pin, GPIO.LOW) epdconfig.spi_writebyte([data]) - epdconfig.digital_write(self.cs_pin, 1) + epdconfig.digital_write(self.cs_pin, GPIO.HIGH) def ReadBusy(self): - logging.debug("e-Paper busy") while(epdconfig.digital_read(self.busy_pin) == 0): # 0: idle, 1: busy epdconfig.delay_ms(100) - logging.debug("e-Paper busy release") def init(self): if (epdconfig.module_init() != 0): return -1 - + # EPD hardware init start self.reset() self.send_command(0x06) # BOOSTER_SOFT_START @@ -97,21 +98,17 @@ class EPD: return 0 def getbuffer(self, image): - # logging.debug("bufsiz = ",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() - # logging.debug("imwidth = %d, imheight = %d",imwidth,imheight) if(imwidth == self.width and imheight == self.height): - logging.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): - logging.debug("Horizontal") for y in range(imheight): for x in range(imwidth): newx = y @@ -120,7 +117,7 @@ class EPD: buf[int((newx + newy*self.width) / 8)] &= ~(0x80 >> (y % 8)) return buf - def display(self, imageblack, imagered): + def display(self, imageblack, imagecolor): self.send_command(0x10) for i in range(0, int(self.width * self.height / 8)): self.send_data(imageblack[i]) @@ -128,7 +125,7 @@ class EPD: self.send_command(0x13) for i in range(0, int(self.width * self.height / 8)): - self.send_data(imagered[i]) + self.send_data(imagecolor[i]) self.send_command(0x92) self.send_command(0x12) # REFRESH From 23cd8ad599ba16835ba5472394f13d9440bee4d1 Mon Sep 17 00:00:00 2001 From: "Michael V. Swisher" Date: Sat, 5 Oct 2019 06:55:04 -0700 Subject: [PATCH 3/6] Updating so waveshare 2.13 b/c models only have to maintain black color channel. Color channels aren't used so no need to maintain them --- .../root/pwnagotchi/scripts/pwnagotchi/ui/display.py | 10 +++++++--- .../scripts/pwnagotchi/ui/waveshare/v1/epd2in13bc.py | 9 +++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/display.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/display.py index d6e00d1..88ea5d4 100644 --- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/display.py +++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/display.py @@ -208,9 +208,13 @@ class Display(View): def _waveshare_bc_render(self): buf_black = self._display.getbuffer(self.canvas) - emptyImage = Image.new('1', (self._display.height, self._display.width), 255) - buf_color = self._display.getbuffer(emptyImage) - self._display.display(buf_black,buf_color) + # emptyImage = Image.new('1', (self._display.height, self._display.width), 255) + # buf_color = self._display.getbuffer(emptyImage) + # self._display.display(buf_black,buf_color) + + # Custom display function that only handles black + # Was included in epd2in13bc.py + self._display.displayBlack(buf_black) diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/waveshare/v1/epd2in13bc.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/waveshare/v1/epd2in13bc.py index c22da4b..ec92465 100644 --- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/waveshare/v1/epd2in13bc.py +++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/waveshare/v1/epd2in13bc.py @@ -117,6 +117,15 @@ class EPD: buf[int((newx + newy*self.width) / 8)] &= ~(0x80 >> (y % 8)) return buf + def displayBlack(self, imageblack): + self.send_command(0x10) + for i in range(0, int(self.width * self.height / 8)): + self.send_data(imageblack[i]) + self.send_command(0x92) + + self.send_command(0x12) # REFRESH + self.ReadBusy() + def display(self, imageblack, imagecolor): self.send_command(0x10) for i in range(0, int(self.width * self.height / 8)): From 1ebb8599b35c0e01116c0f19809ec749b5a3a170 Mon Sep 17 00:00:00 2001 From: "Michael V. Swisher" Date: Mon, 7 Oct 2019 07:30:23 -0700 Subject: [PATCH 4/6] Fixing function name mismatch --- sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/display.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/display.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/display.py index 7fb6a6f..4b82443 100644 --- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/display.py +++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/display.py @@ -128,7 +128,7 @@ class Display(View): self._display.clear() self._render_cb = self._papirus_render - elif self._is_waveshare1(): + elif self._is_waveshare_v1(): logging.info("initializing waveshare v1 display") if self._display_color == 'black': from pwnagotchi.ui.waveshare.v1.epd2in13 import EPD From 41abfbc981a21a83375d7ca757edb71685bc1531 Mon Sep 17 00:00:00 2001 From: "Michael V. Swisher" Date: Thu, 10 Oct 2019 03:23:36 -0700 Subject: [PATCH 5/6] Typo on self._canvas --- pwnagotchi/ui/display.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pwnagotchi/ui/display.py b/pwnagotchi/ui/display.py index 2acc43b..0922fea 100644 --- a/pwnagotchi/ui/display.py +++ b/pwnagotchi/ui/display.py @@ -237,7 +237,7 @@ class Display(View): self._display.displayPartial(buf) def _waveshare_bc_render(self): - buf_black = self._display.getbuffer(self.canvas) + buf_black = self._display.getbuffer(self._canvas) # emptyImage = Image.new('1', (self._display.height, self._display.width), 255) # buf_color = self._display.getbuffer(emptyImage) # self._display.display(buf_black,buf_color) From 9d580ffc0f740db438f2f5aa4ff0937063a9aa65 Mon Sep 17 00:00:00 2001 From: "Michael V. Swisher" Date: Fri, 11 Oct 2019 02:45:22 -0700 Subject: [PATCH 6/6] Updating waveshare logging to specify color vs monochromatic mode --- pwnagotchi/ui/display.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pwnagotchi/ui/display.py b/pwnagotchi/ui/display.py index 0922fea..232ff7e 100644 --- a/pwnagotchi/ui/display.py +++ b/pwnagotchi/ui/display.py @@ -150,8 +150,8 @@ class Display(View): self._render_cb = self._papirus_render elif self._is_waveshare_v1(): - logging.info("initializing waveshare v1 display") if self._display_color == 'black': + logging.info("initializing waveshare v1 display in monochromatic mode") from pwnagotchi.ui.waveshare.v1.epd2in13 import EPD self._display = EPD() self._display.init(self._display.lut_full_update) @@ -160,6 +160,7 @@ class Display(View): self._render_cb = self._waveshare_render else: + logging.info("initializing waveshare v1 display 3-color mode") from pwnagotchi.ui.waveshare.v1.epd2in13bc import EPD self._display = EPD() self._display.init()