incyclist-devices 2.4.6-beta.2 → 2.4.6-beta.3

package/lib/modes/antble-smarttrainer.js

@@ -216,20 +216,22 @@ class SmartTrainerCyclingMode extends power_base_1.default {
             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 = prev + delta / 2;
                 this.simPower = Math.max(newPower, prevPower);
                 this.prevEkin = m * v * v / 2;
                 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 = prev + delta / 2;
+                this.simPower = prev + delta;
                 this.prevEkin = m * v * v / 2;
                 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.simPower = prev + delta / 3;
                 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 {
+                this.logger.logEvent({ message: `set simulated power (mothing changed)`, target: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, prevTarget: this.prevSimPower, actualPower: prevPower, newPower });
             }
         }
         else {
@@ -266,12 +268,11 @@ class SmartTrainerCyclingMode extends power_base_1.default {
                         this.gear = this.gearRatios.length;
                     }
                     delete request.gearDelta;
-                    console.log('# gear changed');
                     this.logger.logEvent({ message: 'gear changed', gear: this.gear, oldGear });
+                    this.data.gearStr = this.getGearString();
                     this.calculateSimulatedPower('gear');
                     if (this.simPower !== undefined) {
-                        this.adapter.sendUpdate({ targetPower: this.simPower }).then(() => { });
-                        this.prevSimPower = this.simPower;
+                        newRequest.targetPower = this.simPower;
                     }
                 }
                 break;
@@ -370,7 +371,6 @@ class SmartTrainerCyclingMode extends power_base_1.default {
     }
     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();
@@ -386,7 +386,6 @@ class SmartTrainerCyclingMode extends power_base_1.default {
             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() {
@@ -402,7 +401,6 @@ 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);
@@ -422,7 +420,7 @@ 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) {
+        if (newRequest.targetPower && this.simPower) {
             this.prevSimPower = newRequest.targetPower;
         }
         return newRequest;

package/package.json

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