incyclist-devices 1.4.96 → 1.4.98

package/lib/ant/antfe/AntFEAdapter.d.ts

@@ -70,9 +70,14 @@ export default class AntFEAdapter extends AntAdapter {
     startWorker(): void;
     stopWorker(): void;
     sendFromQueue(): void;
-    sendUserConfiguration(userWeight: any, bikeWeight: any, wheelDiameter: any, gearRatio: any): Promise<unknown>;
-    sendBasicResistance(resistance: any): Promise<unknown>;
-    sendTargetPower(power: any): Promise<unknown>;
-    sendWindResistance(windCoeff: any, windSpeed: any, draftFactor: any): Promise<unknown>;
-    sendTrackResistance(slope: any, rrCoeff?: any): Promise<unknown>;
+    sendUserConfigurationNR(userWeight: any, bikeWeight: any, wheelDiameter: any, gearRatio: any): void;
+    sendUserConfiguration(userWeight: any, bikeWeight: any, wheelDiameter: any, gearRatio: any, withoutResponse?: boolean): Promise<unknown>;
+    sendBasicResistanceNR(resistance: any): void;
+    sendBasicResistance(resistance: any, withoutResponse?: boolean): Promise<unknown>;
+    sendTargetPowerNR(power: any): void;
+    sendTargetPower(power: any, withoutResponse?: boolean): Promise<unknown>;
+    sendWindResistanceNR(windCoeff: any, windSpeed: any, draftFactor: any): void;
+    sendWindResistance(windCoeff: any, windSpeed: any, draftFactor: any, withoutResponse?: boolean): Promise<unknown>;
+    sendTrackResistanceNR(slope: any, rrCoeff?: any): void;
+    sendTrackResistance(slope: any, rrCoeff?: any, withoutResponse?: boolean): Promise<unknown>;
 }

package/lib/ant/antfe/AntFEAdapter.js

@@ -20,12 +20,16 @@ const ant_fe_st_mode_1 = __importDefault(require("./ant-fe-st-mode"));
 const ant_fe_erg_mode_1 = __importDefault(require("./ant-fe-erg-mode"));
 const ant_fe_adv_st_mode_1 = __importDefault(require("./ant-fe-adv-st-mode"));
 const hex = (v) => Math.abs(v).toString(16).toUpperCase();
-const TIMEOUT_ACK = 5000;
+const TIMEOUT_ACK = 1000;
 const TIMEOUT_START = 10000;
 const TIMEOUT_ATTACH = 3000;
 const DEFAULT_USER_WEIGHT = 75;
 const DEFAULT_BIKE_WEIGHT = 10;
 const DEFAULT_BIKE_WEIGHT_MOUNTAIN = 14.5;
+class MockLogger {
+    log(...args) { console.log('~~~~~Ant:', ...args); }
+    logEvent(event) { console.log('~~~~~Ant:' + event.message, event); }
+}
 class AntFEAdapter extends AntAdapter_1.default {
     constructor(DeviceID, port, stick, protocol) {
         super(protocol);
@@ -182,7 +186,7 @@ class AntFEAdapter extends AntAdapter_1.default {
             return;
         let distance = 0;
         if (this.distanceInternal !== undefined && bikeData.distanceInternal !== undefined) {
-            distance = Math.round(bikeData.distanceInternal - this.distanceInternal);
+            distance = bikeData.distanceInternal - this.distanceInternal;
         }
         if (bikeData.distanceInternal !== undefined)
             this.distanceInternal = bikeData.distanceInternal;
@@ -334,19 +338,21 @@ class AntFEAdapter extends AntAdapter_1.default {
             this.logger.logEvent({ message: 'send bike update requested', update, request });
             try {
                 const isReset = (!request || request.reset || Object.keys(request).length === 0);
+                if (isReset)
+                    this.sendTrackResistanceNR(0);
                 if (update.slope !== undefined) {
-                    yield (0, utils_2.runWithRetries)(() => __awaiter(this, void 0, void 0, function* () { return yield this.sendTrackResistance(update.slope); }), 2, 100);
+                    this.sendTrackResistanceNR(update.slope);
                 }
                 if (update.targetPower !== undefined) {
-                    yield (0, utils_2.runWithRetries)(() => __awaiter(this, void 0, void 0, function* () { return yield this.sendTargetPower(update.targetPower); }), 2, 100);
+                    this.sendTargetPowerNR(update.targetPower);
                 }
                 else if (request.maxPower !== undefined) {
                     if (this.data.power && this.data.power > request.maxPower)
-                        yield (0, utils_2.runWithRetries)(() => __awaiter(this, void 0, void 0, function* () { return yield this.sendTargetPower(request.maxPower); }), 2, 100);
+                        this.sendTargetPowerNR(request.maxPower);
                 }
                 else if (request.minPower !== undefined) {
                     if (this.data.power && this.data.power < request.minPower)
-                        yield (0, utils_2.runWithRetries)(() => __awaiter(this, void 0, void 0, function* () { return yield this.sendTargetPower(request.minPower); }), 2, 100);
+                        this.sendTargetPowerNR(request.minPower);
                 }
             }
             catch (err) {
@@ -436,7 +442,10 @@ class AntFEAdapter extends AntAdapter_1.default {
                 this.stick.write(msg);
         }
     }
-    sendUserConfiguration(userWeight, bikeWeight, wheelDiameter, gearRatio) {
+    sendUserConfigurationNR(userWeight, bikeWeight, wheelDiameter, gearRatio) {
+        this.sendUserConfiguration(userWeight, bikeWeight, wheelDiameter, gearRatio, true);
+    }
+    sendUserConfiguration(userWeight, bikeWeight, wheelDiameter, gearRatio, withoutResponse = false) {
         return new Promise((resolve, reject) => {
             if (!this.connected)
                 reject(new Error('not connected'));
@@ -472,6 +481,10 @@ class AntFEAdapter extends AntAdapter_1.default {
             payload.push(gr & 0xFF);
             const Messages = this.protocol.getAnt().Messages;
             let msg = Messages.acknowledgedData(payload);
+            if (withoutResponse) {
+                this.send(msg, logStr);
+                return resolve(true);
+            }
             this.send(msg, logStr, (res, err) => {
                 if (err)
                     return reject(err);
@@ -479,7 +492,10 @@ class AntFEAdapter extends AntAdapter_1.default {
             });
         });
     }
-    sendBasicResistance(resistance) {
+    sendBasicResistanceNR(resistance) {
+        this.sendBasicResistance(resistance, true);
+    }
+    sendBasicResistance(resistance, withoutResponse = false) {
         return new Promise((resolve, reject) => {
             if (!this.connected)
                 reject(new Error('not connected'));
@@ -500,6 +516,10 @@ class AntFEAdapter extends AntAdapter_1.default {
             payload.push(res & 0xFF);
             const Messages = this.protocol.getAnt().Messages;
             let msg = Messages.acknowledgedData(payload);
+            if (withoutResponse) {
+                this.send(msg, logStr);
+                return resolve(true);
+            }
             this.send(msg, logStr, (res, err) => {
                 if (err)
                     return reject(err);
@@ -507,7 +527,10 @@ class AntFEAdapter extends AntAdapter_1.default {
             });
         });
     }
-    sendTargetPower(power) {
+    sendTargetPowerNR(power) {
+        this.sendTargetPower(power, true);
+    }
+    sendTargetPower(power, withoutResponse = false) {
         return new Promise((resolve, reject) => {
             if (!this.connected)
                 reject(new Error('not connected'));
@@ -528,6 +551,10 @@ class AntFEAdapter extends AntAdapter_1.default {
             payload.push((p >> 8) & 0xFF);
             const Messages = this.protocol.getAnt().Messages;
             let msg = Messages.acknowledgedData(payload);
+            if (withoutResponse) {
+                this.send(msg, logStr);
+                return resolve(true);
+            }
             this.send(msg, logStr, (res, err) => {
                 if (err)
                     return reject(err);
@@ -535,7 +562,10 @@ class AntFEAdapter extends AntAdapter_1.default {
             });
         });
     }
-    sendWindResistance(windCoeff, windSpeed, draftFactor) {
+    sendWindResistanceNR(windCoeff, windSpeed, draftFactor) {
+        this.sendWindResistance(windCoeff, windSpeed, draftFactor, true);
+    }
+    sendWindResistance(windCoeff, windSpeed, draftFactor, withoutResponse = false) {
         return new Promise((resolve, reject) => {
             if (!this.connected)
                 reject(new Error('not connected'));
@@ -566,6 +596,10 @@ class AntFEAdapter extends AntAdapter_1.default {
             payload.push(df & 0xFF);
             const Messages = this.protocol.getAnt().Messages;
             let msg = Messages.acknowledgedData(payload);
+            if (withoutResponse) {
+                this.send(msg, logStr);
+                return resolve(true);
+            }
             this.send(msg, logStr, (res, err) => {
                 if (err)
                     return reject(err);
@@ -573,7 +607,10 @@ class AntFEAdapter extends AntAdapter_1.default {
             });
         });
     }
-    sendTrackResistance(slope, rrCoeff) {
+    sendTrackResistanceNR(slope, rrCoeff) {
+        this.sendTrackResistance(slope, rrCoeff, true);
+    }
+    sendTrackResistance(slope, rrCoeff, withoutResponse = false) {
         return new Promise((resolve, reject) => {
             if (!this.connected)
                 reject(new Error('not connected'));
@@ -600,6 +637,10 @@ class AntFEAdapter extends AntAdapter_1.default {
             payload.push(rr & 0xFF);
             const Messages = this.protocol.getAnt().Messages;
             let msg = Messages.acknowledgedData(payload);
+            if (withoutResponse) {
+                this.send(msg, logStr);
+                return resolve(true);
+            }
             this.send(msg, logStr, (res, err) => {
                 if (err)
                     return reject(err);

package/lib/ble/ble-interface.js

@@ -553,14 +553,14 @@ class BleInterface extends ble_1.BleInterfaceClass {
                     });
                 };
                 const onPeripheralFound = (peripheral, fromCache = false) => __awaiter(this, void 0, void 0, function* () {
-                    if (!peripheral || !peripheral.advertisement || !peripheral.advertisement.localName || !peripheral.advertisement.serviceUuids || peripheral.advertisement.serviceUuids.length === 0)
+                    if (!peripheral || !peripheral.advertisement || !peripheral.advertisement.localName || !peripheral.advertisement.serviceUuids)
                         return;
                     if (fromCache) {
                         this.logEvent({ message: 'adding from Cache', peripheral: peripheral.address });
                     }
                     else {
                         const { id, name, address, advertisement = {} } = peripheral;
-                        this.logEvent({ message: 'BLE scan: found device', peripheral: { id, name, address, services: advertisement.serviceUuids } });
+                        this.logEvent({ message: 'BLE scan: found device', peripheral: { id, name: advertisement.localName, address, services: advertisement.serviceUuids } });
                     }
                     if (peripheral.address === undefined || peripheral.address === '')
                         peripheral.address = peripheral.id;
@@ -568,8 +568,10 @@ class BleInterface extends ble_1.BleInterfaceClass {
                     if (isPeripheralProcessed)
                         return;
                     peripheralsProcessed.push(peripheral.address);
-                    const characteristics = yield this.getCharacteristics(peripheral);
+                    if (scanForDevice && requested.name && requested.name !== peripheral.advertisement.localName)
+                        return;
                     const connector = this.getConnector(peripheral);
+                    const characteristics = yield this.getCharacteristics(peripheral);
                     const connectedServices = connector.getServices();
                     const services = connectedServices ? connectedServices.map(cs => cs.uuid) : undefined;
                     const connectedPeripheral = connector.getPeripheral();
@@ -631,7 +633,7 @@ class BleInterface extends ble_1.BleInterfaceClass {
                 });
                 this.logEvent({ message: `${opStr}: start scanning`, requested: scanForDevice ? { name, address, profile } : undefined, timeout });
                 let services = [];
-                if (scanForDevice) {
+                if (scanForDevice && name && !name.toLowerCase().startsWith('tacx')) {
                     if (props.requested instanceof ble_1.BleDeviceClass) {
                         const device = props.requested;
                         services = (device.getServices()) || [];

package/lib/ble/fm.js

@@ -251,8 +251,8 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
                 this.data.totalDistance = (dvHigh << 8) + dvLow;
             }
             if (flags & IndoorBikeDataFlag.ResistanceLevelPresent) {
-                this.data.resistanceLevel = data.readInt8(offset);
-                offset += 1;
+                this.data.resistanceLevel = data.readInt16LE(offset);
+                offset += 2;
             }
             if (flags & IndoorBikeDataFlag.InstantaneousPowerPresent) {
                 this.data.instantaneousPower = data.readInt16LE(offset);

package/package.json

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