incyclist-devices 1.5.2 → 1.5.3

package/lib/ble/elite.d.ts

@@ -0,0 +1,90 @@
+/// <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 '../protocol';
+import { EventLogger } from 'gd-eventlog';
+import CyclingMode from '../cycling-mode';
+import { IncyclistBikeData } from '../cycling-mode';
+export declare const ELITE_TRAINER_SVC = "347b0001";
+declare type PowerData = {
+    instantaneousPower?: number;
+    balance?: number;
+    accTorque?: number;
+    time: number;
+    rpm: number;
+    raw?: string;
+};
+declare type CrankData = {
+    revolutions?: number;
+    time?: number;
+    cntUpdateMissing?: number;
+};
+export default class BleEliteDevice extends BleDevice {
+    static services: string[];
+    static characteristics: string[];
+    static detectionPriority: number;
+    instantaneousPower: number;
+    balance: number;
+    accTorque: number;
+    rpm: number;
+    timeOffset: number;
+    time: number;
+    currentCrankData: CrankData;
+    prevCrankData: CrankData;
+    constructor(props?: any);
+    isMatching(characteristics: string[]): boolean;
+    init(): Promise<boolean>;
+    getProfile(): string;
+    getServiceUUids(): string[];
+    parseCrankData(crankData: any): {
+        rpm: number;
+        time: any;
+    };
+    parsePower(_data: Uint8Array): PowerData;
+    onData(characteristic: string, data: Buffer): boolean;
+    reset(): void;
+}
+export declare class EliteAdapter extends DeviceAdapter {
+    device: BleEliteDevice;
+    ignore: boolean;
+    ble: BleInterface;
+    protocol: DeviceProtocol;
+    paused: boolean;
+    logger: EventLogger;
+    mode: CyclingMode;
+    distanceInternal: number;
+    prevDataTS: number;
+    userSettings: {
+        weight?: number;
+    };
+    bikeSettings: {
+        weight?: number;
+    };
+    constructor(device: BleDeviceClass, protocol: BleProtocol);
+    isBike(): boolean;
+    isHrm(): boolean;
+    isPower(): boolean;
+    isSame(device: DeviceAdapter): boolean;
+    getProfile(): string;
+    getName(): string;
+    getDisplayName(): string;
+    getCyclingMode(): CyclingMode;
+    getDefaultCyclingMode(): CyclingMode;
+    getSupportedCyclingModes(): any[];
+    getPort(): string;
+    getWeight(): number;
+    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>;
+    sendUpdate(request: any): Promise<void>;
+    pause(): Promise<boolean>;
+    resume(): Promise<boolean>;
+}
+export {};

package/lib/ble/elite.js

@@ -0,0 +1,322 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+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 });
+exports.EliteAdapter = exports.ELITE_TRAINER_SVC = void 0;
+const ble_device_1 = require("./ble-device");
+const ble_interface_1 = __importDefault(require("./ble-interface"));
+const ble_1 = require("./ble");
+const device_1 = __importStar(require("../device"));
+const gd_eventlog_1 = require("gd-eventlog");
+const consts_1 = require("./consts");
+const power_meter_1 = __importDefault(require("../modes/power-meter"));
+exports.ELITE_TRAINER_SVC = '347b0001';
+class BleEliteDevice extends ble_device_1.BleDevice {
+    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;
+    }
+    isMatching(characteristics) {
+        if (!characteristics)
+            return false;
+        const hasCPMeasurement = characteristics.find(c => c === consts_1.CSP_MEASUREMENT) !== undefined;
+        const hasCPFeature = characteristics.find(c => c === consts_1.CSP_FEATURE) !== undefined;
+        return hasCPMeasurement && hasCPFeature;
+    }
+    init() {
+        const _super = Object.create(null, {
+            init: { get: () => super.init }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield _super.init.call(this);
+            }
+            catch (err) {
+                return Promise.resolve(false);
+            }
+        });
+    }
+    getProfile() {
+        return 'Power Meter';
+    }
+    getServiceUUids() {
+        return BleEliteDevice.services;
+    }
+    parseCrankData(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;
+                this.timeOffset += 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, time: this.timeOffset + c.time };
+    }
+    parsePower(_data) {
+        const data = Buffer.from(_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 & 0x10) {
+            }
+            if (flags & 0x20) {
+                const crankData = {
+                    revolutions: data.readUInt16LE(offset),
+                    time: data.readUInt16LE(offset + 2)
+                };
+                const { rpm, time } = this.parseCrankData(crankData);
+                this.rpm = rpm;
+                this.time = time;
+                offset += 4;
+            }
+        }
+        catch (err) {
+        }
+        const { instantaneousPower, balance, accTorque, rpm, time } = this;
+        return { instantaneousPower, balance, accTorque, rpm, time, raw: `2a63:${data.toString('hex')}` };
+    }
+    onData(characteristic, data) {
+        const hasData = super.onData(characteristic, data);
+        if (!hasData)
+            return false;
+        if ((0, ble_1.matches)(characteristic, consts_1.CSP_MEASUREMENT)) {
+            const res = this.parsePower(data);
+            this.emit('data', res);
+            return false;
+        }
+        return true;
+    }
+    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 = BleEliteDevice;
+BleEliteDevice.services = [exports.ELITE_TRAINER_SVC];
+BleEliteDevice.characteristics = [consts_1.CSP_MEASUREMENT, consts_1.CSP_FEATURE, '2a5d', '2a3c'];
+BleEliteDevice.detectionPriority = 10;
+ble_interface_1.default.register('BleCyclingPowerDevice', 'cp', BleEliteDevice, BleEliteDevice.services);
+class EliteAdapter 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-Elite');
+    }
+    isBike() { return true; }
+    isHrm() { return false; }
+    isPower() { return true; }
+    isSame(device) {
+        if (!(device instanceof EliteAdapter))
+            return false;
+        const adapter = device;
+        return (adapter.getName() === this.getName() && adapter.getProfile() === this.getProfile());
+    }
+    getProfile() {
+        return 'Elite Smart Trainer';
+    }
+    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);
+    }
+    getSupportedCyclingModes() {
+        return [power_meter_1.default];
+    }
+    getPort() {
+        return 'ble';
+    }
+    getWeight() {
+        let userWeight = device_1.DEFAULT_USER_WEIGHT;
+        let bikeWeight = device_1.DEFAULT_BIKE_WEIGHT;
+        if (this.userSettings && this.userSettings.weight) {
+            userWeight = Number(this.userSettings.weight);
+        }
+        if (this.bikeSettings && this.bikeSettings.weight) {
+            bikeWeight = Number(this.bikeSettings.weight);
+        }
+        return bikeWeight + userWeight;
+    }
+    setIgnoreBike(ignore) {
+        this.ignore = ignore;
+    }
+    setIgnorePower(ignore) {
+        this.ignore = ignore;
+    }
+    onDeviceData(deviceData) {
+        if (this.prevDataTS && Date.now() - this.prevDataTS < 1000)
+            return;
+        this.prevDataTS = Date.now();
+        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: undefined,
+            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* () {
+            if (props && props.user)
+                this.userSettings = props.user;
+            if (props && props.bikeSettings)
+                this.bikeSettings = props.bikeSettings;
+            this.logger.logEvent({ message: 'csp: start requested', profile: this.getProfile(), 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, profile: this.getProfile() });
+                throw new Error(`could not start device, reason:${err.message}`);
+            }
+        });
+    }
+    stop() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.logger.logEvent({ message: 'stop requested', profile: this.getProfile() });
+            this.distanceInternal = 0;
+            this.device.reset();
+            return this.device.disconnect();
+        });
+    }
+    sendUpdate(request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.paused)
+                return;
+            this.getCyclingMode().sendBikeUpdate(request);
+        });
+    }
+    pause() { this.paused = true; return Promise.resolve(true); }
+    resume() { this.paused = false; return Promise.resolve(true); }
+}
+exports.EliteAdapter = EliteAdapter;

package/lib/ble/incyclist-protocol.js

@@ -41,6 +41,7 @@ const hrm_1 = __importStar(require("./hrm"));
 const pwr_1 = __importStar(require("./pwr"));
 const wahoo_kickr_1 = __importStar(require("./wahoo-kickr"));
 const tacx_1 = __importStar(require("./tacx"));
+const elite_1 = __importStar(require("./elite"));
 class BleProtocol extends protocol_1.default {
     constructor(binding) {
         super();
@@ -76,6 +77,7 @@ class BleProtocol extends protocol_1.default {
             case 'smart trainer':
             case 'wahoo smart trainer':
             case 'fitness machine':
+            case 'elite smart trainer':
             case tacx_1.default.PROFILE.toLowerCase():
                 let device;
                 if (fromDevice)
@@ -87,6 +89,10 @@ class BleProtocol extends protocol_1.default {
                     device = device || new wahoo_kickr_1.default(props());
                     return new wahoo_kickr_1.WahooAdvancedFmAdapter(device, this);
                 }
+                if (profile.toLowerCase() === 'elite smart trainer') {
+                    device = device || new elite_1.default(props());
+                    return new elite_1.EliteAdapter(device, this);
+                }
                 else if (profile === tacx_1.default.PROFILE) {
                     device = device || new tacx_1.default(props());
                     return new tacx_1.TacxBleFEAdapter(device, this);

package/package.json

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