incyclist-devices 1.4.22 → 1.4.25

package/lib/daum/classic/DaumClassicProtocol.js

@@ -1,23 +1,4 @@
 "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) {
@@ -27,6 +8,13 @@ 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/daum/classic/bike.js

@@ -52,9 +52,9 @@ class Daum8008 {
     }
     getUserWeight() {
         if (this.settings && this.settings.user && this.settings.user.weight)
-            return (0, utils_1.getWeight)(this.settings.user.weight);
+            return utils_1.getWeight(this.settings.user.weight);
         else
-            return (0, utils_1.getWeight)();
+            return utils_1.getWeight();
     }
     getBikeWeight() {
         if (this.settings && this.settings.weight) {
@@ -274,7 +274,7 @@ class Daum8008 {
         };
         this.queue.enqueue(cmdInfo);
         if (this.queue.size() > 1)
-            this.logger.logEvent({ message: "sendCommand:adding:", cmd: logStr, hex: (0, utils_1.hexstr)(payload), queueSize: this.queue.size() });
+            this.logger.logEvent({ message: "sendCommand:adding:", cmd: logStr, hex: utils_1.hexstr(payload), queueSize: this.queue.size() });
         if (this.bikeCmdWorker === undefined) {
             this.startWorker();
         }
@@ -293,7 +293,7 @@ class Daum8008 {
             const parser = serialPort.pipe(new ByteLength({ length: expected }));
             parser.on('data', (data) => {
                 let duration = Date.now() - this.cmdStart;
-                this.logger.logEvent({ message: "sendCommand:received:", duration, hex: (0, utils_1.hexstr)(data), port: this.getPort() });
+                this.logger.logEvent({ message: "sendCommand:received:", duration, hex: utils_1.hexstr(data), port: this.getPort() });
                 serialPort.unpipe();
                 if (callbackErr !== undefined) {
                     if (data[0] !== payload[0]) {
@@ -306,7 +306,7 @@ class Daum8008 {
                 callback(data);
                 done();
             });
-            this.logger.logEvent({ message: "sendCommand:sending:", cmd: logStr, hex: (0, utils_1.hexstr)(payload), port: this.getPort() });
+            this.logger.logEvent({ message: "sendCommand:sending:", cmd: logStr, hex: utils_1.hexstr(payload), port: this.getPort() });
             this.cmdCurrent.start = this.cmdStart = Date.now();
             serialPort.write(payload);
         }
@@ -321,53 +321,53 @@ class Daum8008 {
             this.sendDaum8008Command(`checkCockpit(${bikeNo})`, [0x10, bikeNo], 3, (data) => resolve({ bike: data[1], version: data[2] }), (status, err) => {
                 if (status === 408)
                     return resolve({ bike: bikeNo, version: undefined });
-                reject((0, utils_1.buildError)(status, err));
+                reject(utils_1.buildError(status, err));
             });
         });
     }
     getAddress() {
         return new Promise((resolve, reject) => {
-            this.sendDaum8008Command(`getAddress()`, [0x11], 2, (data) => resolve({ bike: data[1] }), (status, err) => reject((0, utils_1.buildError)(status, err)));
+            this.sendDaum8008Command(`getAddress()`, [0x11], 2, (data) => resolve({ bike: data[1] }), (status, err) => reject(utils_1.buildError(status, err)));
         });
     }
     getVersion(bikeNo = 0) {
         return new Promise((resolve, reject) => {
-            this.sendDaum8008Command(`getVersion(${bikeNo})`, [0x73, bikeNo], 11, (data) => resolve({ bike: data[1], serialNo: (0, utils_1.hexstr)(data, 2, 8), cockpit: (0, utils_1.getCockpit)(data[10]) }), (status, err) => reject((0, utils_1.buildError)(status, err)));
+            this.sendDaum8008Command(`getVersion(${bikeNo})`, [0x73, bikeNo], 11, (data) => resolve({ bike: data[1], serialNo: utils_1.hexstr(data, 2, 8), cockpit: utils_1.getCockpit(data[10]) }), (status, err) => reject(utils_1.buildError(status, err)));
         });
     }
     resetDevice(bikeNo = 0) {
         return new Promise((resolve, reject) => {
-            this.sendDaum8008Command(`resetDevice(${bikeNo})`, [0x12, bikeNo], 2, (data) => resolve({}), (status, err) => reject((0, utils_1.buildError)(status, err)));
+            this.sendDaum8008Command(`resetDevice(${bikeNo})`, [0x12, bikeNo], 2, (data) => resolve({}), (status, err) => reject(utils_1.buildError(status, err)));
         });
     }
     startProg(bikeNo = 0) {
         return new Promise((resolve, reject) => {
-            this.sendDaum8008Command(`startProg(${bikeNo})`, [0x21, bikeNo], 3, (data) => resolve({ bike: data[1], pedalling: data[2] > 0 }), (status, err) => reject((0, utils_1.buildError)(status, err)));
+            this.sendDaum8008Command(`startProg(${bikeNo})`, [0x21, bikeNo], 3, (data) => resolve({ bike: data[1], pedalling: data[2] > 0 }), (status, err) => reject(utils_1.buildError(status, err)));
         });
     }
     stopProg(bikeNo = 0) {
         return new Promise((resolve, reject) => {
-            this.sendDaum8008Command(`stopProg(${bikeNo})`, [0x22, bikeNo], 3, (data) => resolve({ bike: data[1], pedalling: data[2] !== 0 }), (status, err) => reject((0, utils_1.buildError)(status, err)));
+            this.sendDaum8008Command(`stopProg(${bikeNo})`, [0x22, bikeNo], 3, (data) => resolve({ bike: data[1], pedalling: data[2] !== 0 }), (status, err) => reject(utils_1.buildError(status, err)));
         });
     }
     setProg(progNo = 0, bikeNo = 0) {
         return new Promise((resolve, reject) => {
-            this.sendDaum8008Command(`setProg(${bikeNo},${progNo})`, [0x23, bikeNo, progNo], 4, (data) => resolve({ bike: data[1], progNo: data[2], pedalling: data[3] !== 0 }), (status, err) => reject((0, utils_1.buildError)(status, err)));
+            this.sendDaum8008Command(`setProg(${bikeNo},${progNo})`, [0x23, bikeNo, progNo], 4, (data) => resolve({ bike: data[1], progNo: data[2], pedalling: data[3] !== 0 }), (status, err) => reject(utils_1.buildError(status, err)));
         });
     }
     setBikeType(bikeType, bikeNo = 0) {
-        const bikeVal = (0, utils_1.getBikeType)(bikeType);
+        const bikeVal = utils_1.getBikeType(bikeType);
         return new Promise((resolve, reject) => {
-            this.sendDaum8008Command(`setBikeType(${bikeNo},${bikeType})`, [0x69, bikeNo, 0, 0, bikeVal], 3, (data) => resolve({}), (status, err) => reject((0, utils_1.buildError)(status, err)));
+            this.sendDaum8008Command(`setBikeType(${bikeNo},${bikeType})`, [0x69, bikeNo, 0, 0, bikeVal], 3, (data) => resolve({}), (status, err) => reject(utils_1.buildError(status, err)));
         });
     }
     setPerson(user = {}, bikeNo = 0) {
         const age = user.age !== undefined ? user.age : utils_1.DEFAULT_AGE;
-        const gender = (0, utils_1.getGender)(user.sex);
-        const length = (0, utils_1.getLength)(user.length);
+        const gender = utils_1.getGender(user.sex);
+        const length = utils_1.getLength(user.length);
         const maxPower = this.settings.maxPower === undefined ? 800 : this.settings.maxPower;
         const mUser = user.weight || this.getUserWeight();
-        const weight = (0, utils_1.getWeight)(mUser) + this.getBikeWeight();
+        const weight = utils_1.getWeight(mUser) + this.getBikeWeight();
         var cmd = [0x24, bikeNo, 0];
         cmd.push(age);
         cmd.push(gender);
@@ -390,26 +390,26 @@ class Daum8008 {
                             if (data[i] === 0 || data[i] === 80)
                                 return;
                         }
-                        reject((0, utils_1.buildError)(512, 'illegal response'));
+                        reject(utils_1.buildError(512, 'illegal response'));
                         ok = false;
                     }
                 });
                 if (ok)
                     resolve({ bike: data[1], age, gender, length, weight });
-            }, (status, err) => reject((0, utils_1.buildError)(status, err)));
+            }, (status, err) => reject(utils_1.buildError(status, err)));
         });
     }
     runData(bikeNo = 0) {
         return new Promise((resolve, reject) => {
             this.sendDaum8008Command(`runData(${bikeNo})`, [0x40, bikeNo], 19, (data) => {
                 try {
-                    const parsed = (0, utils_1.parseRunData)(data);
+                    const parsed = utils_1.parseRunData(data);
                     resolve(parsed);
                 }
                 catch (e) {
-                    reject((0, utils_1.buildError)(500, e));
+                    reject(utils_1.buildError(500, e));
                 }
-            }, (status, err) => reject((0, utils_1.buildError)(status, err)));
+            }, (status, err) => reject(utils_1.buildError(status, err)));
         });
     }
     setGear(gear, bikeNo = 0) {
@@ -419,7 +419,7 @@ class Daum8008 {
         if (gear > 28)
             gearVal = 28;
         return new Promise((resolve, reject) => {
-            this.sendDaum8008Command(`setGear(${bikeNo},${gearVal})`, [0x53, bikeNo, gearVal], 3, (data) => resolve({ bike: data[1], gear: data[2] }), (status, err) => reject((0, utils_1.buildError)(status, err)));
+            this.sendDaum8008Command(`setGear(${bikeNo},${gearVal})`, [0x53, bikeNo, gearVal], 3, (data) => resolve({ bike: data[1], gear: data[2] }), (status, err) => reject(utils_1.buildError(status, err)));
         });
     }
     setPower(power, bikeNo = 0) {
@@ -434,7 +434,7 @@ class Daum8008 {
             if (power > 800)
                 powerRequest = 800;
             const powerVal = Math.round(powerRequest / 5);
-            this.sendDaum8008Command(`setPower(${bikeNo},${power})`, [0x51, bikeNo, powerVal], 3, (data) => resolve({ bike: data[1], power: (data[2] * 5) }), (status, err) => reject((0, utils_1.buildError)(status, err)));
+            this.sendDaum8008Command(`setPower(${bikeNo},${power})`, [0x51, bikeNo, powerVal], 3, (data) => resolve({ bike: data[1], power: (data[2] * 5) }), (status, err) => reject(utils_1.buildError(status, err)));
         });
     }
     setSlope(slope, bikeNo = 0) {
@@ -444,12 +444,12 @@ class Daum8008 {
                 return;
             }
             const cmd = [0x55, bikeNo];
-            const arr = (0, utils_1.Float32ToIntArray)(slope);
+            const arr = utils_1.Float32ToIntArray(slope);
             cmd.push(arr[3]);
             cmd.push(arr[2]);
             cmd.push(arr[1]);
             cmd.push(arr[0]);
-            this.sendDaum8008Command(`setSlope(${bikeNo},${slope})`, cmd, 6, (data) => resolve({ bike: data[1], slope: slope }), (status, err) => reject((0, utils_1.buildError)(status, err)));
+            this.sendDaum8008Command(`setSlope(${bikeNo},${slope})`, cmd, 6, (data) => resolve({ bike: data[1], slope: slope }), (status, err) => reject(utils_1.buildError(status, err)));
         });
     }
 }

package/lib/daum/classic/utils.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Float32ToIntArray = exports.Float32ToHex = exports.hexstr = exports.buildError = exports.parseRunData = exports.getWeight = exports.getLength = exports.getGender = exports.getBikeType = exports.getCockpit = exports.DEFAULT_BIKE_WEIGHT = exports.DEFAULT_USER_WEIGHT = exports.DEFAULT_AGE = void 0;
 exports.DEFAULT_AGE = 30;
 exports.DEFAULT_USER_WEIGHT = 75;
 exports.DEFAULT_BIKE_WEIGHT = 10;

package/lib/daum/constants.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BIKE_TRAINING_STATE = exports.BIKE_INTERFACE = exports.ACTUAL_BIKE_TYPE = void 0;
 exports.ACTUAL_BIKE_TYPE = {
     ALLROUND: 'allround',
     RACE: 'race',

package/lib/daum/premium/DaumClassicCyclingMode.d.ts

@@ -1,7 +1,7 @@
 import CyclingMode, { CyclingModeProperty, IncyclistBikeData, Settings, UpdateRequest } from "../../CyclingMode";
 import DaumAdapter from "../DaumAdapter";
-import PowerMeterCyclingMode from "../PowerMeterCyclingMode";
-export default class DaumClassicCyclingMode extends PowerMeterCyclingMode implements CyclingMode {
+import DaumPowerMeterCyclingMode from "../DaumPowerMeterCyclingMode";
+export default class DaumClassicCyclingMode extends DaumPowerMeterCyclingMode implements CyclingMode {
     constructor(adapter: DaumAdapter, props?: Settings);
     getName(): string;
     getDescription(): string;

package/lib/daum/premium/DaumClassicCyclingMode.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const gd_eventlog_1 = require("gd-eventlog");
 const CyclingMode_1 = require("../../CyclingMode");
-const PowerMeterCyclingMode_1 = __importDefault(require("../PowerMeterCyclingMode"));
+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",
@@ -13,7 +13,7 @@ const config = {
         { key: 'bikeType', name: 'Bike Type', description: '', type: CyclingMode_1.CyclingModeProperyType.SingleSelect, options: ['Race', 'Mountain'], default: 'Race' },
     ]
 };
-class DaumClassicCyclingMode extends PowerMeterCyclingMode_1.default {
+class DaumClassicCyclingMode extends DaumPowerMeterCyclingMode_1.default {
     constructor(adapter, props) {
         super(adapter, props);
         this.logger = adapter ? adapter.logger : undefined;

package/lib/daum/premium/DaumPremiumAdapter.js

@@ -72,7 +72,7 @@ class DaumPremiumDevice extends DaumAdapter_1.default {
             const route = opts.route;
             var info = {};
             this.initData();
-            return (0, utils_1.runWithRetries)(() => __awaiter(this, void 0, void 0, function* () {
+            return utils_1.runWithRetries(() => __awaiter(this, void 0, void 0, function* () {
                 if (this.isStopped())
                     return;
                 try {
@@ -98,7 +98,7 @@ class DaumPremiumDevice extends DaumAdapter_1.default {
                         info.person = yield this.bike.setPerson(user);
                     }
                     if (!this.getCyclingMode().getModeProperty('eppSupport')) {
-                        const gear = yield this.bike.setGear(this.daumRunData.gear || (opts.gear || 10));
+                        const gear = yield this.bike.setGear(this.cyclingData.gear || (opts.gear || 10));
                         return gear;
                     }
                     return;

package/lib/daum/premium/DaumPremiumProtocol.js

@@ -1,23 +1,4 @@
 "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) {
@@ -27,6 +8,13 @@ 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/daum/premium/bike.js

@@ -12,7 +12,6 @@ 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");
@@ -408,7 +407,7 @@ class Daum8i {
             incoming = bufferData;
         }
         const response = [...incoming];
-        this.logger.logEvent({ message: 'sendCommand:RECV', data: (0, utils_1.hexstr)(response) });
+        this.logger.logEvent({ message: 'sendCommand:RECV', data: utils_1.hexstr(response) });
         for (let i = 0; i < incoming.length; i++) {
             const getRemaining = () => {
                 let remaining = '';
@@ -441,11 +440,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} [${(0, utils_1.hexstr)(cmd)}]`, remaining: (0, utils_1.hexstr)(remaining) });
+                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.state.waitingForEnd = false;
                 const cmdStr = cmd.substring(0, cmd.length - 2);
                 const checksumExtracted = cmd.slice(-2);
-                const checksumCalculated = (0, utils_1.checkSum)((0, utils_1.getAsciiArrayFromStr)(cmdStr), []);
+                const checksumCalculated = utils_1.checkSum(utils_1.getAsciiArrayFromStr(cmdStr), []);
                 if (checksumExtracted === checksumCalculated) {
                     this.sendACK();
                     if (this.state.sending && this.state.sending.responseCheckIv) {
@@ -487,8 +486,8 @@ class Daum8i {
                 this.state.busy = true;
             }
             else {
-                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 message = utils_1.buildMessage(command, payload);
+                this.logger.logEvent({ message: 'sendCommand:waiting', port: this.portName, cmd: command, hex: utils_1.hexstr(message) });
                 const busyWait = () => {
                     return new Promise((done) => {
                         let start = Date.now();
@@ -509,7 +508,7 @@ class Daum8i {
                 };
                 const res = yield busyWait();
                 if (!res) {
-                    this.logger.logEvent({ message: 'sendCommand:busy timeout', port: this.portName, cmd: command, hex: (0, utils_1.hexstr)(message), duration: Date.now() - tsRequest });
+                    this.logger.logEvent({ message: 'sendCommand:busy timeout', port: this.portName, cmd: command, hex: utils_1.hexstr(message), duration: Date.now() - tsRequest });
                     return reject(new Error('BUSY timeout'));
                 }
                 this.state.busy = true;
@@ -527,10 +526,10 @@ class Daum8i {
             const portName = this.portName;
             this.state.received = [];
             try {
-                const message = (0, utils_1.buildMessage)(command, payload);
+                const message = 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: (0, utils_1.hexstr)(message) });
+                this.logger.logEvent({ message: "sendCommand:sending:", port: this.portName, cmd: command, hex: utils_1.hexstr(message) });
                 this.state.writeBusy = true;
                 if (!this.connected || port === undefined) {
                     this.logger.logEvent({ message: "sendCommand:error: not connected", port: this.portName });
@@ -590,10 +589,10 @@ class Daum8i {
             buffer.writeUInt16LE(0, 2);
         }
         const cmdData = Uint8Array.from(buffer);
-        return this.sendDaum8iCommand('M70', cmdType, (0, utils_1.bin2esc)(cmdData))
+        return this.sendDaum8iCommand('M70', cmdType, utils_1.bin2esc(cmdData))
             .then((res) => {
             const resData = Uint8Array.from(res, x => x.charCodeAt(0));
-            const cmd = (0, utils_1.esc2bin)(resData);
+            const cmd = utils_1.esc2bin(resData);
             return cmd;
         });
     }
@@ -618,7 +617,7 @@ class Daum8i {
             else if (str === '7')
                 deviceType = 'lyps';
             else
-                throw (new Error(`unknown device type ${typeof str === 'string' ? (0, utils_1.ascii)(str.charAt(0)) : str}`));
+                throw (new Error(`unknown device type ${typeof str === 'string' ? utils_1.ascii(str.charAt(0)) : str}`));
             return deviceType;
         });
     }
@@ -633,7 +632,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' ? (0, utils_1.ascii)(str.charAt(0)) : str}`));
+                throw (new Error(`unknown actual device type ${typeof str === 'string' ? utils_1.ascii(str.charAt(0)) : str}`));
             }
             this.state.actualBikeType = deviceType;
             return deviceType;
@@ -675,12 +674,12 @@ class Daum8i {
     getTrainingData() {
         return this.sendDaum8iCommand('X70', 'AF', [])
             .then((data) => {
-            const td = (0, utils_1.parseTrainingData)(data);
+            const td = utils_1.parseTrainingData(data);
             return td;
         });
     }
     setLoadControl(enabled) {
-        const val = enabled ? (0, utils_1.ascii)('1') : (0, utils_1.ascii)('0');
+        const val = enabled ? utils_1.ascii('1') : utils_1.ascii('0');
         return this.sendDaum8iCommand('S20', 'BF', [val])
             .then((data) => {
             const res = data === '1';
@@ -714,7 +713,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', (0, utils_1.getPersonData)(person))
+        return this.sendReservedDaum8iCommand(utils_1.ReservedCommands.PERSON_SET, 'BF', utils_1.getPersonData(person))
             .then((res) => {
             const buffer = Buffer.from(res);
             const success = buffer.readInt16LE(0) === utils_1.ReservedCommands.PERSON_SET;
@@ -738,9 +737,9 @@ class Daum8i {
     }
     programUploadStart(bikeType, route) {
         const payload = Buffer.alloc(40);
-        const epp = route ? (0, utils_1.routeToEpp)(route) : undefined;
+        const epp = route ? utils_1.routeToEpp(route) : undefined;
         const eppLength = epp ? epp.length : 0;
-        const bikeTypeVal = (0, utils_1.getBikeType)(bikeType);
+        const bikeTypeVal = 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,7 +3,6 @@ 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,7 +12,6 @@ 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"));
@@ -194,7 +193,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 : (0, utils_1.hexstr)(message);
+        const msg = typeof message === 'string' ? message : 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,23 +1,4 @@
 "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) {
@@ -27,6 +8,13 @@ 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 };
 };
@@ -35,7 +23,7 @@ const Device_1 = __importStar(require("../../Device"));
 const gd_eventlog_1 = require("gd-eventlog");
 const comms_1 = __importDefault(require("../comms"));
 const utils_1 = require("../../utils");
-const power_meter_1 = __importDefault(require("./modes/power-meter"));
+const power_meter_1 = __importDefault(require("../../modes/power-meter"));
 class KettlerRacerAdapter extends Device_1.default {
     constructor(protocol, settings) {
         super(protocol);
@@ -300,7 +288,7 @@ class KettlerRacerAdapter extends Device_1.default {
             this.logger.logEvent({ message: 'start()' });
             var info = {};
             yield this.waitForOpened(true);
-            return (0, utils_1.runWithRetries)(() => __awaiter(this, void 0, void 0, function* () {
+            return utils_1.runWithRetries(() => __awaiter(this, void 0, void 0, function* () {
                 try {
                     if (!info.checkDone) {
                         info.checkDone = yield this.check();
@@ -585,7 +573,7 @@ class KettlerRacerAdapter extends Device_1.default {
         if (!retries) {
             return new Promise((resolve, reject) => run(resolve, reject));
         }
-        return (0, utils_1.runWithRetries)(() => {
+        return utils_1.runWithRetries(() => {
             return new Promise((resolve, reject) => run(resolve, reject));
         }, 3, 1000);
     }

package/lib/kettler/ergo-racer/modes/power-meter.d.ts

@@ -1,13 +1,13 @@
 import { EventLogger } from 'gd-eventlog';
 import CyclingMode, { CyclingModeProperty, IncyclistBikeData, Settings, UpdateRequest, CyclingModeBase } from '../../../CyclingMode';
-import KettlerRacerAdapter from '../adapter';
+import { DeviceAdapter } from '../../../Device';
 export default class PowerMeterCyclingMode extends CyclingModeBase implements CyclingMode {
     logger: EventLogger;
     data: IncyclistBikeData;
     prevRequest: UpdateRequest;
     prevUpdateTS: number;
     hasBikeUpdate: boolean;
-    constructor(adapter: KettlerRacerAdapter, props?: Settings);
+    constructor(adapter: DeviceAdapter, props?: Settings);
     getName(): string;
     getDescription(): string;
     getProperties(): CyclingModeProperty[];

package/lib/kettler/ergo-racer/modes/power-meter.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const gd_eventlog_1 = require("gd-eventlog");
 const CyclingMode_1 = require("../../../CyclingMode");
+const Device_1 = require("../../../Device");
 const calculations_1 = __importDefault(require("../../../calculations"));
 const config = {
     name: 'PowerMeter',
@@ -16,7 +17,8 @@ class PowerMeterCyclingMode extends CyclingMode_1.CyclingModeBase {
         super(adapter, props);
         this.prevUpdateTS = 0;
         this.hasBikeUpdate = false;
-        this.logger = adapter ? adapter.getLogger() : undefined;
+        const a = adapter;
+        this.logger = (a && a.getLogger) ? a.getLogger() : undefined;
         if (!this.logger)
             this.logger = new gd_eventlog_1.EventLogger('PowerMeter');
     }
@@ -56,10 +58,16 @@ class PowerMeterCyclingMode extends CyclingMode_1.CyclingModeBase {
                 power = 0;
             }
             let ts = Date.now();
-            const m = this.adapter.getWeight();
-            speed = calculations_1.default.calculateSpeed(m, power, slope);
-            let v = speed / 3.6;
+            const a = this.adapter;
+            const m = a.getWeight ? a.getWeight() : Device_1.DEFAULT_BIKE_WEIGHT + Device_1.DEFAULT_USER_WEIGHT;
             let duration = this.prevUpdateTS === 0 ? 0 : ((ts - this.prevUpdateTS) / 1000);
+            const vPrev = (prevData.speed || 0) / 3.6;
+            const EkinPrev = 1 / 2 * m * vPrev * vPrev;
+            let powerRequired = calculations_1.default.calculatePower(m, vPrev, prevData.slope || 0);
+            const powerDelta = powerRequired - power;
+            const Ekin = EkinPrev - powerDelta * duration;
+            const v = Math.sqrt(2 * Ekin / m);
+            speed = v * 3.6;
             distanceInternal += Math.round(v * duration);
             data.speed = parseFloat(speed.toFixed(1));
             data.power = Math.round(power);

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

@@ -1,23 +1,4 @@
 "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) {
@@ -27,6 +8,13 @@ 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/modes/power-base.d.ts

@@ -0,0 +1,20 @@
+import { IncyclistBikeData, Settings, CyclingModeBase } from '../CyclingMode';
+import { DeviceAdapter } from '../Device';
+import { EventLogger } from 'gd-eventlog';
+export default class PowerBasedCyclingModeBase extends CyclingModeBase {
+    data: IncyclistBikeData;
+    prevUpdateTS: number;
+    logger: EventLogger;
+    constructor(adapter: DeviceAdapter, props?: Settings);
+    initLogger(defaultLogName: any): void;
+    getWeight(): any;
+    getTimeSinceLastUpdate(): number;
+    calculateSpeedAndDistance(power: number, slope: number, m: number, t: number, props?: {}): {
+        speed: number;
+        distance: number;
+    };
+    calculatePowerAndDistance(speed: number, slope: number, m: number, t: number, props?: {}): {
+        power: number;
+        distance: number;
+    };
+}