incyclist-devices 1.5.12 → 1.5.14

package/lib/ble/pwr.js

@@ -121,6 +121,7 @@ class BleCyclingPowerDevice extends ble_device_1.BleDevice {
                 offset += 2;
             }
             if (flags & 0x10) {
+                offset += 6;
             }
             if (flags & 0x20) {
                 const crankData = {

package/lib/ble/tacx.js

@@ -229,9 +229,11 @@ class TacxAdvancedFitnessMachineDevice extends fm_1.default {
             if (flags & 0x1)
                 data.readUInt8(offset++);
             if (flags & 0x4) {
-                data.readUInt16LE(offset);
                 offset += 2;
             }
+            if (flags & 0x10) {
+                offset += 6;
+            }
             if (flags & 0x20) {
                 const crankData = {
                     revolutions: data.readUInt16LE(offset),

package/lib/ble/wahoo-kickr.js

@@ -150,9 +150,11 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
             if (flags & 0x1)
                 data.readUInt8(offset++);
             if (flags & 0x4) {
-                data.readUInt16LE(offset);
                 offset += 2;
             }
+            if (flags & 0x10) {
+                offset += 6;
+            }
             if (flags & 0x20) {
                 const crankData = {
                     revolutions: data.readUInt16LE(offset),

package/lib/daum/DaumAdapter.d.ts

@@ -45,6 +45,7 @@ export default class DaumAdapterBase extends IncyclistDevice implements DeviceAd
     isStopped(): boolean;
     initData(): void;
     start(props?: any): Promise<any>;
+    stopUpdatePull(): void;
     startUpdatePull(): void;
     connect(): void;
     close(): any;

package/lib/daum/DaumAdapter.js

@@ -165,6 +165,15 @@ class DaumAdapterBase extends device_1.default {
     start(props) {
         throw new Error('Method not implemented.');
     }
+    stopUpdatePull() {
+        if (!this.iv)
+            return;
+        if (this.iv.sync)
+            clearInterval(this.iv.sync);
+        if (this.iv.update)
+            clearInterval(this.iv.update);
+        this.iv = undefined;
+    }
     startUpdatePull() {
         if (this.iv)
             return;

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

@@ -18,5 +18,10 @@ export default class DaumClassicAdapter extends DaumAdapter {
     relaunch(props: any): Promise<unknown>;
     start(props: any): Promise<unknown>;
     launch(props: any, isRelaunch?: boolean): Promise<unknown>;
+    startRide(props?: {
+        user?: any;
+        bikeSettings?: any;
+        gear?: any;
+    }): Promise<unknown>;
     getCurrentBikeData(): any;
 }

package/lib/daum/classic/DaumClassicAdapter.js

@@ -114,59 +114,10 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
     }
     launch(props, isRelaunch = false) {
         return __awaiter(this, void 0, void 0, function* () {
-            const opts = props || {};
-            const { user, bikeSettings } = opts;
-            if (user && user.weight)
-                this.userSettings.weight = user.weight;
-            if (bikeSettings && bikeSettings.weight)
-                this.bikeSettings.weight = bikeSettings.weight;
-            this.initData();
             if (isRelaunch) {
                 yield this.stop();
             }
-            let startState = {};
-            return (0, utils_1.runWithRetries)(() => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    if (!this.bike.isConnected())
-                        yield this.bike.saveConnect();
-                    yield this.getBike().resetDevice();
-                    if (!startState.setProg) {
-                        yield this.getBike().setProg(0);
-                        startState.setProg = true;
-                    }
-                    if (!startState.setPerson) {
-                        yield this.getBike().setPerson(user);
-                        startState.setPerson = true;
-                    }
-                    if (!startState.setBikeType) {
-                        const bikeType = this.getCyclingMode().getSetting('bikeType') || 'race';
-                        yield this.getBike().setBikeType(bikeType.toLowerCase());
-                        startState.setBikeType = true;
-                    }
-                    if (!startState.startProg) {
-                        yield this.getBike().startProg();
-                        startState.startProg = true;
-                    }
-                    if (!startState.setGear) {
-                        yield this.bike.setGear(this.cyclingData.gear || (opts.gear || 10));
-                        startState.setGear = true;
-                    }
-                    const startRequest = this.getCyclingMode().getBikeInitRequest();
-                    yield this.sendRequest(startRequest);
-                    startState.checkRunData = true;
-                    const data = yield this.bike.runData();
-                    if (startRequest.targetPower && startRequest.targetPower !== 25 && data.power === 25) {
-                        throw new Error('invalid device response: runData');
-                    }
-                    return data;
-                }
-                catch (err) {
-                    if (startState.checkRunData) {
-                        startState = {};
-                    }
-                    throw (new Error(`could not start device, reason:${err.message}`));
-                }
-            }), 5, 1000)
+            return this.startRide(props)
                 .then(data => {
                 this.stopped = false;
                 this.paused = false;
@@ -175,6 +126,61 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
             });
         });
     }
+    startRide(props = {}) {
+        this.stopUpdatePull();
+        const { user, bikeSettings } = props;
+        if (user && user.weight)
+            this.userSettings.weight = user.weight;
+        if (bikeSettings && bikeSettings.weight)
+            this.bikeSettings.weight = bikeSettings.weight;
+        this.initData();
+        let startState = {};
+        return (0, utils_1.runWithRetries)(() => __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (!this.bike.isConnected())
+                    yield this.bike.saveConnect();
+                yield this.getBike().resetDevice();
+                if (!startState.setProg) {
+                    yield this.getBike().setProg(0);
+                    startState.setProg = true;
+                }
+                if (!startState.setPerson) {
+                    yield this.getBike().setPerson(user);
+                    startState.setPerson = true;
+                }
+                if (!startState.setBikeType) {
+                    const bikeType = this.getCyclingMode().getSetting('bikeType') || 'race';
+                    yield this.getBike().setBikeType(bikeType.toLowerCase());
+                    startState.setBikeType = true;
+                }
+                if (!startState.startProg) {
+                    yield this.getBike().startProg();
+                    startState.startProg = true;
+                }
+                if (!startState.setGear) {
+                    yield this.bike.setGear(this.cyclingData.gear || (props.gear || 10));
+                    startState.setGear = true;
+                }
+                const startRequest = this.getCyclingMode().getBikeInitRequest();
+                yield this.sendRequest(startRequest);
+                startState.checkRunData = true;
+                const data = yield this.bike.runData();
+                if (startRequest.targetPower && startRequest.targetPower !== 25 && data.power === 25) {
+                    throw new Error('invalid device response: runData');
+                }
+                this.stopped = false;
+                this.paused = false;
+                this.startUpdatePull();
+                return data;
+            }
+            catch (err) {
+                if (startState.checkRunData) {
+                    startState = {};
+                }
+                throw (new Error(`could not start device, reason:${err.message}`));
+            }
+        }), 5, 1000);
+    }
     getCurrentBikeData() {
         return this.getBike().runData();
     }

package/package.json

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