incyclist-devices 1.4.45 → 1.4.48

package/lib/ble/fm.js

@@ -18,6 +18,7 @@ const ble_interface_1 = __importDefault(require("./ble-interface"));
 const Device_1 = __importDefault(require("../Device"));
 const gd_eventlog_1 = require("gd-eventlog");
 const power_meter_1 = __importDefault(require("../modes/power-meter"));
+const FTMS_CP = '2ad9';
 const bit = (nr) => (1 << nr);
 const IndoorBikeDataFlag = {
     MoreData: bit(0),
@@ -76,6 +77,8 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
     constructor(props) {
         super(props);
         this.features = undefined;
+        this.hasControl = false;
+        this.isCPSubscribed = false;
         this.data = {};
     }
     init() {
@@ -84,14 +87,20 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
         });
         return __awaiter(this, void 0, void 0, function* () {
             try {
+                this.logEvent({ message: 'get device info' });
                 yield _super.init.call(this);
                 yield this.getFitnessMachineFeatures();
+                this.logEvent({ message: 'device info', deviceInfo: this.deviceInfo, features: this.features });
             }
             catch (err) {
                 return Promise.resolve(false);
             }
         });
     }
+    onDisconnect() {
+        super.onDisconnect();
+        this.hasControl = false;
+    }
     getProfile() {
         return 'Smart Trainer';
     }
@@ -112,7 +121,7 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
             return true;
     }
     isHrm() {
-        return this.hasService('180d');
+        return this.hasService('180d') || (this.features && (this.features.fitnessMachine & FitnessMachineFeatureFlag.HeartRateMeasurementSupported) !== 0);
     }
     parseHrm(_data) {
         const data = Buffer.from(_data);
@@ -150,19 +159,22 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
             offset += 2;
         }
         if (flags & IndoorBikeDataFlag.TotalDistancePresent) {
-            this.data.totalDistance = data.readUInt16LE(offset);
+            const dvLow = data.readUInt8(offset);
+            offset += 1;
+            const dvHigh = data.readUInt16LE(offset);
             offset += 2;
+            this.data.totalDistance = dvHigh << 8 + dvLow;
         }
         if (flags & IndoorBikeDataFlag.ResistanceLevelPresent) {
-            this.data.resistanceLevel = data.readUInt16LE(offset);
+            this.data.resistanceLevel = data.readInt16LE(offset);
             offset += 2;
         }
         if (flags & IndoorBikeDataFlag.InstantaneousPowerPresent) {
-            this.data.instantaneousPower = data.readUInt16LE(offset);
+            this.data.instantaneousPower = data.readInt16LE(offset);
             offset += 2;
         }
         if (flags & IndoorBikeDataFlag.AveragePowerPresent) {
-            this.data.averagePower = data.readUInt16LE(offset);
+            this.data.averagePower = data.readInt16LE(offset);
             offset += 2;
         }
         if (flags & IndoorBikeDataFlag.ExpendedEnergyPresent) {
@@ -193,8 +205,12 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
                 return this.features;
             try {
                 const data = yield this.read('2acc');
-                this.features.fitnessMachine = data.readUInt32LE(0);
-                this.features.targetSettings = data.readUInt32LE(4);
+                const buffer = data ? Buffer.from(data) : undefined;
+                if (buffer) {
+                    const fitnessMachine = buffer.readUInt32LE(0);
+                    const targetSettings = buffer.readUInt32LE(4);
+                    this.features = { fitnessMachine, targetSettings };
+                }
             }
             catch (err) {
                 this.logEvent({ message: 'could not read FitnessMachineFeatures', error: err.message, stack: err.stack });
@@ -211,9 +227,28 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
             this.emit('data', res);
         }
     }
-    write(characteristic, data) {
-        console.log('write', characteristic, data);
-        return Promise.resolve(true);
+    requestControl() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.hasControl)
+                return true;
+            const data = Buffer.alloc(1);
+            data.writeUInt8(0, 0);
+            const success = yield this.write(FTMS_CP, data);
+            if (success)
+                this.hasControl = true;
+            return this.hasControl;
+        });
+    }
+    setTargetPower(power) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const hasControl = yield this.requestControl();
+            if (!hasControl)
+                throw new Error('setTargetPower not possible - control is disabled');
+            const data = Buffer.alloc(3);
+            data.writeUInt8(5, 0);
+            data.writeInt16LE(Math.round(power), 1);
+            const res = yield this.write(FTMS_CP, data);
+        });
     }
     reset() {
         this.data = {};
@@ -237,6 +272,12 @@ class FmAdapter extends Device_1.default {
     isBike() { return this.device.isBike(); }
     isHrm() { return this.device.isHrm(); }
     isPower() { return this.device.isPower(); }
+    isSame(device) {
+        if (!(device instanceof FmAdapter))
+            return false;
+        const adapter = device;
+        return (adapter.getName() === this.getName() && adapter.getProfile() === this.getProfile());
+    }
     getProfile() {
         return 'Smart Trainer';
     }
@@ -316,6 +357,8 @@ class FmAdapter extends Device_1.default {
     start(props) {
         return __awaiter(this, void 0, void 0, function* () {
             this.logger.logEvent({ message: 'start requested', profile: this.getProfile(), props });
+            if (this.ble.isScanning())
+                yield this.ble.stopScan();
             try {
                 const bleDevice = yield this.ble.connectDevice(this.device);
                 if (bleDevice) {
@@ -340,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/hrm.d.ts

@@ -21,7 +21,6 @@ export default class BleHrmDevice extends BleDevice {
     getServiceUUids(): string[];
     parseHrm(_data: Uint8Array): HrmData;
     onData(characteristic: string, data: Buffer): void;
-    write(characteristic: any, data: any): Promise<boolean>;
 }
 export declare class HrmAdapter extends DeviceAdapter {
     device: BleHrmDevice;
@@ -34,6 +33,7 @@ export declare class HrmAdapter extends DeviceAdapter {
     isBike(): boolean;
     isHrm(): boolean;
     isPower(): boolean;
+    isSame(device: DeviceAdapter): boolean;
     getProfile(): string;
     getName(): string;
     getDisplayName(): string;

package/lib/ble/hrm.js

@@ -56,10 +56,6 @@ class BleHrmDevice extends ble_device_1.BleDevice {
             this.emit('data', res);
         }
     }
-    write(characteristic, data) {
-        console.log('write', characteristic, data);
-        return Promise.resolve(true);
-    }
 }
 exports.default = BleHrmDevice;
 BleHrmDevice.services = ['180d'];
@@ -77,6 +73,12 @@ class HrmAdapter extends Device_1.default {
     isBike() { return false; }
     isHrm() { return true; }
     isPower() { return false; }
+    isSame(device) {
+        if (!(device instanceof HrmAdapter))
+            return false;
+        const adapter = device;
+        return (adapter.getName() === this.getName() && adapter.getProfile() === this.getProfile());
+    }
     getProfile() {
         return 'Heartrate Monitor';
     }

package/lib/ble/incyclist-protocol.js

@@ -78,7 +78,15 @@ class BleProtocol extends DeviceProtocol_1.default {
             case 'fm':
             case 'smart trainer':
             case 'fitness machine':
-                return new fm_1.FmAdapter(fromDevice ? bleDevice : new fm_1.default(props()), this);
+                let device;
+                if (fromDevice)
+                    device = bleDevice;
+                else {
+                    device = this.ble.findDeviceInCache(Object.assign(Object.assign({}, props()), { profile: 'Smart Trainer' }));
+                    if (!device)
+                        device = new fm_1.default(props());
+                }
+                return new fm_1.FmAdapter(device, this);
             case 'cp':
             case 'power meter':
                 return new pwr_1.PwrAdapter(fromDevice ? bleDevice : new pwr_1.default(props()), this);

package/lib/ble/pwr.d.ts

@@ -42,7 +42,6 @@ export default class BleCyclingPowerDevice extends BleDevice {
     };
     parsePower(_data: Uint8Array): PowerData;
     onData(characteristic: string, data: Buffer): void;
-    write(characteristic: any, data: any): Promise<boolean>;
     reset(): void;
 }
 export declare class PwrAdapter extends DeviceAdapter {
@@ -59,6 +58,7 @@ export declare class PwrAdapter extends DeviceAdapter {
     isBike(): boolean;
     isHrm(): boolean;
     isPower(): boolean;
+    isSame(device: DeviceAdapter): boolean;
     getProfile(): string;
     getName(): string;
     getDisplayName(): string;
@@ -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

@@ -114,10 +114,6 @@ class BleCyclingPowerDevice extends ble_device_1.BleDevice {
             this.emit('data', res);
         }
     }
-    write(characteristic, data) {
-        console.log('write', characteristic, data);
-        return Promise.resolve(true);
-    }
     reset() {
         this.instantaneousPower = undefined;
         this.balance = undefined;
@@ -147,6 +143,12 @@ class PwrAdapter extends Device_1.default {
     isBike() { return true; }
     isHrm() { return false; }
     isPower() { return true; }
+    isSame(device) {
+        if (!(device instanceof PwrAdapter))
+            return false;
+        const adapter = device;
+        return (adapter.getName() === this.getName() && adapter.getProfile() === this.getProfile());
+    }
     getProfile() {
         return 'Power Meter';
     }
@@ -252,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/daum/DaumAdapter.d.ts

@@ -39,6 +39,7 @@ export default class DaumAdapterBase extends IncyclistDevice implements DeviceAd
     isBike(): boolean;
     isPower(): boolean;
     isHrm(): boolean;
+    isSame(device: DeviceAdapter): boolean;
     setIgnoreHrm(ignore: any): void;
     setIgnoreBike(ignore: any): void;
     isStopped(): boolean;

package/lib/daum/DaumAdapter.js

@@ -131,6 +131,12 @@ class DaumAdapterBase extends Device_1.default {
     isHrm() {
         return true;
     }
+    isSame(device) {
+        if (!(device instanceof DaumAdapterBase))
+            return false;
+        const adapter = device;
+        return (adapter.getName() === this.getName() && adapter.getPort() === this.getPort());
+    }
     setIgnoreHrm(ignore) {
         this.ignoreHrm = ignore;
     }

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

@@ -47,6 +47,7 @@ export default class KettlerRacerAdapter extends DeviceAdapterBase implements De
     isBike(): boolean;
     isPower(): boolean;
     isHrm(): boolean;
+    isSame(device: DeviceAdapter): boolean;
     setID(id: any): void;
     getID(): string;
     getName(): string;

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

@@ -56,6 +56,12 @@ class KettlerRacerAdapter extends Device_1.default {
     isBike() { return true; }
     isPower() { return true; }
     isHrm() { return true; }
+    isSame(device) {
+        if (!(device instanceof KettlerRacerAdapter))
+            return false;
+        const adapter = device;
+        return (adapter.getName() === this.getName() && adapter.getPort() === this.getPort());
+    }
     setID(id) {
         this.id = id;
     }

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/lib/simulator/Simulator.d.ts

@@ -28,6 +28,7 @@ export declare class Simulator extends DeviceAdapter {
     isBike(): boolean;
     isHrm(): boolean;
     isPower(): boolean;
+    isSame(device: DeviceAdapter): boolean;
     getID(): string;
     getName(): string;
     getPort(): string;

package/lib/simulator/Simulator.js

@@ -68,6 +68,11 @@ class Simulator extends Device_1.default {
     isBike() { return true; }
     isHrm() { return false; }
     isPower() { return true; }
+    isSame(device) {
+        if (!(device instanceof Simulator))
+            return false;
+        return true;
+    }
     getID() { return Simulator.NAME; }
     getName() { return Simulator.NAME; }
     getPort() { return 'local'; }

package/package.json

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