incyclist-devices 1.4.47 → 1.4.48

package/lib/ble/fm.d.ts

@@ -87,6 +87,7 @@ export declare class FmAdapter extends DeviceAdapter {
     transformData(bikeData: IncyclistBikeData): DeviceData;
     start(props?: any): Promise<any>;
     stop(): Promise<boolean>;
+    sendUpdate(request: any): Promise<void>;
     pause(): Promise<boolean>;
     resume(): Promise<boolean>;
 }

package/lib/ble/fm.js

@@ -383,6 +383,13 @@ class FmAdapter extends Device_1.default {
             return this.device.disconnect();
         });
     }
+    sendUpdate(request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.paused)
+                return;
+            this.getCyclingMode().sendBikeUpdate(request);
+        });
+    }
     pause() { this.paused = true; return Promise.resolve(true); }
     resume() { this.paused = false; return Promise.resolve(true); }
 }

package/lib/ble/pwr.d.ts

@@ -72,6 +72,7 @@ export declare class PwrAdapter extends DeviceAdapter {
     transformData(bikeData: IncyclistBikeData): DeviceData;
     start(props?: any): Promise<any>;
     stop(): Promise<boolean>;
+    sendUpdate(request: any): Promise<void>;
     pause(): Promise<boolean>;
     resume(): Promise<boolean>;
 }

package/lib/ble/pwr.js

@@ -254,6 +254,13 @@ class PwrAdapter extends Device_1.default {
             return this.device.disconnect();
         });
     }
+    sendUpdate(request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.paused)
+                return;
+            this.getCyclingMode().sendBikeUpdate(request);
+        });
+    }
     pause() { this.paused = true; return Promise.resolve(true); }
     resume() { this.paused = false; return Promise.resolve(true); }
 }

package/lib/modes/power-base.js

@@ -37,6 +37,7 @@ class PowerBasedCyclingModeBase extends CyclingMode_1.CyclingModeBase {
         let powerToMaintainSpeed = calculations_1.default.calculatePower(m, vPrev, slope, props);
         const powerDelta = powerToMaintainSpeed - power;
         const Ekin = EkinPrev - powerDelta * t;
+        console.log('~~~~ calculateSpeedAndDistance', Ekin, powerToMaintainSpeed, power, m, vPrev, slope);
         if (Ekin > 0) {
             const v = Math.sqrt(2 * Ekin / m);
             const speed = v * 3.6;

package/lib/modes/power-meter.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.config = void 0;
 const power_base_1 = __importDefault(require("./power-base"));
+const MIN_SPEED = 10;
 exports.config = {
     name: 'PowerMeter',
     description: 'Power and cadence are taken from device. Speed is calculated from power and current slope\nThis mode will not respect maximum power and/or workout limits',
@@ -54,12 +55,18 @@ class PowerMeterCyclingMode extends power_base_1.default {
             const m = this.getWeight();
             let t = this.getTimeSinceLastUpdate();
             const { speed, distance } = this.calculateSpeedAndDistance(power, slope, m, t);
-            data.speed = speed;
             data.power = Math.round(power);
-            data.distanceInternal = Math.round(distanceInternal + distance);
             data.slope = slope;
+            if (power === 0 && speed < MIN_SPEED) {
+                data.speed = Math.round(prevData.speed - 1) < 0 ? 0 : Math.round(prevData.speed - 1);
+                data.distanceInternal = Math.round(distanceInternal + data.speed / 3.6 * t);
+            }
+            else {
+                data.speed = (power === 0 && speed < MIN_SPEED) ? 0 : speed;
+                data.distanceInternal = (power === 0 && speed < MIN_SPEED) ? Math.round(distanceInternal) : Math.round(distanceInternal + distance);
+            }
             if (props.log)
-                this.logger.logEvent({ message: "updateData result", data, bikeData, prevSpeed: prevData.speed });
+                this.logger.logEvent({ message: "updateData result", data, bikeData, prevSpeed: prevData.speed, stopped: speed < MIN_SPEED });
             this.data = data;
         }
         catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-devices",
-  "version": "1.4.47",
+  "version": "1.4.48",
   "dependencies": {
     "@serialport/parser-byte-length": "^9.0.1",
     "@serialport/parser-delimiter": "^9.0.1",