incyclist-devices 1.4.98 → 1.4.102

package/lib/modes/simulator.js

@@ -1,140 +1,140 @@
-"use strict";
-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 CyclingMode_1 = require("../CyclingMode");
-const power_base_1 = __importDefault(require("./power-base"));
-const MIN_SPEED = 10;
-const config = {
-    name: "Simulator",
-    description: "Simulates a ride with constant speed or power output",
-    properties: [
-        { key: 'mode', name: 'Simulation Type', description: '', type: CyclingMode_1.CyclingModeProperyType.SingleSelect, options: ['Speed', 'Power'], default: 'Power' },
-        { key: 'delay', name: 'Start Delay', description: 'Delay (in s) at start of training', type: CyclingMode_1.CyclingModeProperyType.Integer, default: 2, min: 0, max: 30 },
-        { key: 'power', name: 'Power', description: 'Power (in W) at start of training', condition: (s) => !s.mode || s.mode === 'Power', type: CyclingMode_1.CyclingModeProperyType.Integer, default: 150, min: 25, max: 800 },
-        { key: 'speed', name: 'Speed', description: 'Speed (in km/h) at start of training', condition: (s) => s.mode === 'Speed', type: CyclingMode_1.CyclingModeProperyType.Integer, default: 30, min: 5, max: 50 },
-        { key: 'bikeType', name: 'Bike Type', description: '', type: CyclingMode_1.CyclingModeProperyType.SingleSelect, options: ['Race', 'Mountain', 'Triathlon'], default: 'Race' }
-    ]
-};
-class SimulatorCyclingMode extends power_base_1.default {
-    constructor(adapter, props) {
-        super(adapter, props);
-        this.prevUpdateTS = 0;
-        this.hasBikeUpdate = false;
-        this.event = {};
-        this.logger = adapter.logger || new gd_eventlog_1.EventLogger('SIMMode');
-        this.data = {};
-        this.logger.logEvent({ message: 'constructor', props });
-    }
-    getName() {
-        return config.name;
-    }
-    getDescription() {
-        return config.description;
-    }
-    getProperties() {
-        return config.properties;
-    }
-    getProperty(name) {
-        return config.properties.find(p => p.name === name);
-    }
-    getBikeInitRequest() {
-        return {};
-    }
-    sendBikeUpdate(request) {
-        this.logger.logEvent({ message: 'bike update request', request });
-        const r = request || { refresh: true };
-        if (r.refresh) {
-            if (Object.keys(r).length === 1)
-                return this.prevRequest || {};
-            delete r.refresh;
-        }
-        if (request.slope !== undefined) {
-            if (!this.data)
-                this.data = {};
-            this.data.slope = request.slope;
-        }
-        this.prevRequest = request ? JSON.parse(JSON.stringify(request)) : {};
-        return r;
-    }
-    updateData(bikeData) {
-        const prevData = JSON.parse(JSON.stringify(this.data || {}));
-        const prevSpeed = prevData.speed;
-        const prevRequest = this.prevRequest || {};
-        const data = this.data || {};
-        const bikeType = (this.getSetting('bikeType') || 'Race').toLowerCase();
-        const mode = this.getSetting('mode');
-        delete this.event.gearUpdated;
-        delete this.event.rpmUpdated;
-        try {
-            let rpm = 90;
-            let power = (!mode || mode.toLowerCase() === 'power') ? Number(this.getSetting('power')) : bikeData.power || 0;
-            let slope = (prevData.slope !== undefined ? prevData.slope : prevRequest.slope || 0);
-            let speed = mode.toLowerCase() === 'speed' ? Number(this.getSetting('speed')) : bikeData.speed || 0;
-            let m = this.getWeight();
-            let distanceInternal = prevData.distanceInternal || 0;
-            let ts = Date.now();
-            let duration = this.prevUpdateTS === 0 ? 0 : ((ts - this.prevUpdateTS) / 1000);
-            const t = this.getTimeSinceLastUpdate();
-            let distance = 0;
-            if (!mode || mode.toLowerCase() === 'power') {
-                const res = this.calculateSpeedAndDistance(power, slope, m, t, { bikeType });
-                speed = res.speed;
-                distance = res.distance;
-            }
-            else if (mode.toLowerCase() === 'speed') {
-                const res = this.calculatePowerAndDistance(speed, slope, m, t, { bikeType });
-                power = res.power;
-                distance = res.distance;
-            }
-            if (prevRequest.targetPower) {
-                power = prevRequest.targetPower;
-                const res = this.calculateSpeedAndDistance(power, slope, m, t, { bikeType });
-                speed = res.speed;
-                distance = res.distance;
-            }
-            if (prevRequest.maxPower && power > prevRequest.maxPower) {
-                power = prevRequest.maxPower;
-                const res = this.calculateSpeedAndDistance(power, slope, m, t, { bikeType });
-                speed = res.speed;
-                distance = res.distance;
-            }
-            else if (prevRequest.minPower && power < prevRequest.minPower) {
-                power = prevRequest.minPower;
-                const res = this.calculateSpeedAndDistance(power, slope, m, t, { bikeType });
-                speed = res.speed;
-                distance = res.distance;
-            }
-            if (power === 0 && speed < MIN_SPEED) {
-                data.speed = Math.round(prevData.speed - 1) < 0 ? 0 : Math.round(prevData.speed - 1);
-                data.distanceInternal = distanceInternal + data.speed / 3.6 * t;
-            }
-            else {
-                data.speed = speed;
-                data.distanceInternal = distanceInternal + distance;
-            }
-            data.speed = speed;
-            data.power = Math.round(power);
-            data.distanceInternal = distanceInternal + distance;
-            data.slope = slope;
-            data.pedalRpm = rpm;
-            if (data.time !== undefined)
-                data.time += duration;
-            else
-                data.time = 0;
-            data.heartrate = bikeData.heartrate;
-            data.isPedalling = true;
-            this.prevUpdateTS = ts;
-        }
-        catch (err) {
-            this.logger.logEvent({ message: 'error', fn: 'updateData()', error: err.message || err });
-        }
-        this.logger.logEvent({ message: "updateData result", data, bikeData, prevRequest, prevSpeed });
-        this.data = data;
-        return data;
-    }
-}
-exports.default = SimulatorCyclingMode;
-SimulatorCyclingMode.isERG = true;
+"use strict";
+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 CyclingMode_1 = require("../CyclingMode");
+const power_base_1 = __importDefault(require("./power-base"));
+const MIN_SPEED = 10;
+const config = {
+    name: "Simulator",
+    description: "Simulates a ride with constant speed or power output",
+    properties: [
+        { key: 'mode', name: 'Simulation Type', description: '', type: CyclingMode_1.CyclingModeProperyType.SingleSelect, options: ['Speed', 'Power'], default: 'Power' },
+        { key: 'delay', name: 'Start Delay', description: 'Delay (in s) at start of training', type: CyclingMode_1.CyclingModeProperyType.Integer, default: 2, min: 0, max: 30 },
+        { key: 'power', name: 'Power', description: 'Power (in W) at start of training', condition: (s) => !s.mode || s.mode === 'Power', type: CyclingMode_1.CyclingModeProperyType.Integer, default: 150, min: 25, max: 800 },
+        { key: 'speed', name: 'Speed', description: 'Speed (in km/h) at start of training', condition: (s) => s.mode === 'Speed', type: CyclingMode_1.CyclingModeProperyType.Integer, default: 30, min: 5, max: 50 },
+        { key: 'bikeType', name: 'Bike Type', description: '', type: CyclingMode_1.CyclingModeProperyType.SingleSelect, options: ['Race', 'Mountain', 'Triathlon'], default: 'Race' }
+    ]
+};
+class SimulatorCyclingMode extends power_base_1.default {
+    constructor(adapter, props) {
+        super(adapter, props);
+        this.prevUpdateTS = 0;
+        this.hasBikeUpdate = false;
+        this.event = {};
+        this.logger = adapter.logger || new gd_eventlog_1.EventLogger('SIMMode');
+        this.data = {};
+        this.logger.logEvent({ message: 'constructor', props });
+    }
+    getName() {
+        return config.name;
+    }
+    getDescription() {
+        return config.description;
+    }
+    getProperties() {
+        return config.properties;
+    }
+    getProperty(name) {
+        return config.properties.find(p => p.name === name);
+    }
+    getBikeInitRequest() {
+        return {};
+    }
+    sendBikeUpdate(request) {
+        this.logger.logEvent({ message: 'bike update request', request });
+        const r = request || { refresh: true };
+        if (r.refresh) {
+            if (Object.keys(r).length === 1)
+                return this.prevRequest || {};
+            delete r.refresh;
+        }
+        if (request.slope !== undefined) {
+            if (!this.data)
+                this.data = {};
+            this.data.slope = request.slope;
+        }
+        this.prevRequest = request ? JSON.parse(JSON.stringify(request)) : {};
+        return r;
+    }
+    updateData(bikeData) {
+        const prevData = JSON.parse(JSON.stringify(this.data || {}));
+        const prevSpeed = prevData.speed;
+        const prevRequest = this.prevRequest || {};
+        const data = this.data || {};
+        const bikeType = (this.getSetting('bikeType') || 'Race').toLowerCase();
+        const mode = this.getSetting('mode');
+        delete this.event.gearUpdated;
+        delete this.event.rpmUpdated;
+        try {
+            let rpm = 90;
+            let power = (!mode || mode.toLowerCase() === 'power') ? Number(this.getSetting('power')) : bikeData.power || 0;
+            let slope = (prevData.slope !== undefined ? prevData.slope : prevRequest.slope || 0);
+            let speed = mode.toLowerCase() === 'speed' ? Number(this.getSetting('speed')) : bikeData.speed || 0;
+            let m = this.getWeight();
+            let distanceInternal = prevData.distanceInternal || 0;
+            let ts = Date.now();
+            let duration = this.prevUpdateTS === 0 ? 0 : ((ts - this.prevUpdateTS) / 1000);
+            const t = this.getTimeSinceLastUpdate();
+            let distance = 0;
+            if (!mode || mode.toLowerCase() === 'power') {
+                const res = this.calculateSpeedAndDistance(power, slope, m, t, { bikeType });
+                speed = res.speed;
+                distance = res.distance;
+            }
+            else if (mode.toLowerCase() === 'speed') {
+                const res = this.calculatePowerAndDistance(speed, slope, m, t, { bikeType });
+                power = res.power;
+                distance = res.distance;
+            }
+            if (prevRequest.targetPower) {
+                power = prevRequest.targetPower;
+                const res = this.calculateSpeedAndDistance(power, slope, m, t, { bikeType });
+                speed = res.speed;
+                distance = res.distance;
+            }
+            if (prevRequest.maxPower && power > prevRequest.maxPower) {
+                power = prevRequest.maxPower;
+                const res = this.calculateSpeedAndDistance(power, slope, m, t, { bikeType });
+                speed = res.speed;
+                distance = res.distance;
+            }
+            else if (prevRequest.minPower && power < prevRequest.minPower) {
+                power = prevRequest.minPower;
+                const res = this.calculateSpeedAndDistance(power, slope, m, t, { bikeType });
+                speed = res.speed;
+                distance = res.distance;
+            }
+            if (power === 0 && speed < MIN_SPEED) {
+                data.speed = Math.round(prevData.speed - 1) < 0 ? 0 : Math.round(prevData.speed - 1);
+                data.distanceInternal = distanceInternal + data.speed / 3.6 * t;
+            }
+            else {
+                data.speed = speed;
+                data.distanceInternal = distanceInternal + distance;
+            }
+            data.speed = speed;
+            data.power = Math.round(power);
+            data.distanceInternal = distanceInternal + distance;
+            data.slope = slope;
+            data.pedalRpm = rpm;
+            if (data.time !== undefined)
+                data.time += duration;
+            else
+                data.time = 0;
+            data.heartrate = bikeData.heartrate;
+            data.isPedalling = true;
+            this.prevUpdateTS = ts;
+        }
+        catch (err) {
+            this.logger.logEvent({ message: 'error', fn: 'updateData()', error: err.message || err });
+        }
+        this.logger.logEvent({ message: "updateData result", data, bikeData, prevRequest, prevSpeed });
+        this.data = data;
+        return data;
+    }
+}
+exports.default = SimulatorCyclingMode;
+SimulatorCyclingMode.isERG = true;

package/lib/simulator/Simulator.d.ts

@@ -1,69 +1,69 @@
-import DeviceProtocolBase, { DeviceSettings, DeviceProtocol } from '../DeviceProtocol';
-import DeviceAdapter from '../Device';
-import { EventLogger } from 'gd-eventlog';
-import CyclingMode, { IncyclistBikeData } from '../CyclingMode';
-interface SimulatorSettings extends DeviceSettings {
-    isBot?: boolean;
-    settings?: any;
-}
-export declare class Simulator extends DeviceAdapter {
-    static NAME: string;
-    logger: EventLogger;
-    speed: number;
-    power: number;
-    cadence: number;
-    paused: boolean;
-    time: number;
-    iv: any;
-    started: boolean;
-    slope: number;
-    limit: any;
-    startProps?: any;
-    cyclingMode: CyclingMode;
-    startTS: number;
-    data: IncyclistBikeData;
-    isBot: boolean;
-    ignoreHrm: boolean;
-    userSettings: {
-        weight?: number;
-    };
-    bikeSettings: {
-        weight?: number;
-    };
-    constructor(protocol?: DeviceProtocol, props?: SimulatorSettings);
-    isBike(): boolean;
-    isHrm(): boolean;
-    isPower(): boolean;
-    isSame(device: DeviceAdapter): boolean;
-    getID(): string;
-    getName(): string;
-    getPort(): string;
-    getWeight(): number;
-    setIgnoreHrm(ignore: any): void;
-    getSupportedCyclingModes(): Array<any>;
-    getDefaultCyclingMode(): CyclingMode;
-    getCyclingMode(): CyclingMode;
-    setCyclingMode(mode: CyclingMode | string, settings?: any): void;
-    start(props?: any): Promise<unknown>;
-    stop(): Promise<boolean>;
-    pause(): Promise<boolean>;
-    resume(): Promise<boolean>;
-    toggle(): Promise<boolean>;
-    faster(): void;
-    slower(): void;
-    update(): void;
-    calculateDistance(speedKps: any, timeS: any): number;
-    sendUpdate(request: any): import("../CyclingMode").UpdateRequest;
-}
-export default class SimulatorProtocol extends DeviceProtocolBase {
-    static NAME: string;
-    constructor();
-    add(settings: SimulatorSettings): any;
-    getName(): string;
-    getInterfaces(): string[];
-    isBike(): boolean;
-    isHrm(): boolean;
-    isPower(): boolean;
-    getDevices(): import("../DeviceProtocol").Device[];
-}
-export {};
+import DeviceProtocolBase, { DeviceSettings, DeviceProtocol } from '../DeviceProtocol';
+import DeviceAdapter from '../Device';
+import { EventLogger } from 'gd-eventlog';
+import CyclingMode, { IncyclistBikeData } from '../CyclingMode';
+interface SimulatorSettings extends DeviceSettings {
+    isBot?: boolean;
+    settings?: any;
+}
+export declare class Simulator extends DeviceAdapter {
+    static NAME: string;
+    logger: EventLogger;
+    speed: number;
+    power: number;
+    cadence: number;
+    paused: boolean;
+    time: number;
+    iv: any;
+    started: boolean;
+    slope: number;
+    limit: any;
+    startProps?: any;
+    cyclingMode: CyclingMode;
+    startTS: number;
+    data: IncyclistBikeData;
+    isBot: boolean;
+    ignoreHrm: boolean;
+    userSettings: {
+        weight?: number;
+    };
+    bikeSettings: {
+        weight?: number;
+    };
+    constructor(protocol?: DeviceProtocol, props?: SimulatorSettings);
+    isBike(): boolean;
+    isHrm(): boolean;
+    isPower(): boolean;
+    isSame(device: DeviceAdapter): boolean;
+    getID(): string;
+    getName(): string;
+    getPort(): string;
+    getWeight(): number;
+    setIgnoreHrm(ignore: any): void;
+    getSupportedCyclingModes(): Array<any>;
+    getDefaultCyclingMode(): CyclingMode;
+    getCyclingMode(): CyclingMode;
+    setCyclingMode(mode: CyclingMode | string, settings?: any): void;
+    start(props?: any): Promise<unknown>;
+    stop(): Promise<boolean>;
+    pause(): Promise<boolean>;
+    resume(): Promise<boolean>;
+    toggle(): Promise<boolean>;
+    faster(): void;
+    slower(): void;
+    update(): void;
+    calculateDistance(speedKps: any, timeS: any): number;
+    sendUpdate(request: any): import("../CyclingMode").UpdateRequest;
+}
+export default class SimulatorProtocol extends DeviceProtocolBase {
+    static NAME: string;
+    constructor();
+    add(settings: SimulatorSettings): any;
+    getName(): string;
+    getInterfaces(): string[];
+    isBike(): boolean;
+    isHrm(): boolean;
+    isPower(): boolean;
+    getDevices(): import("../DeviceProtocol").Device[];
+}
+export {};