incyclist-devices 1.4.43 → 1.4.46

package/lib/ble/fm.js

@@ -12,11 +12,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.FmAdapter = void 0;
 const ble_device_1 = require("./ble-device");
 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),
@@ -33,17 +35,109 @@ const IndoorBikeDataFlag = {
     ElapsedTimePresent: bit(11),
     RemainingTimePresent: bit(12)
 };
+const FitnessMachineFeatureFlag = {
+    AverageSpeedSupported: bit(0),
+    CadenceSupported: bit(1),
+    TotalDistanceSupported: bit(2),
+    InclinationSupported: bit(3),
+    ElevationGainSupported: bit(4),
+    PaceSupported: bit(5),
+    StepCountSupported: bit(6),
+    ResistanceLevelSupported: bit(7),
+    StrideCountSupported: bit(8),
+    ExpendedEnergySupported: bit(9),
+    HeartRateMeasurementSupported: bit(10),
+    MetabolicEquivalentSupported: bit(11),
+    ElapsedTimeSupported: bit(12),
+    RemainingTimeSupported: bit(13),
+    PowerMeasurementSupported: bit(14),
+    ForceOnBeltAndPowerOutputSupported: bit(15),
+    UserDataRetentionSupported: bit(16)
+};
+const TargetSettingFeatureFlag = {
+    SpeedTargetSettingSupported: bit(0),
+    InclinationTargetSettingSupported: bit(1),
+    ResistanceTargetSettingSupported: bit(2),
+    PowerTargetSettingSupported: bit(3),
+    HeartRateTargetSettingSupported: bit(4),
+    TargetedExpendedEnergyConfigurationSupported: bit(5),
+    TargetedStepNumberConfigurationSupported: bit(6),
+    TargetedStrideNumberConfigurationSupported: bit(7),
+    TargetedDistanceConfigurationSupported: bit(8),
+    TargetedTrainingTimeConfigurationSupported: bit(9),
+    TargetedTimeInTwoHeartRateZonesConfigurationSupported: bit(10),
+    TargetedTimeInThreeHeartRateZonesConfigurationSupported: bit(11),
+    TargetedTimeInFiveHeartRateZonesConfigurationSupported: bit(12),
+    IndoorBikeSimulationParametersSupported: bit(13),
+    WheelCircumferenceConfigurationSupported: bit(14),
+    SpinDownControlSupported: bit(15),
+    TargetedCadenceConfigurationSupported: bit(16)
+};
 class BleFitnessMachineDevice extends ble_device_1.BleDevice {
     constructor(props) {
         super(props);
+        this.features = undefined;
+        this.hasControl = false;
+        this.isCPSubscribed = false;
         this.data = {};
     }
+    init() {
+        const _super = Object.create(null, {
+            init: { get: () => super.init }
+        });
+        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';
     }
     getServiceUUids() {
         return BleFitnessMachineDevice.services;
     }
+    isBike() {
+        return this.features !== undefined &&
+            (this.features.targetSettings & TargetSettingFeatureFlag.IndoorBikeSimulationParametersSupported) !== 0;
+    }
+    isPower() {
+        if (this.hasService('1818'))
+            return true;
+        if (this.features === undefined)
+            return false;
+        const { fitnessMachine } = this.features;
+        if (fitnessMachine & FitnessMachineFeatureFlag.PowerMeasurementSupported)
+            return true;
+    }
+    isHrm() {
+        return this.hasService('180d') || (this.features && (this.features.fitnessMachine & FitnessMachineFeatureFlag.HeartRateMeasurementSupported) !== 0);
+    }
+    parseHrm(_data) {
+        const data = Buffer.from(_data);
+        try {
+            const flags = data.readUInt8(0);
+            if (flags % 1 === 0) {
+                this.data.heartrate = data.readUInt8(1);
+            }
+            else {
+                this.data.heartrate = data.readUInt16LE(1);
+            }
+        }
+        catch (err) {
+        }
+        return Object.assign(Object.assign({}, this.data), { raw: data.toString('hex') });
+    }
     parseIndoorBikeData(_data) {
         const data = Buffer.from(_data);
         const flags = data.readUInt16LE(0);
@@ -102,20 +196,56 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
         }
         return Object.assign(Object.assign({}, this.data), { raw: data.toString('hex') });
     }
+    getFitnessMachineFeatures() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.features)
+                return this.features;
+            try {
+                const data = yield this.read('2acc');
+                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 });
+            }
+        });
+    }
     onData(characteristic, data) {
-        console.log(characteristic.toLocaleLowerCase(), data);
         if (characteristic.toLocaleLowerCase() === '2ad2') {
             const res = this.parseIndoorBikeData(data);
             this.emit('data', res);
         }
+        if (characteristic.toLocaleLowerCase() === '2a37') {
+            const res = this.parseHrm(data);
+            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;
+        });
     }
-    read(characteristic) {
-        console.log('read', characteristic);
-        return Promise.resolve(Buffer.from([]));
+    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 = {};
@@ -136,9 +266,15 @@ class FmAdapter extends Device_1.default {
         this.mode = this.getDefaultCyclingMode();
         this.logger = new gd_eventlog_1.EventLogger('BLE-FM');
     }
-    isBike() { return true; }
-    isHrm() { return false; }
-    isPower() { return true; }
+    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';
     }
@@ -218,6 +354,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) {

package/lib/ble/hrm.d.ts

@@ -21,8 +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>;
-    read(characteristic: any): Promise<Buffer>;
 }
 export declare class HrmAdapter extends DeviceAdapter {
     device: BleHrmDevice;
@@ -35,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

@@ -12,6 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.HrmAdapter = void 0;
 const ble_device_1 = require("./ble-device");
 const ble_interface_1 = __importDefault(require("./ble-interface"));
 const Device_1 = __importDefault(require("../Device"));
@@ -55,14 +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);
-    }
-    read(characteristic) {
-        console.log('read', characteristic);
-        return Promise.resolve(Buffer.from([]));
-    }
 }
 exports.default = BleHrmDevice;
 BleHrmDevice.services = ['180d'];
@@ -80,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

@@ -1,4 +1,27 @@
 "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);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,13 +31,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -62,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

@@ -33,6 +33,7 @@ export default class BleCyclingPowerDevice extends BleDevice {
     currentCrankData: CrankData;
     prevCrankData: CrankData;
     constructor(props?: any);
+    init(): Promise<boolean>;
     getProfile(): string;
     getServiceUUids(): string[];
     parseCrankData(crankData: any): {
@@ -41,8 +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>;
-    read(characteristic: any): Promise<Buffer>;
     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;

package/lib/ble/pwr.js

@@ -12,6 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.PwrAdapter = void 0;
 const ble_device_1 = require("./ble-device");
 const ble_interface_1 = __importDefault(require("./ble-interface"));
 const Device_1 = __importDefault(require("../Device"));
@@ -29,6 +30,19 @@ class BleCyclingPowerDevice extends ble_device_1.BleDevice {
         this.currentCrankData = undefined;
         this.prevCrankData = undefined;
     }
+    init() {
+        const _super = Object.create(null, {
+            init: { get: () => super.init }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield _super.init.call(this);
+            }
+            catch (err) {
+                return Promise.resolve(false);
+            }
+        });
+    }
     getProfile() {
         return 'Power Meter';
     }
@@ -100,14 +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);
-    }
-    read(characteristic) {
-        console.log('read', characteristic);
-        return Promise.resolve(Buffer.from([]));
-    }
     reset() {
         this.instantaneousPower = undefined;
         this.balance = undefined;
@@ -137,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';
     }

package/lib/calculations.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.solveCubic = exports.IllegalArgumentException = void 0;
 const g = 9.80665;
 const rho = 1.2041;
 const cwABike = {

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

@@ -1,4 +1,27 @@
 "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);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,13 +31,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -115,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;
     }
@@ -300,16 +322,16 @@ class DaumAdapterBase extends Device_1.default {
             return;
         let distance = 0;
         if (this.distanceInternal !== undefined && this.cyclingData.distanceInternal !== undefined) {
-            distance = utils_1.intVal(this.cyclingData.distanceInternal - this.distanceInternal);
+            distance = (0, utils_1.intVal)(this.cyclingData.distanceInternal - this.distanceInternal);
         }
         if (this.cyclingData.distanceInternal !== undefined)
             this.distanceInternal = this.cyclingData.distanceInternal;
         let data = {
-            speed: utils_1.floatVal(this.cyclingData.speed),
-            slope: utils_1.floatVal(this.cyclingData.slope),
-            power: utils_1.intVal(this.cyclingData.power),
-            cadence: utils_1.intVal(this.cyclingData.pedalRpm),
-            heartrate: utils_1.intVal(this.cyclingData.heartrate),
+            speed: (0, utils_1.floatVal)(this.cyclingData.speed),
+            slope: (0, utils_1.floatVal)(this.cyclingData.slope),
+            power: (0, utils_1.intVal)(this.cyclingData.power),
+            cadence: (0, utils_1.intVal)(this.cyclingData.pedalRpm),
+            heartrate: (0, utils_1.intVal)(this.cyclingData.heartrate),
             distance,
             timestamp: Date.now(),
             deviceTime: this.cyclingData.time,

package/lib/daum/SmartTrainerCyclingMode.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.direction = void 0;
 const gd_eventlog_1 = require("gd-eventlog");
 const CyclingMode_1 = require("../CyclingMode");
 const calculations_1 = __importDefault(require("../calculations"));

package/lib/daum/classic/DaumClassicAdapter.js

@@ -86,7 +86,7 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
             const { user } = props;
             this.initData();
             let startState = {};
-            return utils_1.runWithRetries(() => __awaiter(this, void 0, void 0, function* () {
+            return (0, utils_1.runWithRetries)(() => __awaiter(this, void 0, void 0, function* () {
                 try {
                     if (!this.bike.isConnected())
                         yield this.bike.saveConnect();

package/lib/daum/classic/DaumClassicProtocol.js

@@ -1,4 +1,27 @@
 "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);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,13 +31,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };