incyclist-devices 1.4.24 → 1.4.27

package/lib/ble/incyclist-protocol.js

@@ -0,0 +1,106 @@
+"use strict";
+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 __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 };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const gd_eventlog_1 = require("gd-eventlog");
+const DeviceProtocol_1 = __importStar(require("../DeviceProtocol"));
+const DeviceRegistry_1 = __importDefault(require("../DeviceRegistry"));
+const ble_1 = require("./ble");
+const ble_interface_1 = __importDefault(require("./ble-interface"));
+const hrm_1 = __importStar(require("./hrm"));
+const pwr_1 = __importDefault(require("./pwr"));
+const supportedDeviceTypes = [hrm_1.default, pwr_1.default];
+class BleProtocol extends DeviceProtocol_1.default {
+    constructor(binding) {
+        super();
+        const b = binding || BleProtocol._defaultBinding;
+        this.logger = new gd_eventlog_1.EventLogger('BLE');
+        this.ble = new ble_interface_1.default({ binding: b, logger: this.logger });
+        BleProtocol._instances.push(this);
+    }
+    static setDefaultBinding(binding) {
+        BleProtocol._defaultBinding = binding;
+        BleProtocol._instances.forEach((p) => {
+            if (p.ble && !p.ble.getBinding()) {
+                p.ble.setBinding(binding);
+            }
+        });
+    }
+    setBinding(binding) {
+        if (this.ble)
+            this.ble.setBinding(binding);
+    }
+    createDevice(bleDevice) {
+        const fromDevice = bleDevice instanceof ble_1.BleDeviceClass;
+        const profile = bleDevice instanceof ble_1.BleDeviceClass ? bleDevice.getProfile() : bleDevice.profile;
+        const props = () => {
+            const { id, name, address } = bleDevice;
+            return { id, name, address };
+        };
+        switch (profile.toLocaleLowerCase()) {
+            case 'hr':
+            case 'heartrate monitor':
+                return new hrm_1.HrmAdapter(fromDevice ? bleDevice : new hrm_1.default(props()), this);
+        }
+    }
+    getName() { return 'BLE'; }
+    getInterfaces() { return [DeviceProtocol_1.INTERFACE.BLE]; }
+    isBike() { return true; }
+    isHrm() { return true; }
+    isPower() { return true; }
+    add(settings) {
+        this.logger.logEvent({ message: 'adding device', settings });
+        const device = this.createDevice(settings);
+        return device;
+    }
+    scan(props) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                this.ble.on('device', (bleDevice) => {
+                    if (props && props.onDeviceFound) {
+                        const device = this.createDevice(bleDevice);
+                        props.onDeviceFound(device, this);
+                    }
+                });
+                this.logger.logEvent({ message: 'scan started' });
+                yield this.ble.scan({ deviceTypes: supportedDeviceTypes });
+                if (props && props.onScanFinished) {
+                    props.onScanFinished(props.id);
+                }
+            }
+            catch (err) {
+                this.logger.logEvent({ message: 'error', error: err.message });
+            }
+        });
+    }
+    stopScan() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.ble.stopScan();
+            return;
+        });
+    }
+    isScanning() {
+        return this.ble.isScanning();
+    }
+}
+exports.default = BleProtocol;
+BleProtocol._defaultBinding = undefined;
+BleProtocol._instances = [];
+DeviceRegistry_1.default.register(new BleProtocol());

package/lib/ble/pwr.d.ts

@@ -0,0 +1,32 @@
+/// <reference types="node" />
+import { BleDevice } from './ble-device';
+declare type PowerData = {
+    instantaneousPower?: number;
+    balance?: number;
+    accTorque?: number;
+    rpm: number;
+    raw?: Buffer;
+};
+declare type CrankData = {
+    revolutions?: number;
+    time?: number;
+    cntUpdateMissing?: number;
+};
+export default class BleCyclingPowerDevice extends BleDevice {
+    static services: string[];
+    static characteristics: string[];
+    instantaneousPower: number;
+    balance: number;
+    accTorque: number;
+    currentCrankData: CrankData;
+    prevCrankData: CrankData;
+    rpm: number;
+    getProfile(): string;
+    getServiceUUids(): string[];
+    getRpm(crankData: any): number;
+    parsePower(data: Buffer): PowerData;
+    onData(characteristic: string, data: Buffer): void;
+    write(characteristic: any, data: any): Promise<boolean>;
+    read(characteristic: any): Promise<Buffer>;
+}
+export {};

package/lib/ble/pwr.js

@@ -0,0 +1,96 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const ble_device_1 = require("./ble-device");
+const ble_interface_1 = __importDefault(require("./ble-interface"));
+class BleCyclingPowerDevice extends ble_device_1.BleDevice {
+    constructor() {
+        super(...arguments);
+        this.instantaneousPower = undefined;
+        this.balance = undefined;
+        this.accTorque = undefined;
+        this.currentCrankData = undefined;
+        this.prevCrankData = undefined;
+        this.rpm = undefined;
+    }
+    getProfile() {
+        return 'cp';
+    }
+    getServiceUUids() {
+        return BleCyclingPowerDevice.services;
+    }
+    getRpm(crankData) {
+        if (!this.prevCrankData)
+            this.prevCrankData = { revolutions: 0, time: 0, cntUpdateMissing: -1 };
+        const c = this.currentCrankData = crankData;
+        const p = this.prevCrankData;
+        let rpm = this.rpm;
+        let hasUpdate = c.time !== p.time;
+        if (hasUpdate) {
+            let time = c.time - p.time;
+            let revs = c.revolutions - p.revolutions;
+            if (c.time < p.time)
+                time += 0x10000;
+            if (c.revolutions < p.revolutions)
+                revs += 0x10000;
+            rpm = 1024 * 60 * revs / time;
+        }
+        else {
+            if (p.cntUpdateMissing < 0 || p.cntUpdateMissing > 2) {
+                rpm = 0;
+            }
+        }
+        const cntUpdateMissing = p.cntUpdateMissing;
+        this.prevCrankData = this.currentCrankData;
+        if (hasUpdate)
+            this.prevCrankData.cntUpdateMissing = 0;
+        else
+            this.prevCrankData.cntUpdateMissing = cntUpdateMissing + 1;
+        return rpm;
+    }
+    parsePower(data) {
+        try {
+            let offset = 4;
+            const flags = data.readUInt16LE(0);
+            this.instantaneousPower = data.readUInt16LE(2);
+            if (flags & 0x1)
+                this.balance = data.readUInt8(offset++);
+            if (flags & 0x4) {
+                this.accTorque = data.readUInt16LE(offset);
+                offset += 2;
+            }
+            if (flags & 0x20) {
+                const crankData = {
+                    revolutions: data.readUInt16LE(offset),
+                    time: data.readUInt16LE(offset + 2)
+                };
+                this.rpm = this.getRpm(crankData);
+                offset += 4;
+            }
+        }
+        catch (err) {
+        }
+        const { instantaneousPower, balance, accTorque, rpm } = this;
+        return { instantaneousPower, balance, accTorque, rpm, raw: data };
+    }
+    onData(characteristic, data) {
+        if (characteristic.toLocaleLowerCase() === '2a63') {
+            const res = this.parsePower(data);
+            this.emit('data', res);
+        }
+    }
+    write(characteristic, data) {
+        console.log('write', characteristic, data);
+        return Promise.resolve(true);
+    }
+    read(characteristic) {
+        console.log('read', characteristic);
+        return Promise.resolve(Buffer.from([]));
+    }
+}
+exports.default = BleCyclingPowerDevice;
+BleCyclingPowerDevice.services = ['1818'];
+BleCyclingPowerDevice.characteristics = ['2a63', '2a65', '2a5d', '2a3c'];
+ble_interface_1.default.register('BleCyclingPowerDevice', 'cp', BleCyclingPowerDevice, BleCyclingPowerDevice.services);

package/lib/calculations.js

@@ -7,7 +7,6 @@ const cwABike = {
     triathlon: 0.29,
     mountain: 0.57
 };
-const k = 0.01090;
 const cRR = 0.0036;
 class IllegalArgumentException extends Error {
     constructor(message) {
@@ -28,7 +27,7 @@ class C {
         const _cRR = props.cRR || cRR;
         const _cwA = props.cwA || cwABike[props.bikeType || 'race'] || cwABike.race;
         let sl = Math.atan(slope / 100);
-        let c1 = 0.5 * _rho * _cwA + 2 * k;
+        let c1 = 0.5 * _rho * _cwA;
         let c2 = (sl + _cRR) * m * g;
         let p = c2 / c1;
         let q = -1.0 * power / c1;
@@ -70,7 +69,7 @@ class C {
         let _cRR = props.cRR || cRR;
         let _cwA = props.cwA || cwABike[props.bikeType || 'race'] || cwABike.race;
         let sl = Math.sin(Math.atan(slope / 100));
-        let P = (0.5 * _rho * _cwA + 2 * k) * Math.pow(v, 3.0) + (sl + _cRR) * m * g * v;
+        let P = (0.5 * _rho * _cwA) * Math.pow(v, 3.0) + (sl + _cRR) * m * g * v;
         return P;
     }
     static calculateSpeedDaum(gear, rpm, bikeType) {

package/lib/daum/DaumAdapter.d.ts

@@ -1,11 +1,11 @@
 import { EventLogger } from 'gd-eventlog';
 import CyclingMode, { IncyclistBikeData } from '../CyclingMode';
-import DeviceAdapterBase, { Bike, DeviceAdapter, DeviceData } from '../Device';
+import IncyclistDevice, { Bike, DeviceAdapter, DeviceData } from '../Device';
 import { User } from '../types/user';
 interface DaumAdapter {
     getCurrentBikeData(): Promise<any>;
 }
-export default class DaumAdapterBase extends DeviceAdapterBase implements DeviceAdapter, DaumAdapter, Bike {
+export default class DaumAdapterBase extends IncyclistDevice implements DeviceAdapter, DaumAdapter, Bike {
     bike: any;
     ignoreHrm: boolean;
     ignoreBike: boolean;
@@ -13,7 +13,7 @@ export default class DaumAdapterBase extends DeviceAdapterBase implements Device
     distanceInternal: number;
     paused: boolean;
     stopped: boolean;
-    daumRunData: IncyclistBikeData;
+    cyclingData: IncyclistBikeData;
     deviceData: DeviceData;
     currentRequest: any;
     requests: Array<any>;
@@ -56,7 +56,7 @@ export default class DaumAdapterBase extends DeviceAdapterBase implements Device
     update(): Promise<void>;
     sendRequests(): Promise<void>;
     bikeSync(): Promise<void>;
-    updateData(prev: any, bikeData: any): void;
+    updateData(prev: any, bikeData: any): IncyclistBikeData;
     transformData(): DeviceData;
     sendRequest(request: any): Promise<any>;
     refreshRequests(): void;

package/lib/daum/DaumAdapter.js

@@ -22,7 +22,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Device_1 = __importStar(require("../Device"));
 const ERGCyclingMode_1 = __importDefault(require("./ERGCyclingMode"));
 const SmartTrainerCyclingMode_1 = __importDefault(require("./SmartTrainerCyclingMode"));
-const PowerMeterCyclingMode_1 = __importDefault(require("./PowerMeterCyclingMode"));
+const DaumPowerMeterCyclingMode_1 = __importDefault(require("./DaumPowerMeterCyclingMode"));
 const utils_1 = require("../utils");
 class DaumAdapterBase extends Device_1.default {
     constructor(props, bike) {
@@ -34,7 +34,7 @@ class DaumAdapterBase extends Device_1.default {
         this.bike = bike;
         this.stopped = false;
         this.paused = false;
-        this.daumRunData = {
+        this.cyclingData = {
             isPedalling: false,
             time: 0,
             power: 0,
@@ -67,7 +67,7 @@ class DaumAdapterBase extends Device_1.default {
         this.cyclingMode.setSettings(settings);
     }
     getSupportedCyclingModes() {
-        return [ERGCyclingMode_1.default, SmartTrainerCyclingMode_1.default, PowerMeterCyclingMode_1.default];
+        return [ERGCyclingMode_1.default, SmartTrainerCyclingMode_1.default, DaumPowerMeterCyclingMode_1.default];
     }
     getCyclingMode() {
         if (!this.cyclingMode)
@@ -128,7 +128,7 @@ class DaumAdapterBase extends Device_1.default {
         this.distanceInternal = undefined;
         this.paused = false;
         this.stopped = false;
-        this.daumRunData = {
+        this.cyclingData = {
             isPedalling: false,
             time: 0,
             power: 0,
@@ -229,12 +229,15 @@ class DaumAdapterBase extends Device_1.default {
             this.updateBusy = true;
             this.getCurrentBikeData()
                 .then(bikeData => {
-                this.updateData(this.daumRunData, bikeData);
+                this.updateData(this.cyclingData, bikeData);
                 this.transformData();
                 this.updateBusy = false;
             })
                 .catch(err => {
                 this.logEvent({ message: 'bike update error', error: err.message, stack: err.stack });
+                const { isPedalling, power, pedalRpm, speed, distanceInternal, heartrate, slope } = this.cyclingData;
+                this.updateData(this.cyclingData, { isPedalling, power, pedalRpm, speed, distanceInternal, heartrate, slope });
+                this.transformData();
                 this.updateBusy = false;
             });
         });
@@ -289,27 +292,28 @@ class DaumAdapterBase extends Device_1.default {
         data.time = bikeData.time;
         if (bikeData.slope)
             data.slope = bikeData.slope;
-        this.daumRunData = this.getCyclingMode().updateData(data);
+        this.cyclingData = this.getCyclingMode().updateData(data);
+        return this.cyclingData;
     }
     transformData() {
-        if (this.daumRunData === undefined)
+        if (this.cyclingData === undefined)
             return;
         let distance = 0;
-        if (this.distanceInternal !== undefined && this.daumRunData.distanceInternal !== undefined) {
-            distance = utils_1.intVal(this.daumRunData.distanceInternal - this.distanceInternal);
+        if (this.distanceInternal !== undefined && this.cyclingData.distanceInternal !== undefined) {
+            distance = utils_1.intVal(this.cyclingData.distanceInternal - this.distanceInternal);
         }
-        if (this.daumRunData.distanceInternal !== undefined)
-            this.distanceInternal = this.daumRunData.distanceInternal;
+        if (this.cyclingData.distanceInternal !== undefined)
+            this.distanceInternal = this.cyclingData.distanceInternal;
         let data = {
-            speed: utils_1.floatVal(this.daumRunData.speed),
-            slope: utils_1.floatVal(this.daumRunData.slope),
-            power: utils_1.intVal(this.daumRunData.power),
-            cadence: utils_1.intVal(this.daumRunData.pedalRpm),
-            heartrate: utils_1.intVal(this.daumRunData.heartrate),
+            speed: utils_1.floatVal(this.cyclingData.speed),
+            slope: utils_1.floatVal(this.cyclingData.slope),
+            power: utils_1.intVal(this.cyclingData.power),
+            cadence: utils_1.intVal(this.cyclingData.pedalRpm),
+            heartrate: utils_1.intVal(this.cyclingData.heartrate),
             distance,
             timestamp: Date.now(),
-            deviceTime: this.daumRunData.time,
-            deviceDistanceCounter: this.daumRunData.distanceInternal
+            deviceTime: this.cyclingData.time,
+            deviceDistanceCounter: this.cyclingData.distanceInternal
         };
         if (this.ignoreHrm)
             delete data.heartrate;
@@ -350,7 +354,7 @@ class DaumAdapterBase extends Device_1.default {
         });
     }
     refreshRequests() {
-        if (!this.daumRunData.isPedalling || this.daumRunData.pedalRpm === 0)
+        if (!this.cyclingData.isPedalling || this.cyclingData.pedalRpm === 0)
             return;
         let bikeRequest = this.getCyclingMode().sendBikeUpdate({ refresh: true }) || {};
         const prev = this.requests[this.requests.length - 1] || {};
@@ -361,7 +365,7 @@ class DaumAdapterBase extends Device_1.default {
     }
     processClientRequest(request) {
         if (request.slope !== undefined) {
-            this.daumRunData.slope = request.slope;
+            this.cyclingData.slope = request.slope;
         }
         return new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
             let bikeRequest = this.getCyclingMode().sendBikeUpdate(request);

package/lib/daum/DaumPowerMeterCyclingMode.d.ts

@@ -0,0 +1,8 @@
+import CyclingMode, { UpdateRequest } from "../CyclingMode";
+import PowerMeterCyclingMode from "../modes/power-meter";
+export default class DaumPowerMeterCyclingMode extends PowerMeterCyclingMode implements CyclingMode {
+    prevRequest: UpdateRequest;
+    hasBikeUpdate: boolean;
+    getBikeInitRequest(): UpdateRequest;
+    sendBikeUpdate(request: UpdateRequest): UpdateRequest;
+}

package/lib/daum/DaumPowerMeterCyclingMode.js

@@ -0,0 +1,21 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const power_meter_1 = __importDefault(require("../modes/power-meter"));
+class DaumPowerMeterCyclingMode extends power_meter_1.default {
+    constructor() {
+        super(...arguments);
+        this.hasBikeUpdate = false;
+    }
+    getBikeInitRequest() {
+        return { slope: 0 };
+    }
+    sendBikeUpdate(request) {
+        super.sendBikeUpdate(request);
+        this.prevRequest = {};
+        return {};
+    }
+}
+exports.default = DaumPowerMeterCyclingMode;

package/lib/daum/ERGCyclingMode.d.ts

@@ -1,17 +1,14 @@
-import { EventLogger } from "gd-eventlog";
-import CyclingMode, { CyclingModeBase, CyclingModeProperty, IncyclistBikeData, UpdateRequest } from "../CyclingMode";
+import CyclingMode, { CyclingModeProperty, IncyclistBikeData, UpdateRequest } from "../CyclingMode";
 import DaumAdapter from "./DaumAdapter";
+import PowerBasedCyclingModeBase from "../modes/power-base";
 export declare type ERGEvent = {
     rpmUpdated?: boolean;
     gearUpdated?: boolean;
     starting?: boolean;
     tsStart?: number;
 };
-export default class ERGCyclingMode extends CyclingModeBase implements CyclingMode {
-    logger: EventLogger;
-    data: IncyclistBikeData;
+export default class ERGCyclingMode extends PowerBasedCyclingModeBase implements CyclingMode {
     prevRequest: UpdateRequest;
-    prevUpdateTS: number;
     hasBikeUpdate: boolean;
     chain: number[];
     cassette: number[];

package/lib/daum/ERGCyclingMode.js

@@ -3,9 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const gd_eventlog_1 = require("gd-eventlog");
 const CyclingMode_1 = require("../CyclingMode");
 const calculations_1 = __importDefault(require("../calculations"));
+const power_base_1 = __importDefault(require("../modes/power-base"));
 const config = {
     name: "ERG",
     description: "Calculates speed based on power and slope. Power is either set by workout or calculated based on gear and cadence",
@@ -14,15 +14,12 @@ const config = {
         { key: 'startPower', name: 'Starting Power', description: 'Initial power in Watts at start of training', type: CyclingMode_1.CyclingModeProperyType.Integer, default: 50, min: 25, max: 800 },
     ]
 };
-class ERGCyclingMode extends CyclingMode_1.CyclingModeBase {
+class ERGCyclingMode extends power_base_1.default {
     constructor(adapter, props) {
         super(adapter, props);
-        this.prevUpdateTS = 0;
         this.hasBikeUpdate = false;
         this.event = {};
-        this.logger = adapter.logger || new gd_eventlog_1.EventLogger('ERGMode');
-        this.data = {};
-        this.logger.logEvent({ message: 'constructor', props });
+        this.initLogger('ERGMode');
     }
     getName() {
         return config.name;
@@ -132,7 +129,6 @@ class ERGCyclingMode extends CyclingMode_1.CyclingModeBase {
         const prevRequest = this.prevRequest || {};
         const data = this.data || {};
         const bikeType = this.getSetting('bikeType').toLowerCase();
-        console.log('~~~ bikeType', bikeType);
         delete this.event.gearUpdated;
         delete this.event.rpmUpdated;
         if (prevData === {} || prevData.speed === undefined || prevData.speed === 0) {
@@ -140,32 +136,25 @@ class ERGCyclingMode extends CyclingMode_1.CyclingModeBase {
             this.event.tsStart = Date.now();
         }
         try {
-            let rpm = bikeData.pedalRpm || 0;
-            let gear = bikeData.gear || 0;
+            const rpm = bikeData.pedalRpm || 0;
+            const gear = bikeData.gear || 0;
             let power = bikeData.power || 0;
-            let slope = (prevData.slope !== undefined ? prevData.slope : prevRequest.slope || 0);
-            let speed;
-            let m = this.adapter.getWeight();
-            let distanceInternal = prevData.distanceInternal || 0;
-            let ts = Date.now();
-            let duration = this.prevUpdateTS === 0 ? 0 : ((ts - this.prevUpdateTS) / 1000);
-            if (rpm === 0 || bikeData.isPedalling === false) {
-                speed = 0;
+            const slope = (prevData.slope !== undefined ? prevData.slope : prevRequest.slope || 0);
+            const distanceInternal = prevData.distanceInternal || 0;
+            if (!bikeData.pedalRpm || bikeData.isPedalling === false) {
                 power = 0;
             }
-            else {
-                speed = calculations_1.default.calculateSpeed(m, power, slope, { bikeType });
-                let v = speed / 3.6;
-                distanceInternal += Math.round(v * duration);
-            }
+            const m = this.getWeight();
+            const t = this.getTimeSinceLastUpdate();
+            const { speed, distance } = this.calculateSpeedAndDistance(power, slope, m, t, { bikeType });
             data.speed = parseFloat(speed.toFixed(1));
             data.power = Math.round(power);
-            data.distanceInternal = distanceInternal;
+            data.distanceInternal = Math.round(distanceInternal + distance);
             data.slope = slope;
             data.pedalRpm = rpm;
             data.gear = gear;
-            if (data.time !== undefined)
-                data.time += duration;
+            if (data.time !== undefined && !(this.event.starting && !bikeData.pedalRpm))
+                data.time += t;
             else
                 data.time = 0;
             data.heartrate = bikeData.heartrate;
@@ -176,7 +165,6 @@ class ERGCyclingMode extends CyclingMode_1.CyclingModeBase {
             if (rpm && rpm !== prevData.pedalRpm) {
                 this.event.rpmUpdated = true;
             }
-            this.prevUpdateTS = ts;
         }
         catch (err) {
             this.logger.logEvent({ message: 'error', fn: 'updateData()', error: err.message || err });
@@ -188,7 +176,7 @@ class ERGCyclingMode extends CyclingMode_1.CyclingModeBase {
     calculateTargetPower(request, updateMode = true) {
         const bikeType = this.getSetting('bikeType').toLowerCase();
         const defaultPower = this.getSetting('startPower');
-        let m = this.adapter.getWeight();
+        let m = this.getWeight();
         const prevData = this.data || {};
         let target;
         if (prevData.pedalRpm && prevData.gear && (!updateMode || prevData.pedalRpm !== 0)) {

package/lib/daum/classic/DaumClassicAdapter.js

@@ -109,7 +109,7 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
                         startState.startProg = true;
                     }
                     if (!startState.setGear) {
-                        yield this.bike.setGear(this.daumRunData.gear || (opts.gear || 10));
+                        yield this.bike.setGear(this.cyclingData.gear || (opts.gear || 10));
                         startState.setGear = true;
                     }
                     const startRequest = this.getCyclingMode().getBikeInitRequest();

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

@@ -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/tcpserial.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const net_1 = __importDefault(require("net"));
 const gd_eventlog_1 = require("gd-eventlog");
-const TIMEOUT_OPEN = 1000;
 var __responses = {};
 class TcpSocketPort {
     constructor(props) {

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;
+    };
+}