incyclist-devices 3.0.15 → 3.0.17

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

@@ -29,7 +29,8 @@ class BleAdapter extends adpater_js_1.default {
         if (settings.name?.match(/\d/g) || settings.address === undefined)
             return this.getName();
         else {
-            const addressHash = settings.id?.slice(-4)?.toUpperCase() ?? (settings.address?.substring(0, 2) ?? '') + (settings.address?.slice(-2) ?? '');
+            const id = (settings.id ?? settings.address ?? '').replace(/[:\-]/g, '');
+            const addressHash = id.length > 4 ? id.slice(-4).toUpperCase() : id.toUpperCase();
             return `${this.getName()} ${addressHash}`;
         }
     }

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

@@ -267,7 +267,7 @@ class BleInterface extends node_events_1.EventEmitter {
         return new peripheral_js_1.BlePeripheral(announcement);
     }
     createPeripheralFromSettings(settings) {
-        const info = this.getAll().find(a => a.service?.name === settings.name || a.service?.peripheral?.address === settings.address);
+        const info = this.getAll().find(a => a.service?.peripheral?.address === settings.address);
         if (!info?.service)
             return null;
         return this.createPeripheral(info.service);
@@ -281,7 +281,7 @@ class BleInterface extends node_events_1.EventEmitter {
             if (!wasDiscovering)
                 this.startPeripheralScan();
             const onDevice = (device) => {
-                if (device.name === settings.name || device.address === settings.address) {
+                if (device.address === settings.address) {
                     const peripheral = this.createPeripheralFromSettings(device);
                     if (peripheral) {
                         this.off('device', onDevice);
@@ -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 });
@@ -581,7 +588,7 @@ class BleInterface extends node_events_1.EventEmitter {
         return supported.length > 0;
     }
     find(service) {
-        return this.services.find(a => a.service.name === service.name && a.ts > Date.now() - BLE_EXPIRATION_TIMEOUT);
+        return this.services.find(a => a.service.name === service.name && a.service?.peripheral?.address && a.ts > Date.now() - BLE_EXPIRATION_TIMEOUT);
     }
     getAll() {
         return this.services.filter(a => a.ts > Date.now() - BLE_EXPIRATION_TIMEOUT);

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

@@ -250,7 +250,6 @@ 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 });
-            this.updateCyclingModeConfig();
         }
     }
     updateCapabilitiesFromFeatures(features) {

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

@@ -11,6 +11,7 @@ const index_js_1 = require("../../../types/index.js");
 class ZwiftPlayAdapter extends adapter_js_1.default {
     static INCYCLIST_PROFILE_NAME = 'Controller';
     static CAPABILITIES = [index_js_1.IncyclistCapability.AppControl];
+    keyPressedHandler;
     constructor(settings, props) {
         super(settings, props);
         this.logger = new gd_eventlog_1.EventLogger('ZwiftPlay');
@@ -25,9 +26,13 @@ class ZwiftPlayAdapter extends adapter_js_1.default {
             let connected = await super.startSensor();
             if (connected) {
                 const sensor = this.getSensor();
-                sensor.on('key-pressed', (event) => {
-                    this.emit('key-pressed', this.getSettings(), event);
-                });
+                if (this.keyPressedHandler) {
+                    sensor.off('key-pressed', this.keyPressedHandler);
+                }
+                else {
+                    this.keyPressedHandler = this.onKeyPressed.bind(this);
+                }
+                sensor.on('key-pressed', this.keyPressedHandler);
             }
             return connected;
         }
@@ -36,10 +41,18 @@ class ZwiftPlayAdapter extends adapter_js_1.default {
             return false;
         }
     }
+    onKeyPressed(event) {
+        this.emit('key-pressed', this.getSettings(), event);
+    }
+    isEqual(settings) {
+        const equal = super.isEqual(settings) &&
+            settings.address == this.settings.address;
+        return equal;
+    }
     isSame(adapter) {
         if (!(adapter instanceof ZwiftPlayAdapter))
             return false;
-        return this.isEqual(adapter.settings);
+        return this.isEqual(adapter.settings) && this.getUniqueName() === adapter.getUniqueName();
     }
     updateSensor(peripheral) {
         this.device = new sensor_js_1.BleZwiftPlaySensor(peripheral, { logger: this.logger });
@@ -47,6 +60,22 @@ class ZwiftPlayAdapter extends adapter_js_1.default {
     getProfile() {
         return ZwiftPlayAdapter.INCYCLIST_PROFILE_NAME;
     }
+    getUniqueName() {
+        return this.getName();
+    }
+    getName() {
+        const settings = this.settings;
+        let name = settings.name;
+        if (settings.name === 'Zwift-Ride') {
+            if (this.device.getDeviceType() === 'ride-left')
+                name = name + '-L';
+            if (this.device.getDeviceType() === 'ride-right')
+                name = name + '-R';
+        }
+        const id = (settings.id ?? settings.address ?? '').replace(/[:\-]/g, '');
+        const addressHash = id.length > 4 ? id.slice(-4).toUpperCase() : id.toUpperCase();
+        return `${name} ${addressHash}`;
+    }
     getDisplayName() {
         return this.getName();
     }

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;
@@ -66,6 +67,42 @@ class BleZwiftPlaySensor extends sensor_js_1.TBleSensor {
     getRequiredCharacteristics() {
         return ['00000002-19ca-4651-86e5-fa29dcdd09d1', '00000004-19ca-4651-86e5-fa29dcdd09d1'];
     }
+    getDeviceType() {
+        if (this.deviceType)
+            return this.deviceType;
+        if (this.isFM) {
+            this.deviceType = 'hub';
+        }
+        else if (this.peripheral?.getManufacturerData) {
+            const manufacturerData = this.getManufacturerData();
+            if (manufacturerData?.startsWith('4a09')) {
+                const typeVal = Number('0x' + manufacturerData.substring(2, 4));
+                if (typeVal === 9) {
+                    this.deviceType = 'click';
+                    this.encrypted = false;
+                }
+                else if (typeVal === 2) {
+                    this.deviceType = 'right';
+                }
+                else if (typeVal === 3) {
+                    this.deviceType = 'left';
+                }
+                else if (typeVal === 7) {
+                    this.deviceType = 'ride-right';
+                }
+                else if (typeVal === 8) {
+                    this.deviceType = 'ride-left';
+                }
+            }
+        }
+        console.log('# [ZwiftPlay] device type ', this.deviceType, this.peripheral?.getInfo().name, this.peripheral?.getInfo().address);
+        if (!this.deviceType && !this.encryptedSupported()) {
+            this.deviceType = 'click';
+            this.encrypted = false;
+        }
+        this.deviceType = this.deviceType ?? 'click';
+        return this.deviceType;
+    }
     onData(characteristic, data, isNotify) {
         const uuid = (0, utils_js_1.beautifyUUID)(characteristic).toLowerCase();
         if (uuid === '00000002-19ca-4651-86e5-fa29dcdd09d1') {
@@ -153,7 +190,6 @@ class BleZwiftPlaySensor extends sensor_js_1.TBleSensor {
     }
     onMeasurement(d) {
         const data = Buffer.from(d);
-        this.logEvent({ message: 'got hub notification', raw: data.toString('hex') });
         if (data?.length < 1) {
             console.log('Invalid click measurement data', data.toString('hex'));
             return false;
@@ -172,15 +208,19 @@ 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);
         }
         else if (type === 0x3c) {
             this.onDeviceInformation(message);
         }
+        else if (type === 0x15) {
+        }
         else {
-            console.log('Unknown click measurement type', type, message.toString('hex'));
-            this.emit('data', { raw: data.toString('hex') });
+            this.logEvent({ message: 'got hub notification', raw: data.toString('hex') });
         }
         return true;
     }
@@ -285,6 +325,55 @@ 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([
+                [0x01, 'left'],
+                [0x02, 'up'],
+                [0x04, 'right'],
+                [0x08, 'down'],
+                [0x10, 'a'],
+                [0x20, 'b'],
+                [0x40, 'y'],
+                [0x80, 'z'],
+                [0x0100, 'l-shift-up'],
+                [0x0200, 'l-shift-down'],
+                [0x1000, 'r-shift-up'],
+                [0x2000, 'r-shift-down'],
+                [0x0400, 'l-power-up'],
+                [0x4000, 'r-power-up'],
+                [0x0800, 'l-power'],
+                [0x8000, 'r-power'],
+            ]);
+            const buttonMap = data.buttonMap ?? 0;
+            const currentPresses = new Set();
+            const address = this.peripheral?.getInfo()?.address;
+            const name = this.peripheral?.getInfo()?.name;
+            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.logEvent({ message: 'key pressed', key: keyName, name, address, duration, deviceType: this.deviceType });
+                    this.emit('key-pressed', { key: keyName, duration, deviceType: this.deviceType });
+                    this.rideKeyPadStates.set(bit, { pressed: false, timestamp: Date.now() });
+                }
+            });
+        }
+        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);
@@ -312,6 +401,8 @@ class BleZwiftPlaySensor extends sensor_js_1.TBleSensor {
     }
     onClickButtonMessage(d) {
         try {
+            const address = this.peripheral?.getInfo()?.address;
+            const name = this.peripheral?.getInfo()?.name;
             const message = Buffer.from(d);
             const messageStr = message.toString('hex');
             if (messageStr === this.prevClickMessage) {
@@ -322,6 +413,7 @@ class BleZwiftPlaySensor extends sensor_js_1.TBleSensor {
                 const prev = { ...this.upState };
                 this.upState = { pressed: false, timestamp: Date.now() };
                 if (prev.pressed) {
+                    this.logEvent({ message: 'key pressed', key: 'up', name, address, duration: this.upState.timestamp - prev.timestamp, deviceType: this.deviceType });
                     this.emit('key-pressed', { key: 'up', duration: this.upState.timestamp - prev.timestamp, deviceType: this.deviceType });
                 }
             }
@@ -332,6 +424,7 @@ class BleZwiftPlaySensor extends sensor_js_1.TBleSensor {
                 const prev = { ...this.downState };
                 this.downState = { pressed: false, timestamp: Date.now() };
                 if (prev.pressed) {
+                    this.logEvent({ message: 'key pressed', key: 'down', name, address, duration: this.downState.timestamp - prev.timestamp, deviceType: this.deviceType });
                     this.emit('key-pressed', { key: 'down', duration: this.downState.timestamp - prev.timestamp, deviceType: this.deviceType });
                 }
             }
@@ -430,7 +523,7 @@ class BleZwiftPlaySensor extends sensor_js_1.TBleSensor {
                 this.deviceType = 'hub';
                 this.encrypted = false;
             }
-            else if (this.peripheral.getManufacturerData) {
+            else if (this.peripheral?.getManufacturerData) {
                 manufacturerData = this.getManufacturerData();
                 if (manufacturerData?.startsWith('4a09')) {
                     const typeVal = Number('0x' + manufacturerData.substring(2, 4));
@@ -444,6 +537,12 @@ class BleZwiftPlaySensor extends sensor_js_1.TBleSensor {
                     else if (typeVal === 3) {
                         this.deviceType = 'left';
                     }
+                    else if (typeVal === 7) {
+                        this.deviceType = 'ride-right';
+                    }
+                    else if (typeVal === 8) {
+                        this.deviceType = 'ride-left';
+                    }
                 }
             }
             if (!this.deviceType && !this.encryptedSupported()) {
@@ -451,7 +550,7 @@ class BleZwiftPlaySensor extends sensor_js_1.TBleSensor {
                 this.encrypted = false;
             }
             this.deviceType = this.deviceType ?? 'click';
-            this.logEvent({ message: 'Play protocol pairing info', deviceType: this.deviceType, encrypted: this.encrypted, manufacturerData });
+            this.logEvent({ message: 'Play protocol pairing info', deviceType: this.deviceType, encrypted: this.encrypted, manufacturerData: this.getManufacturerData() });
             let message;
             if (this.isFM) {
                 message = Buffer.concat([Buffer.from('RideOn'), Buffer.from([0x02, 0x01])]);
@@ -468,7 +567,7 @@ class BleZwiftPlaySensor extends sensor_js_1.TBleSensor {
             this.logEvent({ message: `send rideOn` });
             await this.write((0, utils_js_1.fullUUID)('00000003-19ca-4651-86e5-fa29dcdd09d1'), message, { withoutResponse: true });
             this.isHubServicePaired = true;
-            this.logEvent({ message: 'pairing done', deviceType: this.deviceType, encrypted: this.encrypted, manufacturerData });
+            this.logEvent({ message: 'pairing done', deviceType: this.deviceType, encrypted: this.encrypted, manufacturerData: this.getManufacturerData() });
             return true;
         }
         catch (err) {
@@ -479,6 +578,15 @@ class BleZwiftPlaySensor extends sensor_js_1.TBleSensor {
     }
     reset() {
     }
+    getManufacturerData() {
+        const data = this.peripheral?.getManufacturerData?.();
+        if (typeof data === 'string')
+            return data;
+        if (Buffer.isBuffer(data)) {
+            return data.toString('hex');
+        }
+        return undefined;
+    }
     getCrypto() {
         let crypto = index_js_1.BindingsFactory.getInstance()?.getBinding()?.crypto;
         if (!crypto)
@@ -506,15 +614,7 @@ class BleZwiftPlaySensor extends sensor_js_1.TBleSensor {
         this.isHubServiceActive = false;
         delete this.initHubServicePromise;
         delete this.prevHubSettings;
-    }
-    getManufacturerData() {
-        const data = this.peripheral.getManufacturerData();
-        if (typeof data === 'string')
-            return data;
-        if (Buffer.isBuffer(data)) {
-            return data.toString('hex');
-        }
-        return undefined;
+        this.rideKeyPadStates = new Map();
     }
 }
 exports.BleZwiftPlaySensor = BleZwiftPlaySensor;

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

@@ -99,34 +99,40 @@ class SmartTrainerCyclingMode extends power_base_js_1.default {
         if (startGearIdx !== -1) {
             config.properties.splice(startGearIdx, 1);
         }
+        try {
+            const device = this.adapter?.getName();
+            this.logger.logEvent({ message: 'reset config', device });
+        }
+        catch { }
     }
     getConfig() {
         const config = super.getConfig();
-        const virtShiftEnabled = this.getFeatureToogle().has('VirtualShifting');
         let virtshift = config.properties.find(p => p.key === 'virtshift');
         let startGear = config.properties.find(p => p.key === 'startGear');
-        if (!virtshift && !this.adapter?.supportsVirtualShifting()) {
-            const options = virtShiftEnabled ? [
-                'Disabled',
-                { key: 'Incyclist', display: 'App only (beta)' },
-                { key: 'Mixed', display: 'App + Bike' }
-            ] :
-                [
+        if (!virtshift) {
+            const device = this.adapter?.getName();
+            const supportsZwift = this.adapter?.supportsVirtualShifting();
+            this.logger.logEvent({ message: 'prepare gear settings config', device, supportsZwift });
+            if (supportsZwift) {
+                const options = [
+                    'Disabled',
+                    { key: 'Incyclist', display: 'App only (beta)' },
+                    { key: 'Mixed', display: 'App + Bike' },
+                    { key: 'SmartTrainer', display: 'SmartTreiner (beta)' }
+                ];
+                virtshift = { key: 'virtshift', name: 'Virtual Shifting', description: 'Enable virtual shifting', type: types_js_1.CyclingModeProperyType.SingleSelect, options, default: 'Mixed' };
+                config.properties.push(virtshift);
+            }
+            else {
+                const options = [
                     'Disabled',
-                    { key: 'Mixed', display: 'Enabled' }
+                    { key: 'Incyclist', display: 'App only (beta)' },
+                    { key: 'Mixed', display: 'App + Bike' }
                 ];
-            virtshift = { key: 'virtshift', name: 'Virtual Shifting', description: 'Enable virtual shifting', type: types_js_1.CyclingModeProperyType.SingleSelect, options, default: 'Disabled' };
-            config.properties.push(virtshift);
-        }
-        if (!virtshift && virtShiftEnabled && this.adapter?.supportsVirtualShifting()) {
-            const options = [
-                'Disabled',
-                { key: 'Incyclist', display: 'App only (beta)' },
-                { key: 'Mixed', display: 'App + Bike' },
-                { key: 'SmartTrainer', display: 'SmartTreiner (beta)' }
-            ];
-            virtshift = { key: 'virtshift', name: 'Virtual Shifting', description: 'Enable virtual shifting', type: types_js_1.CyclingModeProperyType.SingleSelect, options, default: 'Mixed' };
-            config.properties.push(virtshift);
+                virtshift = { key: 'virtshift', name: 'Virtual Shifting', description: 'Enable virtual shifting', type: types_js_1.CyclingModeProperyType.SingleSelect, options, default: 'Disabled' };
+                config.properties.push(virtshift);
+            }
+            this.logger.logEvent({ message: 'gear settings config', config: config.properties });
         }
         if (virtshift && !startGear) {
             startGear = { key: 'startGear', name: 'Initial Gear', description: 'Initial Gear', type: types_js_1.CyclingModeProperyType.Integer, default: 12, min: 1, max: 24, condition: (s) => s?.virtshift === 'Incyclist' || s?.virtshift === 'SmartTrainer' };
@@ -234,10 +240,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 +262,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 +353,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 +369,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/adapter.js

@@ -24,7 +24,8 @@ export default class BleAdapter extends IncyclistDevice {
         if (settings.name?.match(/\d/g) || settings.address === undefined)
             return this.getName();
         else {
-            const addressHash = settings.id?.slice(-4)?.toUpperCase() ?? (settings.address?.substring(0, 2) ?? '') + (settings.address?.slice(-2) ?? '');
+            const id = (settings.id ?? settings.address ?? '').replace(/[:\-]/g, '');
+            const addressHash = id.length > 4 ? id.slice(-4).toUpperCase() : id.toUpperCase();
             return `${this.getName()} ${addressHash}`;
         }
     }

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;
@@ -264,7 +264,7 @@ export class BleInterface extends EventEmitter {
         return new BlePeripheral(announcement);
     }
     createPeripheralFromSettings(settings) {
-        const info = this.getAll().find(a => a.service?.name === settings.name || a.service?.peripheral?.address === settings.address);
+        const info = this.getAll().find(a => a.service?.peripheral?.address === settings.address);
         if (!info?.service)
             return null;
         return this.createPeripheral(info.service);
@@ -278,7 +278,7 @@ export class BleInterface extends EventEmitter {
             if (!wasDiscovering)
                 this.startPeripheralScan();
             const onDevice = (device) => {
-                if (device.name === settings.name || device.address === settings.address) {
+                if (device.address === settings.address) {
                     const peripheral = this.createPeripheralFromSettings(device);
                     if (peripheral) {
                         this.off('device', onDevice);
@@ -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 });
@@ -578,7 +585,7 @@ export class BleInterface extends EventEmitter {
         return supported.length > 0;
     }
     find(service) {
-        return this.services.find(a => a.service.name === service.name && a.ts > Date.now() - BLE_EXPIRATION_TIMEOUT);
+        return this.services.find(a => a.service.name === service.name && a.service?.peripheral?.address && a.ts > Date.now() - BLE_EXPIRATION_TIMEOUT);
     }
     getAll() {
         return this.services.filter(a => a.ts > Date.now() - BLE_EXPIRATION_TIMEOUT);

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

@@ -245,7 +245,6 @@ 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 });
-            this.updateCyclingModeConfig();
         }
     }
     updateCapabilitiesFromFeatures(features) {

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

@@ -5,6 +5,7 @@ import { IncyclistCapability } from '../../../types/index.js';
 export class ZwiftPlayAdapter extends BleAdapter {
     static INCYCLIST_PROFILE_NAME = 'Controller';
     static CAPABILITIES = [IncyclistCapability.AppControl];
+    keyPressedHandler;
     constructor(settings, props) {
         super(settings, props);
         this.logger = new EventLogger('ZwiftPlay');
@@ -19,9 +20,13 @@ export class ZwiftPlayAdapter extends BleAdapter {
             let connected = await super.startSensor();
             if (connected) {
                 const sensor = this.getSensor();
-                sensor.on('key-pressed', (event) => {
-                    this.emit('key-pressed', this.getSettings(), event);
-                });
+                if (this.keyPressedHandler) {
+                    sensor.off('key-pressed', this.keyPressedHandler);
+                }
+                else {
+                    this.keyPressedHandler = this.onKeyPressed.bind(this);
+                }
+                sensor.on('key-pressed', this.keyPressedHandler);
             }
             return connected;
         }
@@ -30,10 +35,18 @@ export class ZwiftPlayAdapter extends BleAdapter {
             return false;
         }
     }
+    onKeyPressed(event) {
+        this.emit('key-pressed', this.getSettings(), event);
+    }
+    isEqual(settings) {
+        const equal = super.isEqual(settings) &&
+            settings.address == this.settings.address;
+        return equal;
+    }
     isSame(adapter) {
         if (!(adapter instanceof ZwiftPlayAdapter))
             return false;
-        return this.isEqual(adapter.settings);
+        return this.isEqual(adapter.settings) && this.getUniqueName() === adapter.getUniqueName();
     }
     updateSensor(peripheral) {
         this.device = new BleZwiftPlaySensor(peripheral, { logger: this.logger });
@@ -41,6 +54,22 @@ export class ZwiftPlayAdapter extends BleAdapter {
     getProfile() {
         return ZwiftPlayAdapter.INCYCLIST_PROFILE_NAME;
     }
+    getUniqueName() {
+        return this.getName();
+    }
+    getName() {
+        const settings = this.settings;
+        let name = settings.name;
+        if (settings.name === 'Zwift-Ride') {
+            if (this.device.getDeviceType() === 'ride-left')
+                name = name + '-L';
+            if (this.device.getDeviceType() === 'ride-right')
+                name = name + '-R';
+        }
+        const id = (settings.id ?? settings.address ?? '').replace(/[:\-]/g, '');
+        const addressHash = id.length > 4 ? id.slice(-4).toUpperCase() : id.toUpperCase();
+        return `${name} ${addressHash}`;
+    }
     getDisplayName() {
         return this.getName();
     }

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;
@@ -63,6 +64,42 @@ export class BleZwiftPlaySensor extends TBleSensor {
     getRequiredCharacteristics() {
         return ['00000002-19ca-4651-86e5-fa29dcdd09d1', '00000004-19ca-4651-86e5-fa29dcdd09d1'];
     }
+    getDeviceType() {
+        if (this.deviceType)
+            return this.deviceType;
+        if (this.isFM) {
+            this.deviceType = 'hub';
+        }
+        else if (this.peripheral?.getManufacturerData) {
+            const manufacturerData = this.getManufacturerData();
+            if (manufacturerData?.startsWith('4a09')) {
+                const typeVal = Number('0x' + manufacturerData.substring(2, 4));
+                if (typeVal === 9) {
+                    this.deviceType = 'click';
+                    this.encrypted = false;
+                }
+                else if (typeVal === 2) {
+                    this.deviceType = 'right';
+                }
+                else if (typeVal === 3) {
+                    this.deviceType = 'left';
+                }
+                else if (typeVal === 7) {
+                    this.deviceType = 'ride-right';
+                }
+                else if (typeVal === 8) {
+                    this.deviceType = 'ride-left';
+                }
+            }
+        }
+        console.log('# [ZwiftPlay] device type ', this.deviceType, this.peripheral?.getInfo().name, this.peripheral?.getInfo().address);
+        if (!this.deviceType && !this.encryptedSupported()) {
+            this.deviceType = 'click';
+            this.encrypted = false;
+        }
+        this.deviceType = this.deviceType ?? 'click';
+        return this.deviceType;
+    }
     onData(characteristic, data, isNotify) {
         const uuid = beautifyUUID(characteristic).toLowerCase();
         if (uuid === '00000002-19ca-4651-86e5-fa29dcdd09d1') {
@@ -150,7 +187,6 @@ export class BleZwiftPlaySensor extends TBleSensor {
     }
     onMeasurement(d) {
         const data = Buffer.from(d);
-        this.logEvent({ message: 'got hub notification', raw: data.toString('hex') });
         if (data?.length < 1) {
             console.log('Invalid click measurement data', data.toString('hex'));
             return false;
@@ -169,15 +205,19 @@ 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);
         }
         else if (type === 0x3c) {
             this.onDeviceInformation(message);
         }
+        else if (type === 0x15) {
+        }
         else {
-            console.log('Unknown click measurement type', type, message.toString('hex'));
-            this.emit('data', { raw: data.toString('hex') });
+            this.logEvent({ message: 'got hub notification', raw: data.toString('hex') });
         }
         return true;
     }
@@ -282,6 +322,55 @@ 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([
+                [0x01, 'left'],
+                [0x02, 'up'],
+                [0x04, 'right'],
+                [0x08, 'down'],
+                [0x10, 'a'],
+                [0x20, 'b'],
+                [0x40, 'y'],
+                [0x80, 'z'],
+                [0x0100, 'l-shift-up'],
+                [0x0200, 'l-shift-down'],
+                [0x1000, 'r-shift-up'],
+                [0x2000, 'r-shift-down'],
+                [0x0400, 'l-power-up'],
+                [0x4000, 'r-power-up'],
+                [0x0800, 'l-power'],
+                [0x8000, 'r-power'],
+            ]);
+            const buttonMap = data.buttonMap ?? 0;
+            const currentPresses = new Set();
+            const address = this.peripheral?.getInfo()?.address;
+            const name = this.peripheral?.getInfo()?.name;
+            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.logEvent({ message: 'key pressed', key: keyName, name, address, duration, deviceType: this.deviceType });
+                    this.emit('key-pressed', { key: keyName, duration, deviceType: this.deviceType });
+                    this.rideKeyPadStates.set(bit, { pressed: false, timestamp: Date.now() });
+                }
+            });
+        }
+        catch (err) {
+            this.logEvent({ message: 'Error', fn: 'onRideKeyPadStatus', error: err.message, stack: err.stack });
+        }
+    }
     onDeviceInformation(m) {
         try {
             const envelope = DeviceDataEnvelope.fromBinary(m);
@@ -309,6 +398,8 @@ export class BleZwiftPlaySensor extends TBleSensor {
     }
     onClickButtonMessage(d) {
         try {
+            const address = this.peripheral?.getInfo()?.address;
+            const name = this.peripheral?.getInfo()?.name;
             const message = Buffer.from(d);
             const messageStr = message.toString('hex');
             if (messageStr === this.prevClickMessage) {
@@ -319,6 +410,7 @@ export class BleZwiftPlaySensor extends TBleSensor {
                 const prev = { ...this.upState };
                 this.upState = { pressed: false, timestamp: Date.now() };
                 if (prev.pressed) {
+                    this.logEvent({ message: 'key pressed', key: 'up', name, address, duration: this.upState.timestamp - prev.timestamp, deviceType: this.deviceType });
                     this.emit('key-pressed', { key: 'up', duration: this.upState.timestamp - prev.timestamp, deviceType: this.deviceType });
                 }
             }
@@ -329,6 +421,7 @@ export class BleZwiftPlaySensor extends TBleSensor {
                 const prev = { ...this.downState };
                 this.downState = { pressed: false, timestamp: Date.now() };
                 if (prev.pressed) {
+                    this.logEvent({ message: 'key pressed', key: 'down', name, address, duration: this.downState.timestamp - prev.timestamp, deviceType: this.deviceType });
                     this.emit('key-pressed', { key: 'down', duration: this.downState.timestamp - prev.timestamp, deviceType: this.deviceType });
                 }
             }
@@ -427,7 +520,7 @@ export class BleZwiftPlaySensor extends TBleSensor {
                 this.deviceType = 'hub';
                 this.encrypted = false;
             }
-            else if (this.peripheral.getManufacturerData) {
+            else if (this.peripheral?.getManufacturerData) {
                 manufacturerData = this.getManufacturerData();
                 if (manufacturerData?.startsWith('4a09')) {
                     const typeVal = Number('0x' + manufacturerData.substring(2, 4));
@@ -441,6 +534,12 @@ export class BleZwiftPlaySensor extends TBleSensor {
                     else if (typeVal === 3) {
                         this.deviceType = 'left';
                     }
+                    else if (typeVal === 7) {
+                        this.deviceType = 'ride-right';
+                    }
+                    else if (typeVal === 8) {
+                        this.deviceType = 'ride-left';
+                    }
                 }
             }
             if (!this.deviceType && !this.encryptedSupported()) {
@@ -448,7 +547,7 @@ export class BleZwiftPlaySensor extends TBleSensor {
                 this.encrypted = false;
             }
             this.deviceType = this.deviceType ?? 'click';
-            this.logEvent({ message: 'Play protocol pairing info', deviceType: this.deviceType, encrypted: this.encrypted, manufacturerData });
+            this.logEvent({ message: 'Play protocol pairing info', deviceType: this.deviceType, encrypted: this.encrypted, manufacturerData: this.getManufacturerData() });
             let message;
             if (this.isFM) {
                 message = Buffer.concat([Buffer.from('RideOn'), Buffer.from([0x02, 0x01])]);
@@ -465,7 +564,7 @@ export class BleZwiftPlaySensor extends TBleSensor {
             this.logEvent({ message: `send rideOn` });
             await this.write(fullUUID('00000003-19ca-4651-86e5-fa29dcdd09d1'), message, { withoutResponse: true });
             this.isHubServicePaired = true;
-            this.logEvent({ message: 'pairing done', deviceType: this.deviceType, encrypted: this.encrypted, manufacturerData });
+            this.logEvent({ message: 'pairing done', deviceType: this.deviceType, encrypted: this.encrypted, manufacturerData: this.getManufacturerData() });
             return true;
         }
         catch (err) {
@@ -476,6 +575,15 @@ export class BleZwiftPlaySensor extends TBleSensor {
     }
     reset() {
     }
+    getManufacturerData() {
+        const data = this.peripheral?.getManufacturerData?.();
+        if (typeof data === 'string')
+            return data;
+        if (Buffer.isBuffer(data)) {
+            return data.toString('hex');
+        }
+        return undefined;
+    }
     getCrypto() {
         let crypto = BindingsFactory.getInstance()?.getBinding()?.crypto;
         if (!crypto)
@@ -503,14 +611,6 @@ export class BleZwiftPlaySensor extends TBleSensor {
         this.isHubServiceActive = false;
         delete this.initHubServicePromise;
         delete this.prevHubSettings;
-    }
-    getManufacturerData() {
-        const data = this.peripheral.getManufacturerData();
-        if (typeof data === 'string')
-            return data;
-        if (Buffer.isBuffer(data)) {
-            return data.toString('hex');
-        }
-        return undefined;
+        this.rideKeyPadStates = new Map();
     }
 }

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

@@ -61,34 +61,40 @@ export default class SmartTrainerCyclingMode extends PowerBasedCyclingModeBase {
         if (startGearIdx !== -1) {
             config.properties.splice(startGearIdx, 1);
         }
+        try {
+            const device = this.adapter?.getName();
+            this.logger.logEvent({ message: 'reset config', device });
+        }
+        catch { }
     }
     getConfig() {
         const config = super.getConfig();
-        const virtShiftEnabled = this.getFeatureToogle().has('VirtualShifting');
         let virtshift = config.properties.find(p => p.key === 'virtshift');
         let startGear = config.properties.find(p => p.key === 'startGear');
-        if (!virtshift && !this.adapter?.supportsVirtualShifting()) {
-            const options = virtShiftEnabled ? [
-                'Disabled',
-                { key: 'Incyclist', display: 'App only (beta)' },
-                { key: 'Mixed', display: 'App + Bike' }
-            ] :
-                [
+        if (!virtshift) {
+            const device = this.adapter?.getName();
+            const supportsZwift = this.adapter?.supportsVirtualShifting();
+            this.logger.logEvent({ message: 'prepare gear settings config', device, supportsZwift });
+            if (supportsZwift) {
+                const options = [
+                    'Disabled',
+                    { key: 'Incyclist', display: 'App only (beta)' },
+                    { key: 'Mixed', display: 'App + Bike' },
+                    { key: 'SmartTrainer', display: 'SmartTreiner (beta)' }
+                ];
+                virtshift = { key: 'virtshift', name: 'Virtual Shifting', description: 'Enable virtual shifting', type: CyclingModeProperyType.SingleSelect, options, default: 'Mixed' };
+                config.properties.push(virtshift);
+            }
+            else {
+                const options = [
                     'Disabled',
-                    { key: 'Mixed', display: 'Enabled' }
+                    { key: 'Incyclist', display: 'App only (beta)' },
+                    { key: 'Mixed', display: 'App + Bike' }
                 ];
-            virtshift = { key: 'virtshift', name: 'Virtual Shifting', description: 'Enable virtual shifting', type: CyclingModeProperyType.SingleSelect, options, default: 'Disabled' };
-            config.properties.push(virtshift);
-        }
-        if (!virtshift && virtShiftEnabled && this.adapter?.supportsVirtualShifting()) {
-            const options = [
-                'Disabled',
-                { key: 'Incyclist', display: 'App only (beta)' },
-                { key: 'Mixed', display: 'App + Bike' },
-                { key: 'SmartTrainer', display: 'SmartTreiner (beta)' }
-            ];
-            virtshift = { key: 'virtshift', name: 'Virtual Shifting', description: 'Enable virtual shifting', type: CyclingModeProperyType.SingleSelect, options, default: 'Mixed' };
-            config.properties.push(virtshift);
+                virtshift = { key: 'virtshift', name: 'Virtual Shifting', description: 'Enable virtual shifting', type: CyclingModeProperyType.SingleSelect, options, default: 'Disabled' };
+                config.properties.push(virtshift);
+            }
+            this.logger.logEvent({ message: 'gear settings config', config: config.properties });
         }
         if (virtshift && !startGear) {
             startGear = { key: 'startGear', name: 'Initial Gear', description: 'Initial Gear', type: CyclingModeProperyType.Integer, default: 12, min: 1, max: 24, condition: (s) => s?.virtshift === 'Incyclist' || s?.virtshift === 'SmartTrainer' };
@@ -196,10 +202,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 +224,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 +315,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 +331,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/adapter.d.ts

@@ -7,12 +7,17 @@ import { BleDeviceSettings, IBlePeripheral } from '../../types.js';
 export declare class ZwiftPlayAdapter extends BleAdapter<BleDeviceData, BleZwiftPlaySensor> {
     protected static INCYCLIST_PROFILE_NAME: LegacyProfile;
     protected static CAPABILITIES: IncyclistCapability[];
+    protected keyPressedHandler?: (event: any) => void;
     constructor(settings: BleDeviceSettings, props?: DeviceProperties);
     protected checkCapabilities(): Promise<void>;
     startSensor(): Promise<boolean>;
+    protected onKeyPressed(event: any): void;
+    isEqual(settings: BleDeviceSettings): boolean;
     isSame(adapter: IAdapter): boolean;
     updateSensor(peripheral: IBlePeripheral): void;
     getProfile(): LegacyProfile;
+    getUniqueName(): string;
+    getName(): string;
     getDisplayName(): string;
     mapData(deviceData: BleDeviceData): IncyclistAdapterData;
 }

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

@@ -13,7 +13,7 @@ type BleZwiftPlaySensorProps = {
     logger?: EventLogger;
     isTrainer?: boolean;
 };
-type DeviceType = 'left' | 'right' | 'click' | 'hub';
+type DeviceType = 'left' | 'right' | 'click' | 'hub' | 'ride-left' | 'ride-right';
 export declare class BleZwiftPlaySensor extends TBleSensor {
     static readonly profile: LegacyProfile;
     static readonly protocol: BleProtocol;
@@ -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;
@@ -44,6 +45,7 @@ export declare class BleZwiftPlaySensor extends TBleSensor {
     reconnectSensor(): Promise<boolean>;
     stopSensor(): Promise<boolean>;
     protected getRequiredCharacteristics(): Array<string>;
+    getDeviceType(): DeviceType;
     onData(characteristic: string, data: Buffer, isNotify?: boolean): boolean;
     requestDataUpdate(dataId: number): Promise<void>;
     setSimulationData(data?: SimulationParam): Promise<void>;
@@ -56,6 +58,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;
@@ -63,10 +66,10 @@ export declare class BleZwiftPlaySensor extends TBleSensor {
     read(characteristic: string, ignoreErrors?: boolean): Promise<Buffer | null>;
     pair(): Promise<boolean>;
     reset(): void;
+    getManufacturerData(): string;
     protected getCrypto(): ICryptoBinding;
     protected encryptedSupported(): boolean;
     protected createKeyPair(): any;
     protected setInitialState(): void;
-    protected getManufacturerData(): string;
 }
 export {};

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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "incyclist-devices",
-    "version": "3.0.15",
+    "version": "3.0.17",
     "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",