incyclist-devices 1.4.89 → 1.4.91

package/lib/ble/ble-device.js

@@ -276,7 +276,6 @@ class BleDevice extends ble_1.BleDeviceClass {
     onData(characteristic, data) {
         const isDuplicate = this.checkForDuplicate(characteristic, data);
         if (isDuplicate) {
-            console.log('~~~ duplicate data', characteristic, data.toString('hex'));
             return;
         }
         this.logEvent({ message: 'got data', characteristic, data: data.toString('hex'), writeQueue: this.writeQueue.length });

package/lib/ble/consts.d.ts

@@ -8,5 +8,7 @@ export declare const INDOOR_BIKE_DATA = "2ad2";
 export declare const CSP = "1818";
 export declare const CSP_MEASUREMENT = "2a63";
 export declare const CSP_FEATURE = "2a65";
+export declare const CSC = "1816";
+export declare const CSC_MEASUREMENT = "2a5b";
 export declare const WAHOO_ADVANCED_TRAINER_CP = "a026e005";
 export declare const WAHOO_ADVANCED_TRAINER_CP_FULL = "A026E005-0A7D-4AB3-97FA-F1500F9FEB8B";

package/lib/ble/consts.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WAHOO_ADVANCED_TRAINER_CP_FULL = exports.WAHOO_ADVANCED_TRAINER_CP = exports.CSP_FEATURE = exports.CSP_MEASUREMENT = exports.CSP = 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.WAHOO_ADVANCED_TRAINER_CP_FULL = exports.WAHOO_ADVANCED_TRAINER_CP = exports.CSC_MEASUREMENT = exports.CSC = exports.CSP_FEATURE = exports.CSP_MEASUREMENT = exports.CSP = 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';
@@ -11,5 +11,7 @@ exports.INDOOR_BIKE_DATA = '2ad2';
 exports.CSP = '1818';
 exports.CSP_MEASUREMENT = '2a63';
 exports.CSP_FEATURE = '2a65';
+exports.CSC = '1816';
+exports.CSC_MEASUREMENT = '2a5b';
 exports.WAHOO_ADVANCED_TRAINER_CP = 'a026e005';
 exports.WAHOO_ADVANCED_TRAINER_CP_FULL = 'A026E005-0A7D-4AB3-97FA-F1500F9FEB8B';

package/lib/ble/tacx.d.ts

@@ -54,8 +54,9 @@ export default class TacxAdvancedFitnessMachineDevice extends BleFitnessMachineD
         rpm: number;
         time: any;
     };
-    parseCSC(_data: Buffer): IndoorBikeData;
-    parsePower(_data: Buffer): IndoorBikeData;
+    parseCSC(_data: Buffer, logOnly?: boolean): IndoorBikeData;
+    parsePower(_data: Buffer, logOnly?: boolean): IndoorBikeData;
+    parseIndoorBikeData(_data: Buffer, logOnly?: boolean): IndoorBikeData;
     resetState(): void;
     parseFEState(capStateBF: number): void;
     parseGeneralFE(data: Buffer): BleFeBikeData;

package/lib/ble/tacx.js

@@ -163,8 +163,10 @@ class TacxAdvancedFitnessMachineDevice extends fm_1.default {
             this.prevCrankData.cntUpdateMissing = cntUpdateMissing + 1;
         return { rpm, time: this.timeOffset + c.time };
     }
-    parseCSC(_data) {
+    parseCSC(_data, logOnly = false) {
         this.logEvent({ message: 'BLE CSC message', data: _data.toString('hex') });
+        if (logOnly)
+            return this.data;
         const data = Buffer.from(_data);
         let offset = 0;
         const flags = data.readUInt8(offset);
@@ -184,8 +186,10 @@ class TacxAdvancedFitnessMachineDevice extends fm_1.default {
         }
         return this.data;
     }
-    parsePower(_data) {
+    parsePower(_data, logOnly = false) {
         this.logEvent({ message: 'BLE CSP message', data: _data.toString('hex') });
+        if (logOnly)
+            return this.data;
         const data = Buffer.from(_data);
         try {
             let offset = 4;
@@ -214,6 +218,12 @@ class TacxAdvancedFitnessMachineDevice extends fm_1.default {
         const { instantaneousPower, cadence, time } = this.data;
         return { instantaneousPower, cadence, time, raw: data.toString('hex') };
     }
+    parseIndoorBikeData(_data, logOnly) {
+        this.logEvent({ message: 'BLE INDOOR_BIKE_DATA message', data: _data.toString('hex') });
+        if (logOnly)
+            return this.data;
+        return super.parseIndoorBikeData(_data);
+    }
     resetState() {
         const state = this.data;
         delete state.time;
@@ -445,20 +455,17 @@ class TacxAdvancedFitnessMachineDevice extends fm_1.default {
             }
             else {
                 switch (uuid) {
-                    case '2a63':
-                        if (!this.hasFECData)
-                            res = this.parsePower(data);
+                    case consts_1.CSP_MEASUREMENT:
+                        res = this.parsePower(data, this.hasFECData);
                         break;
-                    case '2ad2':
-                        if (!this.hasFECData)
-                            res = this.parseIndoorBikeData(data);
+                    case consts_1.INDOOR_BIKE_DATA:
+                        res = this.parseIndoorBikeData(data, this.hasFECData);
                         break;
                     case '2a37':
                         res = this.parseHrm(data);
                         break;
-                    case '2a5b':
-                        if (!this.hasFECData)
-                            res = this.parseCSC(data);
+                    case consts_1.CSC_MEASUREMENT:
+                        res = this.parseCSC(data, this.hasFECData);
                         break;
                     case '2ada':
                         if (!this.hasFECData)

package/lib/ble/wahoo-kickr.d.ts

@@ -3,6 +3,18 @@ import BleProtocol from './incyclist-protocol';
 import { BleDeviceClass, BleWriteProps } from './ble';
 import DeviceAdapter from '../Device';
 import BleFitnessMachineDevice, { FmAdapter } from './fm';
+export declare const enum OpCode {
+    unlock = 32,
+    setResistanceMode = 64,
+    setStandardMode = 65,
+    setErgMode = 66,
+    setSimMode = 67,
+    setSimCRR = 68,
+    setSimWindResistance = 69,
+    setSimGrade = 70,
+    setSimWindSpeed = 71,
+    setWheelCircumference = 72
+}
 declare type IndoorBikeData = {
     speed?: number;
     averageSpeed?: number;

package/lib/ble/wahoo-kickr.js

@@ -340,8 +340,12 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             this.logger.logEvent({ message: 'setSimGrade', slope });
             try {
-                const value = (slope / 100.0 + 1.0) * 32768;
-                const slopeVal = Math.floor(value);
+                let s = slope;
+                if (s < -100)
+                    s = -100;
+                if (s > 100)
+                    s = 100;
+                const slopeVal = Math.min(Math.floor(327.68 * s), 32767);
                 const data = Buffer.alloc(2);
                 data.writeInt16LE(slopeVal, 0);
                 const res = yield this.writeWahooFtmsMessage(70, data);

package/package.json

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