From a3a3414b36943ffd7463afee57cf5742f0eac543 Mon Sep 17 00:00:00 2001 From: username Date: Mon, 9 Nov 2026 18:04:07 +0100 Subject: [PATCH] Detect heart rate bridged by Wahoo trainers over Direct Connect DirectConnectPeripheral.services only returned the service UUIDs from the mDNS announcement, so the Heart Rate service a Wahoo KICKR exposes when it bridges a paired HR strap over WiFi was never seen. - DirectConnectPeripheral.services now merges discovered services into the announced ones, skipping duplicates by normalized UUID. - BleWahooDevice.features sets heartrate=true when the peripheral offers the Heart Rate service, so the adapter enables the HeartRate capability. --- src/ble/wahoo/sensor.ts | 8 +++++++- src/direct-connect/base/peripheral.ts | 9 ++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/ble/wahoo/sensor.ts b/src/ble/wahoo/sensor.ts index 828f005..42110b7 100644 --- a/src/ble/wahoo/sensor.ts +++ b/src/ble/wahoo/sensor.ts @@ -3,6 +3,7 @@ import { DEFAULT_BIKE_WEIGHT, DEFAULT_USER_WEIGHT } from "../../base/consts.js"; import { CSP, CSP_MEASUREMENT, FTMS_CP, FTMS_FEATURE, FTMS_STATUS, HR_MEASUREMENT, INDOOR_BIKE_DATA, POWER_RANGE, RES_LEVEL_RANGE } from "../consts.js"; import { WAHOO_ADVANCED_FTMS, WAHOO_ADVANCED_TRAINER_CP,OpCode, ErgWriteDelay } from './consts.js' import { IndoorBikeData } from "../fm/index.js"; +import { IndoorBikeFeatures } from "../fm/types.js"; import BleFitnessMachineDevice from "../fm/sensor.js"; import { BleProtocol, BleWriteProps } from "../types.js"; import { beautifyUUID} from "../utils.js"; @@ -52,7 +53,12 @@ export default class BleWahooDevice extends BleFitnessMachineDevice { setSlope: true } } - + public get features(): IndoorBikeFeatures { + if (this._features && !this._features.heartrate && this.supportsHeartRate()) + this._features.heartrate = true + return this._features! + } + isMatching(serviceUUIDs: string[]): boolean { diff --git a/src/direct-connect/base/peripheral.ts b/src/direct-connect/base/peripheral.ts index 752dced..58cb202 100644 --- a/src/direct-connect/base/peripheral.ts +++ b/src/direct-connect/base/peripheral.ts @@ -53,7 +53,14 @@ export class DirectConnectPeripheral implements IBlePeripheral { } get services(): BleService[] { - const services = this.announcement?.serviceUUIDs??[] + const announced = this.announcement?.serviceUUIDs??[] + const discovered = this.discoveredServiceUUIds??[] + + const services = [...announced] + discovered.forEach( d => { + if (!services.some( s=> beautifyUUID(s)===beautifyUUID(d))) + services.push(d) + }) return services.map(s => ({uuid:s})) }