incyclist-devices 2.0.26 → 2.0.28

package/lib/serial/daum/DaumAdapter.d.ts

@@ -50,7 +50,7 @@ export default class DaumAdapterBase extends SerialIncyclistDevice implements Da
     sendRequests(): Promise<void>;
     bikeSync(): Promise<void>;
     updateData(prev: any, bikeData: any): IncyclistBikeData;
-    transformData(): DeviceData;
+    transformData(cyclingData: IncyclistBikeData): DeviceData;
     sendRequest(request: any): Promise<any>;
     refreshRequests(): void;
     processClientRequest(request: any): Promise<unknown>;

package/lib/serial/daum/DaumAdapter.js

@@ -235,22 +235,21 @@ class DaumAdapterBase extends adapter_1.SerialIncyclistDevice {
     }
     update() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.logEvent({ message: 'bike update request', stopped: this.stopped, updateBusy: this.updateBusy });
             if (this.stopped)
                 return;
             this.updateBusy = true;
             this.getCurrentBikeData()
                 .then(bikeData => {
-                this.updateData(this.cyclingData, bikeData);
-                const data = this.transformData();
+                const incyclistData = this.updateData(this.cyclingData, bikeData);
+                const data = this.transformData(incyclistData);
                 this.updateBusy = false;
                 this.emitData(data);
             })
                 .catch(err => {
                 this.logEvent({ message: 'bike update error', error: err.message, stack: err.stack });
                 const { isPedalling, power, pedalRpm, speed, distanceInternal, heartrate, slope } = this.cyclingData;
-                this.updateData(this.cyclingData, { isPedalling, power, pedalRpm, speed, distanceInternal, heartrate, slope });
-                this.transformData();
+                const incyclistData = this.updateData(this.cyclingData, { isPedalling, power, pedalRpm, speed, distanceInternal, heartrate, slope });
+                this.transformData(incyclistData);
                 this.updateBusy = false;
             });
         });
@@ -310,25 +309,23 @@ class DaumAdapterBase extends adapter_1.SerialIncyclistDevice {
         this.cyclingData = this.getCyclingMode().updateData(data);
         return this.cyclingData;
     }
-    transformData() {
-        if (this.cyclingData === undefined)
-            return;
+    transformData(cyclingData) {
         let distance = 0;
-        if (this.distanceInternal !== undefined && this.cyclingData.distanceInternal !== undefined) {
-            distance = this.cyclingData.distanceInternal - this.distanceInternal;
+        if (this.distanceInternal !== undefined && cyclingData.distanceInternal !== undefined) {
+            distance = cyclingData.distanceInternal - this.distanceInternal;
         }
-        if (this.cyclingData.distanceInternal !== undefined)
-            this.distanceInternal = this.cyclingData.distanceInternal;
+        if (cyclingData.distanceInternal !== undefined)
+            this.distanceInternal = cyclingData.distanceInternal;
         let data = {
-            speed: this.cyclingData.speed,
-            slope: this.cyclingData.slope,
-            power: (0, utils_1.intVal)(this.cyclingData.power),
-            cadence: (0, utils_1.intVal)(this.cyclingData.pedalRpm),
-            heartrate: (0, utils_1.intVal)(this.cyclingData.heartrate),
+            speed: cyclingData.speed || 0,
+            slope: cyclingData.slope,
+            power: (0, utils_1.intVal)(cyclingData.power || 0),
+            cadence: (0, utils_1.intVal)(cyclingData.pedalRpm),
+            heartrate: (0, utils_1.intVal)(cyclingData.heartrate),
             distance,
             timestamp: Date.now(),
-            deviceTime: this.cyclingData.time,
-            deviceDistanceCounter: this.cyclingData.distanceInternal
+            deviceTime: cyclingData.time,
+            deviceDistanceCounter: cyclingData.distanceInternal
         };
         if (this.ignoreHrm)
             delete data.heartrate;

package/lib/serial/daum/classic/adapter.js

@@ -169,6 +169,7 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
                 if (!this.startPromise) {
                     if (isRelaunch) {
                         yield this.stop();
+                        this.bike.resumeLogging();
                     }
                     this.startPromise = this.performStart(props, isRelaunch);
                 }

package/lib/serial/daum/classic/comms.d.ts

@@ -38,7 +38,7 @@ export default class Daum8008 {
     getPort(): string;
     isConnected(): boolean;
     pauseLogging(): void;
-    resumLogging(): void;
+    resumeLogging(): void;
     logEvent(e: any): void;
     connect(): Promise<boolean>;
     close(): Promise<void>;

package/lib/serial/daum/classic/comms.js

@@ -52,7 +52,7 @@ class Daum8008 {
     pauseLogging() {
         this.isLoggingPaused = true;
     }
-    resumLogging() {
+    resumeLogging() {
         this.isLoggingPaused = false;
     }
     logEvent(e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-devices",
-  "version": "2.0.26",
+  "version": "2.0.28",
   "dependencies": {
     "@serialport/bindings-interface": "^1.2.2",
     "@serialport/parser-byte-length": "^9.0.1",