incyclist-devices 1.4.88 → 1.4.90

package/lib/ble/ble-device.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { EventLogger } from "gd-eventlog";
-import { BleInterfaceClass, BleDeviceClass, BlePeripheral, BleDeviceProps, ConnectProps, BleDeviceInfo } from "./ble";
+import { BleInterfaceClass, BleDeviceClass, BlePeripheral, BleDeviceProps, ConnectProps, BleDeviceInfo, BleWriteProps } from "./ble";
 import BlePeripheralConnector from "./ble-peripheral";
 interface BleDeviceConstructProps extends BleDeviceProps {
     log?: boolean;
@@ -55,7 +55,7 @@ export declare abstract class BleDevice extends BleDeviceClass {
     timeoutCheck(): void;
     startWorker(): void;
     stopWorker(): void;
-    write(characteristicUuid: string, data: Buffer, withoutResponse?: boolean): Promise<ArrayBuffer>;
+    write(characteristicUuid: string, data: Buffer, props?: BleWriteProps): Promise<ArrayBuffer>;
     read(characteristicUuid: string): Promise<Uint8Array>;
     getDeviceInfo(): Promise<BleDeviceInfo>;
 }

package/lib/ble/ble-device.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BleDevice = void 0;
 const gd_eventlog_1 = require("gd-eventlog");
 const ble_1 = require("./ble");
+const ble_2 = require("./ble");
 const CONNECT_WAIT_TIMEOUT = 10000;
 const BLE_TIMEOUT = 1000;
 class BleDevice extends ble_1.BleDeviceClass {
@@ -273,8 +274,13 @@ class BleDevice extends ble_1.BleDeviceClass {
         return false;
     }
     onData(characteristic, data) {
+        const isDuplicate = this.checkForDuplicate(characteristic, data);
+        if (isDuplicate) {
+            return;
+        }
+        this.logEvent({ message: 'got data', characteristic, data: data.toString('hex'), writeQueue: this.writeQueue.length });
         if (this.writeQueue.length > 0) {
-            const writeIdx = this.writeQueue.findIndex(i => i.uuid === characteristic.toLocaleLowerCase());
+            const writeIdx = this.writeQueue.findIndex(i => (0, ble_2.matches)(i.uuid, characteristic));
             if (writeIdx !== -1) {
                 const writeItem = this.writeQueue[writeIdx];
                 this.writeQueue.splice(writeIdx, 1);
@@ -312,9 +318,10 @@ class BleDevice extends ble_1.BleDeviceClass {
         clearInterval(this.workerIv);
         this.workerIv = null;
     }
-    write(characteristicUuid, data, withoutResponse = false) {
+    write(characteristicUuid, data, props) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
+                const { withoutResponse, timeout } = props || {};
                 const connector = this.ble.getConnector(this.peripheral);
                 const isAlreadySubscribed = connector.isSubscribed(characteristicUuid);
                 if (!withoutResponse && !this.workerIv) {
@@ -345,7 +352,8 @@ class BleDevice extends ble_1.BleDeviceClass {
                     else {
                         const writeId = this.writeQueue.length;
                         let messageDeleted = false;
-                        this.writeQueue.push({ uuid: characteristicUuid.toLocaleLowerCase(), data, timeout: Date.now() + BLE_TIMEOUT, resolve, reject });
+                        const writeTimeout = timeout !== undefined ? timeout : BLE_TIMEOUT;
+                        this.writeQueue.push({ uuid: characteristicUuid.toLocaleLowerCase(), data, timeout: Date.now() + writeTimeout, resolve, reject });
                         const to = setTimeout(() => {
                             if (this.writeQueue.length > writeId && !messageDeleted)
                                 this.writeQueue.splice(writeId, 1);

package/lib/ble/ble-erg-mode.js

@@ -100,9 +100,6 @@ class BleERGCyclingMode extends power_base_1.default {
             let power = bikeData.power || 0;
             const slope = (prevData.slope !== undefined ? prevData.slope : prevRequest.slope || 0);
             const distanceInternal = prevData.distanceInternal || 0;
-            if (bikeData.pedalRpm === 0 || bikeData.isPedalling === false) {
-                power = 0;
-            }
             const m = this.getWeight();
             const t = this.getTimeSinceLastUpdate();
             const { speed, distance } = this.calculateSpeedAndDistance(power, slope, m, t, { bikeType });

package/lib/ble/ble.d.ts

@@ -44,6 +44,10 @@ export declare abstract class BleDeviceClass extends EventEmitter {
     abstract getDeviceInfo(): Promise<BleDeviceInfo>;
     setCharacteristicUUIDs(uuids: string[]): void;
 }
+export interface BleWriteProps {
+    withoutResponse?: boolean;
+    timeout?: number;
+}
 export interface BleBinding extends EventEmitter {
     startScanning(serviceUUIDs?: string[], allowDuplicates?: boolean, callback?: (error?: Error) => void): void;
     stopScanning(callback?: () => void): void;

package/lib/ble/fm.d.ts

@@ -2,7 +2,7 @@
 import { BleDevice } from './ble-device';
 import BleInterface from './ble-interface';
 import BleProtocol from './incyclist-protocol';
-import { BleDeviceClass } from './ble';
+import { BleDeviceClass, BleWriteProps } from './ble';
 import DeviceAdapter, { DeviceData } from '../Device';
 import { DeviceProtocol } from '../DeviceProtocol';
 import { EventLogger } from 'gd-eventlog';
@@ -72,7 +72,7 @@ export default class BleFitnessMachineDevice extends BleDevice {
     parseFitnessMachineStatus(_data: Uint8Array): IndoorBikeData;
     getFitnessMachineFeatures(): Promise<IndoorBikeFeatures>;
     onData(characteristic: string, data: Buffer): void;
-    writeFtmsMessage(requestedOpCode: any, data: any): Promise<number>;
+    writeFtmsMessage(requestedOpCode: any, data: any, props?: BleWriteProps): Promise<number>;
     requestControl(): Promise<boolean>;
     setTargetPower(power: number): Promise<boolean>;
     setSlope(slope: any): Promise<boolean>;

package/lib/ble/fm.js

@@ -307,9 +307,6 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
     }
     onData(characteristic, data) {
         super.onData(characteristic, data);
-        const isDuplicate = this.checkForDuplicate(characteristic, data);
-        if (isDuplicate)
-            return;
         const uuid = characteristic.toLocaleLowerCase();
         let res = undefined;
         switch (uuid) {
@@ -332,11 +329,11 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
         if (res)
             this.emit('data', res);
     }
-    writeFtmsMessage(requestedOpCode, data) {
+    writeFtmsMessage(requestedOpCode, data, props) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 this.logEvent({ message: 'fmts:write', data: data.toString('hex') });
-                const res = yield this.write(consts_1.FTMS_CP, data);
+                const res = yield this.write(consts_1.FTMS_CP, data, props);
                 const responseData = Buffer.from(res);
                 const opCode = responseData.readUInt8(0);
                 const request = responseData.readUInt8(1);
@@ -364,7 +361,7 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
             this.isCheckingControl = true;
             const data = Buffer.alloc(1);
             data.writeUInt8(0, 0);
-            const res = yield this.writeFtmsMessage(0, data);
+            const res = yield this.writeFtmsMessage(0, data, { timeout: 5000 });
             if (res === 1) {
                 this.hasControl = true;
             }

package/lib/ble/tacx.js

@@ -496,7 +496,7 @@ class TacxAdvancedFitnessMachineDevice extends fm_1.default {
     }
     sendMessage(message) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.write(this.tacxTx, message, true);
+            yield this.write(this.tacxTx, message, { withoutResponse: true });
             return true;
         });
     }

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

@@ -1,8 +1,20 @@
 /// <reference types="node" />
 import BleProtocol from './incyclist-protocol';
-import { BleDeviceClass } from './ble';
+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;
@@ -37,6 +49,7 @@ export default class WahooAdvancedFitnessMachineDevice extends BleFitnessMachine
     prevSlope: any;
     wahooCP: string;
     isSimMode: boolean;
+    isRequestControlBusy: boolean;
     weight: number;
     simModeSettings: {
         weight: number;
@@ -58,7 +71,7 @@ export default class WahooAdvancedFitnessMachineDevice extends BleFitnessMachine
     };
     parsePower(_data: Buffer): IndoorBikeData;
     onData(characteristic: string, data: Buffer): void;
-    writeWahooFtmsMessage(requestedOpCode: number, data: Buffer): Promise<boolean>;
+    writeWahooFtmsMessage(requestedOpCode: number, data: Buffer, props?: BleWriteProps): Promise<boolean>;
     requestControl(): Promise<boolean>;
     setPowerAdjusting(): void;
     isPowerAdjusting(): boolean;

package/lib/ble/wahoo-kickr.js

@@ -54,6 +54,7 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
         this.timeOffset = 0;
         this.tsPrevWrite = undefined;
         this.prevSlope = undefined;
+        this.isRequestControlBusy = false;
         this.weight = Device_1.DEFAULT_BIKE_WEIGHT + Device_1.DEFAULT_USER_WEIGHT;
         this.data = {};
         this.wahooCP = consts_1.WAHOO_ADVANCED_TRAINER_CP;
@@ -73,7 +74,8 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
             try {
                 yield this.subscribeWriteResponse(this.wahooCP);
                 try {
-                    yield this.subscribeWriteResponse(consts_1.WAHOO_ADVANCED_TRAINER_CP_FULL.toLowerCase());
+                    if (this.wahooCP !== consts_1.WAHOO_ADVANCED_TRAINER_CP_FULL.toLowerCase())
+                        yield this.subscribeWriteResponse(consts_1.WAHOO_ADVANCED_TRAINER_CP_FULL.toLowerCase());
                 }
                 catch (err) {
                 }
@@ -169,7 +171,6 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
     }
     onData(characteristic, data) {
         super.onData(characteristic, data);
-        const isDuplicate = this.checkForDuplicate(characteristic, data);
         const uuid = characteristic.toLowerCase();
         let res = undefined;
         switch (uuid) {
@@ -192,14 +193,14 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
         if (res)
             this.emit('data', res);
     }
-    writeWahooFtmsMessage(requestedOpCode, data) {
+    writeWahooFtmsMessage(requestedOpCode, data, props) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const opcode = Buffer.alloc(1);
                 opcode.writeUInt8(requestedOpCode, 0);
                 const message = Buffer.concat([opcode, data]);
                 this.logEvent({ message: 'wahoo cp:write', data: message.toString('hex') });
-                const res = yield this.write(this.wahooCP, message);
+                const res = yield this.write(this.wahooCP, message, props);
                 const responseData = Buffer.from(res);
                 const result = responseData.readUInt8(0);
                 return result === 1;
@@ -215,16 +216,25 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
             if (this.hasControl)
                 return true;
             this.logEvent({ message: 'requestControl' });
-            const data = Buffer.alloc(2);
-            data.writeUInt8(0xEE, 0);
-            data.writeUInt8(0xFC, 1);
-            const res = yield this.writeWahooFtmsMessage(32, data);
-            if (res === true) {
-                this.hasControl = true;
+            if (this.isRequestControlBusy)
+                return false;
+            this.isRequestControlBusy = true;
+            try {
+                const data = Buffer.alloc(2);
+                data.writeUInt8(0xEE, 0);
+                data.writeUInt8(0xFC, 1);
+                const res = yield this.writeWahooFtmsMessage(32, data, { timeout: 10000 });
+                if (res === true) {
+                    this.hasControl = true;
+                }
+                else {
+                    this.logEvent({ message: 'requestControl failed' });
+                }
             }
-            else {
-                this.logEvent({ message: 'requestControl failed' });
+            catch (err) {
+                this.logEvent({ message: 'error', fn: 'requestControl()', error: err.message || err, stack: err.stack });
             }
+            this.isRequestControlBusy = false;
             return this.hasControl;
         });
     }
@@ -330,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.88",
+  "version": "1.4.90",
   "dependencies": {
     "@serialport/parser-byte-length": "^9.0.1",
     "@serialport/parser-delimiter": "^9.0.1",