feature: display battery status when scanning devices

deadprogram · deadprogram · commit fe46a017b6d1 · 2025-01-11T12:01:32.000+01:00
Signed-off-by: deadprogram &lt;ron@hybridgroup.com&gt;
diff --git a/cmd/haystack/go.mod b/cmd/haystack/go.mod
@@ -3,7 +3,7 @@ module github.com/hybridgroup/go-haystack/cmd/haystack
 go 1.23.0
 
 require (
-	github.com/hybridgroup/go-haystack v0.0.0-20250111073145-3778f18a1e4f
+	github.com/hybridgroup/go-haystack v0.0.0-20250111104239-708b6c40fe39
 	tinygo.org/x/bluetooth v0.10.1-0.20250110080820-c6dfccb1a90b
 )
 
diff --git a/cmd/haystack/go.sum b/cmd/haystack/go.sum
@@ -5,8 +5,8 @@ github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
 github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/hybridgroup/go-haystack v0.0.0-20250111073145-3778f18a1e4f h1:dVy3wqra/+I4H/r9YYBcWVeMQgOIg4NK9I9ZBysdFOM=
-github.com/hybridgroup/go-haystack v0.0.0-20250111073145-3778f18a1e4f/go.mod h1:DvH8VgHcL/L57TkU2JjwjZSIb+CBD5kD4H2ijx/9f7w=
+github.com/hybridgroup/go-haystack v0.0.0-20250111104239-708b6c40fe39 h1:4+m3cjkknROV/4xd2/3w7FHWGYk+ZzY0rpRHbpNXTIE=
+github.com/hybridgroup/go-haystack v0.0.0-20250111104239-708b6c40fe39/go.mod h1:DvH8VgHcL/L57TkU2JjwjZSIb+CBD5kD4H2ijx/9f7w=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
diff --git a/cmd/haystack/scan.go b/cmd/haystack/scan.go
@@ -21,7 +21,7 @@ func scanDevices(verboseFlag *bool) error {
 				println("failed to parse data:", err)
 				return
 			}
-			println(device.Address.String(), device.RSSI, hex.EncodeToString([]byte{status}), hex.EncodeToString(key))
+			println(device.Address.String(), device.RSSI, hex.EncodeToString(key), "- battery", findmy.BatteryStatus(status))
 		}
 	})
 }
diff --git a/tinyscan/badger2040w.go b/tinyscan/badger2040w.go
@@ -11,7 +11,7 @@ import (
 )
 
 var (
-	font = &tinyfont.Picopixel
+	font = &tinyfont.TomThumb
 )
 
 func initTerminal() {
@@ -25,7 +25,7 @@ func initTerminal() {
 	terminal.Configure(&tinyterm.Config{
 		Font:              font,
 		FontHeight:        8,
-		FontOffset:        4,
+		FontOffset:        6,
 		UseSoftwareScroll: true,
 	})
 }
diff --git a/tinyscan/go.mod b/tinyscan/go.mod
@@ -3,7 +3,7 @@ module github.com/hybridgroup/go-haystack/tinyscan
 go 1.23.0
 
 require (
-	github.com/hybridgroup/go-haystack v0.0.0-20250111073145-3778f18a1e4f
+	github.com/hybridgroup/go-haystack v0.0.0-20250111104239-708b6c40fe39
 	tinygo.org/x/bluetooth v0.10.1-0.20250110155930-faf2ed3d797d
 	tinygo.org/x/drivers v0.29.0
 	tinygo.org/x/tinyfont v0.5.0
diff --git a/tinyscan/go.sum b/tinyscan/go.sum
@@ -7,8 +7,8 @@ github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
 github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
-github.com/hybridgroup/go-haystack v0.0.0-20250111073145-3778f18a1e4f h1:dVy3wqra/+I4H/r9YYBcWVeMQgOIg4NK9I9ZBysdFOM=
-github.com/hybridgroup/go-haystack v0.0.0-20250111073145-3778f18a1e4f/go.mod h1:DvH8VgHcL/L57TkU2JjwjZSIb+CBD5kD4H2ijx/9f7w=
+github.com/hybridgroup/go-haystack v0.0.0-20250111104239-708b6c40fe39 h1:4+m3cjkknROV/4xd2/3w7FHWGYk+ZzY0rpRHbpNXTIE=
+github.com/hybridgroup/go-haystack v0.0.0-20250111104239-708b6c40fe39/go.mod h1:DvH8VgHcL/L57TkU2JjwjZSIb+CBD5kD4H2ijx/9f7w=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
diff --git a/tinyscan/main.go b/tinyscan/main.go
@@ -44,8 +44,8 @@ func scanHandler(adapter *bluetooth.Adapter, device bluetooth.ScanResult) {
 			terminalOutput("ERROR: failed to parse data:" + err.Error())
 		default:
 			terminalOutput("--------------------------------")
-			terminalOutput(fmt.Sprintf("%s %d", device.Address.String(), device.RSSI))
-			terminalOutput(fmt.Sprintf("%s %s", hex.EncodeToString(key), hex.EncodeToString([]byte{status})))
+			terminalOutput(fmt.Sprintf("%s %d (battery %s)", device.Address.String(), device.RSSI, findmy.BatteryStatus(status)))
+			terminalOutput(hex.EncodeToString(key))
 		}
 	}
 }
diff --git a/tinyscan/pyportal.go b/tinyscan/pyportal.go
@@ -4,13 +4,13 @@ package main
 
 import (
 	"tinygo.org/x/drivers/ili9341"
-	"tinygo.org/x/tinyfont/proggy"
+	"tinygo.org/x/tinyfont"
 	"tinygo.org/x/tinyterm"
 	"tinygo.org/x/tinyterm/displays"
 )
 
 var (
-	font = &proggy.TinySZ8pt7b
+	font = &tinyfont.TomThumb
 )
 
 func initTerminal() {
@@ -20,7 +20,7 @@ func initTerminal() {
 	terminal = tinyterm.NewTerminal(display)
 	terminal.Configure(&tinyterm.Config{
 		Font:              font,
-		FontHeight:        10,
+		FontHeight:        8,
 		FontOffset:        6,
 		UseSoftwareScroll: true,
 	})

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ module github.com/hybridgroup/go-haystack/cmd/haystack`
`3`	`3`	`go 1.23.0`
`4`	`4`
`5`	`5`	`require (`
`6`		`- github.com/hybridgroup/go-haystack v0.0.0-20250111073145-3778f18a1e4f`
	`6`	`+ github.com/hybridgroup/go-haystack v0.0.0-20250111104239-708b6c40fe39`
`7`	`7`	`tinygo.org/x/bluetooth v0.10.1-0.20250110080820-c6dfccb1a90b`
`8`	`8`	`)`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ func scanDevices(verboseFlag *bool) error {`
`21`	`21`	`println("failed to parse data:", err)`
`22`	`22`	`return`
`23`	`23`	`}`
`24`		`- println(device.Address.String(), device.RSSI, hex.EncodeToString([]byte{status}), hex.EncodeToString(key))`
	`24`	`+ println(device.Address.String(), device.RSSI, hex.EncodeToString(key), "- battery", findmy.BatteryStatus(status))`
`25`	`25`	`}`
`26`	`26`	`})`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`var (`
`14`		`- font = &tinyfont.Picopixel`
	`14`	`+ font = &tinyfont.TomThumb`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`func initTerminal() {`
`@@ -25,7 +25,7 @@ func initTerminal() {`
`25`	`25`	`terminal.Configure(&tinyterm.Config{`
`26`	`26`	`Font: font,`
`27`	`27`	`FontHeight: 8,`
`28`		`- FontOffset: 4,`
	`28`	`+ FontOffset: 6,`
`29`	`29`	`UseSoftwareScroll: true,`
`30`	`30`	`})`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,8 @@ func scanHandler(adapter *bluetooth.Adapter, device bluetooth.ScanResult) {`
`44`	`44`	`terminalOutput("ERROR: failed to parse data:" + err.Error())`
`45`	`45`	`default:`
`46`	`46`	`terminalOutput("--------------------------------")`
`47`		`- terminalOutput(fmt.Sprintf("%s %d", device.Address.String(), device.RSSI))`
`48`		`- terminalOutput(fmt.Sprintf("%s %s", hex.EncodeToString(key), hex.EncodeToString([]byte{status})))`
	`47`	`+ terminalOutput(fmt.Sprintf("%s %d (battery %s)", device.Address.String(), device.RSSI, findmy.BatteryStatus(status)))`
	`48`	`+ terminalOutput(hex.EncodeToString(key))`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`	`}`