Add MAC address option for printer connection and refactor like, everything
This commit is contained in:
parent
90f5e0cf5d
commit
c35188639d
400
main.go
400
main.go
@ -53,7 +53,8 @@ var (
|
|||||||
ejectPaper uint
|
ejectPaper uint
|
||||||
retractPaper uint
|
retractPaper uint
|
||||||
outputPath string
|
outputPath string
|
||||||
version = "dev"
|
address string
|
||||||
|
version = "dev"
|
||||||
)
|
)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
@ -90,11 +91,16 @@ func init() {
|
|||||||
flag.StringVar(&outputPath, "o", "", "Output PNG preview instead of printing (specify output path)")
|
flag.StringVar(&outputPath, "o", "", "Output PNG preview instead of printing (specify output path)")
|
||||||
flag.StringVar(&outputPath, "output", "", "Output PNG preview instead of printing (specify output path)")
|
flag.StringVar(&outputPath, "output", "", "Output PNG preview instead of printing (specify output path)")
|
||||||
|
|
||||||
|
flag.StringVar(&address, "a", "", "Connect to printer by MAC address")
|
||||||
|
flag.StringVar(&address, "address", "", "Connect to printer by MAC address")
|
||||||
|
|
||||||
flag.Usage = func() {
|
flag.Usage = func() {
|
||||||
fmt.Fprintf(os.Stderr, "Bleh! Cat Printer Utility for MXW01, version %s\n",version)
|
fmt.Fprintf(os.Stderr, "Bleh! Cat Printer Utility for MXW01, version %s\n", version)
|
||||||
fmt.Fprintf(os.Stderr, "Usage: %s [options] <image_path or ->\n", os.Args[0])
|
fmt.Fprintf(os.Stderr, "Usage: %s [options] <image_path or ->\n", os.Args[0])
|
||||||
fmt.Fprintln(os.Stderr, `
|
fmt.Fprintln(os.Stderr, `
|
||||||
Options:
|
Options:
|
||||||
|
-h, --help Show this help message
|
||||||
|
-a, --address <mac> Connect to printer by MAC address
|
||||||
-i, --intensity int Print intensity (0-100) (default 80)
|
-i, --intensity int Print intensity (0-100) (default 80)
|
||||||
-m, --mode string Print mode: 1bpp or 4bpp (default "1bpp")
|
-m, --mode string Print mode: 1bpp or 4bpp (default "1bpp")
|
||||||
-d, --dither string Dither method: none, floyd, bayer2x2, bayer4x4, bayer8x8, bayer16x16, atkinson, jjn (default "none")
|
-d, --dither string Dither method: none, floyd, bayer2x2, bayer4x4, bayer8x8, bayer16x16, atkinson, jjn (default "none")
|
||||||
@ -440,112 +446,164 @@ func renderPreviewFrom4bpp(pixels []byte, width, height int) image.Image {
|
|||||||
return img
|
return img
|
||||||
}
|
}
|
||||||
|
|
||||||
func main() {
|
func findPrinter(ctx context.Context) (ble.Advertisement, error) {
|
||||||
flag.Parse()
|
var addr ble.Addr
|
||||||
|
var adv ble.Advertisement
|
||||||
|
|
||||||
needNotifications := getStatus || getBattery || getVersion || getPrintType || getQueryCount || ejectPaper > 0 || retractPaper > 0
|
if address != "" {
|
||||||
|
log.Printf("Connecting directly to MAC address: %s", address)
|
||||||
|
addr = ble.NewAddr(address)
|
||||||
|
fmt.Printf("Using address: %s\n", addr)
|
||||||
|
}
|
||||||
|
|
||||||
if needNotifications {
|
ctxScan, cancel := context.WithTimeout(ctx, scanTimeout)
|
||||||
ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt)
|
log.Println("Scanning for printer...")
|
||||||
defer stop()
|
err := ble.Scan(ctxScan, false, func(a ble.Advertisement) {
|
||||||
|
fmt.Printf("Found advertisement: %s, addr: %s\n", a.LocalName(), a.Addr())
|
||||||
d, err := linux.NewDevice()
|
if address != "" {
|
||||||
if err != nil {
|
if a.Addr().String() == addr.String() { // Wonder why this works and not direct comparison
|
||||||
log.Fatalf("Failed to open BLE device: %v", err)
|
println("Found target printer by address:", a.Addr())
|
||||||
}
|
|
||||||
ble.SetDefaultDevice(d)
|
|
||||||
|
|
||||||
log.Println("Scanning for printer...")
|
|
||||||
log.Println("Connecting...")
|
|
||||||
var adv ble.Advertisement
|
|
||||||
ctxScan, cancel := context.WithTimeout(ctx, scanTimeout)
|
|
||||||
err = ble.Scan(ctxScan, false, func(a ble.Advertisement) {
|
|
||||||
if a.LocalName() == targetPrinterName {
|
|
||||||
adv = a
|
adv = a
|
||||||
cancel()
|
cancel()
|
||||||
}
|
}
|
||||||
}, nil)
|
} else if a.LocalName() == targetPrinterName {
|
||||||
if err != nil && err != context.Canceled {
|
adv = a
|
||||||
log.Fatalf("Scan error: %v", err)
|
cancel()
|
||||||
}
|
|
||||||
if adv == nil {
|
|
||||||
log.Println("Printer not found.")
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
}, nil)
|
||||||
|
if err != nil && err != context.Canceled {
|
||||||
|
return nil, fmt.Errorf("scan error, %v", err)
|
||||||
|
}
|
||||||
|
if adv == nil {
|
||||||
|
return nil, fmt.Errorf("printer not found")
|
||||||
|
}
|
||||||
|
return adv, nil
|
||||||
|
}
|
||||||
|
|
||||||
client, err := ble.Dial(ctx, adv.Addr())
|
func discoverChars(client ble.Client) (*ble.Characteristic, *ble.Characteristic, *ble.Characteristic, error) {
|
||||||
if err != nil {
|
var printChr, notifyChr, dataChr *ble.Characteristic
|
||||||
log.Fatalf("Connect failed: %v", err)
|
services, err := client.DiscoverServices([]ble.UUID{mainServiceUUID})
|
||||||
}
|
if err != nil || len(services) == 0 {
|
||||||
defer client.CancelConnection()
|
return nil, nil, nil, fmt.Errorf("service discovery failed: %v", err)
|
||||||
|
}
|
||||||
mtu, err := client.ExchangeMTU(100)
|
svc := services[0]
|
||||||
if err != nil {
|
chars, err := client.DiscoverCharacteristics(nil, svc)
|
||||||
log.Printf("MTU negotiation failed: %v", err)
|
if err != nil {
|
||||||
} else {
|
return nil, nil, nil, fmt.Errorf("characteristic discovery failed: %v", err)
|
||||||
log.Printf("Negotiated ATT MTU: %d", mtu)
|
}
|
||||||
}
|
for _, c := range chars {
|
||||||
var printChr, notifyChr *ble.Characteristic
|
switch c.UUID.String() {
|
||||||
services, err := client.DiscoverServices([]ble.UUID{mainServiceUUID})
|
case printCharacteristic.String():
|
||||||
if err != nil || len(services) == 0 {
|
printChr = c
|
||||||
log.Fatalf("Service discovery failed: %v", err)
|
case notifyCharacteristic.String():
|
||||||
}
|
notifyChr = c
|
||||||
svc := services[0]
|
case dataCharacteristic.String():
|
||||||
chars, err := client.DiscoverCharacteristics(nil, svc)
|
dataChr = c
|
||||||
if err != nil {
|
|
||||||
log.Fatalf("Characteristic discovery failed: %v", err)
|
|
||||||
}
|
|
||||||
for _, c := range chars {
|
|
||||||
switch c.UUID.String() {
|
|
||||||
case notifyCharacteristic.String():
|
|
||||||
notifyChr = c
|
|
||||||
case printCharacteristic.String():
|
|
||||||
printChr = c
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if notifyChr != nil {
|
|
||||||
_, _ = client.DiscoverDescriptors(nil, notifyChr)
|
|
||||||
err = client.Subscribe(notifyChr, false, func(b []byte) {
|
|
||||||
parseNotification(b)
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
log.Printf("Subscribe failed: %v – notifications will be ignored", err)
|
|
||||||
} else {
|
|
||||||
log.Println("Subscribed to printer notifications.")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if getStatus {
|
|
||||||
sendSimpleCommand(client, printChr, 0xA1)
|
|
||||||
}
|
|
||||||
if getBattery {
|
|
||||||
sendSimpleCommand(client, printChr, 0xAB)
|
|
||||||
}
|
|
||||||
if getVersion {
|
|
||||||
sendSimpleCommand(client, printChr, 0xB1)
|
|
||||||
}
|
|
||||||
if getPrintType {
|
|
||||||
sendSimpleCommand(client, printChr, 0xB0)
|
|
||||||
}
|
|
||||||
if getQueryCount {
|
|
||||||
sendSimpleCommand(client, printChr, 0xA7)
|
|
||||||
}
|
|
||||||
if ejectPaper > 0 {
|
|
||||||
sendLineCommand(client, printChr, 0xA3, ejectPaper)
|
|
||||||
}
|
|
||||||
if retractPaper > 0 {
|
|
||||||
sendLineCommand(client, printChr, 0xA4, retractPaper)
|
|
||||||
}
|
|
||||||
if getStatus || getBattery || getVersion || getPrintType || getQueryCount || ejectPaper > 0 || retractPaper > 0 {
|
|
||||||
log.Println("Waiting for notifications...")
|
|
||||||
time.Sleep(2 * time.Second)
|
|
||||||
}
|
|
||||||
if flag.NArg() < 1 {
|
|
||||||
return // no image to print, other commands may have run
|
|
||||||
} else if flag.NArg() >= 1 && needNotifications {
|
|
||||||
log.Fatalf("Refusing to print and query at the same time due to a firmware bug. Please run print and query commands separately.")
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return printChr, notifyChr, dataChr, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func subToNotifs(client ble.Client, notifyChr *ble.Characteristic) error {
|
||||||
|
if notifyChr != nil {
|
||||||
|
_, _ = client.DiscoverDescriptors(nil, notifyChr)
|
||||||
|
err := client.Subscribe(notifyChr, false, func(b []byte) {
|
||||||
|
parseNotification(b)
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("%v", err)
|
||||||
|
} else {
|
||||||
|
log.Println("Subscribed to printer notifications.")
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
return fmt.Errorf("missing notification characteristic")
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func loadAndProcessImage(imagePath string, printMode PrintMode, ditherType string) ([]byte, int, error) {
|
||||||
|
img, err := decodeImage(imagePath)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
log.Fatalf("Image load error: %v", err)
|
||||||
|
}
|
||||||
|
img = padImageToMinLines(img, minLines)
|
||||||
|
var pixels []byte
|
||||||
|
var height int
|
||||||
|
|
||||||
|
// Convert image to the desired format
|
||||||
|
switch printMode {
|
||||||
|
case Mode1bpp:
|
||||||
|
pixels, height, err = loadImageMonoFromImage(img, ditherType)
|
||||||
|
case Mode4bpp:
|
||||||
|
pixels, height, err = loadImage4BitFromImage(img, ditherType)
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return nil, 0, fmt.Errorf("image conversion error: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return pixels, height, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func loadPrinter() (ble.Client, *ble.Characteristic, *ble.Characteristic, *ble.Characteristic, error) {
|
||||||
|
ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt)
|
||||||
|
defer stop()
|
||||||
|
|
||||||
|
// Initialize BLE device
|
||||||
|
d, err := linux.NewDevice()
|
||||||
|
if err != nil {
|
||||||
|
log.Fatalf("Failed to open BLE device: %v", err)
|
||||||
|
}
|
||||||
|
ble.SetDefaultDevice(d)
|
||||||
|
|
||||||
|
// Find printer
|
||||||
|
adv, err := findPrinter(ctx)
|
||||||
|
if err != nil {
|
||||||
|
log.Fatalf("Failed to find printer: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Connect to printer
|
||||||
|
log.Println("Connecting...")
|
||||||
|
client, err := ble.Dial(ctx, adv.Addr())
|
||||||
|
if err != nil {
|
||||||
|
log.Fatalf("Connect failed: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Negotiate large MTU if possible
|
||||||
|
mtu, err := client.ExchangeMTU(100)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("MTU negotiation failed: %v", err)
|
||||||
|
} else {
|
||||||
|
log.Printf("Negotiated ATT MTU: %d", mtu)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Discover services and characteristics
|
||||||
|
printChr, notifyChr, dataChr, err := discoverChars(client)
|
||||||
|
if err != nil {
|
||||||
|
log.Fatalf("Characteristic discovery failed: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return client, printChr, notifyChr, dataChr, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
flag.Parse()
|
||||||
|
|
||||||
|
if outputPath != "-" {
|
||||||
|
log.Println("Bleh! Cat Printer Utility for MXW01, version", version)
|
||||||
|
}
|
||||||
|
|
||||||
|
needNotifications := getStatus || getBattery || getVersion || getPrintType || getQueryCount || ejectPaper > 0 || retractPaper > 0
|
||||||
|
|
||||||
|
needPrinter := needNotifications || (flag.NArg() > 0 && outputPath == "")
|
||||||
|
|
||||||
|
if !needPrinter && outputPath == "" {
|
||||||
|
log.Println("Nothing to do. Use -h for help.")
|
||||||
|
log.Println("Done!")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get print mode
|
||||||
var printMode PrintMode
|
var printMode PrintMode
|
||||||
switch mode {
|
switch mode {
|
||||||
case "1bpp":
|
case "1bpp":
|
||||||
@ -556,25 +614,15 @@ func main() {
|
|||||||
fmt.Println("Invalid mode. Use '1bpp' or '4bpp'.")
|
fmt.Println("Invalid mode. Use '1bpp' or '4bpp'.")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Get image path
|
||||||
imagePath := flag.Arg(0)
|
imagePath := flag.Arg(0)
|
||||||
|
|
||||||
var pixels []byte
|
pixels, height := []byte(nil), int(0)
|
||||||
var height int
|
|
||||||
img, err := decodeImage(imagePath)
|
|
||||||
|
|
||||||
|
pixels, height, err := loadAndProcessImage(imagePath, printMode, ditherType)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalf("Image load error: %v", err)
|
log.Fatalf("Failed to load and process image: %v", err)
|
||||||
}
|
|
||||||
img = padImageToMinLines(img, minLines)
|
|
||||||
|
|
||||||
switch printMode {
|
|
||||||
case Mode1bpp:
|
|
||||||
pixels, height, err = loadImageMonoFromImage(img, ditherType)
|
|
||||||
case Mode4bpp:
|
|
||||||
pixels, height, err = loadImage4BitFromImage(img, ditherType)
|
|
||||||
}
|
|
||||||
if err != nil {
|
|
||||||
log.Fatalf("Image conversion error: %v", err)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if outputPath != "" {
|
if outputPath != "" {
|
||||||
@ -601,89 +649,75 @@ func main() {
|
|||||||
log.Fatalf("Failed to write PNG preview: %v", err)
|
log.Fatalf("Failed to write PNG preview: %v", err)
|
||||||
}
|
}
|
||||||
if outputPath != "-" {
|
if outputPath != "-" {
|
||||||
fmt.Printf("Preview PNG written to %s\n", outputPath)
|
log.Printf("Preview PNG written to %s\n", outputPath)
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt)
|
if needPrinter {
|
||||||
defer stop()
|
client, printChr, notifyChr, dataChr, err := loadPrinter()
|
||||||
|
|
||||||
d, err := linux.NewDevice()
|
defer client.CancelConnection()
|
||||||
if err != nil {
|
|
||||||
log.Fatalf("Failed to open BLE device: %v", err)
|
|
||||||
}
|
|
||||||
ble.SetDefaultDevice(d)
|
|
||||||
|
|
||||||
log.Println("Scanning for printer...")
|
if err != nil {
|
||||||
log.Println("Connecting...")
|
log.Fatalf("Failed to load printer: %v", err)
|
||||||
var adv ble.Advertisement
|
|
||||||
ctxScan, cancel := context.WithTimeout(ctx, scanTimeout)
|
|
||||||
err = ble.Scan(ctxScan, false, func(a ble.Advertisement) {
|
|
||||||
if a.LocalName() == targetPrinterName {
|
|
||||||
adv = a
|
|
||||||
cancel()
|
|
||||||
}
|
}
|
||||||
}, nil)
|
|
||||||
if err != nil && err != context.Canceled {
|
|
||||||
log.Fatalf("Scan error: %v", err)
|
|
||||||
}
|
|
||||||
if adv == nil {
|
|
||||||
log.Println("Printer not found.")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
client, err := ble.Dial(ctx, adv.Addr())
|
if needNotifications {
|
||||||
if err != nil {
|
// Subscribe to notifications
|
||||||
log.Fatalf("Connect failed: %v", err)
|
err := subToNotifs(client, notifyChr)
|
||||||
}
|
if err != nil {
|
||||||
defer client.CancelConnection()
|
log.Fatalf("Failed to subscribe to notifications: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
mtu, err := client.ExchangeMTU(100)
|
// TODO: check if the firmware allows more than one command at a time
|
||||||
if err != nil {
|
// Also find a neater way to handle this
|
||||||
log.Printf("MTU negotiation failed: %v", err)
|
if getStatus {
|
||||||
} else {
|
sendSimpleCommand(client, printChr, 0xA1)
|
||||||
log.Printf("Negotiated ATT MTU: %d", mtu)
|
}
|
||||||
}
|
if getBattery {
|
||||||
var printChr, dataChr *ble.Characteristic
|
sendSimpleCommand(client, printChr, 0xAB)
|
||||||
services, err := client.DiscoverServices([]ble.UUID{mainServiceUUID})
|
}
|
||||||
if err != nil || len(services) == 0 {
|
if getVersion {
|
||||||
log.Fatalf("Service discovery failed: %v", err)
|
sendSimpleCommand(client, printChr, 0xB1)
|
||||||
}
|
}
|
||||||
svc := services[0]
|
if getPrintType {
|
||||||
chars, err := client.DiscoverCharacteristics(nil, svc)
|
sendSimpleCommand(client, printChr, 0xB0)
|
||||||
if err != nil {
|
}
|
||||||
log.Fatalf("Characteristic discovery failed: %v", err)
|
if getQueryCount {
|
||||||
}
|
sendSimpleCommand(client, printChr, 0xA7)
|
||||||
for _, c := range chars {
|
}
|
||||||
switch c.UUID.String() {
|
if ejectPaper > 0 {
|
||||||
case dataCharacteristic.String():
|
sendLineCommand(client, printChr, 0xA3, ejectPaper)
|
||||||
dataChr = c
|
}
|
||||||
case printCharacteristic.String():
|
if retractPaper > 0 {
|
||||||
printChr = c
|
sendLineCommand(client, printChr, 0xA4, retractPaper)
|
||||||
|
}
|
||||||
|
log.Println("Waiting for notifications...")
|
||||||
|
time.Sleep(2 * time.Second)
|
||||||
|
|
||||||
|
if flag.NArg() < 1 {
|
||||||
|
return // no image to print
|
||||||
|
} else {
|
||||||
|
log.Fatalf("Refusing to print and query at the same time due to a firmware bug. Please run print and query commands separately.")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if printChr == nil {
|
||||||
|
log.Fatalf("Missing required print characteristic")
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if printChr == nil {
|
i := max(intensity, 0)
|
||||||
log.Fatalf("Missing required print characteristic")
|
i = min(i, 100)
|
||||||
}
|
intensityByte := byte(i)
|
||||||
|
|
||||||
i := intensity
|
if dataChr == nil {
|
||||||
if i < 0 {
|
log.Fatalf("Missing required data characteristic")
|
||||||
i = 0
|
}
|
||||||
}
|
|
||||||
if i > 100 {
|
|
||||||
i = 100
|
|
||||||
}
|
|
||||||
intensityByte := byte(i)
|
|
||||||
|
|
||||||
if dataChr == nil {
|
err = sendImageBufferToPrinter(client, dataChr, printChr, pixels, height, printMode, intensityByte)
|
||||||
log.Fatalf("Missing required data characteristic")
|
if err != nil {
|
||||||
}
|
log.Fatalf("Failed to print image: %v", err)
|
||||||
|
}
|
||||||
err = sendImageBufferToPrinter(client, dataChr, printChr, pixels, height, printMode, intensityByte)
|
|
||||||
if err != nil {
|
|
||||||
log.Fatalf("Failed to print image: %v", err)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Println("Done!")
|
log.Println("Done!")
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user