incyclist-devices 1.4.28 → 1.4.31

package/lib/ble/ble-interface.js

@@ -17,7 +17,6 @@ class BleInterface extends ble_1.BleInterfaceClass {
         this.scanState = { isScanning: false, timeout: undefined };
         this.connectState = { isConnecting: false, isConnected: false, isOpened: false };
         this.devices = [];
-        console.log('BleInterface constructor', props);
         if (props.logger)
             this.logger = props.logger;
         else if (props.log) {
@@ -50,7 +49,9 @@ class BleInterface extends ble_1.BleInterfaceClass {
         if (this.logger) {
             this.logger.logEvent(event);
         }
-        console.log(event);
+        if (process.env.BLE_DEBUG) {
+            console.log(event);
+        }
     }
     onStateChange(state) {
         if (state !== ble_1.BleState.POWERED_ON) {
@@ -93,7 +94,7 @@ class BleInterface extends ble_1.BleInterfaceClass {
                             self.connectState.isOpened = false;
                             self.connectState.isConnected = false;
                             self.connectState.isConnecting = false;
-                            this.logEvent({ message: 'connect result: error', error: err.message });
+                            self.logEvent({ message: 'connect result: error', error: err.message });
                             return reject(new Error(err.message));
                         }
                     };

package/lib/ble/hrm.js

@@ -75,7 +75,7 @@ class HrmAdapter extends Device_1.default {
         this.paused = false;
         this.device = device;
         this.ble = protocol.ble;
-        this.logger = new gd_eventlog_1.EventLogger('BleHrm');
+        this.logger = new gd_eventlog_1.EventLogger('Ble-HR');
     }
     isBike() { return false; }
     isHrm() { return true; }

package/lib/ble/incyclist-protocol.js

@@ -25,7 +25,7 @@ const DeviceRegistry_1 = __importDefault(require("../DeviceRegistry"));
 const ble_1 = require("./ble");
 const ble_interface_1 = __importDefault(require("./ble-interface"));
 const hrm_1 = __importStar(require("./hrm"));
-const pwr_1 = __importDefault(require("./pwr"));
+const pwr_1 = __importStar(require("./pwr"));
 const supportedDeviceTypes = [hrm_1.default, pwr_1.default];
 class BleProtocol extends DeviceProtocol_1.default {
     constructor(binding) {
@@ -58,6 +58,9 @@ class BleProtocol extends DeviceProtocol_1.default {
             case 'hr':
             case 'heartrate monitor':
                 return new hrm_1.HrmAdapter(fromDevice ? bleDevice : new hrm_1.default(props()), this);
+            case 'cp':
+            case 'power meter':
+                return new pwr_1.PwrAdapter(fromDevice ? bleDevice : new pwr_1.default(props()), this);
         }
     }
     getName() { return 'BLE'; }

package/lib/ble/pwr.d.ts

@@ -1,9 +1,18 @@
 /// <reference types="node" />
 import { BleDevice } from './ble-device';
+import BleInterface from './ble-interface';
+import BleProtocol from './incyclist-protocol';
+import { BleDeviceClass } from './ble';
+import DeviceAdapter, { DeviceData } from '../Device';
+import { DeviceProtocol } from '../DeviceProtocol';
+import { EventLogger } from 'gd-eventlog';
+import CyclingMode from '../CyclingMode';
+import { IncyclistBikeData } from '../CyclingMode';
 declare type PowerData = {
     instantaneousPower?: number;
     balance?: number;
     accTorque?: number;
+    time: number;
     rpm: number;
     raw?: Buffer;
 };
@@ -18,15 +27,51 @@ export default class BleCyclingPowerDevice extends BleDevice {
     instantaneousPower: number;
     balance: number;
     accTorque: number;
+    rpm: number;
+    timeOffset: number;
+    time: number;
     currentCrankData: CrankData;
     prevCrankData: CrankData;
-    rpm: number;
+    constructor(props?: any);
     getProfile(): string;
     getServiceUUids(): string[];
-    getRpm(crankData: any): number;
+    parseCrankData(crankData: any): {
+        rpm: number;
+        time: any;
+    };
     parsePower(data: Buffer): PowerData;
     onData(characteristic: string, data: Buffer): void;
     write(characteristic: any, data: any): Promise<boolean>;
     read(characteristic: any): Promise<Buffer>;
+    reset(): void;
+}
+export declare class PwrAdapter extends DeviceAdapter {
+    device: BleCyclingPowerDevice;
+    ignore: boolean;
+    ble: BleInterface;
+    protocol: DeviceProtocol;
+    paused: boolean;
+    logger: EventLogger;
+    mode: CyclingMode;
+    distanceInternal: number;
+    constructor(device: BleDeviceClass, protocol: BleProtocol);
+    isBike(): boolean;
+    isHrm(): boolean;
+    isPower(): boolean;
+    getProfile(): string;
+    getName(): string;
+    getDisplayName(): string;
+    getCyclingMode(): CyclingMode;
+    getDefaultCyclingMode(): CyclingMode;
+    getPort(): string;
+    setIgnoreBike(ignore: any): void;
+    setIgnorePower(ignore: any): void;
+    onDeviceData(deviceData: PowerData): void;
+    mapData(deviceData: PowerData): IncyclistBikeData;
+    transformData(bikeData: IncyclistBikeData): DeviceData;
+    start(props?: any): Promise<any>;
+    stop(): Promise<boolean>;
+    pause(): Promise<boolean>;
+    resume(): Promise<boolean>;
 }
 export {};

package/lib/ble/pwr.js

@@ -1,19 +1,33 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const ble_device_1 = require("./ble-device");
 const ble_interface_1 = __importDefault(require("./ble-interface"));
+const Device_1 = __importDefault(require("../Device"));
+const gd_eventlog_1 = require("gd-eventlog");
+const power_meter_1 = __importDefault(require("../modes/power-meter"));
 class BleCyclingPowerDevice extends ble_device_1.BleDevice {
-    constructor() {
-        super(...arguments);
+    constructor(props) {
+        super(props);
         this.instantaneousPower = undefined;
         this.balance = undefined;
         this.accTorque = undefined;
+        this.rpm = undefined;
+        this.timeOffset = 0;
+        this.time = undefined;
         this.currentCrankData = undefined;
         this.prevCrankData = undefined;
-        this.rpm = undefined;
     }
     getProfile() {
         return 'cp';
@@ -21,7 +35,7 @@ class BleCyclingPowerDevice extends ble_device_1.BleDevice {
     getServiceUUids() {
         return BleCyclingPowerDevice.services;
     }
-    getRpm(crankData) {
+    parseCrankData(crankData) {
         if (!this.prevCrankData)
             this.prevCrankData = { revolutions: 0, time: 0, cntUpdateMissing: -1 };
         const c = this.currentCrankData = crankData;
@@ -31,8 +45,10 @@ class BleCyclingPowerDevice extends ble_device_1.BleDevice {
         if (hasUpdate) {
             let time = c.time - p.time;
             let revs = c.revolutions - p.revolutions;
-            if (c.time < p.time)
+            if (c.time < p.time) {
                 time += 0x10000;
+                this.timeOffset += 0x10000;
+            }
             if (c.revolutions < p.revolutions)
                 revs += 0x10000;
             rpm = 1024 * 60 * revs / time;
@@ -48,7 +64,7 @@ class BleCyclingPowerDevice extends ble_device_1.BleDevice {
             this.prevCrankData.cntUpdateMissing = 0;
         else
             this.prevCrankData.cntUpdateMissing = cntUpdateMissing + 1;
-        return rpm;
+        return { rpm, time: this.timeOffset + c.time };
     }
     parsePower(data) {
         try {
@@ -66,14 +82,16 @@ class BleCyclingPowerDevice extends ble_device_1.BleDevice {
                     revolutions: data.readUInt16LE(offset),
                     time: data.readUInt16LE(offset + 2)
                 };
-                this.rpm = this.getRpm(crankData);
+                const { rpm, time } = this.parseCrankData(crankData);
+                this.rpm = rpm;
+                this.time = time;
                 offset += 4;
             }
         }
         catch (err) {
         }
-        const { instantaneousPower, balance, accTorque, rpm } = this;
-        return { instantaneousPower, balance, accTorque, rpm, raw: data };
+        const { instantaneousPower, balance, accTorque, rpm, time } = this;
+        return { instantaneousPower, balance, accTorque, rpm, time, raw: data };
     }
     onData(characteristic, data) {
         if (characteristic.toLocaleLowerCase() === '2a63') {
@@ -89,8 +107,137 @@ class BleCyclingPowerDevice extends ble_device_1.BleDevice {
         console.log('read', characteristic);
         return Promise.resolve(Buffer.from([]));
     }
+    reset() {
+        this.instantaneousPower = undefined;
+        this.balance = undefined;
+        this.accTorque = undefined;
+        this.rpm = undefined;
+        this.timeOffset = 0;
+        this.time = undefined;
+        this.currentCrankData = undefined;
+        this.prevCrankData = undefined;
+    }
 }
 exports.default = BleCyclingPowerDevice;
 BleCyclingPowerDevice.services = ['1818'];
 BleCyclingPowerDevice.characteristics = ['2a63', '2a65', '2a5d', '2a3c'];
 ble_interface_1.default.register('BleCyclingPowerDevice', 'cp', BleCyclingPowerDevice, BleCyclingPowerDevice.services);
+class PwrAdapter extends Device_1.default {
+    constructor(device, protocol) {
+        super(protocol);
+        this.ignore = false;
+        this.paused = false;
+        this.distanceInternal = 0;
+        this.device = device;
+        this.ble = protocol.ble;
+        this.mode = this.getDefaultCyclingMode();
+        this.logger = new gd_eventlog_1.EventLogger('Ble-CP');
+    }
+    isBike() { return true; }
+    isHrm() { return false; }
+    isPower() { return true; }
+    getProfile() {
+        return 'Power Meter';
+    }
+    getName() {
+        return `${this.device.name}`;
+    }
+    getDisplayName() {
+        const { name, instantaneousPower: power } = this.device;
+        const powerStr = power ? ` (${power})` : '';
+        return `${name}${powerStr}`;
+    }
+    getCyclingMode() {
+        if (!this.mode)
+            this.mode = this.getDefaultCyclingMode();
+        return this.mode;
+    }
+    getDefaultCyclingMode() {
+        return new power_meter_1.default(this);
+    }
+    getPort() {
+        return 'ble';
+    }
+    setIgnoreBike(ignore) {
+        this.ignore = ignore;
+    }
+    setIgnorePower(ignore) {
+        this.ignore = ignore;
+    }
+    onDeviceData(deviceData) {
+        this.logger.logEvent({ message: 'onDeviceData', data: deviceData });
+        let incyclistData = this.mapData(deviceData);
+        incyclistData = this.getCyclingMode().updateData(incyclistData);
+        const data = this.transformData(incyclistData);
+        if (this.onDataFn && !this.ignore && !this.paused)
+            this.onDataFn(data);
+    }
+    mapData(deviceData) {
+        const data = {
+            isPedalling: false,
+            power: 0,
+            pedalRpm: 0,
+            speed: 0,
+            heartrate: 0,
+            distanceInternal: 0,
+            slope: undefined,
+            time: undefined
+        };
+        data.power = (deviceData.instantaneousPower !== undefined ? deviceData.instantaneousPower : data.power);
+        data.pedalRpm = (deviceData.rpm !== undefined ? deviceData.rpm : data.pedalRpm);
+        data.time = (deviceData.time !== undefined ? deviceData.time : data.time);
+        data.isPedalling = data.pedalRpm > 0 || (data.pedalRpm === undefined && data.power > 0);
+        return data;
+    }
+    transformData(bikeData) {
+        if (this.ignore) {
+            return {};
+        }
+        if (bikeData === undefined)
+            return;
+        let distance = 0;
+        if (this.distanceInternal !== undefined && bikeData.distanceInternal !== undefined) {
+            distance = Math.round(bikeData.distanceInternal - this.distanceInternal);
+        }
+        if (bikeData.distanceInternal !== undefined)
+            this.distanceInternal = bikeData.distanceInternal;
+        let data = {
+            speed: bikeData.speed,
+            slope: bikeData.slope,
+            power: bikeData.power !== undefined ? Math.round(bikeData.power) : undefined,
+            cadence: bikeData.pedalRpm !== undefined ? Math.round(bikeData.pedalRpm) : undefined,
+            distance,
+            timestamp: Date.now()
+        };
+        return data;
+    }
+    start(props) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.logger.logEvent({ message: 'start requested', props });
+            try {
+                const bleDevice = yield this.ble.connectDevice(this.device);
+                if (bleDevice) {
+                    this.device = bleDevice;
+                    bleDevice.on('data', (data) => {
+                        this.onDeviceData(data);
+                    });
+                    return true;
+                }
+            }
+            catch (err) {
+                this.logger.logEvent({ message: 'start result: error', error: err.message });
+                return false;
+            }
+        });
+    }
+    stop() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.distanceInternal = 0;
+            this.device.reset();
+            return this.device.disconnect();
+        });
+    }
+    pause() { this.paused = true; return Promise.resolve(true); }
+    resume() { this.paused = false; return Promise.resolve(true); }
+}
+exports.PwrAdapter = PwrAdapter;

package/package.json

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