incyclist-devices 1.4.25 → 1.4.28

package/lib/ble/incyclist-protocol.js

@@ -0,0 +1,106 @@
+"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 __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
+    result["default"] = mod;
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const gd_eventlog_1 = require("gd-eventlog");
+const DeviceProtocol_1 = __importStar(require("../DeviceProtocol"));
+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 supportedDeviceTypes = [hrm_1.default, pwr_1.default];
+class BleProtocol extends DeviceProtocol_1.default {
+    constructor(binding) {
+        super();
+        const b = binding || BleProtocol._defaultBinding;
+        this.logger = new gd_eventlog_1.EventLogger('BLE');
+        this.ble = ble_interface_1.default.getInstance({ binding: b, logger: this.logger });
+        BleProtocol._instances.push(this);
+    }
+    static setDefaultBinding(binding) {
+        BleProtocol._defaultBinding = binding;
+        BleProtocol._instances.forEach((p) => {
+            if (p.ble && !p.ble.getBinding()) {
+                p.ble.setBinding(binding);
+            }
+        });
+    }
+    setBinding(binding) {
+        if (this.ble)
+            this.ble.setBinding(binding);
+    }
+    createDevice(bleDevice) {
+        const fromDevice = bleDevice instanceof ble_1.BleDeviceClass;
+        const profile = bleDevice instanceof ble_1.BleDeviceClass ? bleDevice.getProfile() : bleDevice.profile;
+        const props = () => {
+            const { id, name, address } = bleDevice;
+            return { id, name, address };
+        };
+        switch (profile.toLocaleLowerCase()) {
+            case 'hr':
+            case 'heartrate monitor':
+                return new hrm_1.HrmAdapter(fromDevice ? bleDevice : new hrm_1.default(props()), this);
+        }
+    }
+    getName() { return 'BLE'; }
+    getInterfaces() { return [DeviceProtocol_1.INTERFACE.BLE]; }
+    isBike() { return true; }
+    isHrm() { return true; }
+    isPower() { return true; }
+    add(settings) {
+        this.logger.logEvent({ message: 'adding device', settings });
+        const device = this.createDevice(settings);
+        return device;
+    }
+    scan(props) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                this.ble.on('device', (bleDevice) => {
+                    if (props && props.onDeviceFound) {
+                        const device = this.createDevice(bleDevice);
+                        props.onDeviceFound(device, this);
+                    }
+                });
+                this.logger.logEvent({ message: 'scan started' });
+                yield this.ble.scan({ deviceTypes: supportedDeviceTypes });
+                if (props && props.onScanFinished) {
+                    props.onScanFinished(props.id);
+                }
+            }
+            catch (err) {
+                this.logger.logEvent({ message: 'error', error: err.message });
+            }
+        });
+    }
+    stopScan() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.ble.stopScan();
+            return;
+        });
+    }
+    isScanning() {
+        return this.ble.isScanning();
+    }
+}
+exports.default = BleProtocol;
+BleProtocol._defaultBinding = undefined;
+BleProtocol._instances = [];
+DeviceRegistry_1.default.register(new BleProtocol());

package/lib/ble/pwr.d.ts

@@ -0,0 +1,32 @@
+/// <reference types="node" />
+import { BleDevice } from './ble-device';
+declare type PowerData = {
+    instantaneousPower?: number;
+    balance?: number;
+    accTorque?: number;
+    rpm: number;
+    raw?: Buffer;
+};
+declare type CrankData = {
+    revolutions?: number;
+    time?: number;
+    cntUpdateMissing?: number;
+};
+export default class BleCyclingPowerDevice extends BleDevice {
+    static services: string[];
+    static characteristics: string[];
+    instantaneousPower: number;
+    balance: number;
+    accTorque: number;
+    currentCrankData: CrankData;
+    prevCrankData: CrankData;
+    rpm: number;
+    getProfile(): string;
+    getServiceUUids(): string[];
+    getRpm(crankData: any): number;
+    parsePower(data: Buffer): PowerData;
+    onData(characteristic: string, data: Buffer): void;
+    write(characteristic: any, data: any): Promise<boolean>;
+    read(characteristic: any): Promise<Buffer>;
+}
+export {};

package/lib/ble/pwr.js

@@ -0,0 +1,96 @@
+"use strict";
+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"));
+class BleCyclingPowerDevice extends ble_device_1.BleDevice {
+    constructor() {
+        super(...arguments);
+        this.instantaneousPower = undefined;
+        this.balance = undefined;
+        this.accTorque = undefined;
+        this.currentCrankData = undefined;
+        this.prevCrankData = undefined;
+        this.rpm = undefined;
+    }
+    getProfile() {
+        return 'cp';
+    }
+    getServiceUUids() {
+        return BleCyclingPowerDevice.services;
+    }
+    getRpm(crankData) {
+        if (!this.prevCrankData)
+            this.prevCrankData = { revolutions: 0, time: 0, cntUpdateMissing: -1 };
+        const c = this.currentCrankData = crankData;
+        const p = this.prevCrankData;
+        let rpm = this.rpm;
+        let hasUpdate = c.time !== p.time;
+        if (hasUpdate) {
+            let time = c.time - p.time;
+            let revs = c.revolutions - p.revolutions;
+            if (c.time < p.time)
+                time += 0x10000;
+            if (c.revolutions < p.revolutions)
+                revs += 0x10000;
+            rpm = 1024 * 60 * revs / time;
+        }
+        else {
+            if (p.cntUpdateMissing < 0 || p.cntUpdateMissing > 2) {
+                rpm = 0;
+            }
+        }
+        const cntUpdateMissing = p.cntUpdateMissing;
+        this.prevCrankData = this.currentCrankData;
+        if (hasUpdate)
+            this.prevCrankData.cntUpdateMissing = 0;
+        else
+            this.prevCrankData.cntUpdateMissing = cntUpdateMissing + 1;
+        return rpm;
+    }
+    parsePower(data) {
+        try {
+            let offset = 4;
+            const flags = data.readUInt16LE(0);
+            this.instantaneousPower = data.readUInt16LE(2);
+            if (flags & 0x1)
+                this.balance = data.readUInt8(offset++);
+            if (flags & 0x4) {
+                this.accTorque = data.readUInt16LE(offset);
+                offset += 2;
+            }
+            if (flags & 0x20) {
+                const crankData = {
+                    revolutions: data.readUInt16LE(offset),
+                    time: data.readUInt16LE(offset + 2)
+                };
+                this.rpm = this.getRpm(crankData);
+                offset += 4;
+            }
+        }
+        catch (err) {
+        }
+        const { instantaneousPower, balance, accTorque, rpm } = this;
+        return { instantaneousPower, balance, accTorque, rpm, raw: data };
+    }
+    onData(characteristic, data) {
+        if (characteristic.toLocaleLowerCase() === '2a63') {
+            const res = this.parsePower(data);
+            this.emit('data', res);
+        }
+    }
+    write(characteristic, data) {
+        console.log('write', characteristic, data);
+        return Promise.resolve(true);
+    }
+    read(characteristic) {
+        console.log('read', characteristic);
+        return Promise.resolve(Buffer.from([]));
+    }
+}
+exports.default = BleCyclingPowerDevice;
+BleCyclingPowerDevice.services = ['1818'];
+BleCyclingPowerDevice.characteristics = ['2a63', '2a65', '2a5d', '2a3c'];
+ble_interface_1.default.register('BleCyclingPowerDevice', 'cp', BleCyclingPowerDevice, BleCyclingPowerDevice.services);

package/lib/daum/DaumAdapter.d.ts

@@ -1,11 +1,11 @@
 import { EventLogger } from 'gd-eventlog';
 import CyclingMode, { IncyclistBikeData } from '../CyclingMode';
-import DeviceAdapterBase, { Bike, DeviceAdapter, DeviceData } from '../Device';
+import IncyclistDevice, { Bike, DeviceAdapter, DeviceData } from '../Device';
 import { User } from '../types/user';
 interface DaumAdapter {
     getCurrentBikeData(): Promise<any>;
 }
-export default class DaumAdapterBase extends DeviceAdapterBase implements DeviceAdapter, DaumAdapter, Bike {
+export default class DaumAdapterBase extends IncyclistDevice implements DeviceAdapter, DaumAdapter, Bike {
     bike: any;
     ignoreHrm: boolean;
     ignoreBike: boolean;

package/lib/daum/premium/tcpserial.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const net_1 = __importDefault(require("net"));
 const gd_eventlog_1 = require("gd-eventlog");
-const TIMEOUT_OPEN = 1000;
 var __responses = {};
 class TcpSocketPort {
     constructor(props) {

package/lib/modes/power-base.js

@@ -37,17 +37,27 @@ class PowerBasedCyclingModeBase extends CyclingMode_1.CyclingModeBase {
         let powerToMaintainSpeed = calculations_1.default.calculatePower(m, vPrev, slope, props);
         const powerDelta = powerToMaintainSpeed - power;
         const Ekin = EkinPrev - powerDelta * t;
-        const v = Math.sqrt(2 * Ekin / m);
-        const speed = v * 3.6;
-        const distance = v * t;
-        this.data.speed = speed;
-        return { speed, distance };
+        if (Ekin > 0) {
+            const v = Math.sqrt(2 * Ekin / m);
+            const speed = v * 3.6;
+            const distance = v * t;
+            this.data.speed = speed;
+            return { speed, distance };
+        }
+        else {
+            const v = vPrev * 0.5;
+            const speed = v * 3.6;
+            const distance = v * t;
+            this.data.speed = speed;
+            return { speed, distance };
+        }
     }
     calculatePowerAndDistance(speed, slope, m, t, props = {}) {
         const prevData = this.data || {};
         const vPrev = (prevData.speed || 0) / 3.6;
         const EkinPrev = 1 / 2 * m * vPrev * vPrev;
-        const Ekin = 1 / 2 * m * speed * speed;
+        const vTarget = (speed || 0) / 3.6;
+        const Ekin = 1 / 2 * m * vTarget * vTarget;
         const powerDelta = t !== 0 ? (EkinPrev - Ekin) / t : 0;
         const powerToMaintainSpeed = calculations_1.default.calculatePower(m, vPrev, slope, props);
         const power = powerToMaintainSpeed - powerDelta;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-devices",
-  "version": "1.4.25",
+  "version": "1.4.28",
   "dependencies": {
     "@serialport/parser-byte-length": "^9.0.1",
     "@serialport/parser-delimiter": "^9.0.1",
@@ -22,6 +22,7 @@
     "typescript": "^4.5.2"
   },
   "scripts": {
+    "lint": "eslint . --ext .ts",
     "build": "tsc",
     "test": "jest --coverage",
     "dev": "nodemon --watch src -e ts,js --exec npm run build"