incyclist-devices 2.0.38 → 2.1.1

package/lib/modes/daum-premium-standard.d.ts

@@ -0,0 +1,24 @@
+import ICyclingMode, { CyclingModeProperyType, Settings, UpdateRequest } from "./types";
+import { IncyclistBikeData } from "../types";
+import PowerMeterCyclingMode from "./power-meter";
+import { IncyclistDeviceAdapter } from "../base/adpater";
+export default class DaumClassicCyclingMode extends PowerMeterCyclingMode implements ICyclingMode {
+    prevInternalDistance: number;
+    distanceOffset: number;
+    protected static config: {
+        name: string;
+        description: string;
+        properties: {
+            key: string;
+            name: string;
+            description: string;
+            type: CyclingModeProperyType;
+            options: string[];
+            default: string;
+        }[];
+    };
+    constructor(adapter: IncyclistDeviceAdapter, props?: Settings);
+    getBikeInitRequest(): UpdateRequest;
+    updateData(data: IncyclistBikeData): IncyclistBikeData;
+    sendBikeUpdate(request: UpdateRequest): UpdateRequest;
+}

package/lib/{serial/daum/premium/modes/daum-classic.js → modes/daum-premium-standard.js}

@@ -4,16 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const gd_eventlog_1 = require("gd-eventlog");
-const cycling_mode_1 = require("../../../../modes/cycling-mode");
-const DaumPowerMeterCyclingMode_1 = __importDefault(require("../../DaumPowerMeterCyclingMode"));
-const config = {
-    name: "Daum Classic",
-    description: "The device calculates speed and power based on slope. Incyclist will not modify any values recived from the device\nThis mode will not respect maximum power and/or workout limits",
-    properties: [
-        { key: 'bikeType', name: 'Bike Type', description: '', type: cycling_mode_1.CyclingModeProperyType.SingleSelect, options: ['Race', 'Mountain'], default: 'Race' },
-    ]
-};
-class DaumClassicCyclingMode extends DaumPowerMeterCyclingMode_1.default {
+const types_1 = require("./types");
+const power_meter_1 = __importDefault(require("./power-meter"));
+class DaumClassicCyclingMode extends power_meter_1.default {
     constructor(adapter, props) {
         super(adapter, props);
         this.logger = adapter ? adapter.getLogger() : undefined;
@@ -22,65 +15,60 @@ class DaumClassicCyclingMode extends DaumPowerMeterCyclingMode_1.default {
         this.setModeProperty('eppSupport', true);
         this.setModeProperty('setPersonSupport', true);
     }
-    getName() {
-        return config.name;
-    }
-    getDescription() {
-        return config.description;
-    }
-    getProperties() {
-        return config.properties;
-    }
-    getProperty(name) {
-        return config.properties.find(p => p.name === name);
-    }
     getBikeInitRequest() {
         return {};
     }
-    getSettings() {
-        const settings = super.getSettings();
-        settings['setPerson'] = true;
-        return settings;
-    }
-    getSetting(name) {
-        if (name === 'setPerson')
-            return true;
-        return super.getSetting(name);
-    }
     updateData(data) {
         try {
-            const prevData = this.data || {};
+            const prevData = Object.assign({}, this.getData());
             const prevRequest = this.prevRequest || {};
             const bikeData = JSON.parse(JSON.stringify(data));
             let power = data.power || 0;
             let speed = data.speed || 0;
             let slope = (prevData.slope !== undefined ? prevData.slope : prevRequest.slope || 0);
             let distanceBike = data.distanceInternal || 0;
-            let distancePrev = prevData.distanceInternal || 0;
-            let distanceInternal = distanceBike;
+            let distancePrev = this.prevInternalDistance || 0;
+            let distanceInternal = distanceBike + (this.distanceOffset || 0);
+            let time = prevData.time || 0;
             let ts = Date.now();
+            let t = this.getTimeSinceLastUpdate();
             if (!bikeData.pedalRpm || bikeData.isPedalling === false) {
                 speed = 0;
                 power = 0;
             }
             if (distanceBike < distancePrev) {
-                this.logger.logEvent({ message: '~~~ distance overflow', distanceBike, distancePrev });
+                this.logger.logEvent({ message: 'distance overflow', distanceBike, distancePrev });
                 let v = speed / 3.6;
-                let duration = this.prevUpdateTS === 0 ? 0 : ((ts - this.prevUpdateTS) / 1000);
-                distanceInternal = distancePrev + v * duration;
+                const calculateDistance = distancePrev + (this.distanceOffset || 0) + v * t;
+                this.distanceOffset = calculateDistance - distanceBike;
+                distanceInternal = calculateDistance;
             }
             data.speed = parseFloat(speed.toFixed(1));
             data.power = Math.round(power);
             data.distanceInternal = distanceInternal;
             data.slope = slope;
+            data.time = speed > 0 ? time + t : time;
             this.logger.logEvent({ message: "updateData result", data, bikeData, prevRequest: {}, prevSpeed: prevData.speed });
             this.data = JSON.parse(JSON.stringify(data));
             this.prevUpdateTS = ts;
+            this.prevInternalDistance = distanceBike;
         }
         catch (err) {
             this.logger.logEvent({ message: 'error', fn: 'updateData()', error: err.message || err });
         }
         return data;
     }
+    sendBikeUpdate(request) {
+        super.sendBikeUpdate(request);
+        this.prevRequest = {};
+        return {};
+    }
 }
+DaumClassicCyclingMode.config = {
+    name: "Daum Classic",
+    description: "The device calculates speed and power based on slope. Incyclist will not modify any values recived from the device\nThis mode will not respect maximum power and/or workout limits",
+    properties: [
+        { key: 'bikeType', name: 'Bike Type', description: '', type: types_1.CyclingModeProperyType.SingleSelect, options: ['Race', 'Mountain'], default: 'Race' },
+    ]
+};
 exports.default = DaumClassicCyclingMode;

package/lib/modes/daum-smarttrainer.d.ts

@@ -0,0 +1,83 @@
+import { EventLogger } from "gd-eventlog";
+import ICyclingMode, { CyclingModeProperyType, Settings, UpdateRequest } from "./types";
+import { IncyclistBikeData } from "../types";
+import { CyclingModeBase } from "./base";
+import { IncyclistDeviceAdapter } from "../base/adpater";
+interface STUpdateRequest extends UpdateRequest {
+    calculatedPower?: number;
+    delta?: number;
+    enforced?: boolean;
+    belowMin?: boolean;
+    aboveMax?: boolean;
+}
+export declare enum direction {
+    up = "up",
+    down = "down"
+}
+interface STEvent {
+    gearUpdate?: direction;
+    rpmUpdate?: boolean;
+    targetNotReached?: number;
+}
+export default class SmartTrainerCyclingMode extends CyclingModeBase implements ICyclingMode {
+    logger: EventLogger;
+    data?: IncyclistBikeData;
+    prevRequest?: STUpdateRequest;
+    prevUpdateTS: number;
+    chain: number[];
+    cassette: number[];
+    event: STEvent;
+    protected static config: {
+        name: string;
+        description: string;
+        properties: ({
+            key: string;
+            name: string;
+            description: string;
+            type: CyclingModeProperyType;
+            options: string[];
+            default: string;
+            validation?: undefined;
+            condition?: undefined;
+        } | {
+            key: string;
+            name: string;
+            description: string;
+            type: CyclingModeProperyType;
+            default: number;
+            options?: undefined;
+            validation?: undefined;
+            condition?: undefined;
+        } | {
+            key: string;
+            name: string;
+            description: string;
+            type: CyclingModeProperyType;
+            default: boolean;
+            options?: undefined;
+            validation?: undefined;
+            condition?: undefined;
+        } | {
+            key: string;
+            name: string;
+            description: string;
+            type: CyclingModeProperyType;
+            validation: string;
+            default: string;
+            condition: (s: any) => any;
+            options?: undefined;
+        })[];
+    };
+    constructor(adapter: IncyclistDeviceAdapter, props?: Settings);
+    getData(): IncyclistBikeData;
+    getSlope(): number;
+    getWeight(): number;
+    getBikeInitRequest(): STUpdateRequest;
+    useGearSimulation(): boolean;
+    getMinMaxGears(source: string): [number, number];
+    sendBikeUpdate(request: STUpdateRequest): STUpdateRequest;
+    updateData(bikeData: IncyclistBikeData): any;
+    calculateSpeed(gear: any, rpm: any, slope: any, bikeSpeed: any, props?: any): any;
+    calculateTargetPower(request: STUpdateRequest, speed?: number): STUpdateRequest;
+}
+export {};

package/lib/{serial/daum/SmartTrainerCyclingMode.js → modes/daum-smarttrainer.js}

@@ -5,28 +5,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.direction = void 0;
 const gd_eventlog_1 = require("gd-eventlog");
-const cycling_mode_1 = require("../../modes/cycling-mode");
-const calculations_1 = __importDefault(require("../../utils/calculations"));
-const utils_1 = require("./classic/utils");
+const types_1 = require("./types");
+const calculations_1 = __importDefault(require("../utils/calculations"));
+const utils_1 = require("../serial/daum/classic/utils");
+const base_1 = require("./base");
 const SEC_DELAY = 3;
-const config = {
-    name: "SmartTrainer",
-    description: "Calculates power based on speed and slope.",
-    properties: [
-        { key: 'bikeType', name: 'Bike Type', description: '', type: cycling_mode_1.CyclingModeProperyType.SingleSelect, options: ['Race', 'Mountain', 'Triathlon'], default: 'Race' },
-        { key: 'startPower', name: 'Starting Power', description: 'Initial power in Watts at start of training', type: cycling_mode_1.CyclingModeProperyType.Integer, default: 50 },
-        { key: 'minPower', name: 'Minimum Power', description: 'Minimum power in declines', type: cycling_mode_1.CyclingModeProperyType.Integer, default: 50 },
-        { key: 'simulation', name: 'Simulate ', description: 'Simulate ', type: cycling_mode_1.CyclingModeProperyType.Boolean, default: false },
-        { key: 'chainRings', name: 'Chain Rings', description: 'Simulated chain rings (format: <min>-<max>)', type: cycling_mode_1.CyclingModeProperyType.String, validation: '', default: '36-52', condition: (s) => s.simulation },
-        { key: 'cassetteRings', name: 'Cassette', description: 'Simulated cassette (format: <min>-<max>)', type: cycling_mode_1.CyclingModeProperyType.String, validation: '', default: '11-30', condition: (s) => s.simulation },
-    ]
-};
 var direction;
 (function (direction) {
     direction["up"] = "up";
     direction["down"] = "down";
 })(direction || (exports.direction = direction = {}));
-class SmartTrainerCyclingMode extends cycling_mode_1.CyclingModeBase {
+class SmartTrainerCyclingMode extends base_1.CyclingModeBase {
     constructor(adapter, props) {
         super(adapter, props);
         this.prevUpdateTS = 0;
@@ -34,18 +23,14 @@ class SmartTrainerCyclingMode extends cycling_mode_1.CyclingModeBase {
         this.logger = adapter ? adapter.getLogger() : undefined;
         if (!this.logger)
             this.logger = new gd_eventlog_1.EventLogger('SmartTrainer');
+        this.data = { speed: 0, power: 0, distanceInternal: 0, pedalRpm: 0, isPedalling: false, heartrate: 0 };
     }
-    getName() {
-        return config.name;
-    }
-    getDescription() {
-        return config.description;
+    getData() {
+        return this.data;
     }
-    getProperties() {
-        return config.properties;
-    }
-    getProperty(name) {
-        return config.properties.find(p => p.name === name);
+    getSlope() {
+        const { slope } = this.data;
+        return slope || 0;
     }
     getWeight() {
         const a = this.adapter;
@@ -347,4 +332,16 @@ class SmartTrainerCyclingMode extends cycling_mode_1.CyclingModeBase {
         return request;
     }
 }
+SmartTrainerCyclingMode.config = {
+    name: "SmartTrainer",
+    description: "Calculates power based on speed and slope.",
+    properties: [
+        { key: 'bikeType', name: 'Bike Type', description: '', type: types_1.CyclingModeProperyType.SingleSelect, options: ['Race', 'Mountain', 'Triathlon'], default: 'Race' },
+        { key: 'startPower', name: 'Starting Power', description: 'Initial power in Watts at start of training', type: types_1.CyclingModeProperyType.Integer, default: 50 },
+        { key: 'minPower', name: 'Minimum Power', description: 'Minimum power in declines', type: types_1.CyclingModeProperyType.Integer, default: 50 },
+        { key: 'simulation', name: 'Simulate ', description: 'Simulate ', type: types_1.CyclingModeProperyType.Boolean, default: false },
+        { key: 'chainRings', name: 'Chain Rings', description: 'Simulated chain rings (format: <min>-<max>)', type: types_1.CyclingModeProperyType.String, validation: '', default: '36-52', condition: (s) => s.simulation },
+        { key: 'cassetteRings', name: 'Cassette', description: 'Simulated cassette (format: <min>-<max>)', type: types_1.CyclingModeProperyType.String, validation: '', default: '11-30', condition: (s) => s.simulation },
+    ]
+};
 exports.default = SmartTrainerCyclingMode;

package/lib/modes/kettler-erg.d.ts

@@ -0,0 +1,44 @@
+import ICyclingMode, { CyclingModeProperyType, UpdateRequest } from './types';
+import { IncyclistBikeData, IAdapter } from "../types";
+import PowerBasedCyclingModeBase from './power-base';
+export type ERGEvent = {
+    rpmUpdated?: boolean;
+    gearUpdated?: boolean;
+    starting?: boolean;
+    tsStart?: number;
+};
+export default class ERGCyclingMode extends PowerBasedCyclingModeBase implements ICyclingMode {
+    protected static config: {
+        isERG: boolean;
+        name: string;
+        description: string;
+        properties: ({
+            key: string;
+            name: string;
+            description: string;
+            type: CyclingModeProperyType;
+            options: string[];
+            default: string;
+            min?: undefined;
+            max?: undefined;
+        } | {
+            key: string;
+            name: string;
+            description: string;
+            type: CyclingModeProperyType;
+            default: number;
+            min: number;
+            max: number;
+            options?: undefined;
+        })[];
+    };
+    prevRequest: UpdateRequest;
+    hasBikeUpdate: boolean;
+    chain: number[];
+    cassette: number[];
+    event: ERGEvent;
+    constructor(adapter: IAdapter, props?: any);
+    getBikeInitRequest(): UpdateRequest;
+    sendBikeUpdate(request: UpdateRequest): UpdateRequest;
+    updateData(bikeData: IncyclistBikeData): any;
+}

package/lib/{serial/kettler/ergo-racer/modes/erg.js → modes/kettler-erg.js}

@@ -3,17 +3,9 @@ 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("../../../../modes/cycling-mode");
-const power_base_1 = __importDefault(require("../../../../modes/power-base"));
+const types_1 = require("./types");
+const power_base_1 = __importDefault(require("./power-base"));
 const MIN_SPEED = 10;
-const config = {
-    name: "ERG",
-    description: "Calculates speed based on power and slope. Power is either set by a workout",
-    properties: [
-        { key: 'bikeType', name: 'Bike Type', description: '', type: cycling_mode_1.CyclingModeProperyType.SingleSelect, options: ['Race', 'Mountain', 'Triathlon'], default: 'Race' },
-        { key: 'startPower', name: 'Starting Power', description: 'Initial power in Watts at start of training', type: cycling_mode_1.CyclingModeProperyType.Integer, default: 50, min: 25, max: 800 },
-    ]
-};
 class ERGCyclingMode extends power_base_1.default {
     constructor(adapter, props) {
         super(adapter, props);
@@ -21,18 +13,6 @@ class ERGCyclingMode extends power_base_1.default {
         this.event = {};
         this.initLogger('ERGMode');
     }
-    getName() {
-        return config.name;
-    }
-    getDescription() {
-        return config.description;
-    }
-    getProperties() {
-        return config.properties;
-    }
-    getProperty(name) {
-        return config.properties.find(p => p.name === name);
-    }
     getBikeInitRequest() {
         const startPower = this.getSetting('startPower');
         return { targetPower: startPower };
@@ -131,6 +111,7 @@ class ERGCyclingMode extends power_base_1.default {
                 data.time = 0;
             data.heartrate = bikeData.heartrate;
             data.isPedalling = bikeData.isPedalling;
+            this.prevUpdateTS = Date.now();
         }
         catch (err) {
             this.logger.logEvent({ message: 'error', fn: 'updateData()', error: err.message || err });
@@ -140,5 +121,13 @@ class ERGCyclingMode extends power_base_1.default {
         return data;
     }
 }
-ERGCyclingMode.isERG = true;
+ERGCyclingMode.config = {
+    isERG: true,
+    name: "ERG",
+    description: "Calculates speed based on power and slope. Power is either set by a workout",
+    properties: [
+        { key: 'bikeType', name: 'Bike Type', description: '', type: types_1.CyclingModeProperyType.SingleSelect, options: ['Race', 'Mountain', 'Triathlon'], default: 'Race' },
+        { key: 'startPower', name: 'Starting Power', description: 'Initial power in Watts at start of training', type: types_1.CyclingModeProperyType.Integer, default: 50, min: 25, max: 800 },
+    ]
+};
 exports.default = ERGCyclingMode;

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

@@ -1,20 +1,45 @@
-import { IncyclistBikeData, Settings, CyclingModeBase } from './cycling-mode';
+import { CyclingModeConfig, Settings, UpdateRequest } from './types';
+import { IncyclistBikeData, IAdapter } from "../types";
 import { EventLogger } from 'gd-eventlog';
-import { ControllableDeviceAdapter } from '..';
+import { CyclingModeBase } from './base';
 export default class PowerBasedCyclingModeBase extends CyclingModeBase {
     data: IncyclistBikeData;
     prevUpdateTS: number;
     logger: EventLogger;
-    constructor(adapter: ControllableDeviceAdapter, props?: Settings);
+    prevRequest: UpdateRequest | undefined;
+    protected static config: CyclingModeConfig;
+    constructor(adapter: IAdapter, props?: Settings);
+    getData(): IncyclistBikeData;
+    getSlope(): number;
     initLogger(defaultLogName: any): void;
     getWeight(): number;
     getTimeSinceLastUpdate(): number;
+    checkForResetOrEmpty(request: UpdateRequest): UpdateRequest | undefined;
+    protected checkForTempPowerAdjustments(request: UpdateRequest): void;
+    protected checkRefresh(request: UpdateRequest, newRequest: UpdateRequest): void;
+    protected checkTargetPowerSet(request: UpdateRequest, newRequest: UpdateRequest): void;
+    protected checkSlope(request: UpdateRequest): void;
+    protected checkEmptyRequest(newRequest: UpdateRequest): void;
+    protected checkMinPower(request: UpdateRequest, newRequest: UpdateRequest): void;
+    protected checkMaxPower(request: UpdateRequest, newRequest: UpdateRequest): void;
     calculateSpeedAndDistance(power: number, slope: number, m: number, t: number, props?: {}): {
         speed: number;
         distance: number;
     };
+    protected updateSpeedAndDistance(power: number, slope: any, bikeType: any, data: IncyclistBikeData, prevData: any): number;
+    protected getCalcBasics(bikeData: IncyclistBikeData): {
+        data: IncyclistBikeData;
+        prevData: any;
+        prevRequest: UpdateRequest;
+        bikeType: any;
+        slope: any;
+    };
+    copyBikeData(data: IncyclistBikeData, bikeData: IncyclistBikeData): IncyclistBikeData;
     calculatePowerAndDistance(speed: number, slope: number, m: number, t: number, props?: {}): {
         power: number;
         distance: number;
     };
+    getBikeInitRequest(): UpdateRequest;
+    sendBikeUpdate(incoming: UpdateRequest): UpdateRequest;
+    updateData(bikeData: IncyclistBikeData, log?: boolean): IncyclistBikeData;
 }