incyclist-devices 1.4.85 → 1.4.87

package/lib/ble/ble-device.js

@@ -13,6 +13,7 @@ exports.BleDevice = void 0;
 const gd_eventlog_1 = require("gd-eventlog");
 const ble_1 = require("./ble");
 const CONNECT_WAIT_TIMEOUT = 10000;
+const BLE_TIMEOUT = 1000;
 class BleDevice extends ble_1.BleDeviceClass {
     constructor(props) {
         super();
@@ -344,7 +345,7 @@ 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() + 2500, resolve, reject });
+                        this.writeQueue.push({ uuid: characteristicUuid.toLocaleLowerCase(), data, timeout: Date.now() + BLE_TIMEOUT, resolve, reject });
                         const to = setTimeout(() => {
                             if (this.writeQueue.length > writeId && !messageDeleted)
                                 this.writeQueue.splice(writeId, 1);

package/lib/ble/ble-interface.js

@@ -362,7 +362,7 @@ class BleInterface extends ble_1.BleInterfaceClass {
     createDevice(DeviceClass, peripheral, characteristics) {
         try {
             const C = DeviceClass;
-            const device = new C({ peripheral, logger: this.logger });
+            const device = new C({ peripheral });
             const cids = characteristics ? characteristics.map(c => (0, ble_1.uuid)(c.uuid)) : [];
             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());

package/lib/ble/pwr.d.ts

@@ -62,7 +62,6 @@ export declare class PwrAdapter extends DeviceAdapter {
         weight?: number;
     };
     constructor(device: BleDeviceClass, protocol: BleProtocol);
-    select(): void;
     isBike(): boolean;
     isHrm(): boolean;
     isPower(): boolean;

package/lib/ble/pwr.js

@@ -173,7 +173,6 @@ class PwrAdapter extends Device_1.default {
         this.mode = this.getDefaultCyclingMode();
         this.logger = new gd_eventlog_1.EventLogger('Ble-CP');
     }
-    select() { this.selected = true; }
     isBike() { return true; }
     isHrm() { return false; }
     isPower() { return true; }

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

@@ -37,6 +37,12 @@ export default class WahooAdvancedFitnessMachineDevice extends BleFitnessMachine
     prevSlope: any;
     wahooCP: string;
     isSimMode: boolean;
+    weight: number;
+    simModeSettings: {
+        weight: number;
+        crr: number;
+        cw: number;
+    };
     constructor(props?: any);
     isMatching(characteristics: string[]): boolean;
     init(): Promise<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.weight = Device_1.DEFAULT_BIKE_WEIGHT + Device_1.DEFAULT_USER_WEIGHT;
         this.data = {};
         this.wahooCP = consts_1.WAHOO_ADVANCED_TRAINER_CP;
     }
@@ -252,6 +253,7 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
                     this.setPowerAdjusting();
                     this.data.targetPower = power;
                     this.isSimMode = false;
+                    this.simModeSettings = undefined;
                 }
                 return res;
             }
@@ -265,12 +267,27 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             this.logger.logEvent({ message: 'setSimMode', weight, crr, cw });
             try {
+                if (this.isSimMode && this.simModeSettings) {
+                    if (weight === this.simModeSettings.weight &&
+                        crr === this.simModeSettings.crr &&
+                        cw === this.simModeSettings.cw)
+                        return true;
+                }
+                const hasControl = yield this.requestControl();
+                if (!hasControl) {
+                    this.logEvent({ message: 'setSimMode failed', reason: 'control is disabled' });
+                    return false;
+                }
+                this.weight = weight;
+                this.crr = crr;
+                this.cw = cw;
                 const data = Buffer.alloc(6);
                 data.writeInt16LE(Math.round(weight * 100), 0);
                 data.writeInt16LE(Math.round(crr * 10000), 2);
                 data.writeInt16LE(Math.round(cw * 1000), 4);
                 const res = yield this.writeWahooFtmsMessage(67, data);
                 this.isSimMode = true;
+                this.simModeSettings = { weight, crr, cw };
                 return res;
             }
             catch (err) {
@@ -361,10 +378,9 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
             if (this.prevSlope !== undefined && slope === this.prevSlope)
                 return;
             try {
-                const hasControl = yield this.requestControl();
-                if (!hasControl) {
-                    this.logEvent({ message: 'setSlope failed', reason: 'control is disabled' });
-                    return false;
+                if (!this.isSimMode) {
+                    const { weight, crr, cw } = this;
+                    yield this.setSimMode(weight, crr, cw);
                 }
                 const res = yield this.setSimGrade(slope);
                 this.logEvent({ message: 'setSlope result', res });
@@ -380,6 +396,7 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
     reset() {
         this.data = {};
         this.isSimMode = undefined;
+        this.simModeSettings = undefined;
     }
 }
 exports.default = WahooAdvancedFitnessMachineDevice;

package/package.json

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