incyclist-devices 1.4.59 → 1.4.62

package/lib/ble/ble-interface.js

@@ -462,7 +462,7 @@ class BleInterface extends ble_1.BleInterfaceClass {
     }
     scan(props) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { timeout = DEFAULT_SCAN_TIMEOUT, deviceTypes = [], requested } = props;
+            const { timeout = DEFAULT_SCAN_TIMEOUT, deviceTypes = [], requested, isBackgroundScan } = props;
             let profile;
             if (requested)
                 profile = requested instanceof ble_1.BleDeviceClass ?
@@ -479,7 +479,7 @@ class BleInterface extends ble_1.BleInterfaceClass {
             }
             const peripheralsProcessed = [];
             const devicesProcessed = [];
-            this.logEvent({ message: 'scan()', props, scanState: this.scanState,
+            this.logEvent({ message: 'scan()', props: { timeout, isBackgroundScan }, scanState: this.scanState,
                 peripheralCache: this.peripheralCache.map(i => ({ address: i.address, ts: i.ts, name: i.peripheral ? i.peripheral.advertisement.localName : '' })),
                 deviceCache: this.devices.map(i => ({ address: i.device.address, profile: i.device.getProfile(), isConnected: i.isConnected }))
             });

package/lib/ble/ble-peripheral.js

@@ -101,9 +101,10 @@ class BlePeripheralConnector {
                         c.on('data', (data, _isNotification) => {
                             this.onData((0, ble_1.uuid)(c.uuid), data);
                         });
-                        if (callback)
+                        if (callback) {
                             this.on((0, ble_1.uuid)(c.uuid), callback);
-                        this.logEvent({ message: 'subscribe', peripheral: this.peripheral.address, characteristic: c.uuid });
+                        }
+                        this.logEvent({ message: 'subscribe', peripheral: this.peripheral.address, characteristic: c.uuid, uuid: (0, ble_1.uuid)(c.uuid) });
                         if (this.state.subscribed.find(uuid => uuid === c.uuid) === undefined) {
                             try {
                                 yield this.subscribe(c.uuid);
@@ -117,7 +118,7 @@ class BlePeripheralConnector {
                     }
                 }
                 catch (err) {
-                    console.log('~~~ error', err);
+                    this.logEvent({ message: 'error', fn: 'subscribeAll()', error: err.message || err, stack: err.stack });
                 }
             }
             this.state.isSubscribing = false;

package/lib/ble/fm.js

@@ -148,7 +148,7 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
         }
         catch (err) {
         }
-        return Object.assign(Object.assign({}, this.data), { raw: data.toString('hex') });
+        return Object.assign(Object.assign({}, this.data), { raw: `2a37:${data.toString('hex')}` });
     }
     setCrr(crr) { this.crr = crr; }
     getCrr() { return this.crr; }
@@ -215,7 +215,7 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
             this.data.remainingTime = data.readUInt16LE(offset);
             offset += 2;
         }
-        return Object.assign(Object.assign({}, this.data), { raw: data.toString('hex') });
+        return Object.assign(Object.assign({}, this.data), { raw: `2ad2:${data.toString('hex')}` });
     }
     parseFitnessMachineStatus(_data) {
         const data = Buffer.from(_data);
@@ -252,7 +252,7 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
                     default: break;
                 }
         }
-        return Object.assign(Object.assign({}, this.data), { raw: data.toString('hex') });
+        return Object.assign(Object.assign({}, this.data), { raw: `2ada:${data.toString('hex')}` });
     }
     getFitnessMachineFeatures() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -286,6 +286,11 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
             case '2ada':
                 res = this.parseFitnessMachineStatus(data);
                 break;
+            case '2a63':
+            case '2a5b':
+            case '347b0011-7635-408b-8918-8ff3949ce592':
+                this.logger.logEvent({ message: 'onBleData', raw: `uuid:${data.toString('hex')}` });
+                break;
             default:
                 break;
         }

package/lib/ble/pwr.js

@@ -111,6 +111,8 @@ class BleCyclingPowerDevice extends ble_device_1.BleDevice {
                 this.accTorque = data.readUInt16LE(offset);
                 offset += 2;
             }
+            if (flags & 0x10) {
+            }
             if (flags & 0x20) {
                 const crankData = {
                     revolutions: data.readUInt16LE(offset),
@@ -125,7 +127,7 @@ class BleCyclingPowerDevice extends ble_device_1.BleDevice {
         catch (err) {
         }
         const { instantaneousPower, balance, accTorque, rpm, time } = this;
-        return { instantaneousPower, balance, accTorque, rpm, time, raw: data.toString('hex') };
+        return { instantaneousPower, balance, accTorque, rpm, time, raw: `2a63:${data.toString('hex')}` };
     }
     onData(characteristic, data) {
         super.onData(characteristic, data);

package/lib/modes/power-meter.js

@@ -49,8 +49,8 @@ class PowerMeterCyclingMode extends power_base_1.default {
             let power = bikeData.power || 0;
             const slope = prevData.slope || 0;
             const distanceInternal = prevData.distanceInternal || 0;
-            if (bikeData.pedalRpm === 0 || bikeData.isPedalling === false) {
-                power = 0;
+            if (power > 0) {
+                data.isPedalling = true;
             }
             const m = this.getWeight();
             const t = this.getTimeSinceLastUpdate();

package/package.json

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