incyclist-devices 1.4.73 → 1.4.76

package/lib/ble/ble-interface.js

@@ -368,7 +368,7 @@ class BleInterface extends ble_1.BleInterfaceClass {
             this.logEvent({ message: 'trying to create device', peripheral: peripheral.address, characteristics: cids, profile: device.getProfile() });
             const existingDevice = this.devices.find(i => i.device.id === device.id && i.device.getProfile() === device.getProfile());
             if (existingDevice)
-                return existingDevice;
+                return existingDevice.device;
             device.setInterface(this);
             if (characteristics && device.isMatching(cids)) {
                 device.characteristics = characteristics;

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;
@@ -37,6 +42,7 @@ export default class TacxAdvancedFitnessMachineDevice extends BleFitnessMachineD
     isBike(): boolean;
     isPower(): boolean;
     isHrm(): boolean;
+    requestControl(): Promise<boolean>;
     parseCrankData(crankData: any): {
         rpm: number;
         time: any;
@@ -46,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

@@ -114,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 };
@@ -346,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') });
@@ -359,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

@@ -60,7 +60,7 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
             return false;
         const hasWahooCP = characteristics.find(c => c === WAHOO_ADVANCED_TRAINER_CP) !== undefined;
         const hasFTMS = characteristics.find(c => c === fm_1.FTMS_CP) !== undefined;
-        return hasWahooCP;
+        return hasWahooCP && !hasFTMS;
     }
     init() {
         const _super = Object.create(null, {

package/package.json

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