diff --git a/catprinter-ble b/catprinter-ble new file mode 100755 index 0000000..4eecc22 Binary files /dev/null and b/catprinter-ble differ diff --git a/go.mod b/go.mod index 44e1e16..0ef8bc5 100644 --- a/go.mod +++ b/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 diff --git a/go.sum b/go.sum index 3380553..522bf3f 100644 --- a/go.sum +++ b/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= diff --git a/main.go b/main.go index c433576..485d23c 100644 --- a/main.go +++ b/main.go @@ -6,27 +6,32 @@ 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") - notifyCharacteristic = ble.MustParse("ae02") - dataCharacteristic = ble.MustParse("ae03") - targetPrinterName = "MXW01" - scanTimeout = 10 * time.Second - printCommandHeader = []byte{0x22, 0x21} - printCommandFooter = byte(0xFF) + mainServiceUUID = ble.MustParse("ae30") + printCharacteristic = ble.MustParse("ae01") + notifyCharacteristic = ble.MustParse("ae02") + dataCharacteristic = ble.MustParse("ae03") + targetPrinterName = "MXW01" + 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) - img = imaging.AdjustContrast(img, 10) + + 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]) + + // 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) } - - err := client.WriteCharacteristic(dataChr, reversed, true) - if err != nil { - return fmt.Errorf("line %d 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 ") + flag.Parse() + if flag.NArg() < 1 { + fmt.Println("Usage: catprinter-ble [flags] ") + 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) } @@ -292,42 +392,41 @@ func buildCommand(cmdId byte, payload []byte) []byte { func calculateCRC8(data []byte) byte { table := [256]byte{ - 0x00, 0x07, 0x0e, 0x09, 0x1c, 0x1b, 0x12, 0x15, - 0x38, 0x3f, 0x36, 0x31, 0x24, 0x23, 0x2a, 0x2d, - 0x70, 0x77, 0x7e, 0x79, 0x6c, 0x6b, 0x62, 0x65, - 0x48, 0x4f, 0x46, 0x41, 0x54, 0x53, 0x5a, 0x5d, - 0xe0, 0xe7, 0xee, 0xe9, 0xfc, 0xfb, 0xf2, 0xf5, - 0xd8, 0xdf, 0xd6, 0xd1, 0xc4, 0xc3, 0xca, 0xcd, - 0x90, 0x97, 0x9e, 0x99, 0x8c, 0x8b, 0x82, 0x85, - 0xa8, 0xaf, 0xa6, 0xa1, 0xb4, 0xb3, 0xba, 0xbd, - 0xc7, 0xc0, 0xc9, 0xce, 0xdb, 0xdc, 0xd5, 0xd2, - 0xff, 0xf8, 0xf1, 0xf6, 0xe3, 0xe4, 0xed, 0xea, - 0xb7, 0xb0, 0xb9, 0xbe, 0xab, 0xac, 0xa5, 0xa2, - 0x8f, 0x88, 0x81, 0x86, 0x93, 0x94, 0x9d, 0x9a, - 0x27, 0x20, 0x29, 0x2e, 0x3b, 0x3c, 0x35, 0x32, - 0x1f, 0x18, 0x11, 0x16, 0x03, 0x04, 0x0d, 0x0a, - 0x57, 0x50, 0x59, 0x5e, 0x4b, 0x4c, 0x45, 0x42, - 0x6f, 0x68, 0x61, 0x66, 0x73, 0x74, 0x7d, 0x7a, - 0x89, 0x8e, 0x87, 0x80, 0x95, 0x92, 0x9b, 0x9c, - 0xb1, 0xb6, 0xbf, 0xb8, 0xad, 0xaa, 0xa3, 0xa4, - 0xf9, 0xfe, 0xf7, 0xf0, 0xe5, 0xe2, 0xeb, 0xec, - 0xc1, 0xc6, 0xcf, 0xc8, 0xdd, 0xda, 0xd3, 0xd4, - 0x69, 0x6e, 0x67, 0x60, 0x75, 0x72, 0x7b, 0x7c, - 0x51, 0x56, 0x5f, 0x58, 0x4d, 0x4a, 0x43, 0x44, - 0x19, 0x1e, 0x17, 0x10, 0x05, 0x02, 0x0b, 0x0c, - 0x21, 0x26, 0x2f, 0x28, 0x3d, 0x3a, 0x33, 0x34, - 0x4e, 0x49, 0x40, 0x47, 0x52, 0x55, 0x5c, 0x5b, - 0x76, 0x71, 0x78, 0x7f, 0x6a, 0x6d, 0x64, 0x63, - 0x3e, 0x39, 0x30, 0x37, 0x22, 0x25, 0x2c, 0x2b, - 0x06, 0x01, 0x08, 0x0f, 0x1a, 0x1d, 0x14, 0x13, - 0xae, 0xa9, 0xa0, 0xa7, 0xb2, 0xb5, 0xbc, 0xbb, - 0x96, 0x91, 0x98, 0x9f, 0x8a, 0x8d, 0x84, 0x83, - 0xde, 0xd9, 0xd0, 0xd7, 0xc2, 0xc5, 0xcc, 0xcb, - 0xe6, 0xe1, 0xe8, 0xef, 0xfa, 0xfd, 0xf4, 0xf3} + 0x00, 0x07, 0x0e, 0x09, 0x1c, 0x1b, 0x12, 0x15, + 0x38, 0x3f, 0x36, 0x31, 0x24, 0x23, 0x2a, 0x2d, + 0x70, 0x77, 0x7e, 0x79, 0x6c, 0x6b, 0x62, 0x65, + 0x48, 0x4f, 0x46, 0x41, 0x54, 0x53, 0x5a, 0x5d, + 0xe0, 0xe7, 0xee, 0xe9, 0xfc, 0xfb, 0xf2, 0xf5, + 0xd8, 0xdf, 0xd6, 0xd1, 0xc4, 0xc3, 0xca, 0xcd, + 0x90, 0x97, 0x9e, 0x99, 0x8c, 0x8b, 0x82, 0x85, + 0xa8, 0xaf, 0xa6, 0xa1, 0xb4, 0xb3, 0xba, 0xbd, + 0xc7, 0xc0, 0xc9, 0xce, 0xdb, 0xdc, 0xd5, 0xd2, + 0xff, 0xf8, 0xf1, 0xf6, 0xe3, 0xe4, 0xed, 0xea, + 0xb7, 0xb0, 0xb9, 0xbe, 0xab, 0xac, 0xa5, 0xa2, + 0x8f, 0x88, 0x81, 0x86, 0x93, 0x94, 0x9d, 0x9a, + 0x27, 0x20, 0x29, 0x2e, 0x3b, 0x3c, 0x35, 0x32, + 0x1f, 0x18, 0x11, 0x16, 0x03, 0x04, 0x0d, 0x0a, + 0x57, 0x50, 0x59, 0x5e, 0x4b, 0x4c, 0x45, 0x42, + 0x6f, 0x68, 0x61, 0x66, 0x73, 0x74, 0x7d, 0x7a, + 0x89, 0x8e, 0x87, 0x80, 0x95, 0x92, 0x9b, 0x9c, + 0xb1, 0xb6, 0xbf, 0xb8, 0xad, 0xaa, 0xa3, 0xa4, + 0xf9, 0xfe, 0xf7, 0xf0, 0xe5, 0xe2, 0xeb, 0xec, + 0xc1, 0xc6, 0xcf, 0xc8, 0xdd, 0xda, 0xd3, 0xd4, + 0x69, 0x6e, 0x67, 0x60, 0x75, 0x72, 0x7b, 0x7c, + 0x51, 0x56, 0x5f, 0x58, 0x4d, 0x4a, 0x43, 0x44, + 0x19, 0x1e, 0x17, 0x10, 0x05, 0x02, 0x0b, 0x0c, + 0x21, 0x26, 0x2f, 0x28, 0x3d, 0x3a, 0x33, 0x34, + 0x4e, 0x49, 0x40, 0x47, 0x52, 0x55, 0x5c, 0x5b, + 0x76, 0x71, 0x78, 0x7f, 0x6a, 0x6d, 0x64, 0x63, + 0x3e, 0x39, 0x30, 0x37, 0x22, 0x25, 0x2c, 0x2b, + 0x06, 0x01, 0x08, 0x0f, 0x1a, 0x1d, 0x14, 0x13, + 0xae, 0xa9, 0xa0, 0xa7, 0xb2, 0xb5, 0xbc, 0xbb, + 0x96, 0x91, 0x98, 0x9f, 0x8a, 0x8d, 0x84, 0x83, + 0xde, 0xd9, 0xd0, 0xd7, 0xc2, 0xc5, 0xcc, 0xcb, + 0xe6, 0xe1, 0xe8, 0xef, 0xfa, 0xfd, 0xf4, 0xf3} crc := byte(0) for _, b := range data { crc = table[crc^b] } return crc } -