incyclist-devices 1.4.49 → 1.4.50

package/lib/DeviceSupport.js

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/ant/AntScanner.js

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/ble/ble-device.d.ts

@@ -29,6 +29,7 @@ export declare abstract class BleDevice extends BleDeviceClass {
     writeQueue: CommandQueueItem[];
     constructor(props?: BleDeviceConstructProps);
     logEvent(event: any): void;
+    setLogger(logger: EventLogger): void;
     setInterface(ble: BleInterfaceClass): void;
     cleanupListeners(): void;
     onDisconnect(): void;

package/lib/ble/ble-device.js

@@ -39,7 +39,7 @@ class BleDevice extends ble_1.BleDeviceClass {
         if (props.logger) {
             this.logger = props.logger;
         }
-        else if (props.log) {
+        else if (props.log !== false) {
             this.logger = new gd_eventlog_1.EventLogger('BleDevice');
         }
     }
@@ -51,6 +51,9 @@ class BleDevice extends ble_1.BleDeviceClass {
             console.log('~~~BLE:', event);
         }
     }
+    setLogger(logger) {
+        this.logger = logger;
+    }
     setInterface(ble) {
         this.ble = ble;
     }

package/lib/ble/ble-erg-mode.js

@@ -13,6 +13,7 @@ const config = {
         { key: 'startPower', name: 'Starting Power', description: 'Initial power in Watts at start of training', type: CyclingMode_1.CyclingModeProperyType.Integer, default: 50, min: 25, max: 800 },
     ]
 };
+const MIN_SPEED = 10;
 class BleERGCyclingMode extends power_base_1.default {
     constructor(adapter, props) {
         super(adapter, props);
@@ -96,21 +97,26 @@ class BleERGCyclingMode extends power_base_1.default {
         const data = this.data || {};
         const bikeType = this.getSetting('bikeType').toLowerCase();
         try {
-            const rpm = bikeData.pedalRpm || 0;
             let power = bikeData.power || 0;
             const slope = (prevData.slope !== undefined ? prevData.slope : prevRequest.slope || 0);
             const distanceInternal = prevData.distanceInternal || 0;
-            if (!bikeData.pedalRpm || bikeData.isPedalling === false) {
+            if (bikeData.pedalRpm === 0 || bikeData.isPedalling === false) {
                 power = 0;
             }
             const m = this.getWeight();
             const t = this.getTimeSinceLastUpdate();
             const { speed, distance } = this.calculateSpeedAndDistance(power, slope, m, t, { bikeType });
-            data.speed = parseFloat(speed.toFixed(1));
+            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);
+            }
             data.power = Math.round(power);
-            data.distanceInternal = Math.round(distanceInternal + distance);
             data.slope = slope;
-            data.pedalRpm = rpm;
+            data.pedalRpm = bikeData.pedalRpm || 0;
             if (data.time !== undefined && data.speed > 0)
                 data.time += t;
             else

package/lib/ble/ble-st-mode.js

@@ -12,6 +12,7 @@ const config = {
         { key: 'bikeType', name: 'Bike Type', description: '', type: CyclingMode_1.CyclingModeProperyType.SingleSelect, options: ['Race', 'Mountain', 'Triathlon'], default: 'Race' }
     ]
 };
+const MIN_SPEED = 10;
 class FtmsCyclingMode extends power_base_1.default {
     constructor(adapter, props) {
         super(adapter, props);
@@ -66,21 +67,26 @@ class FtmsCyclingMode extends power_base_1.default {
         const data = this.data || {};
         const bikeType = this.getSetting('bikeType').toLowerCase();
         try {
-            const rpm = bikeData.pedalRpm || 0;
             let power = bikeData.power || 0;
             const slope = (prevData.slope !== undefined ? prevData.slope : prevRequest.slope || 0);
             const distanceInternal = prevData.distanceInternal || 0;
-            if (!bikeData.pedalRpm || bikeData.isPedalling === false) {
+            if (bikeData.pedalRpm === 0 || bikeData.isPedalling === false) {
                 power = 0;
             }
             const m = this.getWeight();
             const t = this.getTimeSinceLastUpdate();
             const { speed, distance } = this.calculateSpeedAndDistance(power, slope, m, t, { bikeType });
-            data.speed = parseFloat(speed.toFixed(1));
+            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);
+            }
             data.power = Math.round(power);
-            data.distanceInternal = Math.round(distanceInternal + distance);
             data.slope = slope;
-            data.pedalRpm = rpm;
+            data.pedalRpm = bikeData.pedalRpm || 0;
             if (data.time !== undefined)
                 data.time += t;
             else

package/lib/ble/ble.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import EventEmitter from "events";
 import BlePeripheralConnector from "./ble-peripheral";
 export declare type ConnectProps = {

package/lib/ble/fm.js

@@ -314,12 +314,16 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.hasControl)
                 return true;
+            this.logEvent({ message: 'requestControl' });
             const data = Buffer.alloc(1);
             data.writeUInt8(0, 0);
             const res = yield this.writeFtmsMessage(0, data);
             if (res === 1) {
                 this.hasControl = true;
             }
+            else {
+                this.logEvent({ message: 'requestControl failed' });
+            }
             return this.hasControl;
         });
     }
@@ -329,10 +333,6 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
             if (this.data.targetPower !== undefined && this.data.targetPower === power)
                 return true;
             const hasControl = yield this.requestControl();
-            if (!hasControl) {
-                this.logEvent({ message: 'setTargetPower failed', reason: 'control is disabled' });
-                return false;
-            }
             const data = Buffer.alloc(3);
             data.writeUInt8(5, 0);
             data.writeInt16LE(Math.round(power), 1);
@@ -366,10 +366,6 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
     setIndoorBikeSimulation(windSpeed, gradient, crr, cw) {
         return __awaiter(this, void 0, void 0, function* () {
             const hasControl = yield this.requestControl();
-            if (!hasControl) {
-                this.logEvent({ message: 'setTargetInclination failed', reason: 'control is disabled' });
-                return false;
-            }
             const data = Buffer.alloc(7);
             data.writeUInt8(17, 0);
             data.writeInt16LE(Math.round(windSpeed * 1000), 1);
@@ -439,6 +435,8 @@ class FmAdapter extends Device_1.default {
         this.ble = protocol.ble;
         this.cyclingMode = this.getDefaultCyclingMode();
         this.logger = new gd_eventlog_1.EventLogger('BLE-FM');
+        if (this.device)
+            this.device.setLogger(this.logger);
     }
     isBike() { return this.device.isBike(); }
     isHrm() { return this.device.isHrm(); }
@@ -552,6 +550,7 @@ class FmAdapter extends Device_1.default {
                 yield this.ble.stopScan();
             try {
                 const bleDevice = yield this.ble.connectDevice(this.device);
+                bleDevice.setLogger(this.logger);
                 if (bleDevice) {
                     this.device = bleDevice;
                     const mode = this.getCyclingMode();
@@ -594,12 +593,13 @@ class FmAdapter extends Device_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.paused || !this.device)
                 return;
-            const requested = this.getCyclingMode().sendBikeUpdate(request);
-            if (requested.slope !== undefined) {
-                yield this.device.setSlope(requested.slope);
+            const update = this.getCyclingMode().sendBikeUpdate(request);
+            this.logger.logEvent({ message: 'send bike update requested', profile: this.getProfile(), update, request });
+            if (update.slope !== undefined) {
+                yield this.device.setSlope(update.slope);
             }
-            if (requested.targetPower !== undefined) {
-                yield this.device.setTargetPower(requested.targetPower);
+            if (update.targetPower !== undefined) {
+                yield this.device.setTargetPower(update.targetPower);
             }
         });
     }

package/lib/ble/incyclist-protocol.js

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/daum/DaumAdapter.js

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/daum/classic/DaumClassicProtocol.js

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/daum/premium/DaumPremiumProtocol.js

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/kettler/comms.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { DeviceProtocol } from "../DeviceProtocol";
 import { EventLogger } from "gd-eventlog";
 import { Command } from "../types/command";

package/lib/kettler/ergo-racer/adapter.js

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/kettler/ergo-racer/protocol.d.ts

@@ -28,7 +28,7 @@ export default class KettlerRacerProtocol extends DeviceProtocolBase implements
     isBike(): boolean;
     isHrm(): boolean;
     isPower(): boolean;
-    add(settings: DeviceSettings): import("../../DeviceProtocol").Device;
+    add(settings: DeviceSettings): any;
     scan(props: KettlerRacerScanProps): void;
     checkDevice(port: string): boolean;
     doScan(port: string): Promise<void>;

package/lib/kettler/ergo-racer/protocol.js

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/modes/power-meter.js

@@ -53,7 +53,7 @@ class PowerMeterCyclingMode extends power_base_1.default {
                 power = 0;
             }
             const m = this.getWeight();
-            let t = this.getTimeSinceLastUpdate();
+            const t = this.getTimeSinceLastUpdate();
             const { speed, distance } = this.calculateSpeedAndDistance(power, slope, m, t);
             data.power = Math.round(power);
             data.slope = slope;

package/lib/simulator/Simulator.d.ts

@@ -51,7 +51,7 @@ export declare class Simulator extends DeviceAdapter {
 export default class SimulatorProtocol extends DeviceProtocolBase {
     static NAME: string;
     constructor();
-    add(settings: SimulatorSettings): Simulator;
+    add(settings: SimulatorSettings): any;
     getName(): string;
     getInterfaces(): string[];
     isBike(): boolean;

package/lib/simulator/Simulator.js

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/package.json

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