embedded
/
devices
mirror of https://github.com/periph/devices
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

waveshare213v2: Avoid using a slice for commands

Browse Source 
All commands consist of a single byte and there's no need to use
a slice.

Signed-off-by: Michael Hanselmann <public@hansmi.ch>
pull/36/head
Michael Hanselmann 4 years ago
parent 7bc3961c2e
commit 7aaf04a5a6
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File

66
waveshare2in13v2/waveshare213v2.go
Unescape Escape View File

@ -164,11 +164,11 @@ func (eh *errorHandler) csOut(l gpio.Level) {
eh.err = eh.d.cs.Out(l) eh.err = eh.d.cs.Out(l)
} }
func (eh *errorHandler) sendCommand(c []byte) { func (eh *errorHandler) sendCommand(cmd byte) {
if eh.err != nil { if eh.err != nil {
return return
} }
eh.err = eh.d.sendCommand(c) eh.err = eh.d.sendCommand(cmd)
} }
func (eh *errorHandler) sendData(d []byte) { func (eh *errorHandler) sendData(d []byte) {
@ -220,26 +220,26 @@ func (d *Dev) Init(partialUpdate PartialUpdate) error {
// Partital Update Mode // Partital Update Mode
// VCOM Voltage // VCOM Voltage
eh.sendCommand([]byte{writeVcomRegister}) eh.sendCommand(writeVcomRegister)
eh.sendData([]byte{0x26}) eh.sendData([]byte{0x26})
d.waitUntilIdle() d.waitUntilIdle()
eh.sendCommand([]byte{writeLutRegister}) eh.sendCommand(writeLutRegister)
eh.sendData(d.opts.PartialUpdate[:70]) eh.sendData(d.opts.PartialUpdate[:70])
eh.sendCommand([]byte{0x37}) eh.sendCommand(0x37)
eh.sendData([]byte{0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00}) eh.sendData([]byte{0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00})
eh.sendCommand([]byte{displayUpdateControl2}) eh.sendCommand(displayUpdateControl2)
eh.sendData([]byte{0xC0}) eh.sendData([]byte{0xC0})
eh.sendCommand([]byte{masterActivation}) eh.sendCommand(masterActivation)
d.waitUntilIdle() d.waitUntilIdle()
// Border Waveform // Border Waveform
eh.sendCommand([]byte{borderWaveformControl}) eh.sendCommand(borderWaveformControl)
eh.sendData([]byte{0x01}) eh.sendData([]byte{0x01})
} else { } else {
@ -247,19 +247,19 @@ func (d *Dev) Init(partialUpdate PartialUpdate) error {
// Software Reset // Software Reset
d.waitUntilIdle() d.waitUntilIdle()
eh.sendCommand([]byte{swReset}) eh.sendCommand(swReset)
d.waitUntilIdle() d.waitUntilIdle()
// Set analog block control // Set analog block control
eh.sendCommand([]byte{setAnalogBlockControl}) eh.sendCommand(setAnalogBlockControl)
eh.sendData([]byte{0x54}) eh.sendData([]byte{0x54})
// Set digital block control // Set digital block control
eh.sendCommand([]byte{setDigitalBlockControl}) eh.sendCommand(setDigitalBlockControl)
eh.sendData([]byte{0x3B}) eh.sendData([]byte{0x3B})
// Driver output control // Driver output control
eh.sendCommand([]byte{driverOutputControl}) eh.sendCommand(driverOutputControl)
eh.sendData([]byte{ eh.sendData([]byte{
byte((d.opts.Height - 1) % 0xFF), byte((d.opts.Height - 1) % 0xFF),
byte((d.opts.Height - 1) / 0xFF), byte((d.opts.Height - 1) / 0xFF),
@ -267,40 +267,40 @@ func (d *Dev) Init(partialUpdate PartialUpdate) error {
}) })
// Data entry mode // Data entry mode
eh.sendCommand([]byte{dataEntryModeSetting}) eh.sendCommand(dataEntryModeSetting)
eh.sendData([]byte{0x01}) eh.sendData([]byte{0x01})
// Set Ram-X address start/end position // Set Ram-X address start/end position
eh.sendCommand([]byte{setRAMXAddressStartEndPosition}) eh.sendCommand(setRAMXAddressStartEndPosition)
eh.sendData([]byte{0x00, 0x0F}) eh.sendData([]byte{0x00, 0x0F})
// Set Ram-Y address start/end position // Set Ram-Y address start/end position
eh.sendCommand([]byte{setRAMYAddressStartEndPosition}) eh.sendCommand(setRAMYAddressStartEndPosition)
eh.sendData([]byte{0xF9, 0x00, 0x00, 0x00}) //0xF9-->(249+1)=250 eh.sendData([]byte{0xF9, 0x00, 0x00, 0x00}) //0xF9-->(249+1)=250
// Border Waveform // Border Waveform
eh.sendCommand([]byte{borderWaveformControl}) eh.sendCommand(borderWaveformControl)
eh.sendData([]byte{0x03}) eh.sendData([]byte{0x03})
// VCOM Voltage // VCOM Voltage
eh.sendCommand([]byte{writeVcomRegister}) eh.sendCommand(writeVcomRegister)
eh.sendData([]byte{0x55}) eh.sendData([]byte{0x55})
eh.sendCommand([]byte{gateDrivingVoltageControl}) eh.sendCommand(gateDrivingVoltageControl)
eh.sendData([]byte{gateDrivingVoltage19V}) eh.sendData([]byte{gateDrivingVoltage19V})
eh.sendCommand([]byte{sourceDrivingVoltageControl}) eh.sendCommand(sourceDrivingVoltageControl)
eh.sendData([]byte{sourceDrivingVoltageVSH1_15V, sourceDrivingVoltageVSH2_5V, sourceDrivingVoltageVSL_neg15V}) eh.sendData([]byte{sourceDrivingVoltageVSH1_15V, sourceDrivingVoltageVSH2_5V, sourceDrivingVoltageVSL_neg15V})
// Dummy Line // Dummy Line
eh.sendCommand([]byte{setDummyLinePeriod}) eh.sendCommand(setDummyLinePeriod)
eh.sendData([]byte{0x30}) eh.sendData([]byte{0x30})
// Gate Time // Gate Time
eh.sendCommand([]byte{setGateTime}) eh.sendCommand(setGateTime)
eh.sendData([]byte{0x0A}) eh.sendData([]byte{0x0A})
eh.sendCommand([]byte{writeLutRegister}) eh.sendCommand(writeLutRegister)
eh.sendData(d.opts.FullUpdate[:70]) eh.sendData(d.opts.FullUpdate[:70])
// Set RAM x address count to 0 // Set RAM x address count to 0
@ -322,7 +322,7 @@ func (d *Dev) Clear(color byte) error {
rows, cols := dataDimensions(d.opts) rows, cols := dataDimensions(d.opts)
data := bytes.Repeat([]byte{color}, cols) data := bytes.Repeat([]byte{color}, cols)
if err := d.sendCommand([]byte{writeRAMBW}); err != nil { if err := d.sendCommand(writeRAMBW); err != nil {
return err return err
} }
@ -345,7 +345,7 @@ func (d *Dev) Bounds() image.Rectangle {
return image.Rect(0, 0, d.opts.Width, d.opts.Height) return image.Rect(0, 0, d.opts.Width, d.opts.Height)
} }
func (d *Dev) sendImage(cmd []byte, dstRect image.Rectangle, src *image1bit.VerticalLSB) error { func (d *Dev) sendImage(cmd byte, dstRect image.Rectangle, src *image1bit.VerticalLSB) error {
// TODO: Handle dstRect not matching the device bounds. // TODO: Handle dstRect not matching the device bounds.
if err := d.setMemoryPointer(0, 0); err != nil { if err := d.setMemoryPointer(0, 0); err != nil {
@ -379,7 +379,7 @@ func (d *Dev) Draw(dstRect image.Rectangle, src image.Image, srcPts image.Point)
next := image1bit.NewVerticalLSB(dstRect) next := image1bit.NewVerticalLSB(dstRect)
draw.Src.Draw(next, dstRect, src, srcPts) draw.Src.Draw(next, dstRect, src, srcPts)
if err := d.sendImage([]byte{writeRAMBW}, dstRect, next); err != nil { if err := d.sendImage(writeRAMBW, dstRect, next); err != nil {
return err return err
} }
@ -391,11 +391,11 @@ func (d *Dev) DrawPartial(dstRect image.Rectangle, src image.Image, srcPts image
next := image1bit.NewVerticalLSB(dstRect) next := image1bit.NewVerticalLSB(dstRect)
draw.Src.Draw(next, dstRect, src, srcPts) draw.Src.Draw(next, dstRect, src, srcPts)
if err := d.sendImage([]byte{writeRAMBW}, dstRect, next); err != nil { if err := d.sendImage(writeRAMBW, dstRect, next); err != nil {
return err return err
} }
if err := d.sendImage([]byte{writeRAMRed}, dstRect, next); err != nil { if err := d.sendImage(writeRAMRed, dstRect, next); err != nil {
return err return err
} }
@ -423,12 +423,12 @@ func (d *Dev) sendData(c []byte) error {
return eh.err return eh.err
} }
func (d *Dev) sendCommand(c []byte) error { func (d *Dev) sendCommand(cmd byte) error {
eh := errorHandler{d: *d} eh := errorHandler{d: *d}
eh.dcOut(gpio.Low) eh.dcOut(gpio.Low)
eh.csOut(gpio.Low) eh.csOut(gpio.Low)
eh.cTx(c, nil) eh.cTx([]byte{cmd}, nil)
eh.csOut(gpio.High) eh.csOut(gpio.High)
return eh.err return eh.err
@ -437,9 +437,9 @@ func (d *Dev) sendCommand(c []byte) error {
func (d *Dev) turnOnDisplay() error { func (d *Dev) turnOnDisplay() error {
eh := errorHandler{d: *d} eh := errorHandler{d: *d}
eh.sendCommand([]byte{displayUpdateControl2}) eh.sendCommand(displayUpdateControl2)
eh.sendData([]byte{0xC7}) eh.sendData([]byte{0xC7})
eh.sendCommand([]byte{masterActivation}) eh.sendCommand(masterActivation)
d.waitUntilIdle() d.waitUntilIdle()
@ -469,9 +469,9 @@ func (d *Dev) waitUntilIdle() {
func (d *Dev) setMemoryPointer(x, y int) error { func (d *Dev) setMemoryPointer(x, y int) error {
eh := errorHandler{d: *d} eh := errorHandler{d: *d}
eh.sendCommand([]byte{setRAMXAddressCounter}) eh.sendCommand(setRAMXAddressCounter)
eh.sendData([]byte{byte((x >> 3) & 0xFF)}) eh.sendData([]byte{byte((x >> 3) & 0xFF)})
eh.sendCommand([]byte{setRAMYAddressCounter}) eh.sendCommand(setRAMYAddressCounter)
eh.sendData([]byte{byte(y & 0xFF)}) eh.sendData([]byte{byte(y & 0xFF)})
eh.sendData([]byte{byte((y >> 8) & 0xFF)}) eh.sendData([]byte{byte((y >> 8) & 0xFF)})

Write Preview
Loading…
Cancel
Save