incyclist-devices 2.3.37 → 2.3.39

package/lib/antv2/base/adapter.js

@@ -171,7 +171,7 @@ class AntAdapter extends adpater_1.default {
                         clearInterval(iv);
                         resolve(true);
                     }
-                    if (!this.promiseWaitForData || this.stopped) {
+                    if (this.promiseWaitForData === undefined || this.promiseWaitForData === null || this.stopped) {
                         resolve(false);
                         clearInterval(iv);
                     }
@@ -186,7 +186,7 @@ class AntAdapter extends adpater_1.default {
                 return true;
             }
             const tsStart = Date.now();
-            if (this.promiseWaitForData) {
+            if (this.promiseWaitForData !== undefined && this.promiseWaitForData !== null) {
                 let hasData = false;
                 try {
                     hasData = yield this.promiseWaitForData;
@@ -201,7 +201,7 @@ class AntAdapter extends adpater_1.default {
                 this.promiseWaitForData = null;
                 return hasData;
             }
-            catch (err) {
+            catch (_b) {
                 this.promiseWaitForData = null;
                 return false;
             }
@@ -257,7 +257,7 @@ class AntAdapter extends adpater_1.default {
             try {
                 return yield this.start();
             }
-            catch (error) {
+            catch (_a) {
                 return false;
             }
         });
@@ -350,7 +350,7 @@ class AntAdapter extends adpater_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
             this.startStatus.sensorStarted = this.sensorConnected;
-            if (this.startStatus.sensorStarted || this.startStatus.sensorStarted)
+            if (this.startStatus.sensorStarted)
                 return;
             this.logEvent({ message: 'start sensor', device: this.getName(), props });
             try {

package/lib/antv2/fe/adapter.js

@@ -53,7 +53,7 @@ class AntFEAdapter extends adapter_1.default {
                 return;
             }
             let isReset = request.reset && Object.keys(request).length === 1;
-            const update = isReset ? this.getCyclingMode().getBikeInitRequest() : this.getCyclingMode().sendBikeUpdate(request);
+            const update = isReset ? this.getCyclingMode().getBikeInitRequest() : this.getCyclingMode().buildUpdate(request);
             this.logEvent({ message: 'send bike update requested', device: this.getName(), update, request });
             try {
                 const fe = this.sensor;
@@ -76,7 +76,7 @@ class AntFEAdapter extends adapter_1.default {
                         yield this.reconnect();
                     }
                 }
-                this.logEvent({ message: 'sendBikeUpdate() error', device: this.getName(), error: err.message });
+                this.logEvent({ message: 'sendUpdate() error', device: this.getName(), error: err.message });
             }
         });
     }

package/lib/antv2/pwr/adapter.js

@@ -61,7 +61,7 @@ class AntPwrAdapter extends adapter_1.default {
             try {
                 if ((this.isPaused() || this.isStopped()) && !request.forced)
                     return;
-                return yield this.getCyclingMode().sendBikeUpdate(request);
+                return yield this.getCyclingMode().buildUpdate(request);
             }
             catch (err) {
                 this.logEvent({ message: 'Error', fn: 'sendUpdate', error: err.message });

package/lib/base/adpater.js

@@ -214,10 +214,9 @@ class IncyclistDevice extends events_1.default {
                 return;
             if (!request.enforced && (this.isPaused() || this.isStopped()))
                 return;
-            if (!this.hasCapability(types_1.IncyclistCapability.Control))
-                return this.getCyclingMode().sendBikeUpdate(request);
-            else
+            if (this.hasCapability(types_1.IncyclistCapability.Control))
                 throw new Error('method not implemented');
+            return this.getCyclingMode().buildUpdate(request);
         });
     }
     setUser(user) {

package/lib/ble/cp/adapter.js

@@ -92,7 +92,7 @@ class PwrAdapter extends adapter_1.default {
             try {
                 if (this.isPaused() || this.isStopped())
                     return;
-                return this.getCyclingMode().sendBikeUpdate(request);
+                return this.getCyclingMode().buildUpdate(request);
             }
             catch (err) {
                 this.logEvent({ message: 'Error', fn: 'BleCP:sendUpdate', error: err.message });

package/lib/ble/cp/sensor.js

@@ -69,7 +69,7 @@ class BleCyclingPowerDevice extends sensor_1.TBleSensor {
                 this.time = time;
             }
         }
-        catch (err) {
+        catch (_a) {
         }
         const { instantaneousPower, balance, accTorque, rpm, time } = this;
         return { instantaneousPower, balance, accTorque, rpm, time, raw: `2a63:${data.toString('hex')}` };

package/lib/ble/fm/adapter.d.ts

@@ -33,4 +33,5 @@ export default class BleFmAdapter extends BleAdapter<IndoorBikeData, BleFitnessM
     protected updateCapabilitiesFromFeatures(features: IndoorBikeFeatures): void;
     sendUpdate(request: any, enforced?: boolean): Promise<UpdateRequest | void>;
     sendInitCommands(): Promise<boolean>;
+    protected getFeatureToggle(): import("../../features").FeatureToggle;
 }

package/lib/ble/fm/adapter.js

@@ -23,6 +23,7 @@ const types_1 = require("../../types");
 const utils_1 = require("../../utils/utils");
 const utils_2 = require("../utils");
 const play_1 = require("../zwift/play");
+const features_1 = require("../../features");
 const ZWIFT_PLAY_UUID = '0000000119ca465186e5fa29dcdd09d1';
 class BleFmAdapter extends adapter_1.default {
     constructor(settings, props) {
@@ -49,6 +50,8 @@ class BleFmAdapter extends adapter_1.default {
     }
     supportsVirtualShifting() {
         var _a, _b;
+        if (!this.getFeatureToggle().has('VirtualShifting'))
+            return false;
         return (_b = (_a = this.device) === null || _a === void 0 ? void 0 : _a.getSupportedServiceUUids()) === null || _b === void 0 ? void 0 : _b.some(s => (0, utils_2.matches)(s, ZWIFT_PLAY_UUID));
     }
     getSupportedCyclingModes() {
@@ -264,7 +267,7 @@ class BleFmAdapter extends adapter_1.default {
             if (!enforced && (this.stopped && !this.isStarting()))
                 return;
             try {
-                const update = this.getCyclingMode().sendBikeUpdate(request);
+                const update = this.getCyclingMode().buildUpdate(request);
                 this.logEvent({ message: 'send bike update requested', profile: this.getProfile(), mode: (_a = this.getCyclingMode()) === null || _a === void 0 ? void 0 : _a.getName(), update, request });
                 const device = this.getSensor();
                 if (this.hasCapability(types_1.IncyclistCapability.Control)) {
@@ -284,7 +287,7 @@ class BleFmAdapter extends adapter_1.default {
                             if (!this.zwiftPlay) {
                                 this.initVirtualShifting();
                             }
-                            if (this.zwiftPlay && !isNaN(update.gearRatio)) {
+                            if (this.zwiftPlay && !Number.isNaN(update.gearRatio)) {
                                 let slope = (_a = update.slope) !== null && _a !== void 0 ? _a : 0;
                                 if (slope === 0)
                                     slope = 0.01;
@@ -335,6 +338,9 @@ class BleFmAdapter extends adapter_1.default {
             }
         });
     }
+    getFeatureToggle() {
+        return (0, features_1.useFeatureToggle)();
+    }
 }
 BleFmAdapter.INCYCLIST_PROFILE_NAME = 'Smart Trainer';
 exports.default = BleFmAdapter;

package/lib/ble/hr/sensor.js

@@ -20,7 +20,7 @@ class BleHrmDevice extends sensor_1.TBleSensor {
                 this.rr = (data.readUInt16LE(offset)) / 1024;
             }
         }
-        catch (err) {
+        catch (_a) {
         }
         const { heartrate, rr } = this;
         return { heartrate, rr, raw: data.toString('hex') };

package/lib/ble/utils.js

@@ -24,7 +24,7 @@ function uuid(s) {
     if (s) {
         if (s.includes('-')) {
             const parts = s.split('-');
-            const uuidNo = parseInt('0x' + parts[0]);
+            const uuidNo = Number.parseInt('0x' + parts[0]);
             return uuidNo.toString(16).toLowerCase();
         }
         return s;

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

@@ -52,7 +52,6 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
     }
     onData(characteristic, data, isNotify) {
         const uuid = (0, utils_1.beautifyUUID)(characteristic).toLowerCase();
-        console.log('# data', uuid, data === null || data === void 0 ? void 0 : data.toString('hex'));
         if (uuid === '00000002-19ca-4651-86e5-fa29dcdd09d1') {
             this.onMeasurement(data);
         }
@@ -387,7 +386,7 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
                     const { publicKey, privateKey } = this.createKeyPair();
                     this.privateKey = (_a = this.privateKey) !== null && _a !== void 0 ? _a : Buffer.from(privateKey);
                     this.publicKey = (_b = this.publicKey) !== null && _b !== void 0 ? _b : Buffer.from(publicKey);
-                    message = Buffer.concat([Buffer.from('RideOn'), Buffer.from([0x01, 0x02]), this.publicKey]);
+                    message = Buffer.concat([Buffer.from('RideOn'), Buffer.from([0x02, 0x03]), this.publicKey]);
                 }
                 yield this.write((0, utils_1.fullUUID)('00000003-19ca-4651-86e5-fa29dcdd09d1'), message, { withoutResponse: true });
                 this.isHubServicePaired = true;

package/lib/direct-connect/base/peripheral.js

@@ -154,7 +154,6 @@ class DirectConnectPeripheral {
             if (this.subscribed.includes(uuid)) {
                 return true;
             }
-            console.log('# subscribe ', characteristicUUID);
             const seqNo = this.getNextSeqNo();
             const message = new messages_1.EnableCharacteristicNotificationsMessage();
             const request = message.createRequest(seqNo, { characteristicUUID: (0, utils_1.parseUUID)(characteristicUUID), enable: true });

package/lib/direct-connect/messages/DiscoverCharacteristics.d.ts

@@ -18,5 +18,5 @@ export declare class DiscoverCharacteristicsMessage extends Message<TDCDiscoverC
     parseRequestBody(body: Buffer): TDCDiscoverCharacteristicsRequestBody;
     buildRequestBody(body: TDCDiscoverCharacteristicsRequestBody): Buffer;
     buildResponseBody(body: TDCDiscoverCharacteristicsResponseBody): Buffer;
-    parseResponseBody(body: Buffer): TDCDiscoverCharacteristicsResponseBody;
+    parseResponseBody(responseBody: Buffer): TDCDiscoverCharacteristicsResponseBody;
 }

package/lib/direct-connect/messages/DiscoverCharacteristics.js

@@ -25,9 +25,10 @@ class DiscoverCharacteristicsMessage extends message_1.Message {
         ]));
         return Buffer.concat([serviceUUIDBuffer, ...characteristicBuffers]);
     }
-    parseResponseBody(body) {
+    parseResponseBody(responseBody) {
+        const body = Buffer.from(responseBody);
         const length = body.length;
-        const serviceUUID = body.subarray(0, 16).toString("hex");
+        const serviceUUID = Buffer.from(body.subarray(0, 16)).toString("hex");
         const characteristicDefinitions = [];
         for (let i = 16; i < length; i += 17) {
             const characteristicUUID = Buffer.from(body.subarray(i, i + 16)).toString("hex");

package/lib/direct-connect/messages/DiscoverServices.d.ts

@@ -10,6 +10,6 @@ export interface TDCDiscoverServicesResponseBody extends TDCBody {
 export declare class DiscoverServiceMessage extends Message<EmptyBody, TDCDiscoverServicesResponseBody> {
     constructor();
     buildResponseBody(body: TDCDiscoverServicesResponseBody): Buffer;
-    parseResponseBody(body: Buffer): TDCDiscoverServicesResponseBody;
+    parseResponseBody(responseBody: Buffer): TDCDiscoverServicesResponseBody;
     verifyHeader(header: TDCMessageHeader): boolean;
 }

package/lib/direct-connect/messages/DiscoverServices.js

@@ -12,13 +12,15 @@ class DiscoverServiceMessage extends message_1.Message {
         const serviceBuffers = body.serviceDefinitions.map((service) => {
             return Buffer.from(service.serviceUUID, "hex");
         });
-        return Buffer.concat(serviceBuffers);
+        const response = Buffer.concat(serviceBuffers);
+        return response;
     }
-    parseResponseBody(body) {
+    parseResponseBody(responseBody) {
+        const body = Buffer.from(responseBody);
         const serviceDefinitions = [];
         const length = body.length;
         for (let i = 0; i < length; i += 16) {
-            const serviceUUID = body.subarray(i, i + 16).toString("hex");
+            const serviceUUID = Buffer.from(body.subarray(i, i + 16)).toString("hex");
             serviceDefinitions.push({ serviceUUID });
         }
         return { serviceDefinitions };

package/lib/direct-connect/messages/message.d.ts

@@ -9,7 +9,7 @@ export declare class Message<TReq extends TDCBody, TRes extends TDCBody> {
     createRequest(seqNum: any, body: TReq): Buffer;
     parseRequest(buffer: Buffer): TDCRequest<TReq>;
     prepareResponse(request: TDCRequest<TReq>, respCode: number, body: TRes): TDCResponse<TRes>;
-    parseResponse(buffer: Buffer): TDCResponse<TRes>;
+    parseResponse(response: Buffer): TDCResponse<TRes>;
     buildHeader(header: TDCMessageHeader, length: number): Buffer;
     buildResponseBody(body: TRes): Buffer;
     buildRequestBody(body: TReq): Buffer;

package/lib/direct-connect/messages/message.js

@@ -40,7 +40,8 @@ class Message {
         const header = Object.assign(Object.assign({}, request.header), { respCode });
         return { header, body };
     }
-    parseResponse(buffer) {
+    parseResponse(response) {
+        const buffer = Buffer.from(response);
         const header = (0, exports.parseHeader)(buffer);
         this.verifyHeader(header);
         const bodyBuffer = buffer.subarray(6);

package/lib/features/features.d.ts

@@ -0,0 +1,11 @@
+export type Feature = 'VirtualShifting';
+export declare class FeatureToggle {
+    protected static _instance: FeatureToggle;
+    static getInstance(): FeatureToggle;
+    protected enabled: Array<string>;
+    constructor();
+    add(feature: Feature): void;
+    remove(feature: Feature): void;
+    has(feature: Feature): boolean;
+}
+export declare const useFeatureToggle: () => FeatureToggle;

package/lib/features/features.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useFeatureToggle = exports.FeatureToggle = void 0;
+class FeatureToggle {
+    static getInstance() {
+        if (!FeatureToggle._instance)
+            FeatureToggle._instance = new FeatureToggle();
+        return FeatureToggle._instance;
+    }
+    constructor() {
+        this.enabled = [];
+    }
+    add(feature) {
+        this.enabled.push(feature);
+    }
+    remove(feature) {
+        const index = this.enabled.indexOf(feature);
+        if (index > -1)
+            this.enabled.splice(index, 1);
+    }
+    has(feature) {
+        return this.enabled.includes(feature);
+    }
+}
+exports.FeatureToggle = FeatureToggle;
+const useFeatureToggle = () => {
+    return FeatureToggle.getInstance();
+};
+exports.useFeatureToggle = useFeatureToggle;

package/lib/features/index.d.ts

@@ -0,0 +1 @@
+export * from './features';

package/lib/features/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./features"), exports);

package/lib/index.d.ts

@@ -13,4 +13,5 @@ export * from './serial';
 export * from './ble';
 export * from './antv2';
 export * from './direct-connect';
+export * from './features';
 export { IAdapter, IncyclistDevice, IncyclistDeviceAdapter, DeviceSettings, DeviceProperties, AdapterFactory, InterfaceFactory, IncyclistInterface, INTERFACE, InterfaceProps, ICyclingMode, IncyclistAdapterData as DeviceData, IncyclistCapability, calc, };

package/lib/index.js

@@ -35,3 +35,4 @@ __exportStar(require("./serial"), exports);
 __exportStar(require("./ble"), exports);
 __exportStar(require("./antv2"), exports);
 __exportStar(require("./direct-connect"), exports);
+__exportStar(require("./features"), exports);

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

@@ -32,6 +32,7 @@ export default class SmartTrainerCyclingMode extends PowerBasedCyclingModeBase i
     protected tsStart: number;
     protected simPower: number;
     protected simSlope: number;
+    protected prevData: any;
     protected readonly gearRatios: number[];
     constructor(adapter: IAdapter, props?: any);
     getBikeInitRequest(): UpdateRequest;
@@ -43,13 +44,17 @@ export default class SmartTrainerCyclingMode extends PowerBasedCyclingModeBase i
     protected checkSlopeWithSlopeDelta(request: UpdateRequest, newRequest?: UpdateRequest): void;
     protected checkSlopeWithSimulatedShifting(request: UpdateRequest, newRequest?: UpdateRequest): void;
     checkSlope(request: UpdateRequest, newRequest?: UpdateRequest): void;
+    checkCadenceChange(request: UpdateRequest, newRequest?: UpdateRequest): void;
+    calculateSimulatedPower(request: UpdateRequest): void;
     checkGearChange(request: UpdateRequest, newRequest?: UpdateRequest): void;
     protected verifySimPower(): void;
     protected checkEmptyRequest(newRequest: UpdateRequest): void;
     protected getVirtualShiftMode(): VirtshiftMode;
     updateData(bikeData: IncyclistBikeData, log?: boolean): IncyclistBikeData;
     getData(): Partial<IncyclistBikeData>;
+    protected updateRequired(request?: UpdateRequest): boolean;
     sendBikeUpdate(incoming: UpdateRequest): UpdateRequest;
     protected getGearString(): string;
+    protected getFeatureToogle(): import("../features").FeatureToggle;
 }
 export {};

package/lib/modes/antble-smarttrainer.js

@@ -39,6 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("./types");
 const power_base_1 = __importDefault(require("./power-base"));
 const calculations_1 = __importStar(require("../utils/calculations"));
+const features_1 = require("../features");
 const MIN_POWER = 25;
 class SmartTrainerCyclingMode extends power_base_1.default {
     constructor(adapter, props) {
@@ -71,6 +72,9 @@ class SmartTrainerCyclingMode extends power_base_1.default {
     }
     getConfig() {
         const config = super.getConfig();
+        if (!this.getFeatureToogle().has('VirtualShifting')) {
+            return config;
+        }
         let virtshift = config.properties.find(p => p.key === 'virtshift');
         let startGear = config.properties.find(p => p.key === 'startGear');
         if (!virtshift) {
@@ -90,7 +94,7 @@ class SmartTrainerCyclingMode extends power_base_1.default {
     }
     checkSlopeNoShiftig(request, newRequest = {}) {
         if (request.slope !== undefined) {
-            const targetSlope = newRequest.slope = parseFloat(request.slope.toFixed(1));
+            const targetSlope = newRequest.slope = Number.parseFloat(request.slope.toFixed(1));
             this.data.slope = newRequest.slope;
             try {
                 const slopeAdj = targetSlope >= 0 ? this.getSetting('slopeAdj') : this.getSetting('slopeAdjDown');
@@ -112,7 +116,7 @@ class SmartTrainerCyclingMode extends power_base_1.default {
     }
     checkSlopeWithSlopeDelta(request, newRequest = {}) {
         if (request.slope !== undefined) {
-            const targetSlope = newRequest.slope = parseFloat(request.slope.toFixed(1));
+            const targetSlope = newRequest.slope = Number.parseFloat(request.slope.toFixed(1));
             this.data.slope = newRequest.slope;
             const requestedSlope = targetSlope + this.getSlopeDelta();
             try {
@@ -130,9 +134,13 @@ class SmartTrainerCyclingMode extends power_base_1.default {
             this.checkSlopeNoShiftig(request, newRequest);
             return;
         }
-        if (request.slope !== undefined) {
+        if (request.slope === undefined) {
+            console.log('# set simulated power (same slope):', { simPower: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, cadence: this.data.pedalRpm, power: this.data.power });
+            this.logger.logEvent({ message: 'set simulated power (same slope)', simPower: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, cadence: this.data.pedalRpm, power: this.data.power });
+        }
+        else {
             const prev = (_a = this.data.slope) !== null && _a !== void 0 ? _a : 0;
-            this.data.slope = parseFloat(request.slope.toFixed(1));
+            this.data.slope = Number.parseFloat(request.slope.toFixed(1));
             delete request.slope;
             delete newRequest.slope;
             this.simSlope = this.data.slope;
@@ -151,11 +159,13 @@ class SmartTrainerCyclingMode extends power_base_1.default {
             const prevPower = this.data.power;
             if (this.data.speed < 10 && this.data.isPedalling && (this.data.slope < 1 || this.data.speed === 0)) {
                 this.simPower = Math.max(newPower, prevPower);
-                this.logger.logEvent({ message: 'set simulater power', power: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, prevPower, newPower });
+                console.log('# set simulated power', { power: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, prevPower, newPower });
+                this.logger.logEvent({ message: 'set simulated power', power: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, prevPower, newPower });
             }
             else if (this.data.slope === prev && newPower < prevPower) {
                 this.simPower = prevPower;
-                this.logger.logEvent({ message: 'set simulater power', power: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, prevPower, newPower });
+                console.log('# set simulated power:', { power: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, prevPower, newPower });
+                this.logger.logEvent({ message: 'set simulated power', power: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, prevPower, newPower });
             }
             else {
                 const powerDiff = newPower - prevPower;
@@ -166,7 +176,8 @@ class SmartTrainerCyclingMode extends power_base_1.default {
                 const eKinAfter1sec = eKinPrev - powerDiff * 1;
                 const vAfter1sec = Math.sqrt(2 * eKinAfter1sec / m) * 3600 / 1000;
                 this.simPower = calculations_1.default.calculatePower(m, vAfter1sec / 3.6, (_e = this.simSlope) !== null && _e !== void 0 ? _e : 0);
-                this.logger.logEvent({ message: 'set simulater power', power: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, eKinPrev, eKinTarget, delta, prevPower, newPower });
+                console.log('# set simulated power (Ekin):', { power: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, eKinPrev, eKinTarget, delta, prevPower, newPower });
+                this.logger.logEvent({ message: 'set simulated power (Ekin)', power: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, eKinPrev, eKinTarget, delta, prevPower, newPower });
             }
             this.verifySimPower();
         }
@@ -190,8 +201,53 @@ class SmartTrainerCyclingMode extends power_base_1.default {
                 break;
         }
     }
-    checkGearChange(request, newRequest = {}) {
+    checkCadenceChange(request, newRequest = {}) {
+        const virtshiftMode = this.getVirtualShiftMode();
+        if (virtshiftMode !== 'Simulated') {
+            return;
+        }
+        if (request.targetPower !== undefined || request.targetPowerDelta !== undefined || request.gearDelta !== undefined || request.gearRatio !== undefined) {
+            console.log('# cadence change ignored due to other power/gear request', request);
+            return;
+        }
+        if (this.data.pedalRpm !== this.prevData.pedalRpm) {
+            console.log('# cadence changed  ', { cadence: this.data.pedalRpm, prevCadence: this.prevData.pedalRpm });
+            this.calculateSimulatedPower(request);
+            delete request.slope;
+        }
+    }
+    calculateSimulatedPower(request) {
         var _a, _b, _c, _d;
+        const m = (_b = (_a = this.adapter) === null || _a === void 0 ? void 0 : _a.getWeight()) !== null && _b !== void 0 ? _b : 85;
+        const vCurrent = this.data.speed * 1000 / 3600;
+        const eKinCurrent = m * vCurrent * vCurrent / 2;
+        if (this.data.pedalRpm > 0) {
+            const virtualSpeed = (0, calculations_1.calculateVirtualSpeed)(this.data.pedalRpm, this.gearRatios[this.gear - 1]);
+            const newPower = calculations_1.default.calculatePower(m, virtualSpeed, (_c = this.simSlope) !== null && _c !== void 0 ? _c : 0);
+            const prevPower = this.data.power;
+            if (this.data.speed < 10 && this.data.isPedalling && (this.data.slope < 1 || this.data.speed === 0)) {
+                this.simPower = Math.max(newPower, prevPower);
+                console.log('# set simulated power (starting)', { power: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, prevPower, newPower });
+                this.logger.logEvent({ message: 'set simulated power (starting)', power: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, prevPower, newPower });
+            }
+            else {
+                const powerDiff = newPower - prevPower;
+                const vTarget = virtualSpeed * 1000 / 3600;
+                const eKinTarget = m * vTarget * vTarget / 2;
+                const eKinPrev = eKinCurrent;
+                const delta = eKinTarget - eKinPrev;
+                const eKinAfter1sec = eKinPrev - powerDiff * 1;
+                const vAfter1sec = Math.sqrt(2 * eKinAfter1sec / m) * 3600 / 1000;
+                this.simPower = calculations_1.default.calculatePower(m, vAfter1sec / 3.6, (_d = this.simSlope) !== null && _d !== void 0 ? _d : 0);
+                console.log('# set simulated power (Ekin):', { power: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, eKinPrev, eKinTarget, delta, prevPower, newPower });
+                this.logger.logEvent({ message: 'set simulated power (Ekin)', power: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, eKinPrev, eKinTarget, delta, prevPower, newPower });
+            }
+        }
+        else {
+            delete this.simPower;
+        }
+    }
+    checkGearChange(request, newRequest = {}) {
         const virtshiftMode = this.getVirtualShiftMode();
         switch (virtshiftMode) {
             case 'SlopeDelta':
@@ -217,17 +273,10 @@ class SmartTrainerCyclingMode extends power_base_1.default {
                         this.gear = this.gearRatios.length;
                     }
                     delete request.gearDelta;
-                    if (this.data.pedalRpm > 0) {
-                        const virtualSpeed = (0, calculations_1.calculateVirtualSpeed)(this.data.pedalRpm, this.gearRatios[this.gear - 1]);
-                        const m = (_b = (_a = this.adapter) === null || _a === void 0 ? void 0 : _a.getWeight()) !== null && _b !== void 0 ? _b : 85;
-                        this.simPower = calculations_1.default.calculatePower(m, virtualSpeed, (_d = (_c = this.simSlope) !== null && _c !== void 0 ? _c : this.data.slope) !== null && _d !== void 0 ? _d : 0);
-                        this.verifySimPower();
-                        this.logger.logEvent({ message: 'set simulater power', power: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope });
+                    this.calculateSimulatedPower(request);
+                    if (this.simPower !== undefined) {
                         this.adapter.sendUpdate({ targetPower: this.simPower }).then(() => { });
                     }
-                    else {
-                        delete this.simPower;
-                    }
                 }
                 break;
             case 'Adapter':
@@ -297,6 +346,9 @@ class SmartTrainerCyclingMode extends power_base_1.default {
         }
     }
     getVirtualShiftMode() {
+        if (!this.getFeatureToogle().has('VirtualShifting')) {
+            return 'Disabled';
+        }
         const virtshiftMode = this.getSetting('virtshift');
         if (virtshiftMode === 'Disabled') {
             return 'Disabled';
@@ -316,8 +368,8 @@ class SmartTrainerCyclingMode extends power_base_1.default {
         return 'Disabled';
     }
     updateData(bikeData, log) {
-        var _a, _b, _c, _d, _e;
-        const prev = Object.assign({}, this.data);
+        var _a;
+        const prev = this.prevData = Object.assign({}, this.data);
         const data = super.updateData(bikeData, log);
         const mode = this.getVirtualShiftMode();
         let virtualSpeed;
@@ -332,14 +384,6 @@ class SmartTrainerCyclingMode extends power_base_1.default {
             this.gear = (_a = this.getSetting('startGear')) !== null && _a !== void 0 ? _a : 0;
             data.gearStr = this.getGearString();
         }
-        else if (this.gear !== undefined) {
-            if (prev.power !== data.power || prev.pedalRpm !== data.pedalRpm) {
-                virtualSpeed = (0, calculations_1.calculateVirtualSpeed)(data.pedalRpm, this.gearRatios[this.gear - 1]);
-                const m = (_c = (_b = this.adapter) === null || _b === void 0 ? void 0 : _b.getWeight()) !== null && _c !== void 0 ? _c : 85;
-                this.simPower = calculations_1.default.calculatePower(m, virtualSpeed, (_e = (_d = this.simSlope) !== null && _d !== void 0 ? _d : data.slope) !== null && _e !== void 0 ? _e : 0);
-                this.verifySimPower();
-            }
-        }
         return data;
     }
     getData() {
@@ -347,6 +391,13 @@ class SmartTrainerCyclingMode extends power_base_1.default {
         const data = super.getData();
         return Object.assign(Object.assign({}, data), { gearStr });
     }
+    updateRequired(request) {
+        const virtshiftMode = this.getVirtualShiftMode();
+        if (virtshiftMode === 'Adapter' || virtshiftMode === 'Simulated') {
+            return true;
+        }
+        return super.updateRequired(request);
+    }
     sendBikeUpdate(incoming) {
         this.logger.logEvent({ message: "processing update request", request: incoming, prev: this.prevRequest, data: this.getData() });
         let newRequest = {};
@@ -356,6 +407,7 @@ class SmartTrainerCyclingMode extends power_base_1.default {
             if (req) {
                 return req;
             }
+            this.checkCadenceChange(request, newRequest);
             this.checkGearChange(request, newRequest);
             this.checkSlope(request, newRequest);
             this.checkEmptyRequest(newRequest);
@@ -384,6 +436,9 @@ class SmartTrainerCyclingMode extends power_base_1.default {
         }
         return (_d = this.gear) === null || _d === void 0 ? void 0 : _d.toString();
     }
+    getFeatureToogle() {
+        return (0, features_1.useFeatureToggle)();
+    }
 }
 SmartTrainerCyclingMode.config = {
     name: "Smart Trainer",

package/lib/modes/base.d.ts

@@ -7,6 +7,7 @@ export declare abstract class CyclingModeBase extends CyclingMode implements ICy
     localConfig: CyclingModeConfig;
     protected static config: CyclingModeConfig;
     protected static isERG: boolean;
+    protected prevUpdate: UpdateRequest;
     static supportsERGMode(): boolean;
     constructor(adapter: IAdapter, props?: any);
     setAdapter(adapter: IAdapter): void;
@@ -23,6 +24,8 @@ export declare abstract class CyclingModeBase extends CyclingMode implements ICy
     getSettings(): Settings;
     setModeProperty(name: string, value: any): void;
     getModeProperty(name: string): any;
+    protected updateRequired(request?: UpdateRequest): boolean;
+    buildUpdate(request?: UpdateRequest): UpdateRequest;
     abstract getBikeInitRequest(): UpdateRequest;
     abstract sendBikeUpdate(request: UpdateRequest): UpdateRequest;
     abstract updateData(data: IncyclistBikeData): IncyclistBikeData;