public/antplusbridge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

workaround for when the trainer stops transmitting. ListenForTrainer now

Browse Source 
restarts after not having received data for 10 seconds.
This commit is contained in:
Erik Brakkee 2026-06-14 14:58:22 +02:00
parent 0d49c6f51f
commit c75c2ea0e1
2 changed files with 41 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
cmd/bridge/ant.go
View File

@ -34,7 +34,6 @@ func resetAndWait(drv io.ReadWriter) error {
func ListenForTrainer(vendorId uint16, productId uint16, deviceNumber uint32, func ListenForTrainer(vendorId uint16, productId uint16, deviceNumber uint32,
events chan<- Event) { events chan<- Event) {
defer close(events)
drv, err := usb.GetDevice(gousb.ID(vendorId), gousb.ID(productId)) drv, err := usb.GetDevice(gousb.ID(vendorId), gousb.ID(productId))
if err != nil { if err != nil {
@ -53,36 +52,47 @@ func ListenForTrainer(vendorId uint16, productId uint16, deviceNumber uint32,
logMsg("ant: scan mode started") logMsg("ant: scan mode started")
msgs := make(chan ant.BroadcastMessage, 100) msgs := make(chan ant.BroadcastMessage, 100)
go device.DumpBroadcastMessages(context.Background(), drv, msgs) ctx, cancel := context.WithCancel(context.Background())
defer cancel()
go func() {
device.DumpBroadcastMessages(ctx, drv, msgs)
logMsg("ant: dump broadcast messages ended")
}()
logMsg("ant: listening...") logMsg("ant: listening...")
for msg := range msgs { for {
if deviceNumber != 0 && msg.DeviceNumber() != deviceNumber { select {
logPrintf("ant: received msg from ignored device %v\n", msg.DeviceNumber()) case msg := <-msgs:
continue if deviceNumber != 0 && msg.DeviceNumber() != deviceNumber {
} logPrintf("ant: received msg from ignored device %v\n", msg.DeviceNumber())
//fmt.Printf("raw msg: device type=0x%02x device number=%d content=%x\n",
// msg.DeviceType(), msg.DeviceNumber(), msg.Content())
switch msg.DeviceType() {
case ant.DEVICE_TYPE_POWER:
// Check data page first
page := msg[4] & antDataPageMask
if page != antDataPageCyclingPower {
continue continue
} }
cur := ant.PowerMessage(msg) //fmt.Printf("raw msg: device type=0x%02x device number=%d content=%x\n",
logPrintf("ant: %v: power: %dW cadence: %d rpm\n", // msg.DeviceType(), msg.DeviceNumber(), msg.Content())
msg.DeviceNumber(), cur.InstantaneousPower(), cur.InstantaneousCadence())
select { switch msg.DeviceType() {
case events <- Event{ case ant.DEVICE_TYPE_POWER:
Power: cur.InstantaneousPower(), // Check data page first
Cadence: cur.InstantaneousCadence(), page := msg[4] & antDataPageMask
Now: time.Now(), if page != antDataPageCyclingPower {
}: continue
default: }
logPrintf("ant: dropped event, buffer full\n") cur := ant.PowerMessage(msg)
logPrintf("ant: %v: power: %dW cadence: %d rpm\n",
msg.DeviceNumber(), cur.InstantaneousPower(), cur.InstantaneousCadence())
select {
case events <- Event{
Power: cur.InstantaneousPower(),
Cadence: cur.InstantaneousCadence(),
Now: time.Now(),
}:
default:
logPrintf("ant: dropped event, buffer full\n")
}
} }
case <-time.After(10 * time.Second):
logMsg("ant: no more messages arrived, restarting")
return
} }
} }
} }

6
cmd/bridge/cli.go
View File

@ -81,7 +81,11 @@ This allows these trainers to be used with modern devices that don't support ANT
} }
events := make(chan Event, 1) events := make(chan Event, 1)
go ListenForTrainer(uint16(c.vendorID), uint16(c.productID), c.deviceNumber, events) go func() {
for {
ListenForTrainer(uint16(c.vendorID), uint16(c.productID), c.deviceNumber, events)
}
}()
ExposeBluetooth(events) ExposeBluetooth(events)
return nil return nil