incyclist-devices 1.4.21 → 1.4.22

package/lib/daum/premium/bike.js

@@ -12,6 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Daum8iSerial = exports.Daum8iTcp = void 0;
 const constants_1 = require("../constants");
 const tcpserial_1 = __importDefault(require("./tcpserial"));
 const utils_1 = require("./utils");
@@ -407,7 +408,7 @@ class Daum8i {
             incoming = bufferData;
         }
         const response = [...incoming];
-        this.logger.logEvent({ message: 'sendCommand:RECV', data: utils_1.hexstr(response) });
+        this.logger.logEvent({ message: 'sendCommand:RECV', data: (0, utils_1.hexstr)(response) });
         for (let i = 0; i < incoming.length; i++) {
             const getRemaining = () => {
                 let remaining = '';
@@ -440,11 +441,11 @@ class Daum8i {
             }
             else if (c === 0x17) {
                 const remaining = getRemaining();
-                this.logger.logEvent({ message: "sendCommand:received:", duration: Date.now() - this.state.sending.tsRequest, port: portName, cmd: `${cmd} [${utils_1.hexstr(cmd)}]`, remaining: utils_1.hexstr(remaining) });
+                this.logger.logEvent({ message: "sendCommand:received:", duration: Date.now() - this.state.sending.tsRequest, port: portName, cmd: `${cmd} [${(0, utils_1.hexstr)(cmd)}]`, remaining: (0, utils_1.hexstr)(remaining) });
                 this.state.waitingForEnd = false;
                 const cmdStr = cmd.substring(0, cmd.length - 2);
                 const checksumExtracted = cmd.slice(-2);
-                const checksumCalculated = utils_1.checkSum(utils_1.getAsciiArrayFromStr(cmdStr), []);
+                const checksumCalculated = (0, utils_1.checkSum)((0, utils_1.getAsciiArrayFromStr)(cmdStr), []);
                 if (checksumExtracted === checksumCalculated) {
                     this.sendACK();
                     if (this.state.sending && this.state.sending.responseCheckIv) {
@@ -486,8 +487,8 @@ class Daum8i {
                 this.state.busy = true;
             }
             else {
-                const message = utils_1.buildMessage(command, payload);
-                this.logger.logEvent({ message: 'sendCommand:waiting', port: this.portName, cmd: command, hex: utils_1.hexstr(message) });
+                const message = (0, utils_1.buildMessage)(command, payload);
+                this.logger.logEvent({ message: 'sendCommand:waiting', port: this.portName, cmd: command, hex: (0, utils_1.hexstr)(message) });
                 const busyWait = () => {
                     return new Promise((done) => {
                         let start = Date.now();
@@ -508,7 +509,7 @@ class Daum8i {
                 };
                 const res = yield busyWait();
                 if (!res) {
-                    this.logger.logEvent({ message: 'sendCommand:busy timeout', port: this.portName, cmd: command, hex: utils_1.hexstr(message), duration: Date.now() - tsRequest });
+                    this.logger.logEvent({ message: 'sendCommand:busy timeout', port: this.portName, cmd: command, hex: (0, utils_1.hexstr)(message), duration: Date.now() - tsRequest });
                     return reject(new Error('BUSY timeout'));
                 }
                 this.state.busy = true;
@@ -526,10 +527,10 @@ class Daum8i {
             const portName = this.portName;
             this.state.received = [];
             try {
-                const message = utils_1.buildMessage(command, payload);
+                const message = (0, utils_1.buildMessage)(command, payload);
                 const start = Date.now();
                 const timeout = start + this.getTimeoutValue();
-                this.logger.logEvent({ message: "sendCommand:sending:", port: this.portName, cmd: command, hex: utils_1.hexstr(message) });
+                this.logger.logEvent({ message: "sendCommand:sending:", port: this.portName, cmd: command, hex: (0, utils_1.hexstr)(message) });
                 this.state.writeBusy = true;
                 if (!this.connected || port === undefined) {
                     this.logger.logEvent({ message: "sendCommand:error: not connected", port: this.portName });
@@ -589,10 +590,10 @@ class Daum8i {
             buffer.writeUInt16LE(0, 2);
         }
         const cmdData = Uint8Array.from(buffer);
-        return this.sendDaum8iCommand('M70', cmdType, utils_1.bin2esc(cmdData))
+        return this.sendDaum8iCommand('M70', cmdType, (0, utils_1.bin2esc)(cmdData))
             .then((res) => {
             const resData = Uint8Array.from(res, x => x.charCodeAt(0));
-            const cmd = utils_1.esc2bin(resData);
+            const cmd = (0, utils_1.esc2bin)(resData);
             return cmd;
         });
     }
@@ -617,7 +618,7 @@ class Daum8i {
             else if (str === '7')
                 deviceType = 'lyps';
             else
-                throw (new Error(`unknown device type ${typeof str === 'string' ? utils_1.ascii(str.charAt(0)) : str}`));
+                throw (new Error(`unknown device type ${typeof str === 'string' ? (0, utils_1.ascii)(str.charAt(0)) : str}`));
             return deviceType;
         });
     }
@@ -632,7 +633,7 @@ class Daum8i {
             else if (str === '2')
                 deviceType = constants_1.ACTUAL_BIKE_TYPE.MOUNTAIN;
             else {
-                throw (new Error(`unknown actual device type ${typeof str === 'string' ? utils_1.ascii(str.charAt(0)) : str}`));
+                throw (new Error(`unknown actual device type ${typeof str === 'string' ? (0, utils_1.ascii)(str.charAt(0)) : str}`));
             }
             this.state.actualBikeType = deviceType;
             return deviceType;
@@ -674,12 +675,12 @@ class Daum8i {
     getTrainingData() {
         return this.sendDaum8iCommand('X70', 'AF', [])
             .then((data) => {
-            const td = utils_1.parseTrainingData(data);
+            const td = (0, utils_1.parseTrainingData)(data);
             return td;
         });
     }
     setLoadControl(enabled) {
-        const val = enabled ? utils_1.ascii('1') : utils_1.ascii('0');
+        const val = enabled ? (0, utils_1.ascii)('1') : (0, utils_1.ascii)('0');
         return this.sendDaum8iCommand('S20', 'BF', [val])
             .then((data) => {
             const res = data === '1';
@@ -713,7 +714,7 @@ class Daum8i {
     setPerson(person) {
         const { sex, age, length, weight } = person;
         this.logger.logEvent({ message: 'setPerson() request', sex, age, length, weight });
-        return this.sendReservedDaum8iCommand(utils_1.ReservedCommands.PERSON_SET, 'BF', utils_1.getPersonData(person))
+        return this.sendReservedDaum8iCommand(utils_1.ReservedCommands.PERSON_SET, 'BF', (0, utils_1.getPersonData)(person))
             .then((res) => {
             const buffer = Buffer.from(res);
             const success = buffer.readInt16LE(0) === utils_1.ReservedCommands.PERSON_SET;
@@ -737,9 +738,9 @@ class Daum8i {
     }
     programUploadStart(bikeType, route) {
         const payload = Buffer.alloc(40);
-        const epp = route ? utils_1.routeToEpp(route) : undefined;
+        const epp = route ? (0, utils_1.routeToEpp)(route) : undefined;
         const eppLength = epp ? epp.length : 0;
-        const bikeTypeVal = utils_1.getBikeType(bikeType);
+        const bikeTypeVal = (0, utils_1.getBikeType)(bikeType);
         const wBits = route.lapMode ? DS_BITS_ENDLESS_RACE : DS_BITS_OFF;
         payload.writeInt32LE(0, 0);
         payload.writeInt8(bikeTypeVal, 4);

package/lib/daum/premium/utils.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPersonData = exports.parseTrainingData = exports.routeToEpp = exports.getBikeType = exports.BikeType = exports.ReservedCommands = exports.Int32ToIntArray = exports.Int16ToIntArray = exports.Float32ToIntArray = exports.Float32ToHex = exports.getAsciiArrayFromStr = exports.asciiArrayToString = exports.charArrayToString = exports.ascii = exports.append = exports.getHex = exports.hexstr = exports.getMessageData = exports.buildMessage = exports.checkSum = exports.esc2bin = exports.bin2esc = void 0;
 const win32filetime_1 = __importDefault(require("win32filetime"));
 const sum = (arr) => arr.reduce((a, b) => a + b, 0);
 function bin2esc(arr) {

package/lib/kettler/comms.js

@@ -12,6 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.SendState = exports.SerialCommsState = void 0;
 const gd_eventlog_1 = require("gd-eventlog");
 const utils_1 = require("../utils");
 const events_1 = __importDefault(require("events"));
@@ -193,7 +194,7 @@ class KettlerSerialComms extends events_1.default {
     write(cmd) {
         this.sendState = SendState.Sending;
         const { logStr, message, timeout = (this.settings.timeout || DEFAULT_RCV_TIMEOUT) } = cmd;
-        const msg = typeof message === 'string' ? message : utils_1.hexstr(message);
+        const msg = typeof message === 'string' ? message : (0, utils_1.hexstr)(message);
         const onError = (err) => {
             this.logger.logEvent({ message: "sendCommand:error:", cmd: logStr, error: err.message, port: this.getPort() });
             if (cmd.onError)

package/lib/kettler/ergo-racer/adapter.js

@@ -1,4 +1,23 @@
 "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) {
@@ -8,13 +27,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 };
 };
@@ -288,7 +300,7 @@ class KettlerRacerAdapter extends Device_1.default {
             this.logger.logEvent({ message: 'start()' });
             var info = {};
             yield this.waitForOpened(true);
-            return utils_1.runWithRetries(() => __awaiter(this, void 0, void 0, function* () {
+            return (0, utils_1.runWithRetries)(() => __awaiter(this, void 0, void 0, function* () {
                 try {
                     if (!info.checkDone) {
                         info.checkDone = yield this.check();
@@ -573,7 +585,7 @@ class KettlerRacerAdapter extends Device_1.default {
         if (!retries) {
             return new Promise((resolve, reject) => run(resolve, reject));
         }
-        return utils_1.runWithRetries(() => {
+        return (0, utils_1.runWithRetries)(() => {
             return new Promise((resolve, reject) => run(resolve, reject));
         }, 3, 1000);
     }

package/lib/kettler/ergo-racer/protocol.js

@@ -1,4 +1,23 @@
 "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) {
@@ -8,13 +27,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 };
 };

package/lib/simulator/Simulator.d.ts

@@ -1,6 +1,11 @@
-import DeviceProtocolBase, { DeviceSettings } from '../DeviceProtocol';
+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;
@@ -14,13 +19,23 @@ export declare class Simulator extends DeviceAdapter {
     slope: number;
     limit: any;
     startProps?: any;
-    constructor(protocol?: any);
+    cyclingMode: CyclingMode;
+    startTS: number;
+    data: IncyclistBikeData;
+    isBot: boolean;
+    ignoreHrm: boolean;
+    constructor(protocol?: DeviceProtocol, props?: SimulatorSettings);
     isBike(): boolean;
     isHrm(): boolean;
     isPower(): boolean;
     getID(): string;
     getName(): string;
     getPort(): string;
+    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>;
@@ -30,12 +45,12 @@ export declare class Simulator extends DeviceAdapter {
     slower(): void;
     update(): void;
     calculateDistance(speedKps: any, timeS: any): number;
-    sendUpdate(request: any): any;
+    sendUpdate(request: any): import("../CyclingMode").UpdateRequest;
 }
 export default class SimulatorProtocol extends DeviceProtocolBase {
     static NAME: string;
     constructor();
-    add(settings: DeviceSettings): void;
+    add(settings: SimulatorSettings): any;
     getName(): string;
     getInterfaces(): string[];
     isBike(): boolean;
@@ -43,3 +58,4 @@ export default class SimulatorProtocol extends DeviceProtocolBase {
     isPower(): boolean;
     getDevices(): import("../DeviceProtocol").Device[];
 }
+export {};

package/lib/simulator/Simulator.js

@@ -1,22 +1,45 @@
 "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 (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
+    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.Simulator = void 0;
 const DeviceProtocol_1 = __importStar(require("../DeviceProtocol"));
 const DeviceRegistry_1 = __importDefault(require("../DeviceRegistry"));
 const Device_1 = __importDefault(require("../Device"));
 const gd_eventlog_1 = require("gd-eventlog");
-const calculations_1 = __importDefault(require("../calculations"));
+const simulator_mode_1 = __importDefault(require("./simulator-mode"));
+const DEFAULT_SETTINGS = { name: 'Simulator', port: '', isBot: false };
 class Simulator extends Device_1.default {
-    constructor(protocol) {
+    constructor(protocol, props = DEFAULT_SETTINGS) {
         const proto = protocol || DeviceRegistry_1.default.findByName('Simulator');
         super(proto);
         this.logger = new gd_eventlog_1.EventLogger(Simulator.NAME);
@@ -27,8 +50,16 @@ class Simulator extends Device_1.default {
         this.time = undefined;
         this.iv = undefined;
         this.started = false;
+        this.paused = false;
         this.slope = 0;
         this.limit = {};
+        this.startTS = undefined;
+        this.data = { isPedalling: false, power: 0, pedalRpm: 0, speed: 0, heartrate: 0, distanceInternal: 0 };
+        this.isBot = props.isBot || false;
+        this.ignoreHrm = false;
+        const name = this.getCyclingMode().getName();
+        const modeSettings = this.isBot ? props.settings || {} : this.getCyclingMode().getSettings();
+        this.setCyclingMode(name, modeSettings);
     }
     isBike() { return true; }
     isHrm() { return false; }
@@ -36,28 +67,66 @@ class Simulator extends Device_1.default {
     getID() { return Simulator.NAME; }
     getName() { return Simulator.NAME; }
     getPort() { return 'local'; }
-    start(props) {
-        this.startProps = props;
-        return new Promise((resolve) => {
-            this.logger.logEvent({ message: 'start', iv: this.iv });
-            if (this.started) {
-                return resolve({ started: true, error: undefined });
+    setIgnoreHrm(ignore) {
+        this.ignoreHrm = ignore;
+    }
+    getSupportedCyclingModes() {
+        const supported = [];
+        supported.push(simulator_mode_1.default);
+        return supported;
+    }
+    getDefaultCyclingMode() {
+        return new simulator_mode_1.default(this);
+    }
+    getCyclingMode() {
+        if (!this.cyclingMode)
+            this.setCyclingMode(this.getDefaultCyclingMode());
+        return this.cyclingMode;
+    }
+    setCyclingMode(mode, settings) {
+        let selectedMode;
+        if (typeof mode === 'string') {
+            const supported = this.getSupportedCyclingModes();
+            const CyclingModeClass = supported.find(M => { const m = new M(this); return m.getName() === mode; });
+            if (CyclingModeClass) {
+                this.cyclingMode = new CyclingModeClass(this, settings);
+                return;
             }
-            this.paused = (this.speed === 0);
-            this.started = true;
-            this.time = Date.now();
-            if (this.iv !== undefined) {
-                clearInterval(this.iv);
-                this.iv = undefined;
-            }
-            this.speed = 30;
-            this.iv = setInterval(() => this.update(), 1000);
-            resolve({ started: true, error: undefined });
+            selectedMode = this.getDefaultCyclingMode();
+        }
+        else {
+            selectedMode = mode;
+        }
+        this.cyclingMode = selectedMode;
+        this.cyclingMode.setSettings(settings);
+    }
+    start(props) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.startProps = props;
+            return new Promise((resolve) => {
+                if (!this.isBot)
+                    this.logger.logEvent({ message: 'start', iv: this.iv });
+                if (this.started) {
+                    return resolve({ started: true, error: undefined });
+                }
+                this.started = true;
+                this.time = Date.now();
+                this.startTS = this.time;
+                if (this.iv !== undefined) {
+                    clearInterval(this.iv);
+                    this.iv = undefined;
+                }
+                this.iv = setInterval(() => this.update(), 1000);
+                if (!this.isBot)
+                    this.logger.logEvent({ message: 'started' });
+                resolve({ started: true, error: undefined });
+            });
         });
     }
     stop() {
         return new Promise((resolve, reject) => {
-            this.logger.logEvent({ message: 'stop', iv: this.iv });
+            if (!this.isBot)
+                this.logger.logEvent({ message: 'stop', iv: this.iv });
             this.started = false;
             clearInterval(this.iv);
             this.iv = undefined;
@@ -69,7 +138,8 @@ class Simulator extends Device_1.default {
         return new Promise((resolve, reject) => {
             if (!this.started)
                 return reject(new Error('illegal state - pause() has been called before start()'));
-            this.logger.logEvent({ message: 'pause', iv: this.iv });
+            if (!this.isBot)
+                this.logger.logEvent({ message: 'pause', iv: this.iv });
             this.paused = true;
             resolve(true);
         });
@@ -78,7 +148,8 @@ class Simulator extends Device_1.default {
         return new Promise((resolve, reject) => {
             if (!this.started)
                 reject(new Error('illegal state - resume() has been called before start()'));
-            this.logger.logEvent({ message: 'resume', iv: this.iv });
+            if (!this.isBot)
+                this.logger.logEvent({ message: 'resume', iv: this.iv });
             this.paused = false;
             resolve(true);
         });
@@ -114,29 +185,26 @@ class Simulator extends Device_1.default {
         }
     }
     update() {
-        let prevTime = this.time;
-        this.time = Date.now();
-        let timespan = this.time - prevTime;
-        if (this.limit.slope) {
-            this.slope = this.limit.slope;
-        }
-        if (this.speed === undefined)
-            this.speed = 30;
-        this.power = calculations_1.default.calculatePower(75, this.speed / 3.6, this.slope);
-        if (this.limit.targetPower) {
-            this.power = this.limit.targetPower;
-            this.speed = calculations_1.default.calculateSpeed(75, this.power, this.slope);
-        }
-        if (this.limit.maxPower && this.power > this.limit.maxPower) {
-            this.power = this.limit.maxPower;
-            this.speed = calculations_1.default.calculateSpeed(75, this.power, this.slope);
-        }
-        else if (this.limit.minPower && this.power < this.limit.minPower) {
-            this.power = this.limit.minPower;
-            this.speed = calculations_1.default.calculateSpeed(75, this.power, this.slope);
-        }
-        let distance = this.calculateDistance(this.speed, timespan / 1000);
-        let data = { speed: this.speed, cadence: Math.round(this.cadence), power: Math.round(this.power), timespan, distance };
+        const startDelay = this.getCyclingMode().getSetting('delay');
+        const timeSinceStart = Date.now() - this.startTS;
+        if (startDelay && timeSinceStart < startDelay * 1000)
+            return;
+        const prevDist = this.data.distanceInternal;
+        this.data = this.getCyclingMode().updateData(this.data);
+        let data = {
+            speed: this.data.speed,
+            slope: this.data.slope,
+            power: this.data.power,
+            cadence: this.data.pedalRpm,
+            distance: this.data.distanceInternal - prevDist,
+            heartrate: Math.round(this.data.power - 10 + Math.random() * 20),
+            timestamp: Date.now(),
+            deviceTime: Math.round((Date.now() - this.startTS) / 1000),
+            deviceDistanceCounter: this.data.distanceInternal
+        };
+        this.paused = (this.data.speed === 0);
+        if (this.ignoreHrm)
+            delete data.heartrate;
         if (this.onDataFn) {
             this.onDataFn(data);
         }
@@ -145,15 +213,9 @@ class Simulator extends Device_1.default {
         return timeS * speedKps / 3.6;
     }
     sendUpdate(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.limit;
-            delete r.refresh;
-        }
-        this.limit = r;
-        return this.limit;
+        if (this.paused)
+            return;
+        return this.getCyclingMode().sendBikeUpdate(request);
     }
 }
 exports.Simulator = Simulator;
@@ -161,9 +223,12 @@ Simulator.NAME = 'Simulator';
 class SimulatorProtocol extends DeviceProtocol_1.default {
     constructor() {
         super();
-        this.devices.push(new Simulator(this));
+        this.devices = [];
     }
     add(settings) {
+        let device = new Simulator(this, settings);
+        this.devices.push(device);
+        return device;
     }
     getName() {
         return SimulatorProtocol.NAME;

package/lib/simulator/simulator-mode.d.ts

@@ -0,0 +1,28 @@
+import { EventLogger } from "gd-eventlog";
+import CyclingMode, { CyclingModeBase, CyclingModeProperty, IncyclistBikeData, UpdateRequest } from "../CyclingMode";
+import { Simulator } from "./Simulator";
+export declare type ERGEvent = {
+    rpmUpdated?: boolean;
+    gearUpdated?: boolean;
+    starting?: boolean;
+    tsStart?: number;
+};
+export default class SimulatorCyclingMode extends CyclingModeBase implements CyclingMode {
+    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;
+    calculateTargetPower(request: any, updateMode?: boolean): void;
+}