incyclist-devices 2.3.33 → 2.3.34

package/lib/antv2/fe/adapter.js

@@ -48,7 +48,7 @@ class AntFEAdapter extends adapter_1.default {
                 return;
             if (this.promiseStop)
                 return;
-            if (this.promiseSendUpdate) {
+            if (this.promiseSendUpdate !== undefined) {
                 this.logEvent({ message: 'send bike update skipped', device: this.getName(), request, reason: 'busy' });
                 return;
             }

package/lib/ble/fm/adapter.d.ts

@@ -1,6 +1,6 @@
 import BleFitnessMachineDevice from './sensor';
 import BleAdapter from '../base/adapter';
-import ICyclingMode, { CyclingMode } from '../../modes/types';
+import ICyclingMode, { CyclingMode, UpdateRequest } from '../../modes/types';
 import { IndoorBikeData, IndoorBikeFeatures } from './types';
 import { BleDeviceProperties, BleDeviceSettings, BleStartProperties, IBlePeripheral } from '../types';
 import { IAdapter, IncyclistAdapterData, IncyclistBikeData } from '../../types';
@@ -10,6 +10,7 @@ export default class BleFmAdapter extends BleAdapter<IndoorBikeData, BleFitnessM
     protected distanceInternal: number;
     protected connectPromise: Promise<boolean>;
     protected requestControlRetryDelay: number;
+    protected promiseSendUpdate: Promise<UpdateRequest | void>;
     constructor(settings: BleDeviceSettings, props?: BleDeviceProperties);
     updateSensor(peripheral: IBlePeripheral): void;
     isSame(device: IAdapter): boolean;
@@ -25,6 +26,6 @@ export default class BleFmAdapter extends BleAdapter<IndoorBikeData, BleFitnessM
     protected sendInitialRequest(): Promise<void>;
     protected checkCapabilities(): Promise<void>;
     protected updateCapabilitiesFromFeatures(features: IndoorBikeFeatures): void;
-    sendUpdate(request: any, enforced?: boolean): Promise<void>;
+    sendUpdate(request: any, enforced?: boolean): Promise<UpdateRequest | void>;
     sendInitCommands(): Promise<boolean>;
 }

package/lib/ble/fm/adapter.js

@@ -233,6 +233,10 @@ class BleFmAdapter extends adapter_1.default {
     sendUpdate(request_1) {
         return __awaiter(this, arguments, void 0, function* (request, enforced = false) {
             var _a;
+            if (this.promiseSendUpdate !== undefined) {
+                yield this.promiseSendUpdate;
+                this.promiseSendUpdate = undefined;
+            }
             if (!enforced && (this.paused || !this.device))
                 return;
             if (!enforced && (this.stopped && !this.isStarting()))
@@ -242,16 +246,27 @@ class BleFmAdapter extends adapter_1.default {
                 this.logEvent({ message: 'send bike update requested', profile: this.getProfile(), mode: (_a = this.getCyclingMode()) === null || _a === void 0 ? void 0 : _a.getName(), update, request });
                 const device = this.getSensor();
                 if (this.hasCapability(types_1.IncyclistCapability.Control)) {
-                    if (update.slope !== undefined) {
-                        yield device.setSlope(update.slope);
-                    }
-                    if (update.targetPower !== undefined) {
-                        const tp = update.targetPower > 0 ? update.targetPower : 0;
-                        yield device.setTargetPower(tp);
-                    }
+                    const send = () => __awaiter(this, void 0, void 0, function* () {
+                        const res = {};
+                        if (update.slope !== undefined) {
+                            yield device.setSlope(update.slope);
+                            res.slope = update.slope;
+                        }
+                        if (update.targetPower !== undefined) {
+                            const tp = update.targetPower > 0 ? update.targetPower : 0;
+                            yield device.setTargetPower(tp);
+                            res.targetPower = tp;
+                        }
+                        return res;
+                    });
+                    this.promiseSendUpdate = send();
+                    const confirmed = yield this.promiseSendUpdate;
+                    delete this.promiseSendUpdate;
+                    return confirmed;
                 }
             }
             catch (err) {
+                delete this.promiseSendUpdate;
                 if (err.message === 'not connected') {
                     this.logEvent({ message: 'send bike update failed', reason: 'not connected' });
                 }

package/lib/ble/fm/sensor.js

@@ -13,6 +13,8 @@ const consts_1 = require("../consts");
 const sensor_1 = require("../base/sensor");
 const utils_1 = require("../utils");
 const consts_2 = require("./consts");
+const task_1 = require("../../utils/task");
+const BLE_COMMAND_TIMEOUT = 800;
 class BleFitnessMachineDevice extends sensor_1.TBleSensor {
     constructor(peripheral, props) {
         super(peripheral, props);
@@ -299,14 +301,25 @@ class BleFitnessMachineDevice extends sensor_1.TBleSensor {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 this.logEvent({ message: 'fmts:write', data: data.toString('hex') });
-                const res = yield this.write(consts_1.FTMS_CP, data, props);
+                let res;
+                let tsStart = Date.now();
+                if (props === null || props === void 0 ? void 0 : props.timeout) {
+                    res = yield new task_1.InteruptableTask(this.write(consts_1.FTMS_CP, data, props), {
+                        timeout: 800,
+                        errorOnTimeout: true
+                    }).run();
+                }
+                else {
+                    res = yield this.write(consts_1.FTMS_CP, data, props);
+                }
                 const responseData = Buffer.from(res);
                 const opCode = responseData.readUInt8(0);
                 const request = responseData.readUInt8(1);
                 const result = responseData.readUInt8(2);
                 if (opCode !== 128 || request !== requestedOpCode)
                     throw new Error('Illegal response ');
-                this.logEvent({ message: 'fmts:write result', res, result });
+                const duration = Date.now() - tsStart;
+                this.logEvent({ message: 'fmts:write result', res: responseData.toString('hex'), result, duration });
                 return result;
             }
             catch (err) {
@@ -330,7 +343,7 @@ class BleFitnessMachineDevice extends sensor_1.TBleSensor {
             const data = Buffer.alloc(3);
             data.writeUInt8(3, 0);
             data.writeInt16LE(Math.round(inclination * 10), 1);
-            const res = yield this.writeFtmsMessage(3, data);
+            const res = yield this.writeFtmsMessage(3, data, { timeout: BLE_COMMAND_TIMEOUT });
             return (res === 1);
         });
     }
@@ -350,7 +363,7 @@ class BleFitnessMachineDevice extends sensor_1.TBleSensor {
             data.writeInt16LE(Math.round(gradient * 100), 3);
             data.writeUInt8(Math.round(crr * 10000), 5);
             data.writeUInt8(Math.round(cw * 100), 6);
-            const res = yield this.writeFtmsMessage(17, data);
+            const res = yield this.writeFtmsMessage(17, data, { timeout: BLE_COMMAND_TIMEOUT });
             if (res === 5) {
                 this.hasControl = false;
             }

package/lib/modes/antble-smarttrainer.d.ts

@@ -48,6 +48,7 @@ export default class SmartTrainerCyclingMode extends PowerBasedCyclingModeBase i
     protected checkEmptyRequest(newRequest: UpdateRequest): void;
     protected getVirtualShiftMode(): VirtshiftMode;
     updateData(bikeData: IncyclistBikeData, log?: boolean): IncyclistBikeData;
+    getData(): Partial<IncyclistBikeData>;
     sendBikeUpdate(incoming: UpdateRequest): UpdateRequest;
     protected setInitialGear(data: IncyclistBikeData): void;
     protected getGearString(): string;

package/lib/modes/antble-smarttrainer.js

@@ -133,6 +133,7 @@ class SmartTrainerCyclingMode extends power_base_1.default {
                 const m = (_c = (_b = this.adapter) === null || _b === void 0 ? void 0 : _b.getWeight()) !== null && _c !== void 0 ? _c : 85;
                 this.simPower = calculations_1.default.calculatePower(m, virtualSpeed, (_d = this.simSlope) !== null && _d !== void 0 ? _d : 0);
                 this.verifySimPower();
+                this.logger.logEvent({ message: 'set simulater power', power: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope });
             }
         }
         newRequest.targetPower = this.simPower;
@@ -185,6 +186,9 @@ class SmartTrainerCyclingMode extends power_base_1.default {
                     const m = (_b = (_a = this.adapter) === null || _a === void 0 ? void 0 : _a.getWeight()) !== null && _b !== void 0 ? _b : 85;
                     this.simPower = calculations_1.default.calculatePower(m, virtualSpeed, (_d = (_c = this.simSlope) !== null && _c !== void 0 ? _c : this.data.slope) !== null && _d !== void 0 ? _d : 0);
                     this.verifySimPower();
+                    this.logger.logEvent({ message: 'set simulater power', power: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope });
+                    this.adapter.sendUpdate({ targetPower: this.simPower }).then(() => {
+                    });
                 }
                 break;
             case 'Adapter':
@@ -250,6 +254,11 @@ class SmartTrainerCyclingMode extends power_base_1.default {
         }
         return data;
     }
+    getData() {
+        const gearStr = this.getGearString();
+        const data = super.getData();
+        return Object.assign(Object.assign({}, data), { gearStr });
+    }
     sendBikeUpdate(incoming) {
         this.logger.logEvent({ message: "processing update request", request: incoming, prev: this.prevRequest, data: this.getData() });
         let newRequest = {};
@@ -278,6 +287,7 @@ class SmartTrainerCyclingMode extends power_base_1.default {
         const deltas = requiredPowers.map((p, i) => ({ gear: i + 1, delta: Math.abs(p - data.power) }));
         deltas.sort((a, b) => a.delta - b.delta);
         this.gear = deltas[0].gear;
+        this.logger.logEvent({ message: 'set initial gear', gear: this.gear, m, rpm: data.pedalRpm, power: data.power });
     }
     getGearString() {
         const mode = this.getVirtualShiftMode();

package/lib/modes/power-base.d.ts

@@ -9,7 +9,7 @@ export default class PowerBasedCyclingModeBase extends CyclingModeBase {
     prevRequest: UpdateRequest | undefined;
     protected static config: CyclingModeConfig;
     constructor(adapter: IAdapter, props?: Settings);
-    getData(): IncyclistBikeData;
+    getData(): Partial<IncyclistBikeData>;
     getSlope(): number;
     initLogger(defaultLogName: any): void;
     getWeight(): number;

package/lib/modes/types.d.ts

@@ -47,6 +47,7 @@ export default interface ICyclingMode {
     getSettings(): Settings;
     setModeProperty(name: string, value: any): void;
     getModeProperty(name: string): any;
+    getData(): Partial<IncyclistBikeData>;
 }
 export type CyclingModeConfig = {
     isERG?: boolean;
@@ -74,4 +75,5 @@ export declare class CyclingMode implements ICyclingMode {
     getConfig(): CyclingModeConfig;
     isERG(): boolean;
     isSIM(): boolean;
+    getData(): Partial<IncyclistBikeData>;
 }

package/lib/modes/types.js

@@ -61,5 +61,8 @@ class CyclingMode {
     isSIM() {
         return this.getConfig().isSIM;
     }
+    getData() {
+        return {};
+    }
 }
 exports.CyclingMode = CyclingMode;

package/package.json

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