incyclist-devices 3.0.14 → 3.0.16

package/lib/cjs/ble/base/interface.js

@@ -98,10 +98,10 @@ class BleInterface extends node_events_1.EventEmitter {
         await this.connectInternal();
     }
     async connect(reconnect) {
-        if (this.isAutoStart)
+        if (this.isAutoStart && !reconnect)
             return this.isConnected();
         else
-            return this.connectInternal(reconnect);
+            return await this.connectInternal(reconnect);
     }
     async connectInternal(reconnect) {
         if (this.isConnected())
@@ -298,6 +298,11 @@ class BleInterface extends node_events_1.EventEmitter {
         const { peripheral } = service;
         if (peripheral.address === undefined || peripheral.address === '')
             peripheral.address = peripheral.id || peripheral.name;
+        if (service.name === 'Zwift Ride' && service.serviceUUIDs.some(uuid => (0, utils_js_1.matches)(uuid, 'FC82'))) {
+            const protocol = 'zwift-play';
+            const { id, name, address } = (0, utils_js_1.getPeripheralInfo)(peripheral);
+            return { interface: BleInterface.INTERFACE_NAME, protocol, id, name, address };
+        }
         const protocol = this.getAdapterFactory().getProtocol(service.serviceUUIDs);
         const { id, name, address } = (0, utils_js_1.getPeripheralInfo)(peripheral);
         return { interface: BleInterface.INTERFACE_NAME, protocol, id, name, address };
@@ -573,6 +578,8 @@ class BleInterface extends node_events_1.EventEmitter {
             return false;
         const found = service.serviceUUIDs.map(utils_js_1.parseUUID);
         const expected = this.expectedServices.map(utils_js_1.parseUUID);
+        if (service.name.startsWith('Zwift'))
+            return true;
         const supported = found.filter(uuid => expected.includes(uuid)) ?? [];
         if (!supported.length) {
             this.logEvent({ message: 'peripheral not supported', name: service.name, uuids: service.serviceUUIDs });

package/lib/cjs/ble/fm/adapter.js

@@ -235,9 +235,11 @@ class BleFmAdapter extends adapter_js_1.default {
     async checkCapabilities() {
         const before = this.capabilities.join(',');
         const sensor = this.getSensor();
+        let updateRequired = false;
         if (!sensor.features) {
             try {
                 await sensor.getFitnessMachineFeatures();
+                updateRequired = true;
             }
             catch (err) {
                 this.logEvent({ message: 'error getting fitness machine features', device: this.getName(), interface: this.getInterface(), error: err });
@@ -250,6 +252,9 @@ class BleFmAdapter extends adapter_js_1.default {
         if (before !== after) {
             this.logEvent({ message: 'device capabilities updated', name: this.getSettings().name, interface: this.getSettings().interface, capabilities: this.capabilities });
             this.emit('device-info', this.getSettings(), { capabilities: this.capabilities });
+            updateRequired = true;
+        }
+        if (updateRequired) {
             this.updateCyclingModeConfig();
         }
     }

package/lib/cjs/ble/zwift/play/sensor.js

@@ -19,6 +19,7 @@ class BleZwiftPlaySensor extends sensor_js_1.TBleSensor {
     prevClickMessage;
     upState;
     downState;
+    rideKeyPadStates;
     deviceType;
     publicKey;
     privateKey;
@@ -172,6 +173,9 @@ class BleZwiftPlaySensor extends sensor_js_1.TBleSensor {
         else if (type === 0x03) {
             this.onRidingData(message);
         }
+        else if (type === 0x23) {
+            this.onRideKeyPadStatus(message);
+        }
         else if (type === 0x2A) {
             this.onTrainerResponse(message);
         }
@@ -285,6 +289,53 @@ class BleZwiftPlaySensor extends sensor_js_1.TBleSensor {
             this.logEvent({ message: 'Error', fn: 'onRidingData', error: err.message, stack: err.stack });
         }
     }
+    onRideKeyPadStatus(m) {
+        try {
+            const data = zwift_hub_js_1.RideKeyPadStatus.fromBinary(m);
+            const buttonNames = new Map([
+                [0x10, 'a'],
+                [0x20, 'b'],
+                [0x40, 'y'],
+                [0x80, 'z'],
+                [0x1000, 'r-shift-up'],
+                [0x2000, 'r-shift-down'],
+                [0x4000, 'ride-on'],
+                [0x8000, 'r-power']
+            ]);
+            const buttonMap = data.buttonMap ?? 0;
+            const currentPresses = new Set();
+            buttonNames.forEach((name, bit) => {
+                const isPressed = (buttonMap & bit) === 0;
+                if (isPressed) {
+                    currentPresses.add(bit);
+                    const prevState = this.rideKeyPadStates.get(bit);
+                    if (!prevState || !prevState.pressed) {
+                        this.rideKeyPadStates.set(bit, { pressed: true, timestamp: Date.now() });
+                    }
+                }
+            });
+            this.rideKeyPadStates.forEach((state, bit) => {
+                if (!currentPresses.has(bit) && state.pressed) {
+                    const keyName = buttonNames.get(bit);
+                    const duration = Date.now() - state.timestamp;
+                    this.emit('key-pressed', { key: keyName, duration, deviceType: this.deviceType });
+                    this.rideKeyPadStates.set(bit, { pressed: false, timestamp: Date.now() });
+                }
+            });
+            const pressedButtons = Array.from(currentPresses).map(bit => ({
+                bit: `0x${bit.toString(16).padStart(8, '0')}`,
+                name: buttonNames.get(bit)
+            }));
+            this.logEvent({
+                message: 'ride keypad status received',
+                buttonMap: `0x${buttonMap.toString(16)}`,
+                buttons: pressedButtons
+            });
+        }
+        catch (err) {
+            this.logEvent({ message: 'Error', fn: 'onRideKeyPadStatus', error: err.message, stack: err.stack });
+        }
+    }
     onDeviceInformation(m) {
         try {
             const envelope = zwift_hub_js_1.DeviceDataEnvelope.fromBinary(m);
@@ -506,6 +557,7 @@ class BleZwiftPlaySensor extends sensor_js_1.TBleSensor {
         this.isHubServiceActive = false;
         delete this.initHubServicePromise;
         delete this.prevHubSettings;
+        this.rideKeyPadStates = new Map();
     }
     getManufacturerData() {
         const data = this.peripheral.getManufacturerData();

package/lib/cjs/modes/antble-smarttrainer.js

@@ -234,10 +234,13 @@ class SmartTrainerCyclingMode extends power_base_js_1.default {
         const m = this.adapter?.getWeight() ?? 85;
         const vCurrent = this.data.speed * 1000 / 3600;
         const eKinCurrent = m * vCurrent * vCurrent / 2;
-        if (this.data.pedalRpm > 0) {
-            const virtualSpeed = (0, calculations_js_1.calculateVirtualSpeed)(this.data.pedalRpm, this.gearRatios[this.gear - 1]) * 3.6;
+        const cadence = this.data?.pedalRpm ?? 0;
+        const gear = this.gear ?? 1;
+        const simSlope = this.simSlope ?? 0;
+        if (cadence > 0) {
+            const virtualSpeed = (0, calculations_js_1.calculateVirtualSpeed)(cadence, this.gearRatios[gear - 1]) * 3.6;
             const v = virtualSpeed / 3.6;
-            const newPower = calculations_js_1.default.calculatePower(m, virtualSpeed / 3.6, this.simSlope ?? 0);
+            const newPower = calculations_js_1.default.calculatePower(m, virtualSpeed / 3.6, simSlope);
             const prevPower = this.data.power;
             const prev = (this.prevSimPower ?? prevPower ?? 0);
             const delta = newPower - prev;
@@ -253,7 +256,7 @@ class SmartTrainerCyclingMode extends power_base_js_1.default {
                 this.logEvent({ message: 'set simulated power (gear change)', target: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, prevTarget: this.prevSimPower, actualPower: prevPower, newPower });
             }
             else if (changed === 'slope' || changed === 'cadence') {
-                const adjustTime = this.simSlope < 0 ? 5 : 3;
+                const adjustTime = (this.simSlope ?? 0) < 0 ? 5 : 3;
                 this.simPower = prev + delta / adjustTime;
                 this.logEvent({ message: `set simulated power (${changed} change)`, target: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, prevTarget: this.prevSimPower, actualPower: prevPower, newPower });
             }
@@ -344,9 +347,13 @@ class SmartTrainerCyclingMode extends power_base_js_1.default {
                 else {
                     if (this.gear === undefined) {
                         const initialGear = (0, utils_js_1.intVal)(this.getSetting('startGear'));
-                        this.gear = initialGear + request.gearDelta;
+                        this.gear = initialGear + (request.gearDelta ?? 0);
                     }
-                    newRequest.gearRatio = this.gearRatios[this.gear];
+                    if (this.gear < 1)
+                        this.gear = 1;
+                    if (this.gear > this.gearRatios.length - 1)
+                        this.gear = this.gearRatios.length - 1;
+                    newRequest.gearRatio = this.gearRatios[this.gear - 1];
                     this.logEvent({ message: 'gear initialized', gear: this.gear, gearRatio: newRequest.gearRatio });
                 }
                 break;
@@ -356,10 +363,10 @@ class SmartTrainerCyclingMode extends power_base_js_1.default {
         }
     }
     verifySimPower() {
-        if (this.simPower < 0) {
+        if ((this.simPower ?? 0) < 0) {
             this.simPower = 0;
         }
-        if (this.data.pedalRpm > 0 && this.simPower < MIN_POWER) {
+        if ((this.data.pedalRpm ?? 0) > 0 && (this.simPower ?? 0) < MIN_POWER) {
             this.simPower = MIN_POWER;
         }
         if (!this.data.isPedalling) {

package/lib/cjs/modes/types.js

@@ -70,5 +70,7 @@ class CyclingMode {
     }
     confirmed(request) {
     }
+    onAdapterCapabilitiesChanged() {
+    }
 }
 exports.CyclingMode = CyclingMode;

package/lib/cjs/proto/zwift_hub.js

@@ -672,11 +672,12 @@ class RideKeyPadStatus$Type extends runtime_4.MessageType {
     constructor() {
         super("org.cagnulen.qdomyoszwift.RideKeyPadStatus", [
             { no: 1, name: "ButtonMap", kind: "scalar", jsonName: "ButtonMap", opt: true, T: 13 },
-            { no: 2, name: "AnalogButtons", kind: "message", jsonName: "AnalogButtons", T: () => exports.RideAnalogKeyGroup }
+            { no: 3, name: "AnalogButtons", kind: "message", jsonName: "AnalogButtons", repeat: 2, T: () => exports.RideAnalogKeyPress }
         ]);
     }
     create(value) {
         const message = globalThis.Object.create((this.messagePrototype));
+        message.analogButtons = [];
         if (value !== undefined)
             (0, runtime_3.reflectionMergePartial)(this, message, value);
         return message;
@@ -689,8 +690,8 @@ class RideKeyPadStatus$Type extends runtime_4.MessageType {
                 case 1:
                     message.buttonMap = reader.uint32();
                     break;
-                case 2:
-                    message.analogButtons = exports.RideAnalogKeyGroup.internalBinaryRead(reader, reader.uint32(), options, message.analogButtons);
+                case 3:
+                    message.analogButtons.push(exports.RideAnalogKeyPress.internalBinaryRead(reader, reader.uint32(), options));
                     break;
                 default:
                     let u = options.readUnknownField;
@@ -706,8 +707,8 @@ class RideKeyPadStatus$Type extends runtime_4.MessageType {
     internalBinaryWrite(message, writer, options) {
         if (message.buttonMap !== undefined)
             writer.tag(1, runtime_1.WireType.Varint).uint32(message.buttonMap);
-        if (message.analogButtons)
-            exports.RideAnalogKeyGroup.internalBinaryWrite(message.analogButtons, writer.tag(2, runtime_1.WireType.LengthDelimited).fork(), options).join();
+        for (let i = 0; i < message.analogButtons.length; i++)
+            exports.RideAnalogKeyPress.internalBinaryWrite(message.analogButtons[i], writer.tag(3, runtime_1.WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? runtime_2.UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);

package/lib/esm/ble/base/interface.js

@@ -2,7 +2,7 @@ import { EventEmitter } from "node:events";
 import { EventLogger } from "gd-eventlog";
 import { InteruptableTask } from "../../utils/task.js";
 import { BlePeripheral } from "./peripheral.js";
-import { beautifyUUID, getPeripheralInfo, parseUUID } from "../utils.js";
+import { beautifyUUID, getPeripheralInfo, matches, parseUUID } from "../utils.js";
 import { InterfaceFactory } from "./types.js";
 import { BleAdapterFactory } from "../factories/index.js";
 const BLE_EXPIRATION_TIMEOUT = 10 * 1000 * 60;
@@ -95,10 +95,10 @@ export class BleInterface extends EventEmitter {
         await this.connectInternal();
     }
     async connect(reconnect) {
-        if (this.isAutoStart)
+        if (this.isAutoStart && !reconnect)
             return this.isConnected();
         else
-            return this.connectInternal(reconnect);
+            return await this.connectInternal(reconnect);
     }
     async connectInternal(reconnect) {
         if (this.isConnected())
@@ -295,6 +295,11 @@ export class BleInterface extends EventEmitter {
         const { peripheral } = service;
         if (peripheral.address === undefined || peripheral.address === '')
             peripheral.address = peripheral.id || peripheral.name;
+        if (service.name === 'Zwift Ride' && service.serviceUUIDs.some(uuid => matches(uuid, 'FC82'))) {
+            const protocol = 'zwift-play';
+            const { id, name, address } = getPeripheralInfo(peripheral);
+            return { interface: BleInterface.INTERFACE_NAME, protocol, id, name, address };
+        }
         const protocol = this.getAdapterFactory().getProtocol(service.serviceUUIDs);
         const { id, name, address } = getPeripheralInfo(peripheral);
         return { interface: BleInterface.INTERFACE_NAME, protocol, id, name, address };
@@ -570,6 +575,8 @@ export class BleInterface extends EventEmitter {
             return false;
         const found = service.serviceUUIDs.map(parseUUID);
         const expected = this.expectedServices.map(parseUUID);
+        if (service.name.startsWith('Zwift'))
+            return true;
         const supported = found.filter(uuid => expected.includes(uuid)) ?? [];
         if (!supported.length) {
             this.logEvent({ message: 'peripheral not supported', name: service.name, uuids: service.serviceUUIDs });

package/lib/esm/ble/fm/adapter.js

@@ -230,9 +230,11 @@ export default class BleFmAdapter extends BleAdapter {
     async checkCapabilities() {
         const before = this.capabilities.join(',');
         const sensor = this.getSensor();
+        let updateRequired = false;
         if (!sensor.features) {
             try {
                 await sensor.getFitnessMachineFeatures();
+                updateRequired = true;
             }
             catch (err) {
                 this.logEvent({ message: 'error getting fitness machine features', device: this.getName(), interface: this.getInterface(), error: err });
@@ -245,6 +247,9 @@ export default class BleFmAdapter extends BleAdapter {
         if (before !== after) {
             this.logEvent({ message: 'device capabilities updated', name: this.getSettings().name, interface: this.getSettings().interface, capabilities: this.capabilities });
             this.emit('device-info', this.getSettings(), { capabilities: this.capabilities });
+            updateRequired = true;
+        }
+        if (updateRequired) {
             this.updateCyclingModeConfig();
         }
     }

package/lib/esm/ble/zwift/play/sensor.js

@@ -1,4 +1,4 @@
-import { ClickKeyPadStatus, DeviceDataEnvelope, DeviceInformationContent, DeviceSettings, HubCommand, HubRequest, HubRidingData, Idle, PlayButtonStatus, TrainerResponse } from "../../../proto/zwift_hub.js";
+import { ClickKeyPadStatus, DeviceDataEnvelope, DeviceInformationContent, DeviceSettings, HubCommand, HubRequest, HubRidingData, Idle, PlayButtonStatus, RideKeyPadStatus, TrainerResponse } from "../../../proto/zwift_hub.js";
 import { TBleSensor } from "../../base/sensor.js";
 import { beautifyUUID, fullUUID } from "../../utils.js";
 import { EventEmitter } from "node:events";
@@ -16,6 +16,7 @@ export class BleZwiftPlaySensor extends TBleSensor {
     prevClickMessage;
     upState;
     downState;
+    rideKeyPadStates;
     deviceType;
     publicKey;
     privateKey;
@@ -169,6 +170,9 @@ export class BleZwiftPlaySensor extends TBleSensor {
         else if (type === 0x03) {
             this.onRidingData(message);
         }
+        else if (type === 0x23) {
+            this.onRideKeyPadStatus(message);
+        }
         else if (type === 0x2A) {
             this.onTrainerResponse(message);
         }
@@ -282,6 +286,53 @@ export class BleZwiftPlaySensor extends TBleSensor {
             this.logEvent({ message: 'Error', fn: 'onRidingData', error: err.message, stack: err.stack });
         }
     }
+    onRideKeyPadStatus(m) {
+        try {
+            const data = RideKeyPadStatus.fromBinary(m);
+            const buttonNames = new Map([
+                [0x10, 'a'],
+                [0x20, 'b'],
+                [0x40, 'y'],
+                [0x80, 'z'],
+                [0x1000, 'r-shift-up'],
+                [0x2000, 'r-shift-down'],
+                [0x4000, 'ride-on'],
+                [0x8000, 'r-power']
+            ]);
+            const buttonMap = data.buttonMap ?? 0;
+            const currentPresses = new Set();
+            buttonNames.forEach((name, bit) => {
+                const isPressed = (buttonMap & bit) === 0;
+                if (isPressed) {
+                    currentPresses.add(bit);
+                    const prevState = this.rideKeyPadStates.get(bit);
+                    if (!prevState || !prevState.pressed) {
+                        this.rideKeyPadStates.set(bit, { pressed: true, timestamp: Date.now() });
+                    }
+                }
+            });
+            this.rideKeyPadStates.forEach((state, bit) => {
+                if (!currentPresses.has(bit) && state.pressed) {
+                    const keyName = buttonNames.get(bit);
+                    const duration = Date.now() - state.timestamp;
+                    this.emit('key-pressed', { key: keyName, duration, deviceType: this.deviceType });
+                    this.rideKeyPadStates.set(bit, { pressed: false, timestamp: Date.now() });
+                }
+            });
+            const pressedButtons = Array.from(currentPresses).map(bit => ({
+                bit: `0x${bit.toString(16).padStart(8, '0')}`,
+                name: buttonNames.get(bit)
+            }));
+            this.logEvent({
+                message: 'ride keypad status received',
+                buttonMap: `0x${buttonMap.toString(16)}`,
+                buttons: pressedButtons
+            });
+        }
+        catch (err) {
+            this.logEvent({ message: 'Error', fn: 'onRideKeyPadStatus', error: err.message, stack: err.stack });
+        }
+    }
     onDeviceInformation(m) {
         try {
             const envelope = DeviceDataEnvelope.fromBinary(m);
@@ -503,6 +554,7 @@ export class BleZwiftPlaySensor extends TBleSensor {
         this.isHubServiceActive = false;
         delete this.initHubServicePromise;
         delete this.prevHubSettings;
+        this.rideKeyPadStates = new Map();
     }
     getManufacturerData() {
         const data = this.peripheral.getManufacturerData();

package/lib/esm/modes/antble-smarttrainer.js

@@ -196,10 +196,13 @@ export default class SmartTrainerCyclingMode extends PowerBasedCyclingModeBase {
         const m = this.adapter?.getWeight() ?? 85;
         const vCurrent = this.data.speed * 1000 / 3600;
         const eKinCurrent = m * vCurrent * vCurrent / 2;
-        if (this.data.pedalRpm > 0) {
-            const virtualSpeed = calculateVirtualSpeed(this.data.pedalRpm, this.gearRatios[this.gear - 1]) * 3.6;
+        const cadence = this.data?.pedalRpm ?? 0;
+        const gear = this.gear ?? 1;
+        const simSlope = this.simSlope ?? 0;
+        if (cadence > 0) {
+            const virtualSpeed = calculateVirtualSpeed(cadence, this.gearRatios[gear - 1]) * 3.6;
             const v = virtualSpeed / 3.6;
-            const newPower = calc.calculatePower(m, virtualSpeed / 3.6, this.simSlope ?? 0);
+            const newPower = calc.calculatePower(m, virtualSpeed / 3.6, simSlope);
             const prevPower = this.data.power;
             const prev = (this.prevSimPower ?? prevPower ?? 0);
             const delta = newPower - prev;
@@ -215,7 +218,7 @@ export default class SmartTrainerCyclingMode extends PowerBasedCyclingModeBase {
                 this.logEvent({ message: 'set simulated power (gear change)', target: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, prevTarget: this.prevSimPower, actualPower: prevPower, newPower });
             }
             else if (changed === 'slope' || changed === 'cadence') {
-                const adjustTime = this.simSlope < 0 ? 5 : 3;
+                const adjustTime = (this.simSlope ?? 0) < 0 ? 5 : 3;
                 this.simPower = prev + delta / adjustTime;
                 this.logEvent({ message: `set simulated power (${changed} change)`, target: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, prevTarget: this.prevSimPower, actualPower: prevPower, newPower });
             }
@@ -306,9 +309,13 @@ export default class SmartTrainerCyclingMode extends PowerBasedCyclingModeBase {
                 else {
                     if (this.gear === undefined) {
                         const initialGear = intVal(this.getSetting('startGear'));
-                        this.gear = initialGear + request.gearDelta;
+                        this.gear = initialGear + (request.gearDelta ?? 0);
                     }
-                    newRequest.gearRatio = this.gearRatios[this.gear];
+                    if (this.gear < 1)
+                        this.gear = 1;
+                    if (this.gear > this.gearRatios.length - 1)
+                        this.gear = this.gearRatios.length - 1;
+                    newRequest.gearRatio = this.gearRatios[this.gear - 1];
                     this.logEvent({ message: 'gear initialized', gear: this.gear, gearRatio: newRequest.gearRatio });
                 }
                 break;
@@ -318,10 +325,10 @@ export default class SmartTrainerCyclingMode extends PowerBasedCyclingModeBase {
         }
     }
     verifySimPower() {
-        if (this.simPower < 0) {
+        if ((this.simPower ?? 0) < 0) {
             this.simPower = 0;
         }
-        if (this.data.pedalRpm > 0 && this.simPower < MIN_POWER) {
+        if ((this.data.pedalRpm ?? 0) > 0 && (this.simPower ?? 0) < MIN_POWER) {
             this.simPower = MIN_POWER;
         }
         if (!this.data.isPedalling) {

package/lib/esm/modes/types.js

@@ -67,4 +67,6 @@ export class CyclingMode {
     }
     confirmed(request) {
     }
+    onAdapterCapabilitiesChanged() {
+    }
 }

package/lib/esm/proto/zwift_hub.js

@@ -669,11 +669,12 @@ class RideKeyPadStatus$Type extends MessageType {
     constructor() {
         super("org.cagnulen.qdomyoszwift.RideKeyPadStatus", [
             { no: 1, name: "ButtonMap", kind: "scalar", jsonName: "ButtonMap", opt: true, T: 13 },
-            { no: 2, name: "AnalogButtons", kind: "message", jsonName: "AnalogButtons", T: () => RideAnalogKeyGroup }
+            { no: 3, name: "AnalogButtons", kind: "message", jsonName: "AnalogButtons", repeat: 2, T: () => RideAnalogKeyPress }
         ]);
     }
     create(value) {
         const message = globalThis.Object.create((this.messagePrototype));
+        message.analogButtons = [];
         if (value !== undefined)
             reflectionMergePartial(this, message, value);
         return message;
@@ -686,8 +687,8 @@ class RideKeyPadStatus$Type extends MessageType {
                 case 1:
                     message.buttonMap = reader.uint32();
                     break;
-                case 2:
-                    message.analogButtons = RideAnalogKeyGroup.internalBinaryRead(reader, reader.uint32(), options, message.analogButtons);
+                case 3:
+                    message.analogButtons.push(RideAnalogKeyPress.internalBinaryRead(reader, reader.uint32(), options));
                     break;
                 default:
                     let u = options.readUnknownField;
@@ -703,8 +704,8 @@ class RideKeyPadStatus$Type extends MessageType {
     internalBinaryWrite(message, writer, options) {
         if (message.buttonMap !== undefined)
             writer.tag(1, WireType.Varint).uint32(message.buttonMap);
-        if (message.analogButtons)
-            RideAnalogKeyGroup.internalBinaryWrite(message.analogButtons, writer.tag(2, WireType.LengthDelimited).fork(), options).join();
+        for (let i = 0; i < message.analogButtons.length; i++)
+            RideAnalogKeyPress.internalBinaryWrite(message.analogButtons[i], writer.tag(3, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);

package/lib/types/ble/zwift/play/sensor.d.ts

@@ -27,6 +27,7 @@ export declare class BleZwiftPlaySensor extends TBleSensor {
     protected prevClickMessage: string;
     protected upState: ButtonState;
     protected downState: ButtonState;
+    protected rideKeyPadStates: Map<number, ButtonState>;
     protected deviceType: DeviceType;
     protected publicKey: Buffer;
     protected privateKey: Buffer;
@@ -56,6 +57,7 @@ export declare class BleZwiftPlaySensor extends TBleSensor {
     sendHubCommand(command: HubCommand): Promise<Buffer<ArrayBufferLike>>;
     protected onTrainerResponse(m: Buffer): void;
     protected onRidingData(m: Buffer): void;
+    protected onRideKeyPadStatus(m: Buffer): void;
     protected onDeviceInformation(m: Buffer): void;
     onClickButtonMessage(d: Buffer): void;
     onPingMessage(message: Buffer): void;

package/lib/types/modes/antble-smarttrainer.d.ts

@@ -28,14 +28,14 @@ export default class SmartTrainerCyclingMode extends PowerBasedCyclingModeBase i
         })[];
     };
     protected gearDelta: number;
-    protected gear: number;
-    protected tsStart: number;
-    protected simPower: number;
-    protected simSlope: number;
-    protected maintainPower: number;
-    protected prevData: any;
-    protected prevEkin: number;
-    protected prevSimPower: number;
+    protected gear?: number;
+    protected tsStart?: number;
+    protected simPower?: number;
+    protected simSlope?: number;
+    protected maintainPower?: number;
+    protected prevData?: any;
+    protected prevEkin?: number;
+    protected prevSimPower?: number;
     protected readonly gearRatios: number[];
     constructor(adapter: IAdapter, props?: any);
     getBikeInitRequest(): UpdateRequest;
@@ -58,6 +58,6 @@ export default class SmartTrainerCyclingMode extends PowerBasedCyclingModeBase i
     getData(): Partial<IncyclistBikeData>;
     protected updateRequired(request?: UpdateRequest): boolean;
     sendBikeUpdate(incoming: UpdateRequest): UpdateRequest;
-    protected getGearString(): string;
+    protected getGearString(): string | undefined;
     protected getFeatureToogle(): import("../features/features.js").FeatureToggle;
 }

package/lib/types/modes/base.d.ts

@@ -5,7 +5,7 @@ export declare abstract class CyclingModeBase extends CyclingMode implements ICy
     adapter: IAdapter;
     settings: Settings;
     properties: Settings;
-    localConfig: CyclingModeConfig;
+    localConfig?: CyclingModeConfig;
     protected static config: CyclingModeConfig;
     protected static isERG: boolean;
     protected prevUpdate: UpdateRequest;

package/lib/types/modes/types.d.ts

@@ -47,7 +47,7 @@ export default interface ICyclingMode {
     buildUpdate(request: UpdateRequest): UpdateRequest;
     confirmed(request: UpdateRequest): void;
     updateData(data: IncyclistBikeData): IncyclistBikeData;
-    setSettings(settings: any): any;
+    setSettings(settings: any): void;
     setSetting(name: string, value: any): void;
     getSetting(name: string): any;
     getSettings(): Settings;
@@ -88,4 +88,5 @@ export declare class CyclingMode implements ICyclingMode {
     resetConfig(): void;
     getData(): Partial<IncyclistBikeData>;
     confirmed(request: UpdateRequest): void;
+    onAdapterCapabilitiesChanged(): void;
 }

package/lib/types/proto/zwift_hub.d.ts

@@ -65,7 +65,7 @@ export interface RideAnalogKeyGroup {
 }
 export interface RideKeyPadStatus {
     buttonMap?: number;
-    analogButtons?: RideAnalogKeyGroup;
+    analogButtons: RideAnalogKeyPress[];
 }
 export interface TrainerResponse {
     unknown?: number;

package/lib/types/types/interface.d.ts

@@ -10,7 +10,7 @@ export type InterfaceProps = {
 export interface IncyclistInterface extends EventEmitter {
     getName(): string;
     setBinding(binding: any): void;
-    connect(): Promise<boolean>;
+    connect(reconnect?: boolean): Promise<boolean>;
     disconnect(): Promise<boolean>;
     terminate(): Promise<void>;
     isConnected(): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "incyclist-devices",
-    "version": "3.0.14",
+    "version": "3.0.16",
     "scripts": {
         "lint": "eslint . --ext .ts",
         "build": "npm run build:esm && npm run build:cjs",
@@ -31,6 +31,7 @@
         "@serialport/binding-mock": "^10.2.2",
         "@serialport/bindings-cpp": "^13.0.1",
         "@stoprocent/noble": "^2.4.0",
+        "@types/jest": "^30.0.0",
         "@types/node": "^25.6.0",
         "@typescript-eslint/eslint-plugin": "^8.59.0",
         "@typescript-eslint/parser": "^8.59.0",