incyclist-devices 1.4.72 → 1.4.75

package/lib/ble/ble-interface.js

@@ -198,18 +198,24 @@ class BleInterface extends ble_1.BleInterfaceClass {
             return [];
         }
         const get = (deviceTypes, fnCompare) => {
-            return deviceTypes.filter(DeviceType => {
+            const types = deviceTypes.filter(DeviceType => {
                 const C = DeviceType;
-                if (!C.services)
-                    return false;
-                return C.services.find((s) => fnCompare(s));
+                let found = false;
+                if (C.services)
+                    found = C.services.find((s) => fnCompare(s));
+                return found;
             });
+            return types;
         };
         if (typeof services === 'string') {
-            return get(deviceTypes, (s) => s === (0, ble_1.uuid)(services));
+            return get(deviceTypes, (s) => (0, ble_1.uuid)(s) === (0, ble_1.uuid)(services));
         }
         if (Array.isArray(services)) {
-            return get(deviceTypes, s => services.map(ble_1.uuid).includes(s));
+            const sids = services.map(ble_1.uuid);
+            return get(deviceTypes, s => {
+                const res = sids.includes((0, ble_1.uuid)(s));
+                return res;
+            });
         }
         return [];
     }
@@ -579,7 +585,12 @@ class BleInterface extends ble_1.BleInterfaceClass {
                         const d = this.createDevice(DeviceClass, peripheral, characteristics);
                         if (!d)
                             return;
-                        yield d.connect();
+                        try {
+                            yield d.connect();
+                        }
+                        catch (err) {
+                            this.logEvent({ message: 'error', fn: 'onPeripheralFound()', error: err.message || err, stack: err.stack });
+                        }
                         if (scanForDevice) {
                             if ((id && id !== '' && d.id === id) ||
                                 (address && address !== '' && d.address === address) ||

package/lib/ble/fm.d.ts

@@ -8,6 +8,9 @@ import { DeviceProtocol } from '../DeviceProtocol';
 import { EventLogger } from 'gd-eventlog';
 import CyclingMode from '../CyclingMode';
 import { IncyclistBikeData } from '../CyclingMode';
+export declare const FTMS_CP = "2ad9";
+export declare const FTMS_STATUS = "2ada";
+export declare const INDOOR_BIKE_DATA = "2ad2";
 declare type PowerData = {
     instantaneousPower?: number;
     balance?: number;

package/lib/ble/fm.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FmAdapter = void 0;
+exports.FmAdapter = exports.INDOOR_BIKE_DATA = exports.FTMS_STATUS = exports.FTMS_CP = void 0;
 const ble_device_1 = require("./ble-device");
 const ble_interface_1 = __importDefault(require("./ble-interface"));
 const Device_1 = __importDefault(require("../Device"));
@@ -20,9 +20,9 @@ const gd_eventlog_1 = require("gd-eventlog");
 const power_meter_1 = __importDefault(require("../modes/power-meter"));
 const ble_st_mode_1 = __importDefault(require("./ble-st-mode"));
 const ble_erg_mode_1 = __importDefault(require("./ble-erg-mode"));
-const FTMS_CP = '2ad9';
-const FTMS_STATUS = '2ada';
-const INDOOR_BIKE_DATA = '2ad2';
+exports.FTMS_CP = '2ad9';
+exports.FTMS_STATUS = '2ada';
+exports.INDOOR_BIKE_DATA = '2ad2';
 const cwABike = {
     race: 0.35,
     triathlon: 0.29,
@@ -99,9 +99,9 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
     isMatching(characteristics) {
         if (!characteristics)
             return false;
-        const hasStatus = characteristics.find(c => c === FTMS_STATUS) !== undefined;
-        const hasCP = characteristics.find(c => c === FTMS_CP) !== undefined;
-        const hasIndoorBike = characteristics.find(c => c === INDOOR_BIKE_DATA) !== undefined;
+        const hasStatus = characteristics.find(c => c === exports.FTMS_STATUS) !== undefined;
+        const hasCP = characteristics.find(c => c === exports.FTMS_CP) !== undefined;
+        const hasIndoorBike = characteristics.find(c => c === exports.INDOOR_BIKE_DATA) !== undefined;
         return hasStatus && hasCP && hasIndoorBike;
     }
     subscribeWriteResponse(cuuid) {
@@ -131,7 +131,7 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
         });
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                yield this.subscribeWriteResponse(FTMS_CP);
+                yield this.subscribeWriteResponse(exports.FTMS_CP);
                 yield _super.initDevice.call(this);
                 yield this.getFitnessMachineFeatures();
                 this.logEvent({ message: 'device info', deviceInfo: this.deviceInfo, features: this.features });
@@ -310,13 +310,13 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
         const uuid = characteristic.toLocaleLowerCase();
         let res = undefined;
         switch (uuid) {
-            case INDOOR_BIKE_DATA:
+            case exports.INDOOR_BIKE_DATA:
                 res = this.parseIndoorBikeData(data);
                 break;
             case '2a37':
                 res = this.parseHrm(data);
                 break;
-            case FTMS_STATUS:
+            case exports.FTMS_STATUS:
                 res = this.parseFitnessMachineStatus(data);
                 break;
             case '2a63':
@@ -334,7 +334,7 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 this.logEvent({ message: 'fmts:write', data: data.toString('hex') });
-                const res = yield this.write(FTMS_CP, data);
+                const res = yield this.write(exports.FTMS_CP, data);
                 const responseData = Buffer.from(res);
                 const opCode = responseData.readUInt8(0);
                 const request = responseData.readUInt8(1);
@@ -486,7 +486,7 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
 }
 exports.default = BleFitnessMachineDevice;
 BleFitnessMachineDevice.services = ['1826'];
-BleFitnessMachineDevice.characteristics = ['2acc', INDOOR_BIKE_DATA, '2ad6', '2ad8', FTMS_CP, FTMS_STATUS];
+BleFitnessMachineDevice.characteristics = ['2acc', exports.INDOOR_BIKE_DATA, '2ad6', '2ad8', exports.FTMS_CP, exports.FTMS_STATUS];
 ble_interface_1.default.register('BleFitnessMachineDevice', 'fm', BleFitnessMachineDevice, BleFitnessMachineDevice.services);
 class FmAdapter extends Device_1.default {
     constructor(device, protocol) {

package/lib/ble/tacx.d.ts

@@ -13,6 +13,11 @@ interface BleFeBikeData extends IndoorBikeData {
     AccumulatedPower?: number;
     TrainerStatus?: number;
     TargetStatus?: 'OnTarget' | 'LowSpeed' | 'HighSpeed';
+    HwVersion?: number;
+    ManId?: number;
+    ModelNum?: number;
+    SwVersion?: number;
+    SerialNumber?: number;
 }
 declare type CrankData = {
     revolutions?: number;
@@ -30,12 +35,14 @@ export default class TacxAdvancedFitnessMachineDevice extends BleFitnessMachineD
     data: BleFeBikeData;
     hasFECData: boolean;
     constructor(props?: any);
+    isMatching(characteristics: string[]): boolean;
     init(): Promise<boolean>;
     getProfile(): string;
     getServiceUUids(): string[];
     isBike(): boolean;
     isPower(): boolean;
     isHrm(): boolean;
+    requestControl(): Promise<boolean>;
     parseCrankData(crankData: any): {
         rpm: number;
         time: any;
@@ -45,8 +52,9 @@ export default class TacxAdvancedFitnessMachineDevice extends BleFitnessMachineD
     parseFEState(capStateBF: number): void;
     parseGeneralFE(data: Buffer): BleFeBikeData;
     parseTrainerData(data: Buffer): BleFeBikeData;
+    parseProductInformation(data: Buffer): BleFeBikeData;
     parseFECMessage(_data: Buffer): BleFeBikeData;
-    onData(characteristic: string, data: Buffer): void;
+    onData(characteristic: string, data: Buffer): any;
     getChecksum(message: any[]): number;
     buildMessage(payload?: number[], msgID?: number): Buffer;
     sendMessage(message: Buffer): Promise<boolean>;

package/lib/ble/tacx.js

@@ -77,6 +77,13 @@ class TacxAdvancedFitnessMachineDevice extends fm_1.default {
         this.data = {};
         this.hasFECData = false;
     }
+    isMatching(characteristics) {
+        if (!characteristics)
+            return false;
+        const hasTacxCP = characteristics.find(c => c === TACX_FE_C_RX) !== undefined && characteristics.find(c => c === TACX_FE_C_TX) !== undefined;
+        const hasFTMS = characteristics.find(c => c === fm_1.FTMS_CP) !== undefined;
+        return hasTacxCP && !hasFTMS;
+    }
     init() {
         const _super = Object.create(null, {
             initDevice: { get: () => super.initDevice }
@@ -107,6 +114,11 @@ class TacxAdvancedFitnessMachineDevice extends fm_1.default {
     isHrm() {
         return this.hasService('180d');
     }
+    requestControl() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return true;
+        });
+    }
     parseCrankData(crankData) {
         if (!this.prevCrankData)
             this.prevCrankData = { revolutions: 0, time: 0, cntUpdateMissing: -1 };
@@ -339,8 +351,22 @@ class TacxAdvancedFitnessMachineDevice extends fm_1.default {
         this.parseFEState(flagStateBF);
         return this.data;
     }
+    parseProductInformation(data) {
+        const swRevSup = data.readUInt8(2);
+        const swRevMain = data.readUInt8(3);
+        const serial = data.readInt32LE(4);
+        this.data.SwVersion = swRevMain;
+        if (swRevSup !== 0xFF) {
+            this.data.SwVersion += swRevSup / 1000;
+        }
+        if (serial !== 0xFFFFFFFF) {
+            this.data.SerialNumber = serial;
+        }
+        return this.data;
+    }
     parseFECMessage(_data) {
         const data = Buffer.from(_data);
+        this.logEvent({ message: 'FE-C message', data: data.toString('hex') });
         const c = data.readUInt8(0);
         if (c !== SYNC_BYTE) {
             this.logEvent({ message: 'SYNC missing', raw: data.toString('hex') });
@@ -352,45 +378,54 @@ class TacxAdvancedFitnessMachineDevice extends fm_1.default {
         let res;
         switch (messageId) {
             case ANTMessages.generalFE:
-                res = this.parseGeneralFE(data.slice(4, len + 2));
+                res = this.parseGeneralFE(data.slice(4, len + 3));
                 break;
             case ANTMessages.trainerData:
-                res = this.parseTrainerData(data.slice(4, len + 2));
+                res = this.parseTrainerData(data.slice(4, len + 3));
+                break;
+            case ANTMessages.productInformation:
+                res = this.parseProductInformation(data.slice(4, len + 3));
                 break;
         }
         res.raw = data.toString('hex');
         return res;
     }
     onData(characteristic, data) {
-        super.onData(characteristic, data);
-        const uuid = characteristic.toLocaleLowerCase();
-        let res = undefined;
-        if (uuid && uuid.startsWith(TACX_FE_C_RX)) {
-            res = this.parseFECMessage(data);
-        }
-        else {
-            switch (uuid) {
-                case '2a63':
-                    if (!this.hasFECData)
-                        res = this.parsePower(data);
-                    break;
-                case '2ad2':
-                    if (!this.hasFECData)
-                        res = this.parseIndoorBikeData(data);
-                    break;
-                case '2a37':
-                    res = this.parseHrm(data);
-                    break;
-                case '2ada':
-                    if (!this.hasFECData)
-                        res = this.parseFitnessMachineStatus(data);
-                    break;
-                default:
-                    break;
+        try {
+            super.onData(characteristic, data);
+            const uuid = characteristic.toLocaleLowerCase();
+            let res = undefined;
+            if (uuid && uuid.startsWith(TACX_FE_C_RX)) {
+                res = this.parseFECMessage(data);
+            }
+            else {
+                switch (uuid) {
+                    case '2a63':
+                        if (!this.hasFECData)
+                            res = this.parsePower(data);
+                        break;
+                    case '2ad2':
+                        if (!this.hasFECData)
+                            res = this.parseIndoorBikeData(data);
+                        break;
+                    case '2a37':
+                        res = this.parseHrm(data);
+                        break;
+                    case '2ada':
+                        if (!this.hasFECData)
+                            res = this.parseFitnessMachineStatus(data);
+                        break;
+                    default:
+                        break;
+                }
             }
+            if (res)
+                this.emit('data', res);
+            return res;
+        }
+        catch (err) {
+            this.logEvent({ message: 'error', fn: 'tacx.onData()', error: err.message || err, stack: err.stack });
         }
-        if (res)
-            this.emit('data', res);
     }
     getChecksum(message) {
         let checksum = 0;

package/lib/ble/wahoo-kickr.js

@@ -36,7 +36,7 @@ const ble_interface_1 = __importDefault(require("./ble-interface"));
 const Device_1 = require("../Device");
 const gd_eventlog_1 = require("gd-eventlog");
 const fm_1 = __importStar(require("./fm"));
-const WAHOO_ADVANCED_FTMS = 'a026e00b';
+const WAHOO_ADVANCED_FTMS = 'a026ee0b';
 const WAHOO_ADVANCED_TRAINER_CP = 'a026e005';
 const cwABike = {
     race: 0.35,
@@ -59,7 +59,8 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
         if (!characteristics)
             return false;
         const hasWahooCP = characteristics.find(c => c === WAHOO_ADVANCED_TRAINER_CP) !== undefined;
-        return hasWahooCP;
+        const hasFTMS = characteristics.find(c => c === fm_1.FTMS_CP) !== undefined;
+        return hasWahooCP && !hasFTMS;
     }
     init() {
         const _super = Object.create(null, {

package/package.json

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