incyclist-devices 2.3.31 → 2.3.32

package/lib/antv2/fe/adapter.js

@@ -61,7 +61,8 @@ class AntFEAdapter extends adapter_1.default {
                     this.promiseSendUpdate = fe.sendTrackResistance(update.slope);
                 }
                 if (update.targetPower !== undefined) {
-                    this.promiseSendUpdate = fe.sendTargetPower(update.targetPower);
+                    const tp = update.targetPower > 0 ? update.targetPower : 0;
+                    this.promiseSendUpdate = fe.sendTargetPower(tp);
                 }
                 yield this.promiseSendUpdate;
                 delete this.promiseSendUpdate;
@@ -112,6 +113,7 @@ class AntFEAdapter extends adapter_1.default {
             power: adapterData.power,
             speed: adapterData.speed,
             cadence: adapterData.pedalRpm,
+            gearStr: adapterData.gearStr,
             timestamp: Date.now()
         });
         if (adapterData.distanceInternal !== undefined) {

package/lib/ble/fm/adapter.js

@@ -246,7 +246,8 @@ class BleFmAdapter extends adapter_1.default {
                         yield device.setSlope(update.slope);
                     }
                     if (update.targetPower !== undefined) {
-                        yield device.setTargetPower(update.targetPower);
+                        const tp = update.targetPower > 0 ? update.targetPower : 0;
+                        yield device.setTargetPower(tp);
                     }
                 }
             }

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

@@ -44,6 +44,7 @@ export default class SmartTrainerCyclingMode extends PowerBasedCyclingModeBase i
     protected checkSlopeWithSimulatedShifting(request: UpdateRequest, newRequest?: UpdateRequest): void;
     checkSlope(request: UpdateRequest, newRequest?: 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;

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 MIN_POWER = 25;
 class SmartTrainerCyclingMode extends power_base_1.default {
     constructor(adapter, props) {
         super(adapter, props);
@@ -111,7 +112,8 @@ class SmartTrainerCyclingMode extends power_base_1.default {
     checkSlopeWithSimulatedShifting(request, newRequest = {}) {
         var _a, _b, _c, _d;
         if (this.gear === undefined) {
-            return this.checkSlopeNoShiftig(request, newRequest);
+            this.checkSlopeNoShiftig(request, newRequest);
+            return;
         }
         if (request.slope !== undefined) {
             const prev = (_a = this.data.slope) !== null && _a !== void 0 ? _a : 0;
@@ -126,22 +128,14 @@ class SmartTrainerCyclingMode extends power_base_1.default {
             }
             catch (_e) {
             }
-            if (this.data.slope === prev) {
-                newRequest.targetPower = this.simPower;
-                return;
-            }
-            else {
+            if (this.data.slope !== prev) {
                 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;
                 this.simPower = calculations_1.default.calculatePower(m, virtualSpeed, (_d = this.simSlope) !== null && _d !== void 0 ? _d : 0);
-                newRequest.targetPower = this.simPower;
+                this.verifySimPower();
             }
-            if (this.simPower < 0)
-                this.simPower = 0;
-        }
-        else {
-            newRequest.targetPower = this.simPower;
         }
+        newRequest.targetPower = this.simPower;
     }
     checkSlope(request, newRequest = {}) {
         const virtshiftMode = this.getVirtualShiftMode();
@@ -190,6 +184,7 @@ class SmartTrainerCyclingMode extends power_base_1.default {
                     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();
                 }
                 break;
             case 'Adapter':
@@ -198,6 +193,14 @@ class SmartTrainerCyclingMode extends power_base_1.default {
                 break;
         }
     }
+    verifySimPower() {
+        if (this.simPower < 0) {
+            this.simPower = 0;
+        }
+        if (this.data.pedalRpm > 0 && this.simPower < MIN_POWER) {
+            this.simPower = MIN_POWER;
+        }
+    }
     checkEmptyRequest(newRequest) {
         if (Object.keys(newRequest).length === 0) {
             if (this.prevRequest) {
@@ -242,6 +245,7 @@ class SmartTrainerCyclingMode extends power_base_1.default {
                 virtualSpeed = (0, calculations_1.calculateVirtualSpeed)(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 : data.slope) !== null && _d !== void 0 ? _d : 0);
+                this.verifySimPower();
             }
         }
         return data;
@@ -279,10 +283,10 @@ class SmartTrainerCyclingMode extends power_base_1.default {
         const mode = this.getVirtualShiftMode();
         if (mode === "Disabled")
             return undefined;
-        if (this.gear === undefined || this.gear === null)
+        if (mode === 'Simulated' && (this.gear === undefined || this.gear === null))
             return '';
         if (mode === "SlopeDelta")
-            return this.gear > 0 ? `+${this.gear}` : `${this.gear}`;
+            return this.gearDelta > 0 ? `+${this.gearDelta}` : `${this.gearDelta}`;
         return this.gear.toString();
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-devices",
-  "version": "2.3.31",
+  "version": "2.3.32",
   "dependencies": {
     "@serialport/bindings-interface": "^1.2.2",
     "@serialport/parser-byte-length": "^9.0.1",