incyclist-devices 1.4.23 → 1.4.24

package/lib/ant/AntScanner.js

@@ -22,6 +22,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const gd_eventlog_1 = require("gd-eventlog");
 const DeviceProtocol_1 = __importStar(require("../DeviceProtocol"));
 const AntHrmAdapter_1 = __importDefault(require("./anthrm/AntHrmAdapter"));
+const pwr_adapter_1 = __importDefault(require("./antpwr/pwr-adapter"));
 const AntFEAdapter_1 = __importDefault(require("./antfe/AntFEAdapter"));
 const LOGGER_NAME = 'ANT+Scanner';
 const DEFAULT_SCAN_TIMEOUT = 30000;
@@ -89,7 +90,8 @@ class AntProtocol extends DeviceProtocol_1.default {
         this.scanning = false;
         this.profiles = [
             { name: 'Heartrate Monitor', Adapter: AntHrmAdapter_1.default },
-            { name: 'Smart Trainer', Adapter: AntFEAdapter_1.default }
+            { name: 'Smart Trainer', Adapter: AntFEAdapter_1.default },
+            { name: 'Power Meter', Adapter: pwr_adapter_1.default }
         ];
     }
     add(settings) {

package/lib/ant/antpwr/AntPWRAdapter.d.ts

@@ -0,0 +1,24 @@
+import AntAdapter from '../AntAdapter';
+export default class AntFEAdapter extends AntAdapter {
+    started: boolean;
+    starting: boolean;
+    connected: boolean;
+    distanceInternal?: number;
+    workerId?: any;
+    currentCmd?: any;
+    constructor(DeviceID: any, port: any, stick: any, protocol: any);
+    isBike(): boolean;
+    isHrm(): boolean;
+    isPower(): boolean;
+    getProfile(): string;
+    getName(): string;
+    getDisplayName(): string;
+    onAttached(): void;
+    getLogData(data: any, excludeList: any): any;
+    onDeviceData(deviceData: any): void;
+    onDeviceEvent(data: any): void;
+    updateData(data: any, deviceData: any): any;
+    transformData(bikeData: any): any;
+    start(props?: any): Promise<any>;
+    stop(): Promise<boolean>;
+}

package/lib/ant/antpwr/AntPWRAdapter.js

@@ -0,0 +1,252 @@
+"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 __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 AntAdapter_1 = __importDefault(require("../AntAdapter"));
+const utils_1 = require("../utils");
+const floatVal = (d) => d ? parseFloat(d) : d;
+const intVal = (d) => d ? parseInt(d) : d;
+const hex = (v) => Math.abs(v).toString(16).toUpperCase();
+const DEFAULT_START_TIMEOUT = 5000;
+class AntFEAdapter extends AntAdapter_1.default {
+    constructor(DeviceID, port, stick, protocol) {
+        super(protocol);
+        this.logger = new gd_eventlog_1.EventLogger('Ant+PWR');
+        this.logger.logEvent({ message: 'Ant+PWR Adapter created', DeviceID, port });
+        this.deviceID = DeviceID;
+        this.port = port;
+        this.stick = stick;
+        this.deviceData = {
+            DeviceID
+        };
+        this.data = {};
+        this.started = false;
+        this.starting = false;
+        this.connected = false;
+    }
+    isBike() { return true; }
+    isHrm() { return false; }
+    isPower() { return true; }
+    getProfile() {
+        return 'Power Meter';
+    }
+    getName() {
+        return `Ant+PWR ${this.deviceID}`;
+    }
+    getDisplayName() {
+        const { DeviceID, ManId } = this.deviceData;
+        return `${utils_1.getBrand(ManId)} PWR ${DeviceID}`;
+    }
+    onAttached() {
+        this.logger.logEvent({ message: 'Device connected' });
+        this.connected = true;
+    }
+    getLogData(data, excludeList) {
+        const logData = JSON.parse(JSON.stringify(data));
+        excludeList.forEach((key) => {
+            delete logData[key];
+        });
+        return logData;
+    }
+    onDeviceData(deviceData) {
+        if (!this.started || this.isStopped())
+            return;
+        this.deviceData = deviceData;
+        try {
+            if (this.onDataFn && !(this.ignoreBike && this.ignorePower) && !this.paused) {
+                if (!this.lastUpdate || (Date.now() - this.lastUpdate) > this.updateFrequency) {
+                    const logData = this.getLogData(deviceData, ['PairedDevices', 'RawData']);
+                    this.logger.logEvent({ message: 'onDeviceData', data: logData });
+                    this.data = this.updateData(this.data, deviceData);
+                    const data = this.transformData(this.data);
+                    this.onDataFn(data);
+                    this.lastUpdate = Date.now();
+                }
+            }
+        }
+        catch (err) {
+        }
+    }
+    onDeviceEvent(data) {
+        try {
+            const cmdInfo = this.currentCmd;
+            if (!cmdInfo)
+                return;
+            const msg = cmdInfo.msg.readUInt8(2);
+            const Constants = this.getProtocol().getAnt().Constants;
+            const { expectedResponse } = cmdInfo;
+            if (data.message === msg) {
+                if (expectedResponse === undefined && data.code === Constants.EVENT_TRANSFER_TX_COMPLETED) {
+                    this.currentCmd.response = { success: true, message: hex(data.message), code: hex(data.code) };
+                    return;
+                }
+                if (expectedResponse === undefined && data.code !== Constants.EVENT_TRANSFER_TX_COMPLETED) {
+                    this.currentCmd.response = { success: false, message: hex(data.message), code: hex(data.code) };
+                    return;
+                }
+            }
+            if (data.message === 1) {
+                if (expectedResponse !== undefined && data.code === expectedResponse) {
+                    this.currentCmd.response = { success: true, message: hex(data.message), code: hex(data.code) };
+                    return;
+                }
+                if (expectedResponse === undefined && (data.code === Constants.EVENT_TRANSFER_TX_COMPLETED || data.code === 3)) {
+                    this.currentCmd.response = { success: true, message: hex(data.message), code: hex(data.code) };
+                    return;
+                }
+                if (data.code === Constants.EVENT_TRANSFER_TX_FAILED || data.code === Constants.EVENT_CHANNEL_COLLISION) {
+                    this.currentCmd.response = { success: false, message: hex(data.message), code: hex(data.code) };
+                    return;
+                }
+            }
+            if (this.currentCmd !== undefined && data.message === Constants.MESSAGE_CHANNEL_ACKNOWLEDGED_DATA && data.code === 31) {
+                this.logger.log("could not send (TRANSFER_IN_PROGRESS)");
+                this.currentCmd.response = { success: false, message: hex(data.message), code: hex(data.code) };
+                return;
+            }
+            this.logger.logEvent({ message: "Incoming Event ", event: { message: hex(data.message), code: hex(data.code) } });
+        }
+        catch (err) {
+            this.logger.logEvent({ message: 'Error', fn: 'parseEvent', event: { message: hex(data.message), code: hex(data.code) }, error: err.message || err });
+        }
+    }
+    updateData(data, deviceData) {
+        return;
+        if (data.distanceOffs === undefined)
+            data.distanceOffs = 0;
+        data.speed = (deviceData.VirtualSpeed !== undefined ? deviceData.VirtualSpeed : deviceData.RealSpeed) * 3.6;
+        data.slope = (deviceData.Incline !== undefined ? deviceData.Incline : data.slope);
+        data.power = (deviceData.InstantaneousPower !== undefined ? deviceData.InstantaneousPower : data.power);
+        data.pedalRpm = (deviceData.Cadence !== undefined ? deviceData.Cadence : data.pedalRpm);
+        data.heartrate = (deviceData.HeartRate !== undefined ? deviceData.HeartRate : data.heartrate);
+        if (deviceData.Distance !== undefined && deviceData.Distance !== 0) {
+            data.distanceInternal = deviceData.Distance - data.distanceOffs;
+            data.distance = data.distanceInternal / 1000;
+        }
+        else {
+            if (this.lastUpdate && deviceData.Cadence !== undefined && deviceData.Cadence > 0 && data.speed) {
+                const t = (Date.now() - this.lastUpdate) / 1000;
+                const prevDistance = data.distanceInternal || 0;
+                data.distanceInternal = Math.round(data.speed / 3.6 * t) + prevDistance;
+                data.distance = data.distanceInternal / 1000;
+            }
+        }
+        return data;
+    }
+    transformData(bikeData) {
+        return;
+        if (bikeData === undefined)
+            return;
+        let distance = 0;
+        if (this.distanceInternal !== undefined && bikeData.distanceInternal !== undefined) {
+            distance = intVal(bikeData.distanceInternal - this.distanceInternal);
+        }
+        if (bikeData.distanceInternal !== undefined)
+            this.distanceInternal = bikeData.distanceInternal;
+        let data = {
+            speed: floatVal(bikeData.speed),
+            slope: floatVal(bikeData.slope),
+            power: intVal(bikeData.power),
+            cadence: intVal(bikeData.pedalRpm),
+            heartrate: intVal(bikeData.heartrate),
+            distance,
+            timestamp: Date.now()
+        };
+        if (this.ignorePower) {
+            delete data.power;
+            delete data.cadence;
+        }
+        if (this.ignoreBike) {
+            data = { heartrate: data.heartrate };
+        }
+        if (this.ignoreHrm)
+            delete data.heartrate;
+        return data;
+    }
+    start(props) {
+        const _super = Object.create(null, {
+            start: { get: () => super.start }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            yield _super.start.call(this, props);
+            this.logger.logEvent({ message: 'start()', props });
+            const opts = props || {};
+            const { args = {} } = opts;
+            return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+                if (this.ignoreBike && this.ignorePower) {
+                    this.logger.logEvent({ message: 'start() not done: bike disabled' });
+                    return resolve(false);
+                }
+                if (this.starting) {
+                    this.logger.logEvent({ message: 'start() not done: bike starting' });
+                    return resolve(false);
+                }
+                if (this.started) {
+                    this.logger.logEvent({ message: 'start() done: bike was already started' });
+                    return resolve(true);
+                }
+                this.starting = true;
+                const Ant = this.getProtocol().getAnt();
+                const protocol = this.getProtocol();
+                let start = Date.now();
+                let timeout = start + (args.timeout || DEFAULT_START_TIMEOUT);
+                const iv = setInterval(() => {
+                    if (Date.now() > timeout) {
+                        clearInterval(iv);
+                        this.starting = false;
+                        reject(new Error('timeout'));
+                    }
+                    if (this.isStopped()) {
+                        clearInterval(iv);
+                        this.starting = false;
+                        reject(new Error('stopped'));
+                    }
+                }, 100);
+                protocol.attachSensors(this, Ant.BicyclePowerSensor, 'powerData')
+                    .then(() => {
+                    this.starting = false;
+                    this.started = true;
+                    clearInterval(iv);
+                    resolve(true);
+                })
+                    .catch(err => reject(err));
+            }));
+        });
+    }
+    stop() {
+        const _super = Object.create(null, {
+            stop: { get: () => super.stop }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            yield _super.stop.call(this);
+            this.logger.logEvent({ message: 'stop()' });
+            return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+                this.starting = false;
+                return resolve(true);
+                this.started = false;
+                if (this.ignoreHrm)
+                    return resolve(false);
+                try {
+                    const protocol = this.getProtocol();
+                    yield protocol.detachSensor(this);
+                    resolve(true);
+                }
+                catch (err) {
+                    reject(err);
+                }
+            }));
+        });
+    }
+}
+exports.default = AntFEAdapter;

package/lib/ant/antpwr/pwr-adapter.d.ts

@@ -0,0 +1,48 @@
+import AntAdapter from '../AntAdapter';
+import { IncyclistBikeData } from '../../CyclingMode';
+import CyclingMode from '../../CyclingMode';
+import { DeviceData } from '../../Device';
+export declare type AntPwrData = {
+    DeviceID: number;
+    PedalPower?: number;
+    RightPedalPower?: number;
+    LeftPedalPower?: number;
+    Cadence?: number;
+    AccumulatedPower?: number;
+    Power?: number;
+    offset?: number;
+    EventCount?: number;
+    TimeStamp?: number;
+    Slope?: number;
+    TorqueTicksStamp?: number;
+    CalculatedCadence?: number;
+    CalculatedTorque?: number;
+    CalculatedPower?: number;
+};
+export default class AntFEAdapter extends AntAdapter {
+    started: boolean;
+    starting: boolean;
+    connected: boolean;
+    distanceInternal?: number;
+    workerId?: any;
+    currentCmd?: any;
+    mode: CyclingMode;
+    constructor(DeviceID: any, port: any, stick: any, protocol: any);
+    isBike(): boolean;
+    isHrm(): boolean;
+    isPower(): boolean;
+    getProfile(): string;
+    getName(): string;
+    getDisplayName(): string;
+    getCyclingMode(): CyclingMode;
+    getDefaultCyclingMode(): CyclingMode;
+    onAttached(): void;
+    getLogData(data: any, excludeList: any): any;
+    onDeviceData(deviceData: AntPwrData): void;
+    onDeviceEvent(data: any): void;
+    sendUpdate(request: any): void;
+    mapData(deviceData: AntPwrData): IncyclistBikeData;
+    transformData(bikeData: IncyclistBikeData): DeviceData;
+    start(props?: any): Promise<any>;
+    stop(): Promise<boolean>;
+}

package/lib/ant/antpwr/pwr-adapter.js

@@ -0,0 +1,259 @@
+"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 __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 AntAdapter_1 = __importDefault(require("../AntAdapter"));
+const utils_1 = require("../utils");
+const power_meter_1 = __importDefault(require("../../modes/power-meter"));
+const floatVal = (d) => d ? parseFloat(d) : d;
+const intVal = (d) => d ? parseInt(d) : d;
+const hex = (v) => Math.abs(v).toString(16).toUpperCase();
+const DEFAULT_START_TIMEOUT = 5000;
+class AntFEAdapter extends AntAdapter_1.default {
+    constructor(DeviceID, port, stick, protocol) {
+        super(protocol);
+        this.logger = new gd_eventlog_1.EventLogger('Ant+PWR');
+        this.logger.logEvent({ message: 'Ant+PWR Adapter created', DeviceID, port });
+        this.deviceID = DeviceID;
+        this.port = port;
+        this.stick = stick;
+        this.deviceData = {
+            DeviceID
+        };
+        this.data = {};
+        this.started = false;
+        this.starting = false;
+        this.connected = false;
+        this.mode = this.getDefaultCyclingMode();
+    }
+    isBike() { return true; }
+    isHrm() { return false; }
+    isPower() { return true; }
+    getProfile() {
+        return 'Power Meter';
+    }
+    getName() {
+        return `Ant+PWR ${this.deviceID}`;
+    }
+    getDisplayName() {
+        const { DeviceID, ManId } = this.deviceData;
+        return `${utils_1.getBrand(ManId)} PWR ${DeviceID}`;
+    }
+    getCyclingMode() {
+        if (!this.mode)
+            this.mode = this.getDefaultCyclingMode();
+        return this.mode;
+    }
+    getDefaultCyclingMode() {
+        return new power_meter_1.default(this);
+    }
+    onAttached() {
+        this.logger.logEvent({ message: 'Device connected' });
+        this.connected = true;
+    }
+    getLogData(data, excludeList) {
+        const logData = JSON.parse(JSON.stringify(data));
+        excludeList.forEach((key) => {
+            delete logData[key];
+        });
+        return logData;
+    }
+    onDeviceData(deviceData) {
+        if (!this.started || this.isStopped())
+            return;
+        this.deviceData = deviceData;
+        try {
+            if (this.onDataFn && !(this.ignoreBike && this.ignorePower) && !this.paused) {
+                if (!this.lastUpdate || (Date.now() - this.lastUpdate) > this.updateFrequency) {
+                    const logData = this.getLogData(deviceData, ['PairedDevices', 'RawData']);
+                    this.logger.logEvent({ message: 'onDeviceData', data: logData });
+                    let incyclistData = this.mapData(deviceData);
+                    incyclistData = this.getCyclingMode().updateData(incyclistData);
+                    const data = this.transformData(incyclistData);
+                    this.onDataFn(data);
+                    this.lastUpdate = Date.now();
+                }
+            }
+        }
+        catch (err) {
+        }
+    }
+    onDeviceEvent(data) {
+        try {
+            const cmdInfo = this.currentCmd;
+            if (!cmdInfo)
+                return;
+            const msg = cmdInfo.msg.readUInt8(2);
+            const Constants = this.getProtocol().getAnt().Constants;
+            const { expectedResponse } = cmdInfo;
+            if (data.message === msg) {
+                if (expectedResponse === undefined && data.code === Constants.EVENT_TRANSFER_TX_COMPLETED) {
+                    this.currentCmd.response = { success: true, message: hex(data.message), code: hex(data.code) };
+                    return;
+                }
+                if (expectedResponse === undefined && data.code !== Constants.EVENT_TRANSFER_TX_COMPLETED) {
+                    this.currentCmd.response = { success: false, message: hex(data.message), code: hex(data.code) };
+                    return;
+                }
+            }
+            if (data.message === 1) {
+                if (expectedResponse !== undefined && data.code === expectedResponse) {
+                    this.currentCmd.response = { success: true, message: hex(data.message), code: hex(data.code) };
+                    return;
+                }
+                if (expectedResponse === undefined && (data.code === Constants.EVENT_TRANSFER_TX_COMPLETED || data.code === 3)) {
+                    this.currentCmd.response = { success: true, message: hex(data.message), code: hex(data.code) };
+                    return;
+                }
+                if (data.code === Constants.EVENT_TRANSFER_TX_FAILED || data.code === Constants.EVENT_CHANNEL_COLLISION) {
+                    this.currentCmd.response = { success: false, message: hex(data.message), code: hex(data.code) };
+                    return;
+                }
+            }
+            if (this.currentCmd !== undefined && data.message === Constants.MESSAGE_CHANNEL_ACKNOWLEDGED_DATA && data.code === 31) {
+                this.logger.log("could not send (TRANSFER_IN_PROGRESS)");
+                this.currentCmd.response = { success: false, message: hex(data.message), code: hex(data.code) };
+                return;
+            }
+            this.logger.logEvent({ message: "Incoming Event ", event: { message: hex(data.message), code: hex(data.code) } });
+        }
+        catch (err) {
+            this.logger.logEvent({ message: 'Error', fn: 'parseEvent', event: { message: hex(data.message), code: hex(data.code) }, error: err.message || err });
+        }
+    }
+    sendUpdate(request) {
+        if (this.paused)
+            return;
+        this.getCyclingMode().sendBikeUpdate(request);
+    }
+    mapData(deviceData) {
+        const data = {
+            isPedalling: false,
+            power: 0,
+            pedalRpm: 0,
+            speed: 0,
+            heartrate: 0,
+            distanceInternal: 0,
+            slope: undefined,
+            time: undefined
+        };
+        data.slope = (deviceData.Slope !== undefined ? deviceData.Slope : data.slope);
+        data.power = (deviceData.Power !== undefined ? deviceData.Power : data.power);
+        data.pedalRpm = (deviceData.Cadence !== undefined ? deviceData.Cadence : data.pedalRpm);
+        data.time = (deviceData.TimeStamp !== undefined ? deviceData.TimeStamp : data.time);
+        data.isPedalling = data.pedalRpm > 0;
+        return data;
+    }
+    transformData(bikeData) {
+        if (bikeData === undefined)
+            return;
+        let distance = 0;
+        if (this.distanceInternal !== undefined && bikeData.distanceInternal !== undefined) {
+            distance = intVal(bikeData.distanceInternal - this.distanceInternal);
+        }
+        if (bikeData.distanceInternal !== undefined)
+            this.distanceInternal = bikeData.distanceInternal;
+        let data = {
+            speed: floatVal(bikeData.speed),
+            slope: floatVal(bikeData.slope),
+            power: intVal(bikeData.power),
+            cadence: intVal(bikeData.pedalRpm),
+            distance,
+            timestamp: Date.now()
+        };
+        if (this.ignorePower) {
+            delete data.power;
+            delete data.cadence;
+        }
+        if (this.ignoreBike) {
+            data = {};
+        }
+        return data;
+    }
+    start(props) {
+        const _super = Object.create(null, {
+            start: { get: () => super.start }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            yield _super.start.call(this, props);
+            this.logger.logEvent({ message: 'start()', props });
+            const opts = props || {};
+            const { args = {} } = opts;
+            return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+                if (this.ignoreBike && this.ignorePower) {
+                    this.logger.logEvent({ message: 'start() not done: bike disabled' });
+                    return resolve(false);
+                }
+                if (this.starting) {
+                    this.logger.logEvent({ message: 'start() not done: bike starting' });
+                    return resolve(false);
+                }
+                if (this.started) {
+                    this.logger.logEvent({ message: 'start() done: bike was already started' });
+                    return resolve(true);
+                }
+                this.starting = true;
+                const Ant = this.getProtocol().getAnt();
+                const protocol = this.getProtocol();
+                let start = Date.now();
+                let timeout = start + (args.timeout || DEFAULT_START_TIMEOUT);
+                const iv = setInterval(() => {
+                    if (Date.now() > timeout) {
+                        clearInterval(iv);
+                        this.starting = false;
+                        reject(new Error('timeout'));
+                    }
+                    if (this.isStopped()) {
+                        clearInterval(iv);
+                        this.starting = false;
+                        reject(new Error('stopped'));
+                    }
+                }, 100);
+                protocol.attachSensors(this, Ant.BicyclePowerSensor, 'powerData')
+                    .then(() => {
+                    this.starting = false;
+                    this.started = true;
+                    clearInterval(iv);
+                    resolve(true);
+                })
+                    .catch(err => reject(err));
+            }));
+        });
+    }
+    stop() {
+        const _super = Object.create(null, {
+            stop: { get: () => super.stop }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            yield _super.stop.call(this);
+            this.logger.logEvent({ message: 'stop()' });
+            return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+                this.starting = false;
+                return resolve(true);
+                this.started = false;
+                if (this.ignoreHrm)
+                    return resolve(false);
+                try {
+                    const protocol = this.getProtocol();
+                    yield protocol.detachSensor(this);
+                    resolve(true);
+                }
+                catch (err) {
+                    reject(err);
+                }
+            }));
+        });
+    }
+}
+exports.default = AntFEAdapter;

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

@@ -23,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);

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/modes/power-meter.d.ts

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

package/lib/modes/power-meter.js

@@ -0,0 +1,86 @@
+"use strict";
+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 Device_1 = require("../Device");
+const calculations_1 = __importDefault(require("../calculations"));
+const config = {
+    name: 'PowerMeter',
+    description: 'Power and cadence are taken from device. Speed is calculated from power and current slope\nThis mode will not respect maximum power and/or workout limits',
+    properties: []
+};
+class PowerMeterCyclingMode extends CyclingMode_1.CyclingModeBase {
+    constructor(adapter, props) {
+        super(adapter, props);
+        this.prevUpdateTS = 0;
+        this.hasBikeUpdate = false;
+        const a = adapter;
+        this.logger = (a && a.getLogger) ? a.getLogger() : undefined;
+        if (!this.logger)
+            this.logger = new gd_eventlog_1.EventLogger('PowerMeter');
+    }
+    getName() {
+        return config.name;
+    }
+    getDescription() {
+        return config.description;
+    }
+    getProperties() {
+        return config.properties;
+    }
+    getProperty(name) {
+        return config.properties.find(p => p.name === name);
+    }
+    getBikeInitRequest() {
+        return {};
+    }
+    sendBikeUpdate(request) {
+        if (request.slope)
+            this.data.slope = request.slope;
+        this.logger.logEvent({ message: "processing update request", request, prev: this.prevRequest });
+        this.prevRequest = {};
+        return {};
+    }
+    updateData(data) {
+        try {
+            const prevData = this.data || {};
+            const prevRequest = this.prevRequest || {};
+            const bikeData = JSON.parse(JSON.stringify(data));
+            let power = data.power || 0;
+            let speed = data.speed || 0;
+            let slope = (prevData.slope !== undefined ? prevData.slope : prevRequest.slope || 0);
+            let distanceInternal = prevData.distanceInternal || 0;
+            if (!bikeData.pedalRpm || bikeData.isPedalling === false) {
+                speed = 0;
+                power = 0;
+            }
+            let ts = Date.now();
+            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);
+            data.distanceInternal = Math.round(distanceInternal);
+            data.slope = slope;
+            this.logger.logEvent({ message: "updateData result", data, bikeData, prevRequest: {}, prevSpeed: prevData.speed });
+            this.data = JSON.parse(JSON.stringify(data));
+            this.prevUpdateTS = ts;
+        }
+        catch (err) {
+            this.logger.logEvent({ message: 'error', fn: 'updateData()', error: err.message || err });
+        }
+        return data;
+    }
+}
+exports.default = PowerMeterCyclingMode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-devices",
-  "version": "1.4.23",
+  "version": "1.4.24",
   "dependencies": {
     "@serialport/parser-byte-length": "^9.0.1",
     "@serialport/parser-delimiter": "^9.0.1",