incyclist-devices 2.1.28 → 2.1.30

package/lib/antv2/fe/adapter.d.ts

@@ -16,6 +16,7 @@ export default class AntFEAdapter extends AntAdapter<FitnessEquipmentSensorState
     protected startProps: AntDeviceProperties;
     protected promiseReconnect: Promise<boolean>;
     protected promiseSendUpdate: Promise<boolean>;
+    protected promiseStop: Promise<boolean>;
     constructor(settings: AntDeviceSettings, props?: AntDeviceProperties);
     getDisplayName(): string;
     isReconnecting(): boolean;

package/lib/antv2/fe/adapter.js

@@ -40,6 +40,8 @@ class AntFEAdapter extends adapter_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             if ((this.paused || this.isReconnecting()) && !forced)
                 return;
+            if (this.promiseStop)
+                return;
             if (this.promiseSendUpdate) {
                 this.logEvent({ message: 'send bike update skipped', device: this.getName(), request, reason: 'busy' });
                 return;
@@ -221,9 +223,15 @@ class AntFEAdapter extends adapter_1.default {
         fe.setSendTimeout(5000);
     }
     stop() {
-        const stopped = super.stop();
-        this.sensorConnected = false;
-        return stopped;
+        const _super = Object.create(null, {
+            stop: { get: () => super.stop }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            this.promiseStop = _super.stop.call(this);
+            this.sensorConnected = false;
+            const stopped = yield this.promiseStop;
+            return stopped;
+        });
     }
     reconnect() {
         return __awaiter(this, void 0, void 0, function* () {

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

@@ -56,7 +56,7 @@ export default class DaumAdapter<S extends SerialDeviceSettings, P extends Devic
     sendRequests(): Promise<void>;
     bikeSync(): Promise<void>;
     updateData(bikeData: IncyclistBikeData): IncyclistBikeData;
-    transformData(cyclingData: IncyclistBikeData): IncyclistAdapterData;
+    transformData(cyclingData: IncyclistBikeData, fromBike?: boolean): IncyclistAdapterData;
     sendRequest(request: any): Promise<any>;
     refreshRequests(): void;
     processClientRequest(request: any): Promise<unknown>;

package/lib/serial/daum/DaumAdapter.js

@@ -382,7 +382,7 @@ class DaumAdapter extends adapter_1.SerialIncyclistDevice {
                 try {
                     this.logEvent({ message: 'bike update error', port: this.getPort(), error: err.message, stack: err.stack });
                     const incyclistData = this.updateData(this.deviceData);
-                    this.transformData(incyclistData);
+                    this.transformData(incyclistData, false);
                 }
                 catch (_a) { }
                 this.updateBusy = false;
@@ -445,7 +445,7 @@ class DaumAdapter extends adapter_1.SerialIncyclistDevice {
         this.deviceData = this.getCyclingMode().updateData(data);
         return this.deviceData;
     }
-    transformData(cyclingData) {
+    transformData(cyclingData, fromBike = true) {
         let distance = 0;
         if (this.distanceInternal !== undefined && cyclingData.distanceInternal !== undefined) {
             distance = cyclingData.distanceInternal - this.distanceInternal;
@@ -459,10 +459,10 @@ class DaumAdapter extends adapter_1.SerialIncyclistDevice {
             cadence: (0, utils_1.intVal)(cyclingData.pedalRpm),
             heartrate: (0, utils_1.intVal)(cyclingData.heartrate),
             distance,
-            timestamp: Date.now(),
             deviceTime: cyclingData.time,
             deviceDistanceCounter: cyclingData.distanceInternal
         };
+        data.timestamp = fromBike ? Date.now() : this.data.timestamp;
         this.data = data;
         return data;
     }

package/lib/serial/daum/premium/adapter.d.ts

@@ -20,6 +20,7 @@ export default class DaumPremiumAdapter extends DaumAdapter<SerialDeviceSettings
     performCheck(): Promise<boolean>;
     getStartRetries(): number;
     getStartRetryTimeout(): number;
+    restart(pause?: number): Promise<boolean>;
     performStart(props?: DaumPremiumDeviceProperties, _isRelaunch?: boolean, wasPaused?: boolean): Promise<boolean>;
     requiresProgramUpload(): boolean;
     getCurrentBikeData(): Promise<IncyclistBikeData>;

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

@@ -122,6 +122,16 @@ class DaumPremiumAdapter extends DaumAdapter_1.default {
     getStartRetryTimeout() {
         return START_RETRY_TIMEOUT;
     }
+    restart(pause) {
+        const _super = Object.create(null, {
+            restart: { get: () => super.restart }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.requiresProgramUpload())
+                return false;
+            return yield _super.restart.call(this, pause);
+        });
+    }
     performStart(props = {}, _isRelaunch = false, wasPaused = false) {
         return __awaiter(this, void 0, void 0, function* () {
             this.setBikeProps(props);

package/package.json

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