kopia lustrzana https://github.com/peterhinch/micropython-nano-gui
ILI9xxx: Remove misleading code comment re touch.
Peter Hinch
rodzic
4fd7112162
commit
a487992b37
|
|
@ -1,5 +1,4 @@
|
|||
# ILI9341 nano-gui driver for ili9341 displays
|
||||
# As with all nano-gui displays, touch is not supported.
|
||||
|
||||
# Copyright (c) Peter Hinch 2020
|
||||
# Released under the MIT license see LICENSE
|
||||
|
|
@ -15,6 +14,7 @@ import framebuf
|
|||
import uasyncio as asyncio
|
||||
from drivers.boolpalette import BoolPalette
|
||||
|
||||
|
||||
@micropython.viper
|
||||
def _lcopy(dest: ptr16, source: ptr8, lut: ptr16, length: int):
|
||||
# rgb565 - 16bit/pixel
|
||||
|
|
@ -23,7 +23,7 @@ def _lcopy(dest:ptr16, source:ptr8, lut:ptr16, length:int):
|
|||
c = source[x]
|
||||
dest[n] = lut[c >> 4] # current pixel
|
||||
n += 1
|
||||
dest[n] = lut[c & 0x0f] # next pixel
|
||||
dest[n] = lut[c & 0x0F] # next pixel
|
||||
n += 1
|
||||
|
||||
|
||||
|
|
@ -37,11 +37,10 @@ class ILI9341(framebuf.FrameBuffer):
|
|||
# ILI9341 expects RGB order
|
||||
@staticmethod
|
||||
def rgb(r, g, b):
|
||||
return (r & 0xf8) | (g & 0xe0) >> 5 | (g & 0x1c) << 11 | (b & 0xf8) << 5
|
||||
return (r & 0xF8) | (g & 0xE0) >> 5 | (g & 0x1C) << 11 | (b & 0xF8) << 5
|
||||
|
||||
# Transpose width & height for landscape mode
|
||||
def __init__(self, spi, cs, dc, rst, height=240, width=320,
|
||||
usd=False, init_spi=False):
|
||||
def __init__(self, spi, cs, dc, rst, height=240, width=320, usd=False, init_spi=False):
|
||||
self._spi = spi
|
||||
self._cs = cs
|
||||
self._dc = dc
|
||||
|
|
@ -65,34 +64,38 @@ class ILI9341(framebuf.FrameBuffer):
|
|||
self._spi_init(spi) # Bus may be shared
|
||||
self._lock = asyncio.Lock()
|
||||
# Send initialization commands
|
||||
self._wcmd(b'\x01') # SWRESET Software reset
|
||||
self._wcmd(b"\x01") # SWRESET Software reset
|
||||
sleep_ms(100)
|
||||
self._wcd(b'\xcf', b'\x00\xC1\x30') # PWCTRB Pwr ctrl B
|
||||
self._wcd(b'\xed', b'\x64\x03\x12\x81') # POSC Pwr on seq. ctrl
|
||||
self._wcd(b'\xe8', b'\x85\x00\x78') # DTCA Driver timing ctrl A
|
||||
self._wcd(b'\xcb', b'\x39\x2C\x00\x34\x02') # PWCTRA Pwr ctrl A
|
||||
self._wcd(b'\xf7', b'\x20') # PUMPRC Pump ratio control
|
||||
self._wcd(b'\xea', b'\x00\x00') # DTCB Driver timing ctrl B
|
||||
self._wcd(b'\xc0', b'\x23') # PWCTR1 Pwr ctrl 1
|
||||
self._wcd(b'\xc1', b'\x10') # PWCTR2 Pwr ctrl 2
|
||||
self._wcd(b'\xc5', b'\x3E\x28') # VMCTR1 VCOM ctrl 1
|
||||
self._wcd(b'\xc7', b'\x86') # VMCTR2 VCOM ctrl 2
|
||||
self._wcd(b"\xcf", b"\x00\xC1\x30") # PWCTRB Pwr ctrl B
|
||||
self._wcd(b"\xed", b"\x64\x03\x12\x81") # POSC Pwr on seq. ctrl
|
||||
self._wcd(b"\xe8", b"\x85\x00\x78") # DTCA Driver timing ctrl A
|
||||
self._wcd(b"\xcb", b"\x39\x2C\x00\x34\x02") # PWCTRA Pwr ctrl A
|
||||
self._wcd(b"\xf7", b"\x20") # PUMPRC Pump ratio control
|
||||
self._wcd(b"\xea", b"\x00\x00") # DTCB Driver timing ctrl B
|
||||
self._wcd(b"\xc0", b"\x23") # PWCTR1 Pwr ctrl 1
|
||||
self._wcd(b"\xc1", b"\x10") # PWCTR2 Pwr ctrl 2
|
||||
self._wcd(b"\xc5", b"\x3E\x28") # VMCTR1 VCOM ctrl 1
|
||||
self._wcd(b"\xc7", b"\x86") # VMCTR2 VCOM ctrl 2
|
||||
# (b'\x88', b'\xe8', b'\x48', b'\x28')[rotation // 90]
|
||||
if self.height > self.width:
|
||||
self._wcd(b'\x36', b'\x48' if usd else b'\x88') # MADCTL: RGB portrait mode
|
||||
self._wcd(b"\x36", b"\x48" if usd else b"\x88") # MADCTL: RGB portrait mode
|
||||
else:
|
||||
self._wcd(b'\x36', b'\x28' if usd else b'\xe8') # MADCTL: RGB landscape mode
|
||||
self._wcd(b'\x37', b'\x00') # VSCRSADD Vertical scrolling start address
|
||||
self._wcd(b'\x3a', b'\x55') # PIXFMT COLMOD: Pixel format 16 bits (MCU & interface)
|
||||
self._wcd(b'\xb1', b'\x00\x18') # FRMCTR1 Frame rate ctrl
|
||||
self._wcd(b'\xb6', b'\x08\x82\x27') # DFUNCTR
|
||||
self._wcd(b'\xf2', b'\x00') # ENABLE3G Enable 3 gamma ctrl
|
||||
self._wcd(b'\x26', b'\x01') # GAMMASET Gamma curve selected
|
||||
self._wcd(b'\xe0', b'\x0F\x31\x2B\x0C\x0E\x08\x4E\xF1\x37\x07\x10\x03\x0E\x09\x00') # GMCTRP1
|
||||
self._wcd(b'\xe1', b'\x00\x0E\x14\x03\x11\x07\x31\xC1\x48\x08\x0F\x0C\x31\x36\x0F') # GMCTRN1
|
||||
self._wcmd(b'\x11') # SLPOUT Exit sleep
|
||||
self._wcd(b"\x36", b"\x28" if usd else b"\xe8") # MADCTL: RGB landscape mode
|
||||
self._wcd(b"\x37", b"\x00") # VSCRSADD Vertical scrolling start address
|
||||
self._wcd(b"\x3a", b"\x55") # PIXFMT COLMOD: Pixel format 16 bits (MCU & interface)
|
||||
self._wcd(b"\xb1", b"\x00\x18") # FRMCTR1 Frame rate ctrl
|
||||
self._wcd(b"\xb6", b"\x08\x82\x27") # DFUNCTR
|
||||
self._wcd(b"\xf2", b"\x00") # ENABLE3G Enable 3 gamma ctrl
|
||||
self._wcd(b"\x26", b"\x01") # GAMMASET Gamma curve selected
|
||||
self._wcd(
|
||||
b"\xe0", b"\x0F\x31\x2B\x0C\x0E\x08\x4E\xF1\x37\x07\x10\x03\x0E\x09\x00"
|
||||
) # GMCTRP1
|
||||
self._wcd(
|
||||
b"\xe1", b"\x00\x0E\x14\x03\x11\x07\x31\xC1\x48\x08\x0F\x0C\x31\x36\x0F"
|
||||
) # GMCTRN1
|
||||
self._wcmd(b"\x11") # SLPOUT Exit sleep
|
||||
sleep_ms(100)
|
||||
self._wcmd(b'\x29') # DISPLAY_ON
|
||||
self._wcmd(b"\x29") # DISPLAY_ON
|
||||
sleep_ms(100)
|
||||
|
||||
# Write a command.
|
||||
|
|
@ -125,9 +128,9 @@ class ILI9341(framebuf.FrameBuffer):
|
|||
if self._spi_init: # A callback was passed
|
||||
self._spi_init(self._spi) # Bus may be shared
|
||||
# Commands needed to start data write
|
||||
self._wcd(b'\x2a', int.to_bytes(self.width, 4, 'big')) # SET_COLUMN
|
||||
self._wcd(b'\x2b', int.to_bytes(ht, 4, 'big')) # SET_PAGE
|
||||
self._wcmd(b'\x2c') # WRITE_RAM
|
||||
self._wcd(b"\x2a", int.to_bytes(self.width, 4, "big")) # SET_COLUMN
|
||||
self._wcd(b"\x2b", int.to_bytes(ht, 4, "big")) # SET_PAGE
|
||||
self._wcmd(b"\x2c") # WRITE_RAM
|
||||
self._dc(1)
|
||||
self._cs(0)
|
||||
for start in range(0, wd * ht, wd): # For each line
|
||||
|
|
@ -139,16 +142,16 @@ class ILI9341(framebuf.FrameBuffer):
|
|||
async with self._lock:
|
||||
lines, mod = divmod(self.height, split) # Lines per segment
|
||||
if mod:
|
||||
raise ValueError('Invalid do_refresh arg.')
|
||||
raise ValueError("Invalid do_refresh arg.")
|
||||
clut = ILI9341.lut
|
||||
wd = self.width // 2
|
||||
ht = self.height
|
||||
lb = self._linebuf
|
||||
buf = self._mvb
|
||||
# Commands needed to start data write
|
||||
self._wcd(b'\x2a', int.to_bytes(self.width, 4, 'big')) # SET_COLUMN
|
||||
self._wcd(b'\x2b', int.to_bytes(ht, 4, 'big')) # SET_PAGE
|
||||
self._wcmd(b'\x2c') # WRITE_RAM
|
||||
self._wcd(b"\x2a", int.to_bytes(self.width, 4, "big")) # SET_COLUMN
|
||||
self._wcd(b"\x2b", int.to_bytes(ht, 4, "big")) # SET_PAGE
|
||||
self._wcmd(b"\x2c") # WRITE_RAM
|
||||
self._dc(1)
|
||||
line = 0
|
||||
for _ in range(split): # For each segment
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
# ILI9486 nano-gui driver for ili9486 displays
|
||||
# As with all nano-gui displays, touch is not supported.
|
||||
|
||||
# Copyright (c) Peter Hinch 2022
|
||||
# Released under the MIT license see LICENSE
|
||||
|
|
@ -63,10 +62,14 @@ class ILI9486(framebuf.FrameBuffer):
|
|||
# ILI9486 expects RGB order. 8 bit register writes require padding
|
||||
@classmethod
|
||||
def rgb(cls, r, g, b):
|
||||
return cls.COLOR_INVERT ^ ((r & 0xF8) | (g & 0xE0) >> 5 | (g & 0x1C) << 11 | (b & 0xF8) << 5)
|
||||
return cls.COLOR_INVERT ^ (
|
||||
(r & 0xF8) | (g & 0xE0) >> 5 | (g & 0x1C) << 11 | (b & 0xF8) << 5
|
||||
)
|
||||
|
||||
# Transpose width & height for landscape mode
|
||||
def __init__(self, spi, cs, dc, rst, height=320, width=480, usd=False, mirror=False, init_spi=False):
|
||||
def __init__(
|
||||
self, spi, cs, dc, rst, height=320, width=480, usd=False, mirror=False, init_spi=False
|
||||
):
|
||||
self._spi = spi
|
||||
self._cs = cs
|
||||
self._dc = dc
|
||||
|
|
@ -111,7 +114,7 @@ class ILI9486(framebuf.FrameBuffer):
|
|||
madctl = 0x48 if usd else 0x88
|
||||
if mirror:
|
||||
madctl ^= 0x80
|
||||
self._wcd(b"\x36", madctl.to_bytes(1, 'big')) # MADCTL: RGB portrait mode
|
||||
self._wcd(b"\x36", madctl.to_bytes(1, "big")) # MADCTL: RGB portrait mode
|
||||
self._wcmd(b"\x11") # sleep out
|
||||
self._wcmd(b"\x29") # display on
|
||||
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue