incyclist-devices 1.4.77 → 1.4.78

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/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

@@ -76,6 +76,8 @@ class TacxAdvancedFitnessMachineDevice extends fm_1.default {
         this.tsPrevWrite = undefined;
         this.data = {};
         this.hasFECData = false;
+        this.messageCnt = 0;
+        this.prevMessages = {};
     }
     isMatching(characteristics) {
         if (!characteristics)
@@ -120,8 +122,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 +376,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,6 +427,16 @@ 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)) {
                 res = this.parseFECMessage(data);
@@ -439,7 +455,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)

package/package.json

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