incyclist-devices 1.5.8 → 1.5.10

package/lib/antv2/fe.js

@@ -225,9 +225,11 @@ class AntFEAdapter extends ant_device_1.default {
                     const userWeight = args.userWeight || user.weight || DEFAULT_USER_WEIGHT;
                     const bikeWeight = args.bikeWeight || defaultBikeWeight;
                     let i = 0;
-                    while (i < 3 && !status.userSent && !status.slopeSent) {
-                        status.userSent = status.userSent || (yield fe.sendUserConfiguration(userWeight, bikeWeight, args.wheelDiameter, args.gearRatio));
-                        status.slopeSent = status.slopeSent || (yield fe.sendTrackResistance(0.0));
+                    while (i < 3 && (!status.userSent || !status.slopeSent)) {
+                        if (!timeout || iv)
+                            status.userSent = status.userSent || (yield fe.sendUserConfiguration(userWeight, bikeWeight, args.wheelDiameter, args.gearRatio));
+                        if (!timeout || iv)
+                            status.slopeSent = status.slopeSent || (yield fe.sendTrackResistance(0.0));
                         i++;
                     }
                     stopInterval();

package/lib/daum/premium/DaumPremiumAdapter.d.ts

@@ -7,6 +7,8 @@ export default class DaumPremiumDevice extends DaumAdapter {
     getInterface(): any;
     getSupportedCyclingModes(): Array<any>;
     check(): Promise<unknown>;
+    relaunch(props: any): Promise<unknown>;
     start(props: any): Promise<unknown>;
+    launch(props: any, isRelaunch?: boolean): Promise<unknown>;
     getCurrentBikeData(): Promise<any>;
 }

package/lib/daum/premium/DaumPremiumAdapter.js

@@ -62,11 +62,20 @@ class DaumPremiumDevice extends DaumAdapter_1.default {
             }
         }));
     }
+    relaunch(props) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.logger.logEvent({ message: 'relaunch()' });
+            return yield this.launch(props, true);
+        });
+    }
     start(props) {
         return __awaiter(this, void 0, void 0, function* () {
             this.logger.logEvent({ message: 'start()' });
-            console.log('~~~setPersonSupport:', this.getCyclingMode().getModeProperty('setPersonSupport'));
-            console.log('~~~eppSupport:', this.getCyclingMode().getModeProperty('eppSupport'));
+            return yield this.launch(props, false);
+        });
+    }
+    launch(props, isRelaunch = false) {
+        return __awaiter(this, void 0, void 0, function* () {
             const opts = props || {};
             if (opts.user && opts.user.weight)
                 this.userSettings.weight = opts.user.weight;
@@ -77,16 +86,14 @@ class DaumPremiumDevice extends DaumAdapter_1.default {
             var info = {};
             this.initData();
             return (0, utils_1.runWithRetries)(() => __awaiter(this, void 0, void 0, function* () {
-                if (this.isStopped())
-                    return;
                 try {
-                    if (!this.bike.isConnected()) {
+                    if (!isRelaunch && !this.bike.isConnected()) {
                         yield this.bike.saveConnect();
                     }
-                    if (!info.deviceType) {
+                    if (!isRelaunch && !info.deviceType) {
                         info.deviceType = yield this.bike.getDeviceType();
                     }
-                    if (!info.version) {
+                    if (!isRelaunch && !info.version) {
                         info.version = yield this.bike.getProtocolVersion();
                     }
                     if (this.getCyclingMode().getModeProperty('eppSupport')) {
@@ -113,7 +120,8 @@ class DaumPremiumDevice extends DaumAdapter_1.default {
                 }
             }), 5, 1500)
                 .then(data => {
-                this.startUpdatePull();
+                if (!isRelaunch || this.isStopped())
+                    this.startUpdatePull();
                 return data;
             });
         });

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "incyclist-devices",
-  "version": "1.5.8",
+  "version": "1.5.10",
   "dependencies": {
     "@serialport/parser-byte-length": "^9.0.1",
     "@serialport/parser-delimiter": "^9.0.1",
     "@types/serialport": "^8.0.1",
     "gd-ant-plus": "^0.0.33",
-    "incyclist-ant-plus": "^0.1.5",
+    "incyclist-ant-plus": "^0.1.7",
     "win32filetime": "^1.0.2"
   },
   "peerDependencies": {