Major changes, dithering, 4bpp mode.
This commit is contained in:
parent
885d814c70
commit
15c63572ca
BIN
catprinter-ble
Executable file
BIN
catprinter-ble
Executable file
Binary file not shown.
4
go.mod
4
go.mod
@ -2,9 +2,11 @@ module catprinter-ble
|
||||
|
||||
go 1.22
|
||||
|
||||
require github.com/go-ble/ble v0.0.0-20240122180141-8c5522f54333
|
||||
|
||||
require (
|
||||
github.com/go-ble/ble v0.0.0-20240122180141-8c5522f54333
|
||||
github.com/disintegration/imaging v1.6.2 // indirect
|
||||
github.com/makeworld-the-better-one/dither v1.0.0 // indirect
|
||||
github.com/mattn/go-colorable v0.1.6 // indirect
|
||||
github.com/mattn/go-isatty v0.0.12 // indirect
|
||||
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
|
||||
|
||||
7
go.sum
7
go.sum
@ -6,9 +6,13 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c=
|
||||
github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
|
||||
github.com/esimov/dithergo v0.0.0-20210215145655-7f9ddf55e848 h1:4mfWkM1T8YZsWyuuIQcV0lskFRCkCMPnKBWKcBOTJUs=
|
||||
github.com/esimov/dithergo v0.0.0-20210215145655-7f9ddf55e848/go.mod h1:KQYJwxnA4taJBkCet7blGupIXRROaNk+5mvpcIRSjZA=
|
||||
github.com/go-ble/ble v0.0.0-20240122180141-8c5522f54333 h1:bQK6D51cNzMSTyAf0HtM30V2IbljHTDam7jru9JNlJA=
|
||||
github.com/go-ble/ble v0.0.0-20240122180141-8c5522f54333/go.mod h1:fFJl/jD/uyILGBeD5iQ8tYHrPlJafyqCJzAyTHNJ1Uk=
|
||||
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
|
||||
github.com/makeworld-the-better-one/dither v1.0.0 h1:sBZdGV4o6MG6UMMRJhzDhruwlt99yQe0ChwgL29LMWg=
|
||||
github.com/makeworld-the-better-one/dither v1.0.0/go.mod h1:iYNC2QRNGWaeJ7G6eiItq30v4ZRPHOb2Od6g7AFYehI=
|
||||
github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE=
|
||||
github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
|
||||
github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
|
||||
@ -29,6 +33,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
|
||||
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
|
||||
github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
|
||||
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
|
||||
github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
|
||||
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
|
||||
golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 h1:hVwzHzIUGRjiF7EcUjqNxk3NCfkPxbDKRdnNE1Rpg0U=
|
||||
golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
|
||||
@ -41,3 +47,4 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
|
||||
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
|
||||
175
main.go
175
main.go
@ -6,18 +6,20 @@ package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"flag"
|
||||
"fmt"
|
||||
"image/color"
|
||||
"github.com/disintegration/imaging"
|
||||
"log"
|
||||
"os"
|
||||
"os/signal"
|
||||
"time"
|
||||
|
||||
"github.com/disintegration/imaging"
|
||||
ble "github.com/go-ble/ble"
|
||||
"github.com/go-ble/ble/linux"
|
||||
dither "github.com/makeworld-the-better-one/dither"
|
||||
)
|
||||
|
||||
|
||||
var (
|
||||
mainServiceUUID = ble.MustParse("ae30")
|
||||
printCharacteristic = ble.MustParse("ae01")
|
||||
@ -27,6 +29,9 @@ var (
|
||||
scanTimeout = 10 * time.Second
|
||||
printCommandHeader = []byte{0x22, 0x21}
|
||||
printCommandFooter = byte(0xFF)
|
||||
intensity = flag.Int("intensity", 80, "Print intensity (0-100)")
|
||||
mode = flag.String("mode", "1bpp", "Print mode: 1bpp or 4bpp")
|
||||
ditherType = flag.String("dither", "none", "Dither method: none, floyd, bayer2x2, bayer4x4, bayer8x8, bayer16x16, atkinson, jjn")
|
||||
)
|
||||
|
||||
func min(a, b int) int {
|
||||
@ -36,13 +41,6 @@ func min(a, b int) int {
|
||||
return b
|
||||
}
|
||||
|
||||
func reverseBitsInByte(b byte) byte {
|
||||
b = (b&0xF0)>>4 | (b&0x0F)<<4
|
||||
b = (b&0xCC)>>2 | (b&0x33)<<2
|
||||
b = (b&0xAA)>>1 | (b&0x55)<<1
|
||||
return b
|
||||
}
|
||||
|
||||
func dumpCharacteristics(client ble.Client, svc *ble.Service) {
|
||||
chars, err := client.DiscoverCharacteristics(nil, svc)
|
||||
if err != nil {
|
||||
@ -122,7 +120,7 @@ const (
|
||||
)
|
||||
|
||||
// Convert image to 1bpp, dithered, and packed bytes
|
||||
func loadImageMono(path string) ([]byte, int, error) {
|
||||
func loadImageMono(path string, ditherType string) ([]byte, int, error) {
|
||||
img, err := imaging.Open(path, imaging.AutoOrientation(true))
|
||||
if err != nil {
|
||||
return nil, 0, fmt.Errorf("image open error: %v", err)
|
||||
@ -132,15 +130,48 @@ func loadImageMono(path string) ([]byte, int, error) {
|
||||
height := int(float64(linePixels) / ratio)
|
||||
img = imaging.Resize(img, linePixels, height, imaging.Lanczos)
|
||||
img = imaging.Grayscale(img)
|
||||
|
||||
if ditherType != "none" {
|
||||
palette := []color.Color{
|
||||
color.RGBA{0, 0, 0, 0xFF},
|
||||
color.RGBA{0xFF, 0xFF, 0xFF, 0xFF},
|
||||
}
|
||||
d := dither.NewDitherer(palette)
|
||||
|
||||
switch ditherType {
|
||||
case "floyd":
|
||||
d.Matrix = dither.FloydSteinberg
|
||||
case "bayer2x2":
|
||||
d.Mapper = dither.Bayer(2, 2, 1.0)
|
||||
case "bayer4x4":
|
||||
d.Mapper = dither.Bayer(4, 4, 1.0)
|
||||
case "bayer8x8":
|
||||
d.Mapper = dither.Bayer(8, 8, 1.0)
|
||||
case "bayer16x16":
|
||||
d.Mapper = dither.Bayer(16, 16, 1.0)
|
||||
case "atkinson":
|
||||
d.Matrix = dither.Atkinson
|
||||
case "jjn":
|
||||
d.Matrix = dither.JarvisJudiceNinke
|
||||
default:
|
||||
return nil, 0, fmt.Errorf("unknown dither type: %s", ditherType)
|
||||
}
|
||||
|
||||
img := d.DitherCopy(img)
|
||||
if img == nil {
|
||||
return nil, 0, fmt.Errorf("d.Dither(img) returned nil")
|
||||
}
|
||||
} else {
|
||||
img = imaging.AdjustContrast(img, 10)
|
||||
}
|
||||
|
||||
pixels := make([]byte, (linePixels*height)/8)
|
||||
for y := 0; y < height; y++ {
|
||||
for x := 0; x < linePixels; x++ {
|
||||
gray := color.GrayModel.Convert(img.At(x, y)).(color.Gray)
|
||||
if gray.Y < 127 {
|
||||
if gray.Y < 128 {
|
||||
idx := (y*linePixels + x) / 8
|
||||
bit := 7 - (x % 8)
|
||||
bit := x % 8
|
||||
pixels[idx] |= 1 << bit
|
||||
}
|
||||
}
|
||||
@ -149,62 +180,132 @@ func loadImageMono(path string) ([]byte, int, error) {
|
||||
return pixels, height, nil
|
||||
}
|
||||
|
||||
func sendImageToPrinter(client ble.Client, dataChr, printChr *ble.Characteristic, path string) error {
|
||||
pixels, height, err := loadImageMono(path)
|
||||
func loadImage4Bit(path string) ([]byte, int, error) {
|
||||
img, err := imaging.Open(path, imaging.AutoOrientation(true))
|
||||
if err != nil {
|
||||
return nil, 0, fmt.Errorf("image open error: %v", err)
|
||||
}
|
||||
|
||||
aspectRatio := float64(img.Bounds().Dx()) / float64(img.Bounds().Dy())
|
||||
height := int(float64(linePixels) / aspectRatio)
|
||||
img = imaging.Resize(img, linePixels, height, imaging.Lanczos)
|
||||
img = imaging.Grayscale(img)
|
||||
|
||||
pixels := make([]byte, (linePixels*height)/2)
|
||||
for y := 0; y < height; y++ {
|
||||
for x := 0; x < linePixels; x++ {
|
||||
gray := color.GrayModel.Convert(img.At(x, y)).(color.Gray)
|
||||
// Direct port: invert and quantize
|
||||
level := (255 - gray.Y) >> 4
|
||||
|
||||
idx := (y*linePixels + x) >> 1
|
||||
shift := uint(((x & 1) ^ 1) << 2) // 4 if even, 0 if odd (matches C#)
|
||||
|
||||
pixels[idx] |= level << shift
|
||||
}
|
||||
}
|
||||
|
||||
return pixels, height, nil
|
||||
}
|
||||
|
||||
// Extend sendImageToPrinter to handle 4-bit mode
|
||||
type PrintMode byte
|
||||
|
||||
const (
|
||||
Mode1bpp PrintMode = 0x00
|
||||
Mode4bpp PrintMode = 0x02
|
||||
)
|
||||
|
||||
func sendImageToPrinter(client ble.Client, dataChr, printChr *ble.Characteristic, path string, mode PrintMode, intensity byte) error {
|
||||
var (
|
||||
pixels []byte
|
||||
height int
|
||||
err error
|
||||
bytesPerLine int
|
||||
)
|
||||
|
||||
if mode == Mode4bpp {
|
||||
pixels, height, err = loadImage4Bit(path)
|
||||
bytesPerLine = linePixels / 2
|
||||
} else {
|
||||
pixels, height, err = loadImageMono(path, *ditherType)
|
||||
bytesPerLine = linePixels / 8
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
fmt.Printf("Sending image: %dx%d lines\n", linePixels, height)
|
||||
|
||||
cmd := buildCommand(0xA2, []byte{80}) // intensity 80
|
||||
err = client.WriteCharacteristic(printChr, cmd, true)
|
||||
if err != nil {
|
||||
cmd := buildCommand(0xA2, []byte{intensity})
|
||||
if err := client.WriteCharacteristic(printChr, cmd, true); err != nil {
|
||||
return fmt.Errorf("intensity set failed: %v", err)
|
||||
}
|
||||
|
||||
lines := height
|
||||
param := []byte{
|
||||
byte(lines & 0xFF), byte(lines >> 8),
|
||||
0x30, // reserved
|
||||
0x00, // 1bpp mode
|
||||
0x30,
|
||||
byte(mode),
|
||||
}
|
||||
cmd = buildCommand(0xA9, param)
|
||||
err = client.WriteCharacteristic(printChr, cmd, true)
|
||||
if err != nil {
|
||||
if err := client.WriteCharacteristic(printChr, cmd, true); err != nil {
|
||||
return fmt.Errorf("print command failed: %v", err)
|
||||
}
|
||||
|
||||
mtu := 20 // BLE default payload size; adjust if you've negotiated a higher MTU
|
||||
for y := 0; y < lines; y++ {
|
||||
slice := pixels[y*bytesPerLine : (y+1)*bytesPerLine]
|
||||
reversed := make([]byte, bytesPerLine)
|
||||
for i := 0; i < bytesPerLine; i++ {
|
||||
reversed[i] = reverseBitsInByte(slice[i])
|
||||
}
|
||||
|
||||
err := client.WriteCharacteristic(dataChr, reversed, true)
|
||||
if err != nil {
|
||||
return fmt.Errorf("line %d write failed: %v", y, err)
|
||||
// Split into MTU-friendly chunks
|
||||
for offset := 0; offset < len(slice); offset += mtu {
|
||||
end := min(offset+mtu, len(slice))
|
||||
chunk := slice[offset:end]
|
||||
|
||||
if err := client.WriteCharacteristic(dataChr, chunk, true); err != nil {
|
||||
return fmt.Errorf("line %d chunk write failed: %v", y, err)
|
||||
}
|
||||
time.Sleep(6 * time.Millisecond)
|
||||
}
|
||||
}
|
||||
|
||||
cmd = buildCommand(0xAD, []byte{0x00}) // flush
|
||||
err = client.WriteCharacteristic(printChr, cmd, true)
|
||||
if err != nil {
|
||||
cmd = buildCommand(0xAD, []byte{0x00})
|
||||
if err := client.WriteCharacteristic(printChr, cmd, true); err != nil {
|
||||
return fmt.Errorf("flush failed: %v", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
func main() {
|
||||
if len(os.Args) < 2 {
|
||||
fmt.Println("Usage: catprinter-ble <image_path>")
|
||||
flag.Parse()
|
||||
if flag.NArg() < 1 {
|
||||
fmt.Println("Usage: catprinter-ble [flags] <image_path>")
|
||||
flag.PrintDefaults()
|
||||
return
|
||||
}
|
||||
|
||||
imagePath := flag.Arg(0)
|
||||
i := *intensity
|
||||
if i < 0 {
|
||||
i = 0
|
||||
}
|
||||
if i > 100 {
|
||||
i = 100
|
||||
}
|
||||
intensityByte := byte(i)
|
||||
|
||||
var printMode PrintMode
|
||||
switch *mode {
|
||||
case "1bpp":
|
||||
printMode = Mode1bpp
|
||||
case "4bpp":
|
||||
printMode = Mode4bpp
|
||||
default:
|
||||
fmt.Println("Invalid mode. Use '1bpp' or '4bpp'.")
|
||||
return
|
||||
}
|
||||
imagePath := os.Args[1]
|
||||
|
||||
ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt)
|
||||
defer stop()
|
||||
@ -247,7 +348,6 @@ func main() {
|
||||
log.Printf("Negotiated ATT MTU: %d", mtu)
|
||||
}
|
||||
|
||||
|
||||
services, err := client.DiscoverServices([]ble.UUID{mainServiceUUID})
|
||||
if err != nil || len(services) == 0 {
|
||||
log.Fatalf("Service discovery failed: %v", err)
|
||||
@ -271,7 +371,7 @@ func main() {
|
||||
log.Fatalf("Required characteristics missing")
|
||||
}
|
||||
|
||||
err = sendImageToPrinter(client, dataChr, printChr, imagePath)
|
||||
err = sendImageToPrinter(client, dataChr, printChr, imagePath, printMode, intensityByte)
|
||||
if err != nil {
|
||||
log.Fatalf("Failed to print image: %v", err)
|
||||
}
|
||||
@ -330,4 +430,3 @@ func calculateCRC8(data []byte) byte {
|
||||
}
|
||||
return crc
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user