mirror of
https://github.com/tinygo-org/drivers.git
synced 2026-08-25 00:48:59 +00:00
st7789: remove dependency on the machine package by using internal/pin instead
Signed-off-by: deadprogram <ron@hybridgroup.com>
This commit is contained in:
+33
-23
@@ -7,13 +7,14 @@ package st7789 // import "tinygo.org/x/drivers/st7789"
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"image/color"
|
"image/color"
|
||||||
"machine"
|
|
||||||
"math"
|
"math"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"errors"
|
"errors"
|
||||||
|
|
||||||
"tinygo.org/x/drivers"
|
"tinygo.org/x/drivers"
|
||||||
|
"tinygo.org/x/drivers/internal/legacy"
|
||||||
|
"tinygo.org/x/drivers/internal/pin"
|
||||||
"tinygo.org/x/drivers/pixel"
|
"tinygo.org/x/drivers/pixel"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -46,10 +47,10 @@ type Device = DeviceOf[pixel.RGB565BE]
|
|||||||
// formats.
|
// formats.
|
||||||
type DeviceOf[T Color] struct {
|
type DeviceOf[T Color] struct {
|
||||||
bus drivers.SPI
|
bus drivers.SPI
|
||||||
dcPin machine.Pin
|
dcPin pin.OutputFunc
|
||||||
resetPin machine.Pin
|
resetPin pin.OutputFunc
|
||||||
csPin machine.Pin
|
csPin pin.OutputFunc
|
||||||
blPin machine.Pin
|
blPin pin.OutputFunc
|
||||||
width int16
|
width int16
|
||||||
height int16
|
height int16
|
||||||
columnOffsetCfg int16
|
columnOffsetCfg int16
|
||||||
@@ -83,23 +84,27 @@ type Config struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// New creates a new ST7789 connection. The SPI wire must already be configured.
|
// New creates a new ST7789 connection. The SPI wire must already be configured.
|
||||||
func New(bus drivers.SPI, resetPin, dcPin, csPin, blPin machine.Pin) Device {
|
func New(bus drivers.SPI, resetPin, dcPin, csPin, blPin pin.Output) Device {
|
||||||
return NewOf[pixel.RGB565BE](bus, resetPin, dcPin, csPin, blPin)
|
return NewOf[pixel.RGB565BE](bus, resetPin, dcPin, csPin, blPin)
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewOf creates a new ST7789 connection with a particular pixel format. The SPI
|
// NewOf creates a new ST7789 connection with a particular pixel format. The SPI
|
||||||
// wire must already be configured.
|
// wire must already be configured.
|
||||||
func NewOf[T Color](bus drivers.SPI, resetPin, dcPin, csPin, blPin machine.Pin) DeviceOf[T] {
|
func NewOf[T Color](bus drivers.SPI, resetPin, dcPin, csPin, blPin pin.Output) DeviceOf[T] {
|
||||||
dcPin.Configure(machine.PinConfig{Mode: machine.PinOutput})
|
// IMPORTANT: pin configuration should really be done outside of this
|
||||||
resetPin.Configure(machine.PinConfig{Mode: machine.PinOutput})
|
// driver, but for backwards compatibility with existing code, we do it
|
||||||
csPin.Configure(machine.PinConfig{Mode: machine.PinOutput})
|
// here.
|
||||||
blPin.Configure(machine.PinConfig{Mode: machine.PinOutput})
|
legacy.ConfigurePinOut(dcPin)
|
||||||
|
legacy.ConfigurePinOut(resetPin)
|
||||||
|
legacy.ConfigurePinOut(csPin)
|
||||||
|
legacy.ConfigurePinOut(blPin)
|
||||||
|
|
||||||
return DeviceOf[T]{
|
return DeviceOf[T]{
|
||||||
bus: bus,
|
bus: bus,
|
||||||
dcPin: dcPin,
|
dcPin: dcPin.Set,
|
||||||
resetPin: resetPin,
|
resetPin: resetPin.Set,
|
||||||
csPin: csPin,
|
csPin: csPin.Set,
|
||||||
blPin: blPin,
|
blPin: blPin.Set,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -139,12 +144,7 @@ func (d *DeviceOf[T]) Configure(cfg Config) {
|
|||||||
d.batchLength += d.batchLength & 1
|
d.batchLength += d.batchLength & 1
|
||||||
|
|
||||||
// Reset the device
|
// Reset the device
|
||||||
d.resetPin.High()
|
d.Reset()
|
||||||
time.Sleep(50 * time.Millisecond)
|
|
||||||
d.resetPin.Low()
|
|
||||||
time.Sleep(50 * time.Millisecond)
|
|
||||||
d.resetPin.High()
|
|
||||||
time.Sleep(50 * time.Millisecond)
|
|
||||||
|
|
||||||
// Common initialization
|
// Common initialization
|
||||||
d.startWrite()
|
d.startWrite()
|
||||||
@@ -212,6 +212,16 @@ func (d *DeviceOf[T]) Configure(cfg Config) {
|
|||||||
d.blPin.High() // Backlight ON
|
d.blPin.High() // Backlight ON
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Reset performs a hardware reset of the display.
|
||||||
|
func (d *DeviceOf[T]) Reset() {
|
||||||
|
d.resetPin.High()
|
||||||
|
time.Sleep(50 * time.Millisecond)
|
||||||
|
d.resetPin.Low()
|
||||||
|
time.Sleep(50 * time.Millisecond)
|
||||||
|
d.resetPin.High()
|
||||||
|
time.Sleep(50 * time.Millisecond)
|
||||||
|
}
|
||||||
|
|
||||||
// Send a command with data to the display. It does not change the chip select
|
// Send a command with data to the display. It does not change the chip select
|
||||||
// pin (it must be low when calling). The DC pin is left high after return,
|
// pin (it must be low when calling). The DC pin is left high after return,
|
||||||
// meaning that data can be sent right away.
|
// meaning that data can be sent right away.
|
||||||
@@ -229,7 +239,7 @@ func (d *DeviceOf[T]) sendCommand(command uint8, data []byte) error {
|
|||||||
// startWrite must be called at the beginning of all exported methods to set the
|
// startWrite must be called at the beginning of all exported methods to set the
|
||||||
// chip select pin low.
|
// chip select pin low.
|
||||||
func (d *DeviceOf[T]) startWrite() {
|
func (d *DeviceOf[T]) startWrite() {
|
||||||
if d.csPin != machine.NoPin {
|
if d.csPin != nil {
|
||||||
d.csPin.Low()
|
d.csPin.Low()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -237,7 +247,7 @@ func (d *DeviceOf[T]) startWrite() {
|
|||||||
// endWrite must be called at the end of all exported methods to set the chip
|
// endWrite must be called at the end of all exported methods to set the chip
|
||||||
// select pin high.
|
// select pin high.
|
||||||
func (d *DeviceOf[T]) endWrite() {
|
func (d *DeviceOf[T]) endWrite() {
|
||||||
if d.csPin != machine.NoPin {
|
if d.csPin != nil {
|
||||||
d.csPin.High()
|
d.csPin.High()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user