mirror of
https://github.com/infinition/Bjorn.git
synced 2025-12-13 16:14:57 +00:00
BREAKING CHANGE: Complete refactor of architecture to prepare BJORN V2 release, APIs, assets, and UI, webapp, logics, attacks, a lot of new features...
This commit is contained in:
@@ -1,15 +1,22 @@
|
||||
# epd2in13_V2 — V2 alignée V4, zone utile 120px centrée dans 122px
|
||||
# - Fenêtrage complet 122x250
|
||||
# - Data entry: X++ puis Y++ (0x03) comme V3/V4
|
||||
# - getbuffer() accepte une image 120x250 (ou 122x250) et la centre (offset=1)
|
||||
# - Aucune rotation/mirroring côté driver (géré en amont si besoin)
|
||||
# - Pas de décalage wrap-around d’1 pixel (fini la ligne sombre)
|
||||
|
||||
import logging
|
||||
from . import epdconfig
|
||||
|
||||
# Display resolution
|
||||
EPD_WIDTH = 122
|
||||
EPD_HEIGHT = 250
|
||||
# Résolution physique du panneau (hardware)
|
||||
EPD_WIDTH = 122
|
||||
EPD_HEIGHT = 250
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
class EPD:
|
||||
def __init__(self):
|
||||
self.is_initialized = False # New flag to track if the display has been initialized #INFINITION
|
||||
self.is_initialized = False
|
||||
self.reset_pin = epdconfig.RST_PIN
|
||||
self.dc_pin = epdconfig.DC_PIN
|
||||
self.busy_pin = epdconfig.BUSY_PIN
|
||||
@@ -19,38 +26,40 @@ class EPD:
|
||||
|
||||
FULL_UPDATE = 0
|
||||
PART_UPDATE = 1
|
||||
lut_full_update= [
|
||||
0x80,0x60,0x40,0x00,0x00,0x00,0x00, #LUT0: BB: VS 0 ~7
|
||||
0x10,0x60,0x20,0x00,0x00,0x00,0x00, #LUT1: BW: VS 0 ~7
|
||||
0x80,0x60,0x40,0x00,0x00,0x00,0x00, #LUT2: WB: VS 0 ~7
|
||||
0x10,0x60,0x20,0x00,0x00,0x00,0x00, #LUT3: WW: VS 0 ~7
|
||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00, #LUT4: VCOM: VS 0 ~7
|
||||
|
||||
0x03,0x03,0x00,0x00,0x02, # TP0 A~D RP0
|
||||
0x09,0x09,0x00,0x00,0x02, # TP1 A~D RP1
|
||||
0x03,0x03,0x00,0x00,0x02, # TP2 A~D RP2
|
||||
0x00,0x00,0x00,0x00,0x00, # TP3 A~D RP3
|
||||
0x00,0x00,0x00,0x00,0x00, # TP4 A~D RP4
|
||||
0x00,0x00,0x00,0x00,0x00, # TP5 A~D RP5
|
||||
0x00,0x00,0x00,0x00,0x00, # TP6 A~D RP6
|
||||
# LUTs d'origine (Waveshare)
|
||||
lut_full_update= [
|
||||
0x80,0x60,0x40,0x00,0x00,0x00,0x00,
|
||||
0x10,0x60,0x20,0x00,0x00,0x00,0x00,
|
||||
0x80,0x60,0x40,0x00,0x00,0x00,0x00,
|
||||
0x10,0x60,0x20,0x00,0x00,0x00,0x00,
|
||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
||||
|
||||
0x03,0x03,0x00,0x00,0x02,
|
||||
0x09,0x09,0x00,0x00,0x02,
|
||||
0x03,0x03,0x00,0x00,0x02,
|
||||
0x00,0x00,0x00,0x00,0x00,
|
||||
0x00,0x00,0x00,0x00,0x00,
|
||||
0x00,0x00,0x00,0x00,0x00,
|
||||
0x00,0x00,0x00,0x00,0x00,
|
||||
|
||||
0x15,0x41,0xA8,0x32,0x30,0x0A,
|
||||
]
|
||||
|
||||
lut_partial_update = [ #20 bytes
|
||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00, #LUT0: BB: VS 0 ~7
|
||||
0x80,0x00,0x00,0x00,0x00,0x00,0x00, #LUT1: BW: VS 0 ~7
|
||||
0x40,0x00,0x00,0x00,0x00,0x00,0x00, #LUT2: WB: VS 0 ~7
|
||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00, #LUT3: WW: VS 0 ~7
|
||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00, #LUT4: VCOM: VS 0 ~7
|
||||
lut_partial_update = [
|
||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
||||
0x80,0x00,0x00,0x00,0x00,0x00,0x00,
|
||||
0x40,0x00,0x00,0x00,0x00,0x00,0x00,
|
||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
||||
|
||||
0x0A,0x00,0x00,0x00,0x00, # TP0 A~D RP0
|
||||
0x00,0x00,0x00,0x00,0x00, # TP1 A~D RP1
|
||||
0x00,0x00,0x00,0x00,0x00, # TP2 A~D RP2
|
||||
0x00,0x00,0x00,0x00,0x00, # TP3 A~D RP3
|
||||
0x00,0x00,0x00,0x00,0x00, # TP4 A~D RP4
|
||||
0x00,0x00,0x00,0x00,0x00, # TP5 A~D RP5
|
||||
0x00,0x00,0x00,0x00,0x00, # TP6 A~D RP6
|
||||
0x0A,0x00,0x00,0x00,0x00,
|
||||
0x00,0x00,0x00,0x00,0x00,
|
||||
0x00,0x00,0x00,0x00,0x00,
|
||||
0x00,0x00,0x00,0x00,0x00,
|
||||
0x00,0x00,0x00,0x00,0x00,
|
||||
0x00,0x00,0x00,0x00,0x00,
|
||||
0x00,0x00,0x00,0x00,0x00,
|
||||
|
||||
0x15,0x41,0xA8,0x32,0x30,0x0A,
|
||||
]
|
||||
@@ -66,26 +75,20 @@ class EPD:
|
||||
|
||||
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)
|
||||
|
||||
# send a lot of data
|
||||
def send_data2(self, data):
|
||||
epdconfig.digital_write(self.dc_pin, 1)
|
||||
epdconfig.digital_write(self.cs_pin, 0)
|
||||
epdconfig.spi_writebyte2(data)
|
||||
epdconfig.digital_write(self.cs_pin, 1)
|
||||
|
||||
def ReadBusy(self):
|
||||
while(epdconfig.digital_read(self.busy_pin) == 1): # 0: idle, 1: busy
|
||||
epdconfig.delay_ms(100)
|
||||
# 0: idle, 1: busy
|
||||
while epdconfig.digital_read(self.busy_pin) == 1:
|
||||
epdconfig.delay_ms(50)
|
||||
|
||||
def TurnOnDisplay(self):
|
||||
self.send_command(0x22)
|
||||
@@ -100,126 +103,129 @@ class EPD:
|
||||
self.ReadBusy()
|
||||
|
||||
def init(self, update):
|
||||
if not self.is_initialized: # Avoid repeated initialization and accumulation of File descriptors #INFINITION
|
||||
"""
|
||||
Init V2 alignée V4 :
|
||||
- Data entry: 0x03 (X++ puis Y++)
|
||||
- X-window: start=0x00, end=0x0F (16 octets = 128 bits => couvre nos 122 px)
|
||||
- Y-window: start=0x0000, end=0x00F9 (250 lignes)
|
||||
- Curseur: X=0x00, Y=0x0000
|
||||
"""
|
||||
if not self.is_initialized:
|
||||
if epdconfig.module_init() != 0:
|
||||
return -1
|
||||
self.reset()
|
||||
self.is_initialized = True
|
||||
|
||||
if(update == self.FULL_UPDATE):
|
||||
|
||||
if update == self.FULL_UPDATE:
|
||||
self.ReadBusy()
|
||||
self.send_command(0x12) # soft reset
|
||||
self.send_command(0x12) # soft reset
|
||||
self.ReadBusy()
|
||||
|
||||
self.send_command(0x74) #set analog block control
|
||||
self.send_data(0x54)
|
||||
self.send_command(0x7E) #set digital block control
|
||||
self.send_data(0x3B)
|
||||
# Analog/Digital blocks
|
||||
self.send_command(0x74); self.send_data(0x54)
|
||||
self.send_command(0x7E); self.send_data(0x3B)
|
||||
|
||||
self.send_command(0x01) #Driver output control
|
||||
self.send_data(0xF9)
|
||||
# Driver output control (height - 1) => 249
|
||||
self.send_command(0x01)
|
||||
self.send_data(0xF9) # 249
|
||||
self.send_data(0x00)
|
||||
self.send_data(0x00)
|
||||
|
||||
self.send_command(0x11) #data entry mode
|
||||
self.send_data(0x01)
|
||||
|
||||
self.send_command(0x44) #set Ram-X address start/end position
|
||||
self.send_data(0x00)
|
||||
self.send_data(0x0F) #0x0C-->(15+1)*8=128
|
||||
|
||||
self.send_command(0x45) #set Ram-Y address start/end position
|
||||
self.send_data(0xF9) #0xF9-->(249+1)=250
|
||||
self.send_data(0x00)
|
||||
self.send_data(0x00)
|
||||
self.send_data(0x00)
|
||||
|
||||
self.send_command(0x3C) #BorderWavefrom
|
||||
# Data entry mode X++ Y++
|
||||
self.send_command(0x11)
|
||||
self.send_data(0x03)
|
||||
|
||||
self.send_command(0x2C) #VCOM Voltage
|
||||
self.send_data(0x55) #
|
||||
# Fenêtre RAM X (octets) 0..15 (16*8=128 bits -> couvre 122 px)
|
||||
self.send_command(0x44)
|
||||
self.send_data(0x00) # start
|
||||
self.send_data(0x0F) # end
|
||||
|
||||
self.send_command(0x03)
|
||||
self.send_data(self.lut_full_update[70])
|
||||
# Fenêtre RAM Y 0..249
|
||||
self.send_command(0x45)
|
||||
self.send_data(0x00) # Y-start L
|
||||
self.send_data(0x00) # Y-start H
|
||||
self.send_data(0xF9) # Y-end L
|
||||
self.send_data(0x00) # Y-end H
|
||||
|
||||
self.send_command(0x04) #
|
||||
# Border/VCOM/LUT timing
|
||||
self.send_command(0x3C); self.send_data(0x03)
|
||||
self.send_command(0x2C); self.send_data(0x55)
|
||||
|
||||
self.send_command(0x03); self.send_data(self.lut_full_update[70])
|
||||
self.send_command(0x04)
|
||||
self.send_data(self.lut_full_update[71])
|
||||
self.send_data(self.lut_full_update[72])
|
||||
self.send_data(self.lut_full_update[73])
|
||||
self.send_command(0x3A); self.send_data(self.lut_full_update[74]) # Dummy line
|
||||
self.send_command(0x3B); self.send_data(self.lut_full_update[75]) # Gate time
|
||||
|
||||
self.send_command(0x3A) #Dummy Line
|
||||
self.send_data(self.lut_full_update[74])
|
||||
self.send_command(0x3B) #Gate time
|
||||
self.send_data(self.lut_full_update[75])
|
||||
self.send_command(0x32) # LUT table
|
||||
for i in range(70):
|
||||
self.send_data(self.lut_full_update[i])
|
||||
|
||||
self.send_command(0x32)
|
||||
for count in range(70):
|
||||
self.send_data(self.lut_full_update[count])
|
||||
|
||||
self.send_command(0x4E) # set RAM x address count to 0
|
||||
self.send_data(0x00)
|
||||
self.send_command(0x4F) # set RAM y address count to 0X127
|
||||
self.send_data(0xF9)
|
||||
self.send_data(0x00)
|
||||
# Curseur X/Y
|
||||
self.send_command(0x4E); self.send_data(0x00) # X-counter (byte)
|
||||
self.send_command(0x4F); self.send_data(0x00); self.send_data(0x00) # Y-counter
|
||||
self.ReadBusy()
|
||||
|
||||
else:
|
||||
self.send_command(0x2C) #VCOM Voltage
|
||||
self.send_data(0x26)
|
||||
|
||||
# PARTIAL init
|
||||
self.send_command(0x2C); self.send_data(0x26) # VCOM
|
||||
self.ReadBusy()
|
||||
|
||||
self.send_command(0x32)
|
||||
for count in range(70):
|
||||
self.send_data(self.lut_partial_update[count])
|
||||
for i in range(70):
|
||||
self.send_data(self.lut_partial_update[i])
|
||||
|
||||
self.send_command(0x37)
|
||||
self.send_data(0x00)
|
||||
self.send_data(0x00)
|
||||
self.send_data(0x00)
|
||||
self.send_data(0x00)
|
||||
self.send_data(0x40)
|
||||
self.send_data(0x00)
|
||||
self.send_data(0x00)
|
||||
self.send_data(0x00); self.send_data(0x00); self.send_data(0x00)
|
||||
self.send_data(0x00); self.send_data(0x40); self.send_data(0x00); self.send_data(0x00)
|
||||
|
||||
self.send_command(0x22)
|
||||
self.send_data(0xC0)
|
||||
self.send_command(0x20)
|
||||
self.ReadBusy()
|
||||
self.send_command(0x22); self.send_data(0xC0)
|
||||
self.send_command(0x20); self.ReadBusy()
|
||||
|
||||
self.send_command(0x3C); self.send_data(0x01)
|
||||
|
||||
# Même fenêtrage qu’en full
|
||||
self.send_command(0x44); self.send_data(0x00); self.send_data(0x0F)
|
||||
self.send_command(0x45); self.send_data(0x00); self.send_data(0x00); self.send_data(0xF9); self.send_data(0x00)
|
||||
self.send_command(0x4E); self.send_data(0x00)
|
||||
self.send_command(0x4F); self.send_data(0x00); self.send_data(0x00)
|
||||
|
||||
self.send_command(0x3C) #BorderWavefrom
|
||||
self.send_data(0x01)
|
||||
return 0
|
||||
|
||||
|
||||
def getbuffer(self, image):
|
||||
if self.width%8 == 0:
|
||||
linewidth = int(self.width/8)
|
||||
else:
|
||||
linewidth = int(self.width/8) + 1
|
||||
|
||||
buf = [0xFF] * (linewidth * self.height)
|
||||
image_monocolor = image.convert('1')
|
||||
imwidth, imheight = image_monocolor.size
|
||||
pixels = image_monocolor.load()
|
||||
|
||||
if(imwidth == self.width and imheight == self.height):
|
||||
logger.debug("Vertical")
|
||||
for y in range(imheight):
|
||||
for x in range(imwidth):
|
||||
if pixels[x, y] == 0:
|
||||
x = imwidth - x
|
||||
buf[int(x / 8) + y * linewidth] &= ~(0x80 >> (x % 8))
|
||||
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:
|
||||
newy = imwidth - newy - 1
|
||||
buf[int(newx / 8) + newy*linewidth] &= ~(0x80 >> (y % 8))
|
||||
return buf
|
||||
|
||||
W, H = self.width, self.height # 122 x 250
|
||||
bytes_per_line = (W + 7) // 8 # 16
|
||||
buf = bytearray([0xFF] * (bytes_per_line * H))
|
||||
|
||||
img = image.convert('1')
|
||||
imw, imh = img.size
|
||||
|
||||
work_w = min(imw, 120)
|
||||
x_offset = (W - work_w) // 2 # =1 pour 120px
|
||||
|
||||
pixels = img.load()
|
||||
for y in range(min(imh, H)):
|
||||
base = y * bytes_per_line
|
||||
for x in range(work_w):
|
||||
src_x = x if imw == 120 else (x + (imw - work_w)//2)
|
||||
if pixels[src_x, y] == 0:
|
||||
xi = x + x_offset
|
||||
if xi <= 0 or xi >= W-1:
|
||||
continue # sécurité: ne jamais écrire col 0 ni 121
|
||||
byte_index = base + (xi >> 3)
|
||||
bit = 0x80 >> (xi & 7)
|
||||
buf[byte_index] &= (~bit) & 0xFF
|
||||
|
||||
# force colonnes 0 et 121 en blanc
|
||||
buf[base + (0 >> 3)] |= (0x80 >> (0 & 7))
|
||||
buf[base + (121 >> 3)] |= (0x80 >> (121 & 7))
|
||||
|
||||
return buf
|
||||
|
||||
|
||||
|
||||
def display(self, image):
|
||||
self.send_command(0x24)
|
||||
@@ -227,63 +233,37 @@ class EPD:
|
||||
self.TurnOnDisplay()
|
||||
|
||||
def displayPartial(self, image):
|
||||
if self.width%8 == 0:
|
||||
linewidth = int(self.width/8)
|
||||
else:
|
||||
linewidth = int(self.width/8) + 1
|
||||
|
||||
buf = [0x00] * self.height * linewidth
|
||||
for j in range(0, self.height):
|
||||
for i in range(0, linewidth):
|
||||
buf[i + j * linewidth] = ~image[i + j * linewidth]
|
||||
bytes_per_line = (self.width + 7) // 8
|
||||
total = self.height * bytes_per_line
|
||||
# Buffer inversé pour le second plan (comme d’origine)
|
||||
buf_inv = bytearray(total)
|
||||
for i in range(total):
|
||||
buf_inv[i] = (~image[i]) & 0xFF
|
||||
|
||||
self.send_command(0x24)
|
||||
self.send_data2(image)
|
||||
|
||||
|
||||
self.send_data2(image)
|
||||
self.send_command(0x26)
|
||||
self.send_data2(buf)
|
||||
self.send_data2(buf_inv)
|
||||
self.TurnOnDisplayPart()
|
||||
|
||||
def displayPartBaseImage(self, image):
|
||||
self.send_command(0x24)
|
||||
self.send_data2(image)
|
||||
|
||||
self.send_command(0x26)
|
||||
self.send_data2(image)
|
||||
self.TurnOnDisplay()
|
||||
|
||||
def Clear(self, color=0xFF):
|
||||
if self.width%8 == 0:
|
||||
linewidth = int(self.width/8)
|
||||
else:
|
||||
linewidth = int(self.width/8) + 1
|
||||
# logger.debug(linewidth)
|
||||
|
||||
buf = [0x00] * self.height * linewidth
|
||||
for j in range(0, self.height):
|
||||
for i in range(0, linewidth):
|
||||
buf[i + j * linewidth] = color
|
||||
|
||||
bytes_per_line = (self.width + 7) // 8
|
||||
buf = bytearray([color] * (self.height * bytes_per_line))
|
||||
self.send_command(0x24)
|
||||
self.send_data2(buf)
|
||||
|
||||
# self.send_command(0x26)
|
||||
# for j in range(0, self.height):
|
||||
# for i in range(0, linewidth):
|
||||
# self.send_data(color)
|
||||
|
||||
self.TurnOnDisplay()
|
||||
|
||||
def sleep(self):
|
||||
# self.send_command(0x22) #POWER OFF
|
||||
# self.send_data(0xC3)
|
||||
# self.send_command(0x20)
|
||||
|
||||
self.send_command(0x10) #enter deep sleep
|
||||
self.send_command(0x10) # enter deep sleep
|
||||
self.send_data(0x03)
|
||||
epdconfig.delay_ms(2000)
|
||||
epdconfig.module_exit()
|
||||
|
||||
### END OF FILE ###
|
||||
|
||||
# END OF FILE
|
||||
|
||||
Reference in New Issue
Block a user