incyclist-devices 1.4.102 → 1.5.0

package/lib/modes/power-base.js

@@ -1,70 +1,70 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const CyclingMode_1 = require("../CyclingMode");
-const Device_1 = require("../Device");
-const calculations_1 = __importDefault(require("../calculations"));
-const gd_eventlog_1 = require("gd-eventlog");
-class PowerBasedCyclingModeBase extends CyclingMode_1.CyclingModeBase {
-    constructor(adapter, props) {
-        super(adapter, props);
-        this.prevUpdateTS = 0;
-        this.data = { speed: 0, power: 0, distanceInternal: 0, pedalRpm: 0, isPedalling: false, heartrate: 0 };
-    }
-    initLogger(defaultLogName) {
-        const a = this.adapter;
-        this.logger = (a && a.getLogger) ? a.getLogger() : undefined;
-        if (!this.logger)
-            this.logger = new gd_eventlog_1.EventLogger(defaultLogName);
-    }
-    getWeight() {
-        const a = this.adapter;
-        const m = (a && a.getWeight && a.getWeight()) ? a.getWeight() : Device_1.DEFAULT_BIKE_WEIGHT + Device_1.DEFAULT_USER_WEIGHT;
-        return m;
-    }
-    getTimeSinceLastUpdate() {
-        const ts = Date.now();
-        const duration = this.prevUpdateTS === 0 ? 0 : ((ts - this.prevUpdateTS) / 1000);
-        this.prevUpdateTS = ts;
-        return duration;
-    }
-    calculateSpeedAndDistance(power, slope, m, t, props = {}) {
-        const prevData = this.data || {};
-        const vPrev = (prevData.speed || 0) / 3.6;
-        const EkinPrev = 1 / 2 * m * vPrev * vPrev;
-        let powerToMaintainSpeed = calculations_1.default.calculatePower(m, vPrev, slope, props);
-        const powerDelta = powerToMaintainSpeed - power;
-        const Ekin = EkinPrev - powerDelta * t;
-        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 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;
-        const v = speed / 3.6;
-        const distance = v * t;
-        this.data.power = power;
-        return { power, distance };
-    }
-}
-exports.default = PowerBasedCyclingModeBase;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const cycling_mode_1 = require("../cycling-mode");
+const device_1 = require("../device");
+const calculations_1 = __importDefault(require("../calculations"));
+const gd_eventlog_1 = require("gd-eventlog");
+class PowerBasedCyclingModeBase extends cycling_mode_1.CyclingModeBase {
+    constructor(adapter, props) {
+        super(adapter, props);
+        this.prevUpdateTS = 0;
+        this.data = { speed: 0, power: 0, distanceInternal: 0, pedalRpm: 0, isPedalling: false, heartrate: 0 };
+    }
+    initLogger(defaultLogName) {
+        const a = this.adapter;
+        this.logger = (a && a.getLogger) ? a.getLogger() : undefined;
+        if (!this.logger)
+            this.logger = new gd_eventlog_1.EventLogger(defaultLogName);
+    }
+    getWeight() {
+        const a = this.adapter;
+        const m = (a && a.getWeight && a.getWeight()) ? a.getWeight() : device_1.DEFAULT_BIKE_WEIGHT + device_1.DEFAULT_USER_WEIGHT;
+        return m;
+    }
+    getTimeSinceLastUpdate() {
+        const ts = Date.now();
+        const duration = this.prevUpdateTS === 0 ? 0 : ((ts - this.prevUpdateTS) / 1000);
+        this.prevUpdateTS = ts;
+        return duration;
+    }
+    calculateSpeedAndDistance(power, slope, m, t, props = {}) {
+        const prevData = this.data || {};
+        const vPrev = (prevData.speed || 0) / 3.6;
+        const EkinPrev = 1 / 2 * m * vPrev * vPrev;
+        let powerToMaintainSpeed = calculations_1.default.calculatePower(m, vPrev, slope, props);
+        const powerDelta = powerToMaintainSpeed - power;
+        const Ekin = EkinPrev - powerDelta * t;
+        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 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;
+        const v = speed / 3.6;
+        const distance = v * t;
+        this.data.power = power;
+        return { power, distance };
+    }
+}
+exports.default = PowerBasedCyclingModeBase;

package/lib/modes/power-meter.d.ts

@@ -1,20 +1,20 @@
-import CyclingMode, { CyclingModeProperty, IncyclistBikeData, Settings, UpdateRequest } from '../CyclingMode';
-import PowerBasedCyclingModeBase from './power-base';
-import { DeviceAdapter } from '../Device';
-export declare const config: {
-    name: string;
-    description: string;
-    properties: any[];
-};
-export default class PowerMeterCyclingMode extends PowerBasedCyclingModeBase implements CyclingMode {
-    constructor(adapter: DeviceAdapter, props?: Settings);
-    getName(): string;
-    getDescription(): string;
-    getProperties(): CyclingModeProperty[];
-    getProperty(name: string): CyclingModeProperty;
-    getBikeInitRequest(): UpdateRequest;
-    sendBikeUpdate(request?: UpdateRequest): UpdateRequest;
-    updateData(bikeData: IncyclistBikeData, props?: {
-        log: boolean;
-    }): IncyclistBikeData;
-}
+import CyclingMode, { CyclingModeProperty, IncyclistBikeData, Settings, UpdateRequest } from '../cycling-mode';
+import PowerBasedCyclingModeBase from './power-base';
+import { DeviceAdapter } from '../device';
+export declare const config: {
+    name: string;
+    description: string;
+    properties: any[];
+};
+export default class PowerMeterCyclingMode extends PowerBasedCyclingModeBase implements CyclingMode {
+    constructor(adapter: DeviceAdapter, props?: Settings);
+    getName(): string;
+    getDescription(): string;
+    getProperties(): CyclingModeProperty[];
+    getProperty(name: string): CyclingModeProperty;
+    getBikeInitRequest(): UpdateRequest;
+    sendBikeUpdate(request?: UpdateRequest): UpdateRequest;
+    updateData(bikeData: IncyclistBikeData, props?: {
+        log: boolean;
+    }): IncyclistBikeData;
+}

package/lib/modes/power-meter.js

@@ -1,78 +1,78 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.config = void 0;
-const power_base_1 = __importDefault(require("./power-base"));
-const MIN_SPEED = 10;
-exports.config = {
-    name: 'PowerMeter',
-    description: 'Power and cadence are taken from device. Speed is calculated from power and current slope\nThis mode will not respect maximum power and/or workout limits',
-    properties: []
-};
-class PowerMeterCyclingMode extends power_base_1.default {
-    constructor(adapter, props) {
-        super(adapter, props);
-        this.initLogger('PowerMeterMode');
-        this.data = { speed: 0, slope: 0, power: 0, distanceInternal: 0, pedalRpm: 0, isPedalling: false, heartrate: 0 };
-    }
-    getName() {
-        return exports.config.name;
-    }
-    getDescription() {
-        return exports.config.description;
-    }
-    getProperties() {
-        return exports.config.properties;
-    }
-    getProperty(name) {
-        return exports.config.properties.find(p => p.name === name);
-    }
-    getBikeInitRequest() {
-        return {};
-    }
-    sendBikeUpdate(request = {}) {
-        const prevData = this.data || {};
-        const prevSlope = prevData.slope || 0;
-        if (request.slope && request.slope !== prevSlope) {
-            this.data.slope = request.slope;
-            this.updateData(this.data, { log: false });
-        }
-        this.logger.logEvent({ message: "processing update request", request });
-        return {};
-    }
-    updateData(bikeData, props = { log: true }) {
-        try {
-            const prevData = this.data || {};
-            const data = JSON.parse(JSON.stringify(bikeData));
-            let power = bikeData.power || 0;
-            const slope = prevData.slope || 0;
-            const distanceInternal = prevData.distanceInternal || 0;
-            if (power > 0) {
-                data.isPedalling = true;
-            }
-            const m = this.getWeight();
-            const t = this.getTimeSinceLastUpdate();
-            const { speed, distance } = this.calculateSpeedAndDistance(power, slope, m, t);
-            data.power = Math.round(power);
-            data.slope = slope;
-            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;
-            }
-            if (props.log)
-                this.logger.logEvent({ message: "updateData result", data, bikeData, prevSpeed: prevData.speed, stopped: speed < MIN_SPEED });
-            this.data = data;
-        }
-        catch (err) {
-            this.logger.logEvent({ message: 'error', fn: 'updateData()', error: err.message || err });
-        }
-        return this.data;
-    }
-}
-exports.default = PowerMeterCyclingMode;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.config = void 0;
+const power_base_1 = __importDefault(require("./power-base"));
+const MIN_SPEED = 10;
+exports.config = {
+    name: 'PowerMeter',
+    description: 'Power and cadence are taken from device. Speed is calculated from power and current slope\nThis mode will not respect maximum power and/or workout limits',
+    properties: []
+};
+class PowerMeterCyclingMode extends power_base_1.default {
+    constructor(adapter, props) {
+        super(adapter, props);
+        this.initLogger('PowerMeterMode');
+        this.data = { speed: 0, slope: 0, power: 0, distanceInternal: 0, pedalRpm: 0, isPedalling: false, heartrate: 0 };
+    }
+    getName() {
+        return exports.config.name;
+    }
+    getDescription() {
+        return exports.config.description;
+    }
+    getProperties() {
+        return exports.config.properties;
+    }
+    getProperty(name) {
+        return exports.config.properties.find(p => p.name === name);
+    }
+    getBikeInitRequest() {
+        return {};
+    }
+    sendBikeUpdate(request = {}) {
+        const prevData = this.data || {};
+        const prevSlope = prevData.slope || 0;
+        if (request.slope && request.slope !== prevSlope) {
+            this.data.slope = request.slope;
+            this.updateData(this.data, { log: false });
+        }
+        this.logger.logEvent({ message: "processing update request", request });
+        return {};
+    }
+    updateData(bikeData, props = { log: true }) {
+        try {
+            const prevData = this.data || {};
+            const data = JSON.parse(JSON.stringify(bikeData));
+            let power = bikeData.power || 0;
+            const slope = prevData.slope || 0;
+            const distanceInternal = prevData.distanceInternal || 0;
+            if (power > 0) {
+                data.isPedalling = true;
+            }
+            const m = this.getWeight();
+            const t = this.getTimeSinceLastUpdate();
+            const { speed, distance } = this.calculateSpeedAndDistance(power, slope, m, t);
+            data.power = Math.round(power);
+            data.slope = slope;
+            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;
+            }
+            if (props.log)
+                this.logger.logEvent({ message: "updateData result", data, bikeData, prevSpeed: prevData.speed, stopped: speed < MIN_SPEED });
+            this.data = data;
+        }
+        catch (err) {
+            this.logger.logEvent({ message: 'error', fn: 'updateData()', error: err.message || err });
+        }
+        return this.data;
+    }
+}
+exports.default = PowerMeterCyclingMode;

package/lib/modes/simulator.d.ts

@@ -1,29 +1,29 @@
-import { EventLogger } from "gd-eventlog";
-import { CyclingModeProperty, IncyclistBikeData, UpdateRequest } from "../CyclingMode";
-import { Simulator } from "../simulator/Simulator";
-import PowerBasedCyclingModeBase from "./power-base";
-export declare type ERGEvent = {
-    rpmUpdated?: boolean;
-    gearUpdated?: boolean;
-    starting?: boolean;
-    tsStart?: number;
-};
-export default class SimulatorCyclingMode extends PowerBasedCyclingModeBase {
-    static isERG: boolean;
-    logger: EventLogger;
-    data: IncyclistBikeData;
-    prevRequest: UpdateRequest;
-    prevUpdateTS: number;
-    hasBikeUpdate: boolean;
-    chain: number[];
-    cassette: number[];
-    event: ERGEvent;
-    constructor(adapter: Simulator, props?: any);
-    getName(): string;
-    getDescription(): string;
-    getProperties(): CyclingModeProperty[];
-    getProperty(name: string): CyclingModeProperty;
-    getBikeInitRequest(): UpdateRequest;
-    sendBikeUpdate(request: UpdateRequest): UpdateRequest;
-    updateData(bikeData: IncyclistBikeData): IncyclistBikeData;
-}
+import { EventLogger } from "gd-eventlog";
+import { CyclingModeProperty, IncyclistBikeData, UpdateRequest } from "../cycling-mode";
+import { Simulator } from "../simulator/Simulator";
+import PowerBasedCyclingModeBase from "./power-base";
+export declare type ERGEvent = {
+    rpmUpdated?: boolean;
+    gearUpdated?: boolean;
+    starting?: boolean;
+    tsStart?: number;
+};
+export default class SimulatorCyclingMode extends PowerBasedCyclingModeBase {
+    static isERG: boolean;
+    logger: EventLogger;
+    data: IncyclistBikeData;
+    prevRequest: UpdateRequest;
+    prevUpdateTS: number;
+    hasBikeUpdate: boolean;
+    chain: number[];
+    cassette: number[];
+    event: ERGEvent;
+    constructor(adapter: Simulator, props?: any);
+    getName(): string;
+    getDescription(): string;
+    getProperties(): CyclingModeProperty[];
+    getProperty(name: string): CyclingModeProperty;
+    getBikeInitRequest(): UpdateRequest;
+    sendBikeUpdate(request: UpdateRequest): UpdateRequest;
+    updateData(bikeData: IncyclistBikeData): IncyclistBikeData;
+}