incyclist-devices 2.4.5 → 2.4.6-beta.1

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

@@ -35,6 +35,7 @@ export default class SmartTrainerCyclingMode extends PowerBasedCyclingModeBase i
     protected maintainPower: number;
     protected prevData: any;
     protected prevEkin: number;
+    protected prevSimPower: number;
     protected readonly gearRatios: number[];
     constructor(adapter: IAdapter, props?: any);
     getBikeInitRequest(): UpdateRequest;

package/lib/modes/antble-smarttrainer.js

@@ -149,8 +149,6 @@ class SmartTrainerCyclingMode extends power_base_1.default {
             return;
         }
         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;
@@ -189,6 +187,7 @@ class SmartTrainerCyclingMode extends power_base_1.default {
         }
     }
     checkCadenceChange(request, newRequest = {}) {
+        var _a;
         const virtshiftMode = this.getVirtualShiftMode();
         if (virtshiftMode !== 'Simulated') {
             return;
@@ -198,10 +197,8 @@ class SmartTrainerCyclingMode extends power_base_1.default {
             return;
         }
         if (this.data.pedalRpm !== this.prevData.pedalRpm) {
-            console.log('# cadence changed  ', { cadence: this.data.pedalRpm, prevCadence: this.prevData.pedalRpm });
             this.logger.logEvent({ message: 'cadence changed', cadence: this.data.pedalRpm, prevCadence: this.prevData.pedalRpm });
-            this.calculateSimulatedPower('cadence');
-            delete request.slope;
+            request.slope = (_a = request.slope) !== null && _a !== void 0 ? _a : this.data.slope;
         }
     }
     calculateSimulatedPower(changed) {
@@ -216,29 +213,23 @@ class SmartTrainerCyclingMode extends power_base_1.default {
             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;
+            const prev = ((_e = (_d = this.prevSimPower) !== null && _d !== void 0 ? _d : prevPower) !== null && _e !== void 0 ? _e : 0);
+            const delta = newPower - prev;
             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 });
+                this.logger.logEvent({ message: 'set simulated power (starting)', target: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, prevTarget: this.prevSimPower, actualPower: prevPower, newPower });
             }
             else if (changed === 'gear') {
-                this.simPower = newPower;
+                this.simPower = prev + delta / 2;
                 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 });
+                this.logger.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') {
+                this.simPower = prev + delta / 4;
+                this.logger.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 });
             }
             else {
-                const powerDiff = newPower - prevPower;
-                const vTarget = virtualSpeed * 1000 / 3600;
-                const eKinTarget = m * vTarget * vTarget / 2;
-                const eKinPrev = (_d = this.prevEkin) !== null && _d !== void 0 ? _d : 0;
-                const delta = eKinTarget - eKinPrev;
-                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 {
@@ -280,6 +271,7 @@ class SmartTrainerCyclingMode extends power_base_1.default {
                     this.calculateSimulatedPower('gear');
                     if (this.simPower !== undefined) {
                         this.adapter.sendUpdate({ targetPower: this.simPower }).then(() => { });
+                        this.prevSimPower = this.simPower;
                     }
                 }
                 break;
@@ -430,6 +422,9 @@ class SmartTrainerCyclingMode extends power_base_1.default {
         catch (err) {
             this.logger.logEvent({ message: "error", fn: 'sendBikeUpdate()', error: err.message, stack: err.stack });
         }
+        if (newRequest.targetPower) {
+            this.prevSimPower = newRequest.targetPower;
+        }
         return newRequest;
     }
     getGearString() {

package/package.json

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