incyclist-devices 1.4.77 → 1.4.79

package/lib/ble/ble-device.js

@@ -316,7 +316,7 @@ class BleDevice extends ble_1.BleDeviceClass {
                         return;
                     }
                     if (withoutResponse) {
-                        this.logEvent({ message: 'writing' });
+                        this.logEvent({ message: 'writing', data: data.toString('hex'), withoutResponse });
                         characteristic.write(data, withoutResponse);
                         resolve(new ArrayBuffer(0));
                         return;

package/lib/ble/consts.d.ts

@@ -0,0 +1,7 @@
+export declare const TACX_FE_C_BLE = "6e40fec1";
+export declare const TACX_FE_C_RX = "6e40fec2";
+export declare const TACX_FE_C_TX = "6e40fec3";
+export declare const FTMS = "1826";
+export declare const FTMS_CP = "2ad9";
+export declare const FTMS_STATUS = "2ada";
+export declare const INDOOR_BIKE_DATA = "2ad2";

package/lib/ble/consts.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.INDOOR_BIKE_DATA = exports.FTMS_STATUS = exports.FTMS_CP = exports.FTMS = exports.TACX_FE_C_TX = exports.TACX_FE_C_RX = exports.TACX_FE_C_BLE = void 0;
+exports.TACX_FE_C_BLE = '6e40fec1';
+exports.TACX_FE_C_RX = '6e40fec2';
+exports.TACX_FE_C_TX = '6e40fec3';
+exports.FTMS = '1826';
+exports.FTMS_CP = '2ad9';
+exports.FTMS_STATUS = '2ada';
+exports.INDOOR_BIKE_DATA = '2ad2';

package/lib/ble/fm.d.ts

@@ -8,9 +8,6 @@ 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 = exports.INDOOR_BIKE_DATA = exports.FTMS_STATUS = exports.FTMS_CP = void 0;
+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"));
@@ -20,9 +20,7 @@ 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"));
-exports.FTMS_CP = '2ad9';
-exports.FTMS_STATUS = '2ada';
-exports.INDOOR_BIKE_DATA = '2ad2';
+const consts_1 = require("./consts");
 const cwABike = {
     race: 0.35,
     triathlon: 0.29,
@@ -99,9 +97,10 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
     isMatching(characteristics) {
         if (!characteristics)
             return false;
-        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;
+        const hasStatus = characteristics.find(c => c === consts_1.FTMS_STATUS) !== undefined;
+        const hasCP = characteristics.find(c => c === consts_1.FTMS_CP) !== undefined;
+        const hasIndoorBike = characteristics.find(c => c === consts_1.INDOOR_BIKE_DATA) !== undefined;
+        const hasTacx = characteristics.find(c => c === consts_1.TACX_FE_C_RX) !== undefined && characteristics.find(c => c === consts_1.TACX_FE_C_TX) !== undefined;
         return hasStatus && hasCP && hasIndoorBike;
     }
     subscribeWriteResponse(cuuid) {
@@ -131,7 +130,7 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
         });
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                yield this.subscribeWriteResponse(exports.FTMS_CP);
+                yield this.subscribeWriteResponse(consts_1.FTMS_CP);
                 yield _super.initDevice.call(this);
                 yield this.getFitnessMachineFeatures();
                 this.logEvent({ message: 'device info', deviceInfo: this.deviceInfo, features: this.features });
@@ -310,13 +309,13 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
         const uuid = characteristic.toLocaleLowerCase();
         let res = undefined;
         switch (uuid) {
-            case exports.INDOOR_BIKE_DATA:
+            case consts_1.INDOOR_BIKE_DATA:
                 res = this.parseIndoorBikeData(data);
                 break;
             case '2a37':
                 res = this.parseHrm(data);
                 break;
-            case exports.FTMS_STATUS:
+            case consts_1.FTMS_STATUS:
                 res = this.parseFitnessMachineStatus(data);
                 break;
             case '2a63':
@@ -334,7 +333,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(exports.FTMS_CP, data);
+                const res = yield this.write(consts_1.FTMS_CP, data);
                 const responseData = Buffer.from(res);
                 const opCode = responseData.readUInt8(0);
                 const request = responseData.readUInt8(1);
@@ -485,8 +484,8 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
     }
 }
 exports.default = BleFitnessMachineDevice;
-BleFitnessMachineDevice.services = ['1826'];
-BleFitnessMachineDevice.characteristics = ['2acc', exports.INDOOR_BIKE_DATA, '2ad6', '2ad8', exports.FTMS_CP, exports.FTMS_STATUS];
+BleFitnessMachineDevice.services = [consts_1.FTMS];
+BleFitnessMachineDevice.characteristics = ['2acc', consts_1.INDOOR_BIKE_DATA, '2ad6', '2ad8', consts_1.FTMS_CP, consts_1.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

@@ -24,6 +24,14 @@ declare type CrankData = {
     time?: number;
     cntUpdateMissing?: number;
 };
+declare type MessageInfo = {
+    message: string;
+    ts: number;
+    uuid: string;
+};
+declare type MessageLog = {
+    [uuid: string]: MessageInfo;
+};
 export default class TacxAdvancedFitnessMachineDevice extends BleFitnessMachineDevice {
     static services: string[];
     static characteristics: string[];
@@ -34,6 +42,8 @@ export default class TacxAdvancedFitnessMachineDevice extends BleFitnessMachineD
     tsPrevWrite: any;
     data: BleFeBikeData;
     hasFECData: boolean;
+    prevMessages: MessageLog;
+    messageCnt: number;
     constructor(props?: any);
     isMatching(characteristics: string[]): boolean;
     init(): Promise<boolean>;
@@ -44,6 +54,9 @@ export default class TacxAdvancedFitnessMachineDevice extends BleFitnessMachineD
     isHrm(): boolean;
     requestControl(): Promise<boolean>;
     parseCrankData(crankData: any): {
+        rpm?: undefined;
+        time?: undefined;
+    } | {
         rpm: number;
         time: any;
     };

package/lib/ble/tacx.js

@@ -36,9 +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 TACX_FE_C_BLE = '6e40fec1';
-const TACX_FE_C_RX = '6e40fec2';
-const TACX_FE_C_TX = '6e40fec3';
+const consts_1 = require("./consts");
 const SYNC_BYTE = 0xA4;
 const DEFAULT_CHANNEL = 5;
 const ACKNOWLEDGED_DATA = 0x4F;
@@ -76,13 +74,15 @@ class TacxAdvancedFitnessMachineDevice extends fm_1.default {
         this.tsPrevWrite = undefined;
         this.data = {};
         this.hasFECData = false;
+        this.messageCnt = 0;
+        this.prevMessages = {};
     }
     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;
+        const hasTacxCP = characteristics.find(c => c === consts_1.TACX_FE_C_RX) !== undefined && characteristics.find(c => c === consts_1.TACX_FE_C_TX) !== undefined;
+        const hasFTMS = characteristics.find(c => c === consts_1.FTMS_CP) !== undefined;
+        return hasTacxCP;
     }
     init() {
         const _super = Object.create(null, {
@@ -120,8 +120,10 @@ class TacxAdvancedFitnessMachineDevice extends fm_1.default {
         });
     }
     parseCrankData(crankData) {
-        if (!this.prevCrankData)
-            this.prevCrankData = { revolutions: 0, time: 0, cntUpdateMissing: -1 };
+        if (!this.prevCrankData) {
+            this.prevCrankData = Object.assign(Object.assign({}, crankData), { cntUpdateMissing: -1 });
+            return {};
+        }
         const c = this.currentCrankData = crankData;
         const p = this.prevCrankData;
         let rpm = this.data.cadence;
@@ -372,6 +374,8 @@ class TacxAdvancedFitnessMachineDevice extends fm_1.default {
                 break;
         }
         this.parseFEState(flagStateBF);
+        if (power !== undefined && cadence !== undefined)
+            this.hasFECData = true;
         return this.data;
     }
     parseProductInformation(data) {
@@ -421,8 +425,18 @@ class TacxAdvancedFitnessMachineDevice extends fm_1.default {
     onData(characteristic, data) {
         try {
             const uuid = characteristic.toLocaleLowerCase();
+            const message = data.toString('hex');
+            const ts = Date.now();
+            if (this.prevMessages[uuid]) {
+                const prev = this.prevMessages[uuid];
+                if (prev.message === message && prev.ts > ts - 500) {
+                    return;
+                }
+            }
+            this.prevMessages[uuid] = { uuid, ts, message };
+            this.messageCnt++;
             let res = undefined;
-            if (uuid && uuid.startsWith(TACX_FE_C_RX)) {
+            if (uuid && uuid.startsWith(consts_1.TACX_FE_C_RX)) {
                 res = this.parseFECMessage(data);
             }
             else {
@@ -439,7 +453,8 @@ class TacxAdvancedFitnessMachineDevice extends fm_1.default {
                         res = this.parseHrm(data);
                         break;
                     case '2a5b':
-                        res = this.parseCSC(data);
+                        if (!this.hasFECData)
+                            res = this.parseCSC(data);
                         break;
                     case '2ada':
                         if (!this.hasFECData)
@@ -477,7 +492,7 @@ class TacxAdvancedFitnessMachineDevice extends fm_1.default {
     }
     sendMessage(message) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.write(TACX_FE_C_TX, message, true);
+            yield this.write(consts_1.TACX_FE_C_TX, message, true);
             return true;
         });
     }
@@ -629,8 +644,8 @@ class TacxAdvancedFitnessMachineDevice extends fm_1.default {
     }
 }
 exports.default = TacxAdvancedFitnessMachineDevice;
-TacxAdvancedFitnessMachineDevice.services = [TACX_FE_C_BLE];
-TacxAdvancedFitnessMachineDevice.characteristics = ['2acc', '2ad2', '2ad6', '2ad8', '2ad9', '2ada', TACX_FE_C_RX, TACX_FE_C_TX];
+TacxAdvancedFitnessMachineDevice.services = [consts_1.TACX_FE_C_BLE];
+TacxAdvancedFitnessMachineDevice.characteristics = ['2acc', '2ad2', '2ad6', '2ad8', '2ad9', '2ada', consts_1.TACX_FE_C_RX, consts_1.TACX_FE_C_TX];
 TacxAdvancedFitnessMachineDevice.PROFILE = PROFILE_ID;
 ble_interface_1.default.register('TacxBleFEDevice', 'tacx-ble-fec', TacxAdvancedFitnessMachineDevice, TacxAdvancedFitnessMachineDevice.services);
 class TacxBleFEAdapter extends fm_1.FmAdapter {

package/lib/ble/wahoo-kickr.js

@@ -36,6 +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 consts_1 = require("./consts");
 const WAHOO_ADVANCED_FTMS = 'a026ee0b';
 const WAHOO_ADVANCED_TRAINER_CP = 'a026e005';
 const cwABike = {
@@ -59,7 +60,7 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
         if (!characteristics)
             return false;
         const hasWahooCP = characteristics.find(c => c === WAHOO_ADVANCED_TRAINER_CP) !== undefined;
-        const hasFTMS = characteristics.find(c => c === fm_1.FTMS_CP) !== undefined;
+        const hasFTMS = characteristics.find(c => c === consts_1.FTMS_CP) !== undefined;
         return hasWahooCP && !hasFTMS;
     }
     init() {

package/package.json

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