incyclist-devices 1.4.68 → 1.4.71

package/lib/ble/ble-device.js

@@ -108,8 +108,6 @@ class BleDevice extends ble_1.BleDeviceClass {
     }
     init() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.isInitialized)
-                return Promise.resolve(true);
             return yield this.initDevice();
         });
     }
@@ -269,7 +267,7 @@ class BleDevice extends ble_1.BleDeviceClass {
         const updatedQueue = [];
         let hasTimeout = false;
         this.writeQueue.forEach(writeItem => {
-            if (writeItem.timeout && writeItem.timeout > now) {
+            if (writeItem.timeout && writeItem.timeout < now) {
                 if (writeItem.reject) {
                     hasTimeout = true;
                     writeItem.reject(new Error('timeout'));
@@ -326,7 +324,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() + 1000, resolve, reject });
+                        this.writeQueue.push({ uuid: characteristicUuid.toLocaleLowerCase(), data, timeout: Date.now() + 2500, resolve, reject });
                         const to = setTimeout(() => {
                             if (this.writeQueue.length > writeId && !messageDeleted)
                                 this.writeQueue.splice(writeId, 1);

package/lib/ble/fm.js

@@ -424,9 +424,11 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
     }
     setIndoorBikeSimulation(windSpeed, gradient, crr, cw) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this.hasControl)
-                return;
             const hasControl = yield this.requestControl();
+            if (!hasControl) {
+                this.logEvent({ message: 'setIndoorBikeSimulation failed', reason: 'control is disabled' });
+                return false;
+            }
             const data = Buffer.alloc(7);
             data.writeUInt8(17, 0);
             data.writeInt16LE(Math.round(windSpeed * 1000), 1);

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

@@ -34,6 +34,7 @@ export default class WahooAdvancedFitnessMachineDevice extends BleFitnessMachine
     currentCrankData: CrankData;
     timeOffset: number;
     tsPrevWrite: any;
+    prevSlope: any;
     constructor(props?: any);
     isMatching(characteristics: string[]): boolean;
     init(): Promise<boolean>;

package/lib/ble/wahoo-kickr.js

@@ -37,7 +37,7 @@ const Device_1 = require("../Device");
 const gd_eventlog_1 = require("gd-eventlog");
 const fm_1 = __importStar(require("./fm"));
 const WAHOO_ADVANCED_FTMS = 'a026e00b';
-const WAHOO_ADVANCED_TRAINER_CP = 'a026e037';
+const WAHOO_ADVANCED_TRAINER_CP = 'a026e005';
 const cwABike = {
     race: 0.35,
     triathlon: 0.29,
@@ -52,6 +52,7 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
         this.currentCrankData = undefined;
         this.timeOffset = 0;
         this.tsPrevWrite = undefined;
+        this.prevSlope = undefined;
         this.data = {};
     }
     isMatching(characteristics) {
@@ -196,6 +197,8 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
             if (this.hasControl)
                 return true;
             this.logEvent({ message: 'requestControl' });
+            this.hasControl = true;
+            return;
             const data = Buffer.alloc(2);
             data.writeUInt8(0xEE, 0);
             data.writeUInt8(0xFC, 1);
@@ -295,8 +298,23 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
     setSlope(slope) {
         return __awaiter(this, void 0, void 0, function* () {
             this.logEvent({ message: 'setSlope', slope });
-            const { windSpeed, crr, cw } = this;
-            return yield this.setIndoorBikeSimulation(windSpeed, slope, crr, cw);
+            if (this.prevSlope !== undefined && slope === this.prevSlope)
+                return;
+            try {
+                const hasControl = yield this.requestControl();
+                if (!hasControl) {
+                    this.logEvent({ message: 'setTargetPower failed', reason: 'control is disabled' });
+                    return false;
+                }
+                const res = yield this.setSimGrade(slope);
+                this.logEvent({ message: 'setSlope result', res });
+                this.prevSlope = slope;
+                return res;
+            }
+            catch (err) {
+                this.logEvent({ message: 'setSlope failed', reason: err.message || err });
+                this.prevSlope = undefined;
+            }
         });
     }
     reset() {
@@ -304,7 +322,7 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
     }
 }
 exports.default = WahooAdvancedFitnessMachineDevice;
-WahooAdvancedFitnessMachineDevice.services = ['a026ee0b'];
+WahooAdvancedFitnessMachineDevice.services = ['1818'];
 WahooAdvancedFitnessMachineDevice.characteristics = ['2acc', '2ad2', '2ad6', '2ad8', '2ad9', '2ada', WAHOO_ADVANCED_TRAINER_CP];
 ble_interface_1.default.register('WahooAdvancedFitnessMachineDevice', 'wahoo-fm', WahooAdvancedFitnessMachineDevice, WahooAdvancedFitnessMachineDevice.services);
 class WahooAdvancedFmAdapter extends fm_1.FmAdapter {

package/lib/daum/classic/utils.d.ts

@@ -1,7 +1,7 @@
 export declare const DEFAULT_AGE = 30;
 export declare const DEFAULT_USER_WEIGHT = 75;
 export declare const DEFAULT_BIKE_WEIGHT = 10;
-export declare function getCockpit(c: any): "Cardio" | "Fitness" | "Vita De Luxe" | "8008" | "8008 TRS" | "8080" | "Therapie" | "8008 TRS Pro" | "8008 TRS3" | "Unknown";
+export declare function getCockpit(c: any): "Cardio" | "Fitness" | "Vita De Luxe" | "8008" | "8008 TRS" | "8080" | "Therapie" | "8008 TRS Pro" | "8008 TRS3" | "ergo_lyps Cardio Pro" | "Unknown";
 export declare function getBikeType(type: any): 1 | 0;
 export declare function getGender(sex: any): 1 | 2;
 export declare function getLength(length: any): number;

package/lib/daum/classic/utils.js

@@ -24,6 +24,8 @@ function getCockpit(c) {
             return "8008 TRS Pro";
         case 160:
             return "8008 TRS3";
+        case 0x8D:
+            return "ergo_lyps Cardio Pro";
         default:
             return "Unknown";
     }

package/package.json

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