diff --git a/waveshare2in13v2/errorhandler.go b/waveshare2in13v2/errorhandler.go index c3c9fab..8225444 100644 --- a/waveshare2in13v2/errorhandler.go +++ b/waveshare2in13v2/errorhandler.go @@ -44,12 +44,20 @@ func (eh *errorHandler) sendCommand(cmd byte) { if eh.err != nil { return } - eh.err = eh.d.sendCommand(cmd) + + eh.dcOut(gpio.Low) + eh.csOut(gpio.Low) + eh.cTx([]byte{cmd}, nil) + eh.csOut(gpio.High) } -func (eh *errorHandler) sendData(d []byte) { +func (eh *errorHandler) sendData(data []byte) { if eh.err != nil { return } - eh.err = eh.d.sendData(d) + + eh.dcOut(gpio.High) + eh.csOut(gpio.Low) + eh.cTx(data, nil) + eh.csOut(gpio.High) } diff --git a/waveshare2in13v2/waveshare213v2.go b/waveshare2in13v2/waveshare213v2.go index 2018f6e..6643ff1 100644 --- a/waveshare2in13v2/waveshare213v2.go +++ b/waveshare2in13v2/waveshare213v2.go @@ -357,28 +357,6 @@ func (d *Dev) String() string { return fmt.Sprintf("epd.Dev{%s, %s, Height: %d, Width: %d}", d.c, d.dc, d.opts.Height, d.opts.Width) } -func (d *Dev) sendData(c []byte) error { - eh := errorHandler{d: *d} - - eh.dcOut(gpio.High) - eh.csOut(gpio.Low) - eh.cTx(c, nil) - eh.csOut(gpio.High) - - return eh.err -} - -func (d *Dev) sendCommand(cmd byte) error { - eh := errorHandler{d: *d} - - eh.dcOut(gpio.Low) - eh.csOut(gpio.Low) - eh.cTx([]byte{cmd}, nil) - eh.csOut(gpio.High) - - return eh.err -} - func (d *Dev) turnOnDisplay() error { eh := errorHandler{d: *d}