incyclist-devices 1.5.35 → 1.5.37

package/lib/daum/DaumAdapter.js

@@ -217,8 +217,7 @@ class DaumAdapterBase extends device_1.default {
                         clearInterval(this.iv.update);
                     this.iv = undefined;
                 }
-                if (this.bike.stopWorker && typeof (this.bike.stopWorker) === 'function')
-                    this.bike.stopWorker();
+                this.bike.stopWorker();
                 this.logEvent({ message: 'stop request completed' });
                 this.paused = undefined;
                 resolve(true);

package/lib/daum/ERGCyclingMode.js

@@ -47,6 +47,8 @@ class ERGCyclingMode extends power_base_1.default {
         };
         this.logger.logEvent({ message: "processing update request", request, prev: this.prevRequest, data: getData(), event: this.event });
         let newRequest = {};
+        let isRefreshOnly = request && request.refresh && Object.keys(request).length === 1;
+        let isInit = request && request.init;
         try {
             if (!request || request.reset || Object.keys(request).length === 0) {
                 this.prevRequest = {};
@@ -79,7 +81,7 @@ class ERGCyclingMode extends power_base_1.default {
             }
             if (request.refresh) {
                 delete request.refresh;
-                if (this.prevRequest !== undefined && this.prevRequest.targetPower !== undefined && !this.event.gearUpdated && !this.event.rpmUpdated) {
+                if (this.prevRequest !== undefined && this.prevRequest.targetPower !== undefined && !this.prevRequest.init) {
                     newRequest.targetPower = this.prevRequest.targetPower;
                 }
                 else if (this.event.gearUpdated || this.event.rpmUpdated) {
@@ -116,10 +118,13 @@ class ERGCyclingMode extends power_base_1.default {
                     newRequest.minPower = request.minPower;
                 }
             }
+            if (!isRefreshOnly && !isInit)
+                this.prevRequest = JSON.parse(JSON.stringify(request));
+            else if (isInit)
+                this.prevRequest = {};
             if (newRequest.targetPower !== undefined && prevData.power !== undefined && newRequest.targetPower === prevData.power) {
                 delete newRequest.targetPower;
             }
-            this.prevRequest = JSON.parse(JSON.stringify(request));
         }
         catch (err) {
             this.logger.logEvent({ message: "error", fn: 'sendBikeUpdate()', error: err.message || err, stack: err.stack });

package/lib/daum/classic/bike.js

@@ -220,6 +220,7 @@ class Daum8008 {
         }, 50);
     }
     stopWorker() {
+        this.logEvent({ message: "stop worker", port: this.getPort() });
         if (this.queue !== undefined)
             this.queue.clear();
         if (this.bikeCmdWorker !== undefined) {
@@ -230,7 +231,7 @@ class Daum8008 {
             this.queue.clear();
     }
     sendDaum8008CommandfromQueue() {
-        if (!this.connected || this.closing)
+        if (!this.connected || this.closing || !this.sp)
             return;
         if (this.cmdStart !== undefined && this.error !== undefined) {
             if (this.cmdStart !== undefined) {

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

@@ -75,6 +75,7 @@ declare class Daum8i {
     sendACK(): void;
     sendNAK(): void;
     sendReservedDaum8iCommand(command: ReservedCommands, cmdType: any, data?: Buffer): Promise<any[]>;
+    stopWorker(): void;
     getProtocolVersion(): Promise<string>;
     getDashboardVersion(): Promise<unknown>;
     getDeviceType(): Promise<any>;

package/lib/daum/premium/bike.js

@@ -636,6 +636,9 @@ class Daum8i {
             return cmd;
         });
     }
+    stopWorker() {
+        this.logEvent({ message: "stop worker", port: this.getPort() });
+    }
     getProtocolVersion() {
         return this.sendDaum8iCommand('V00', 'AF', [])
             .then((data) => {

package/package.json

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