incyclist-devices 2.4.3 → 2.4.5

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

@@ -32,7 +32,9 @@ export default class SmartTrainerCyclingMode extends PowerBasedCyclingModeBase i
     protected tsStart: number;
     protected simPower: number;
     protected simSlope: number;
+    protected maintainPower: number;
     protected prevData: any;
+    protected prevEkin: number;
     protected readonly gearRatios: number[];
     constructor(adapter: IAdapter, props?: any);
     getBikeInitRequest(): UpdateRequest;
@@ -45,7 +47,7 @@ export default class SmartTrainerCyclingMode extends PowerBasedCyclingModeBase i
     protected checkSlopeWithSimulatedShifting(request: UpdateRequest, newRequest?: UpdateRequest): void;
     checkSlope(request: UpdateRequest, newRequest?: UpdateRequest): void;
     checkCadenceChange(request: UpdateRequest, newRequest?: UpdateRequest): void;
-    calculateSimulatedPower(request: UpdateRequest): void;
+    calculateSimulatedPower(changed?: string): void;
     checkGearChange(request: UpdateRequest, newRequest?: UpdateRequest): void;
     protected verifySimPower(): void;
     protected checkEmptyRequest(newRequest: UpdateRequest): void;

package/lib/modes/antble-smarttrainer.js

@@ -89,14 +89,14 @@ class SmartTrainerCyclingMode extends power_base_1.default {
             config.properties.push(virtshift);
         }
         if (!virtshift && virtShiftEnabled && this.adapter.supportsVirtualShifting()) {
-            virtshift.default = 'Enabled';
-            virtshift.options = [
+            const options = [
                 'Disabled',
                 { key: 'Incyclist', display: 'App only (beta)' },
                 { key: 'Mixed', display: 'App + Bike' },
                 { key: 'SmartTrainer', display: 'SmartTreiner (beta)' }
             ];
-            virtshift.default = 'SmartTrainer';
+            virtshift = { key: 'virtshift', name: 'Virtual Shifting', description: 'Enable virtual shifting', type: types_1.CyclingModeProperyType.SingleSelect, options, default: 'Mixed' };
+            config.properties.push(virtshift);
         }
         if (virtshift && !startGear) {
             startGear = { key: 'startGear', name: 'Initial Gear', description: 'Initial Gear', type: types_1.CyclingModeProperyType.Integer, default: 12, min: 1, max: 24, condition: (s) => (s === null || s === void 0 ? void 0 : s.virtshift) === 'Incyclist' || (s === null || s === void 0 ? void 0 : s.virtshift) === 'SmartTrainer' };
@@ -141,7 +141,9 @@ class SmartTrainerCyclingMode extends power_base_1.default {
         }
     }
     checkSlopeWithSimulatedShifting(request, newRequest = {}) {
-        var _a, _b, _c, _d, _e;
+        var _a;
+        if (this.simPower)
+            return;
         if (this.gear === undefined) {
             this.checkSlopeNoShiftig(request, newRequest);
             return;
@@ -161,36 +163,9 @@ class SmartTrainerCyclingMode extends power_base_1.default {
                 if (slopeAdj !== undefined)
                     this.simSlope = this.simSlope * slopeAdj / 100;
             }
-            catch (_f) {
-            }
-            const virtualSpeed = (0, calculations_1.calculateVirtualSpeed)(this.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;
-            const vCurrent = this.data.speed * 1000 / 3600;
-            const eKinCurrent = m * vCurrent * vCurrent / 2;
-            const newPower = calculations_1.default.calculatePower(m, virtualSpeed, (_d = this.simSlope) !== null && _d !== void 0 ? _d : 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', { 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;
-                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;
-                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, (_e = this.simSlope) !== null && _e !== void 0 ? _e : 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 });
+            catch (_b) {
             }
+            this.calculateSimulatedPower('slope');
             this.verifySimPower();
         }
         newRequest.targetPower = this.simPower;
@@ -224,39 +199,53 @@ class SmartTrainerCyclingMode extends power_base_1.default {
         }
         if (this.data.pedalRpm !== this.prevData.pedalRpm) {
             console.log('# cadence changed  ', { cadence: this.data.pedalRpm, prevCadence: this.prevData.pedalRpm });
-            this.calculateSimulatedPower(request);
+            this.logger.logEvent({ message: 'cadence changed', cadence: this.data.pedalRpm, prevCadence: this.prevData.pedalRpm });
+            this.calculateSimulatedPower('cadence');
             delete request.slope;
         }
     }
-    calculateSimulatedPower(request) {
-        var _a, _b, _c, _d;
+    calculateSimulatedPower(changed) {
+        var _a, _b, _c, _d, _e;
+        if (this.simPower)
+            return;
         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 virtualSpeed = (0, calculations_1.calculateVirtualSpeed)(this.data.pedalRpm, this.gearRatios[this.gear - 1]) * 3.6;
+            const v = virtualSpeed / 3.6;
+            const newPower = calculations_1.default.calculatePower(m, virtualSpeed / 3.6, (_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)) {
+            if (!this.prevEkin && this.data.isPedalling) {
                 this.simPower = Math.max(newPower, prevPower);
+                this.prevEkin = m * v * v / 2;
                 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 if (changed === 'gear') {
+                this.simPower = newPower;
+                this.prevEkin = m * v * v / 2;
+                console.log('# set simulated power (gear change)', { power: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, prevPower, newPower });
+                this.logger.logEvent({ message: 'set simulated power (gear change)', 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 eKinPrev = (_d = this.prevEkin) !== null && _d !== void 0 ? _d : 0;
                 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);
+                const eKinAfter1sec = eKinPrev + powerDiff * 1;
+                const vAfter1sec = Math.sqrt(eKinAfter1sec / m * 2);
+                this.simPower = calculations_1.default.calculatePower(m, vAfter1sec, (_e = this.simSlope) !== null && _e !== void 0 ? _e : 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;
+            if (this.data.speed < 5) {
+                delete this.prevEkin;
+            }
         }
     }
     checkGearChange(request, newRequest = {}) {
@@ -271,12 +260,13 @@ class SmartTrainerCyclingMode extends power_base_1.default {
                 break;
             case 'Simulated':
                 if (request.gearDelta !== undefined) {
+                    const oldGear = this.gear;
                     if (this.gear === undefined) {
-                        const initialGear = this.getSetting('startGear');
-                        this.gear = initialGear + request.gearDelta;
+                        const initialGear = Number(this.getSetting('startGear'));
+                        this.gear = initialGear + Number(request.gearDelta);
                     }
                     else {
-                        this.gear += request.gearDelta;
+                        this.gear += Number(request.gearDelta);
                     }
                     if (this.gear < 1) {
                         this.gear = 1;
@@ -285,7 +275,9 @@ class SmartTrainerCyclingMode extends power_base_1.default {
                         this.gear = this.gearRatios.length;
                     }
                     delete request.gearDelta;
-                    this.calculateSimulatedPower(request);
+                    console.log('# gear changed');
+                    this.logger.logEvent({ message: 'gear changed', gear: this.gear, oldGear });
+                    this.calculateSimulatedPower('gear');
                     if (this.simPower !== undefined) {
                         this.adapter.sendUpdate({ targetPower: this.simPower }).then(() => { });
                     }
@@ -310,7 +302,7 @@ class SmartTrainerCyclingMode extends power_base_1.default {
                 }
                 else if (request.gearDelta !== undefined) {
                     if (this.gear === undefined) {
-                        const initialGear = this.getSetting('startGear');
+                        const initialGear = Number(this.getSetting('startGear'));
                         this.gear = initialGear + request.gearDelta;
                     }
                     else {
@@ -327,7 +319,7 @@ class SmartTrainerCyclingMode extends power_base_1.default {
                 }
                 else {
                     if (this.gear === undefined) {
-                        const initialGear = this.getSetting('startGear');
+                        const initialGear = Number(this.getSetting('startGear'));
                         this.gear = initialGear + request.gearDelta;
                     }
                     newRequest.gearRatio = this.gearRatios[this.gear];
@@ -358,29 +350,35 @@ 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';
-        }
-        else if (virtshiftMode === 'Incyclist') {
-            return 'Simulated';
-        }
-        else if (virtshiftMode === 'SmartTrainer') {
-            return 'Adapter';
-        }
-        else if (virtshiftMode === 'Mixed') {
-            return 'SlopeDelta';
+        try {
+            if (!this.getFeatureToogle().has('VirtualShifting')) {
+                return 'Disabled';
+            }
+            const virtshiftMode = this.getSetting('virtshift');
+            if (virtshiftMode === 'Disabled') {
+                return 'Disabled';
+            }
+            else if (virtshiftMode === 'Incyclist') {
+                return 'Simulated';
+            }
+            else if (virtshiftMode === 'SmartTrainer') {
+                return 'Adapter';
+            }
+            else if (virtshiftMode === 'Mixed') {
+                return 'SlopeDelta';
+            }
+            else if (virtshiftMode === 'Enabled') {
+                return this.adapter.supportsVirtualShifting() ? 'Adapter' : 'Simulated';
+            }
         }
-        else if (virtshiftMode === 'Enabled') {
-            return this.adapter.supportsVirtualShifting() ? 'Adapter' : 'Simulated';
+        catch (err) {
+            this.logger.logEvent({ message: 'error', fn: 'getVirtualShiftMode', error: err.message, stack: err.stack });
         }
         return 'Disabled';
     }
     updateData(bikeData, log) {
         var _a;
+        console.log('# update data', bikeData);
         const prev = this.prevData = Object.assign({}, this.data);
         const data = super.updateData(bikeData, log);
         const mode = this.getVirtualShiftMode();
@@ -393,9 +391,10 @@ class SmartTrainerCyclingMode extends power_base_1.default {
             this.tsStart = Date.now();
         }
         if (this.gear === undefined && this.tsStart && data.power > 0 && (Date.now() - this.tsStart > 3000)) {
-            this.gear = (_a = this.getSetting('startGear')) !== null && _a !== void 0 ? _a : 0;
+            this.gear = (_a = Number(this.getSetting('startGear'))) !== null && _a !== void 0 ? _a : 0;
             data.gearStr = this.getGearString();
         }
+        console.log('# data updated', data);
         return data;
     }
     getData() {
@@ -411,9 +410,11 @@ class SmartTrainerCyclingMode extends power_base_1.default {
         return super.updateRequired(request);
     }
     sendBikeUpdate(incoming) {
+        console.log('# bike update request', incoming);
         this.logger.logEvent({ message: "processing update request", request: incoming, prev: this.prevRequest, data: this.getData() });
         let newRequest = {};
         const request = Object.assign({}, incoming);
+        delete this.simPower;
         try {
             const req = this.checkForResetOrEmpty(request);
             if (req) {
@@ -432,21 +433,21 @@ class SmartTrainerCyclingMode extends power_base_1.default {
         return newRequest;
     }
     getGearString() {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         const mode = this.getVirtualShiftMode();
         if (mode === "Disabled")
             return undefined;
         if (mode === 'Simulated') {
-            this.gear = (_b = (_a = this.gear) !== null && _a !== void 0 ? _a : this.getSetting('startGear')) !== null && _b !== void 0 ? _b : 0;
+            this.gear = (_a = this.gear) !== null && _a !== void 0 ? _a : Number((_b = this.getSetting('startGear')) !== null && _b !== void 0 ? _b : 0);
             return this.gear.toString();
         }
         if (mode === "SlopeDelta")
             return this.gearDelta > 0 ? `+${this.gearDelta}` : `${this.gearDelta}`;
         if (mode === 'Adapter') {
-            this.gear = (_c = this.gear) !== null && _c !== void 0 ? _c : this.getSetting('startGear');
+            this.gear = (_c = this.gear) !== null && _c !== void 0 ? _c : Number((_d = this.getSetting('startGear')) !== null && _d !== void 0 ? _d : 1);
             return this.gear.toString();
         }
-        return (_d = this.gear) === null || _d === void 0 ? void 0 : _d.toString();
+        return (_e = this.gear) === null || _e === void 0 ? void 0 : _e.toString();
     }
     getFeatureToogle() {
         return (0, features_1.useFeatureToggle)();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-devices",
-  "version": "2.4.3",
+  "version": "2.4.5",
   "dependencies": {
     "@protobuf-ts/runtime": "^2.11.1",
     "@serialport/bindings-interface": "^1.2.2",