incyclist-devices 1.4.86 → 1.4.88

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/wahoo-kickr.d.ts

@@ -37,6 +37,7 @@ export default class WahooAdvancedFitnessMachineDevice extends BleFitnessMachine
     prevSlope: any;
     wahooCP: string;
     isSimMode: boolean;
+    weight: number;
     simModeSettings: {
         weight: number;
         crr: number;

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;
     }
@@ -277,6 +278,9 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
                     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);
@@ -326,7 +330,7 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             this.logger.logEvent({ message: 'setSimGrade', slope });
             try {
-                const value = (Math.min(1, Math.max(-1, slope)) + 1.0) * 65535 / 2.0;
+                const value = (slope / 100.0 + 1.0) * 32768;
                 const slopeVal = Math.floor(value);
                 const data = Buffer.alloc(2);
                 data.writeInt16LE(slopeVal, 0);
@@ -374,10 +378,11 @@ 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;
+                    const hasSimMode = yield this.setSimMode(weight, crr, cw);
+                    if (!hasSimMode)
+                        throw new Error('Sim Mode not enabled');
                 }
                 const res = yield this.setSimGrade(slope);
                 this.logEvent({ message: 'setSlope result', res });
@@ -387,6 +392,7 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
             catch (err) {
                 this.logEvent({ message: 'setSlope failed', reason: err.message || err });
                 this.prevSlope = undefined;
+                return false;
             }
         });
     }

package/package.json

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