Skip to content

Commit

Permalink
waveshare2in13v2: Test updates to both buffers
Browse files Browse the repository at this point in the history 
Move the logic applying display content changes to both buffers to the
"drawImage" function.
  • Loading branch information
@hansmi @maruel
hansmi authored and maruel committed Dec 27, 2021
1 parent df5238c commit 8a5bc2a
Show file tree
Hide file tree
Showing 3 changed files with 134 additions and 44 deletions.
54 changes: 36 additions & 18 deletions waveshare2in13v2/drawing.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,12 @@ func setMemoryArea(ctrl controller, area image.Rectangle) {
}

type drawOpts struct {
cmd byte
devSize image.Point
buffer *image1bit.VerticalLSB
dstRect image.Rectangle
src image.Image
srcPts image.Point
commands []byte
devSize image.Point
buffer *image1bit.VerticalLSB
dstRect image.Rectangle
src image.Image
srcPts image.Point
}

type drawSpec struct {
Expand All @@ -82,28 +82,25 @@ func (o *drawOpts) spec() drawSpec {
return s
}

// drawImage sends an image to the controller after setting up the registers.
func drawImage(ctrl controller, opts *drawOpts) {
s := opts.spec()

if s.MemRect.Empty() {
// sendImage sends an image to the controller after setting up the registers.
// The area is in bytes on the horizontal axis.
func sendImage(ctrl controller, cmd byte, area image.Rectangle, img *image1bit.VerticalLSB) {
if area.Empty() {
return
}

draw.Src.Draw(opts.buffer, s.DstRect, opts.src, opts.srcPts)

setMemoryArea(ctrl, s.MemRect)
setMemoryArea(ctrl, area)

ctrl.sendCommand(opts.cmd)
ctrl.sendCommand(cmd)

rowData := make([]byte, s.MemRect.Dx())
rowData := make([]byte, area.Dx())

for y := s.MemRect.Min.Y; y < s.MemRect.Max.Y; y++ {
for y := area.Min.Y; y < area.Max.Y; y++ {
for x := 0; x < len(rowData); x++ {
rowData[x] = 0

for bit := 0; bit < 8; bit++ {
if opts.buffer.BitAt(((s.MemRect.Min.X+x)*8)+bit, y) {
if img.BitAt(((area.Min.X+x)*8)+bit, y) {
rowData[x] |= 0x80 >> bit
}
}
Expand All @@ -113,6 +110,27 @@ func drawImage(ctrl controller, opts *drawOpts) {
}
}

func drawImage(ctrl controller, opts *drawOpts) {
s := opts.spec()

if s.MemRect.Empty() {
return
}

draw.Src.Draw(opts.buffer, s.DstRect, opts.src, opts.srcPts)

commands := opts.commands

if len(commands) == 0 {
commands = []byte{writeRAMBW, writeRAMRed}
}

// Keep the two buffers in sync.
for _, cmd := range commands {
sendImage(ctrl, cmd, s.MemRect, opts.buffer)
}
}

func clearDisplay(ctrl controller, size image.Point, color image1bit.Bit) {
var colorValue byte

Expand Down
113 changes: 97 additions & 16 deletions waveshare2in13v2/drawing_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ package waveshare2in13v2
import (
"bytes"
"image"
"image/draw"
"testing"

"github.com/google/go-cmp/cmp"
Expand Down Expand Up @@ -58,6 +59,89 @@ func TestDrawSpec(t *testing.T) {
}
}

func TestSendImage(t *testing.T) {
for _, tc := range []struct {
name string
cmd byte
area image.Rectangle
img *image1bit.VerticalLSB
want []record
}{
{
name: "empty",
},
{
name: "partial",
cmd: writeRAMBW,
area: image.Rect(2, 20, 4, 40),
img: image1bit.NewVerticalLSB(image.Rect(0, 0, 64, 64)),
want: []record{
{cmd: dataEntryModeSetting, data: []byte{0x3}},
{cmd: setRAMXAddressStartEndPosition, data: []byte{2, 4 - 1}},
{cmd: setRAMYAddressStartEndPosition, data: []byte{20, 0, 40 - 1, 0}},
{cmd: setRAMXAddressCounter, data: []byte{2}},
{cmd: setRAMYAddressCounter, data: []byte{20, 0}},
{
cmd: writeRAMBW,
data: bytes.Repeat([]byte{0}, 2*(30-10)),
},
},
},
{
name: "partial non-aligned",
cmd: writeRAMRed,
area: image.Rect(2, 4, 6, 8),
img: func() *image1bit.VerticalLSB {
img := image1bit.NewVerticalLSB(image.Rect(0, 0, 64, 64))
draw.Src.Draw(img, image.Rect(17, 4, 41, 8), &image.Uniform{image1bit.On}, image.Point{})
return img
}(),
want: []record{
{cmd: dataEntryModeSetting, data: []byte{0x3}},
{cmd: setRAMXAddressStartEndPosition, data: []byte{2, 6 - 1}},
{cmd: setRAMYAddressStartEndPosition, data: []byte{4, 0, 8 - 1, 0}},
{cmd: setRAMXAddressCounter, data: []byte{2}},
{cmd: setRAMYAddressCounter, data: []byte{4, 0}},
{
cmd: writeRAMRed,
data: bytes.Repeat([]byte{0x7f, 0xff, 0xff, 0x80}, 4),
},
},
},
{
name: "full",
cmd: writeRAMBW,
area: image.Rect(0, 0, 10, 120),
img: func() *image1bit.VerticalLSB {
img := image1bit.NewVerticalLSB(image.Rect(0, 0, 80, 120))
draw.Src.Draw(img, image.Rect(0, 0, 80, 120), &image.Uniform{image1bit.On}, image.Point{})
return img
}(),
want: []record{
{cmd: dataEntryModeSetting, data: []byte{0x3}},
{cmd: setRAMXAddressStartEndPosition, data: []byte{0, 10 - 1}},
{cmd: setRAMYAddressStartEndPosition, data: []byte{0, 0, 120 - 1, 0}},
{cmd: setRAMXAddressCounter, data: []byte{0}},
{cmd: setRAMYAddressCounter, data: []byte{0, 0}},
{
cmd: writeRAMBW,
data: bytes.Repeat([]byte{0xff}, 80/8*120),
},
},
},
} {
t.Run(tc.name, func(t *testing.T) {
var got fakeController

sendImage(&got, tc.cmd, tc.area, tc.img)

if diff := cmp.Diff([]record(got), tc.want, cmpopts.EquateEmpty(), cmp.AllowUnexported(record{})); diff != "" {
t.Errorf("sendImage() difference (-got +want):\n%s", diff)
}
})
}
}

func TestDrawImage(t *testing.T) {
for _, tc := range []struct {
name string
Expand All @@ -66,19 +150,16 @@ func TestDrawImage(t *testing.T) {
}{
{
name: "empty",
opts: drawOpts{
src: &image.Uniform{image1bit.On},
},
},
{
name: "partial",
opts: drawOpts{
cmd: writeRAMBW,
devSize: image.Pt(64, 64),
buffer: image1bit.NewVerticalLSB(image.Rect(0, 0, 64, 64)),
dstRect: image.Rect(17, 4, 41, 8),
src: &image.Uniform{image1bit.On},
srcPts: image.Pt(0, 0),
commands: []byte{writeRAMBW},
devSize: image.Pt(64, 64),
buffer: image1bit.NewVerticalLSB(image.Rect(0, 0, 64, 64)),
dstRect: image.Rect(17, 4, 41, 8),
src: &image.Uniform{image1bit.On},
srcPts: image.Pt(0, 0),
},
want: []record{
{cmd: dataEntryModeSetting, data: []byte{0x3}},
Expand All @@ -95,12 +176,12 @@ func TestDrawImage(t *testing.T) {
{
name: "full",
opts: drawOpts{
cmd: writeRAMBW,
devSize: image.Pt(80, 120),
buffer: image1bit.NewVerticalLSB(image.Rect(0, 0, 80, 120)),
dstRect: image.Rect(0, 0, 80, 120),
src: &image.Uniform{image1bit.On},
srcPts: image.Pt(33, 44),
commands: []byte{writeRAMRed},
devSize: image.Pt(80, 120),
buffer: image1bit.NewVerticalLSB(image.Rect(0, 0, 80, 120)),
dstRect: image.Rect(0, 0, 80, 120),
src: &image.Uniform{image1bit.On},
srcPts: image.Pt(33, 44),
},
want: []record{
{cmd: dataEntryModeSetting, data: []byte{0x3}},
Expand All @@ -109,7 +190,7 @@ func TestDrawImage(t *testing.T) {
{cmd: setRAMXAddressCounter, data: []byte{0}},
{cmd: setRAMYAddressCounter, data: []byte{0, 0}},
{
cmd: writeRAMBW,
cmd: writeRAMRed,
data: bytes.Repeat([]byte{0xff}, 80/8*120),
},
},
Expand Down
11 changes: 1 addition & 10 deletions waveshare2in13v2/waveshare213v2.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,16 +267,7 @@ func (d *Dev) Draw(dstRect image.Rectangle, src image.Image, srcPts image.Point)

eh := errorHandler{d: *d}

// Keep the two buffers in sync.
for _, cmd := range []byte{writeRAMBW, writeRAMRed} {
opts.cmd = cmd

drawImage(&eh, &opts)

if eh.err != nil {
break
}
}
drawImage(&eh, &opts)

if eh.err == nil {
updateDisplay(&eh, d.mode)
Expand Down

0 comments on commit 8a5bc2a

Please sign in to comment.