incyclist-devices 2.1.0 → 2.1.2

package/lib/serial/daum/premium/comms.js

@@ -12,12 +12,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const consts_1 = require("../consts");
 const utils_1 = require("./utils");
 const types_1 = require("./types");
+const types_2 = require("../types");
+const types_3 = require("./types");
 const utils_2 = require("../../../utils/utils");
-const comms_1 = __importDefault(require("../../comms"));
-const consts_2 = require("./consts");
+const comms_1 = __importDefault(require("../../base/comms"));
+const consts_1 = require("./consts");
 class Daum8i extends comms_1.default {
     validatePath(path) {
         return (0, utils_1.validatePath)(path);
@@ -26,10 +27,10 @@ class Daum8i extends comms_1.default {
         return 'DaumPremium';
     }
     getAckTimeoutValue() {
-        return consts_2.DEFAULT_ACK_TIMEOUT;
+        return consts_1.DEFAULT_ACK_TIMEOUT;
     }
     getTimeoutValue() {
-        return consts_2.DEFAULT_TIMEOUT;
+        return consts_1.DEFAULT_TIMEOUT;
     }
     onConnected() {
         this.sp.on('data', this.onData.bind(this));
@@ -103,7 +104,7 @@ class Daum8i extends comms_1.default {
                             this.recvState.data.enqueue({ type: 'Response', cmd: cmd.substring(0, 3), data: payload });
                         }
                         else {
-                            const error = new types_1.CheckSumError();
+                            const error = new types_3.CheckSumError();
                             this.recvState.data.enqueue({ type: 'Error', error, data: cmd });
                             this.recvState.waitingForACK = false;
                             this.recvState.waitingForStart = true;
@@ -176,7 +177,7 @@ class Daum8i extends comms_1.default {
                         }
                         if (response.type === 'Error') {
                             this.logEvent(Object.assign(Object.assign({ message: `sendCommand:received:ERROR` }, logPayload), { error: response.error.message }));
-                            if (response.error instanceof types_1.CheckSumError && retry < 5) {
+                            if (response.error instanceof types_3.CheckSumError && retry < 5) {
                                 checksumFailure = true;
                                 yield this.sendNAK(logPayload);
                                 retry++;
@@ -230,7 +231,7 @@ class Daum8i extends comms_1.default {
                     }
                 }
             }
-            throw new types_1.ACKTimeout();
+            throw new types_3.ACKTimeout();
         });
     }
     waitForResponse() {
@@ -248,7 +249,7 @@ class Daum8i extends comms_1.default {
                     return response;
                 }
             }
-            throw new types_1.ResponseTimeout();
+            throw new types_2.ResponseTimeout();
         });
     }
     write(buffer, ackExpected = true) {
@@ -320,11 +321,11 @@ class Daum8i extends comms_1.default {
             const str = yield this.sendStrCommand('getActualBikeType', 'M72');
             let deviceType;
             if (str === '0')
-                deviceType = consts_1.ACTUAL_BIKE_TYPE.ALLROUND;
+                deviceType = types_1.ACTUAL_BIKE_TYPE.ALLROUND;
             else if (str === '1')
-                deviceType = consts_1.ACTUAL_BIKE_TYPE.RACE;
+                deviceType = types_1.ACTUAL_BIKE_TYPE.RACE;
             else if (str === '2')
-                deviceType = consts_1.ACTUAL_BIKE_TYPE.MOUNTAIN;
+                deviceType = types_1.ACTUAL_BIKE_TYPE.MOUNTAIN;
             else {
                 throw (new Error(`unknown actual device type ${typeof str === 'string' ? (0, utils_1.ascii)(str.charAt(0)) : str}`));
             }
@@ -336,16 +337,16 @@ class Daum8i extends comms_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             let bikeType;
             switch (actualBikeType) {
-                case consts_1.ACTUAL_BIKE_TYPE.ALLROUND:
+                case types_1.ACTUAL_BIKE_TYPE.ALLROUND:
                     bikeType = '0';
                     break;
-                case consts_1.ACTUAL_BIKE_TYPE.RACE:
+                case types_1.ACTUAL_BIKE_TYPE.RACE:
                     bikeType = '1';
                     break;
-                case consts_1.ACTUAL_BIKE_TYPE.TRIATHLON:
+                case types_1.ACTUAL_BIKE_TYPE.TRIATHLON:
                     bikeType = '1';
                     break;
-                case consts_1.ACTUAL_BIKE_TYPE.MOUNTAIN:
+                case types_1.ACTUAL_BIKE_TYPE.MOUNTAIN:
                     bikeType = '2';
                     break;
                 default:
@@ -354,11 +355,11 @@ class Daum8i extends comms_1.default {
             const str = yield this.sendStrCommand('setActualBikeType', `M72${bikeType}`);
             let deviceType;
             if (str === '0')
-                deviceType = consts_1.ACTUAL_BIKE_TYPE.ALLROUND;
+                deviceType = types_1.ACTUAL_BIKE_TYPE.ALLROUND;
             else if (str === '1')
-                deviceType = consts_1.ACTUAL_BIKE_TYPE.RACE;
+                deviceType = types_1.ACTUAL_BIKE_TYPE.RACE;
             else if (str === '2')
-                deviceType = consts_1.ACTUAL_BIKE_TYPE.MOUNTAIN;
+                deviceType = types_1.ACTUAL_BIKE_TYPE.MOUNTAIN;
             else
                 throw (new Error('unknown actual device type'));
             this.actualBikeType = deviceType;
@@ -462,7 +463,7 @@ class Daum8i extends comms_1.default {
             const epp = route ? (0, utils_1.routeToEpp)(route) : undefined;
             const eppLength = epp ? epp.length : 0;
             const bikeTypeVal = (0, utils_1.getBikeType)(bikeType);
-            const wBits = route.lapMode ? consts_2.DS_BITS_ENDLESS_RACE : consts_2.DS_BITS_OFF;
+            const wBits = route.lapMode ? consts_1.DS_BITS_ENDLESS_RACE : consts_1.DS_BITS_OFF;
             payload.writeInt32LE(0, 0);
             payload.writeInt8(bikeTypeVal, 4);
             payload.writeInt8(0, 5);
@@ -492,7 +493,7 @@ class Daum8i extends comms_1.default {
             const remaining = epp.length - offset;
             if (remaining <= 0)
                 return Promise.resolve(true);
-            const size = remaining > consts_2.MAX_DATA_BLOCK_SIZE ? consts_2.MAX_DATA_BLOCK_SIZE : remaining;
+            const size = remaining > consts_1.MAX_DATA_BLOCK_SIZE ? consts_1.MAX_DATA_BLOCK_SIZE : remaining;
             const payload = Buffer.alloc(size + 8);
             payload.writeInt32LE(size, 0);
             payload.writeInt32LE(offset, 4);
@@ -553,7 +554,7 @@ class Daum8i extends comms_1.default {
                         done = true;
                     while (success && !done) {
                         success = yield this.programUploadSendBlock(epp, offset);
-                        offset += consts_2.MAX_DATA_BLOCK_SIZE;
+                        offset += consts_1.MAX_DATA_BLOCK_SIZE;
                         done = offset >= epp.length;
                         if (onStatusUpdate)
                             onStatusUpdate(done ? epp.length : offset, epp.length);

package/lib/serial/daum/premium/mock.d.ts

@@ -2,7 +2,7 @@
 /// <reference types="node" />
 import { MockBindingInterface, MockPortBinding, CreatePortOptions } from '@serialport/binding-mock';
 import { BindingInterface } from '@serialport/bindings-interface';
-import { User } from '../../../types/user';
+import { User } from '../../../types';
 export type MockProps = {
     interface: string;
     path: string;

package/lib/serial/daum/premium/mock.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Daum8iMockBinding = exports.parseProgramListNewData = exports.Daum8MockSimulator = exports.Daum8iMockImpl = exports.Daum8iMock = void 0;
 const binding_mock_1 = require("@serialport/binding-mock");
 const __1 = require("../../");
-const user_1 = require("../../../types/user");
+const types_1 = require("../../../types");
 const utils_1 = require("../../../utils/utils");
 const utils_2 = require("./utils");
 const consts_1 = require("./consts");
@@ -99,7 +99,7 @@ class Daum8MockSimulator {
         this.power = 0;
         this.currentPower = 0;
         this.loadControl = 1;
-        this.person = { weight: 75, length: 180, age: 30, sex: user_1.Gender.MALE };
+        this.person = { weight: 75, length: 180, age: 30, sex: types_1.Gender.MALE };
         this.data = DEFAULT_TRAINING_DATA;
         this.openHandles = [];
         this._isSimulateACKTimeout = false;

package/lib/serial/daum/premium/types.d.ts

@@ -1,7 +1,30 @@
-import { DaumBikeData, DeviceProperties } from "../../../types/device";
-import { Route } from "../../../types/route";
+import { DeviceProperties } from "../../../types";
 import { Queue } from "../../../utils/utils";
-import { Request, Response } from "../../comms";
+import { Request, Response } from "../../base/comms";
+export type Point = {
+    lat?: number;
+    lng?: number;
+    elevation?: number;
+    distance: number;
+    slope?: number;
+};
+export type Route = {
+    programId: number;
+    points: Point[];
+    type: string;
+    name?: string;
+    description?: string;
+    lapMode: boolean;
+    totalDistance: number;
+    minElevation?: number;
+    maxElevation?: number;
+    sampleRate?: number;
+};
+export interface DaumPremiumDeviceProperties extends DeviceProperties {
+    route?: Route;
+    gear?: number;
+    onStatusUpdate?: OnDeviceStartCallback;
+}
 export declare class CheckSumError extends Error {
     constructor();
 }
@@ -11,21 +34,7 @@ export declare class ACKTimeout extends Error {
 export declare class BusyTimeout extends Error {
     constructor();
 }
-export declare class ResponseTimeout extends Error {
-    constructor();
-}
-export interface DaumPremiumBikeData extends DaumBikeData {
-}
 export type OnDeviceStartCallback = (completed: number, total: number) => void;
-export type DaumPremiumAdapterProps = {
-    path: string;
-    ifaceName: string;
-};
-export interface Daum8iDeviceProperties extends DeviceProperties {
-    route?: Route;
-    gear?: number;
-    onStatusUpdate?: OnDeviceStartCallback;
-}
 export interface DaumPremiumRequest extends Request {
     command: string;
     payload?: string | Uint8Array;
@@ -44,3 +53,9 @@ export type DaumPremiumCommsState = {
     partialCmd?: any;
     data: Queue<ResponseObject>;
 };
+export declare enum ACTUAL_BIKE_TYPE {
+    ALLROUND = "allround",
+    RACE = "race",
+    MOUNTAIN = "mountain",
+    TRIATHLON = "triathlon"
+}

package/lib/serial/daum/premium/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ResponseTimeout = exports.BusyTimeout = exports.ACKTimeout = exports.CheckSumError = void 0;
+exports.ACTUAL_BIKE_TYPE = exports.BusyTimeout = exports.ACKTimeout = exports.CheckSumError = void 0;
 class CheckSumError extends Error {
     constructor() {
         super();
@@ -22,10 +22,10 @@ class BusyTimeout extends Error {
     }
 }
 exports.BusyTimeout = BusyTimeout;
-class ResponseTimeout extends Error {
-    constructor() {
-        super();
-        this.message = 'RESP timeout';
-    }
-}
-exports.ResponseTimeout = ResponseTimeout;
+var ACTUAL_BIKE_TYPE;
+(function (ACTUAL_BIKE_TYPE) {
+    ACTUAL_BIKE_TYPE["ALLROUND"] = "allround";
+    ACTUAL_BIKE_TYPE["RACE"] = "race";
+    ACTUAL_BIKE_TYPE["MOUNTAIN"] = "mountain";
+    ACTUAL_BIKE_TYPE["TRIATHLON"] = "triathlon";
+})(ACTUAL_BIKE_TYPE || (exports.ACTUAL_BIKE_TYPE = ACTUAL_BIKE_TYPE = {}));

package/lib/serial/daum/premium/utils.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="node" />
-import { IncyclistBikeData } from "../../..";
-import { Route } from "../../../types/route";
-import { User } from "../../../types/user";
+import { User, IncyclistBikeData } from "../../../types";
+import { Route } from "./types";
 export declare const DEBUG_LOGGER: {
     log: (e: any, ...args: any[]) => void;
     logEvent: (event: any) => void;

package/lib/serial/daum/premium/utils.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parsePersonData = exports.getPersonData = exports.parseTrainingData = exports.routeToEpp = exports.FileTimeSupport = exports.getBikeType = exports.BikeType = exports.ReservedCommands = exports.getAsciiArrayFromStr = exports.ascii = exports.hexstr = exports.getMessageData = exports.buildMessage = exports.checkSum = exports.esc2bin = exports.bin2esc = exports.validatePath = exports.validateHost = exports.responseLog = exports.DEBUG_LOGGER = void 0;
-const user_1 = require("../../../types/user");
+const types_1 = require("../../../types");
 const win32filetime_1 = __importDefault(require("win32filetime"));
 const sum = (arr) => arr.reduce((a, b) => a + b, 0);
 exports.DEBUG_LOGGER = {
@@ -323,7 +323,7 @@ function getPersonData(user) {
         buffer.writeUInt8(0, offset);
         offset += 1;
     }
-    buffer.writeInt32LE(user && user.sex === user_1.Gender.FEMALE ? 2 : 1, offset);
+    buffer.writeInt32LE(user && user.sex === types_1.Gender.FEMALE ? 2 : 1, offset);
     offset += 4;
     buffer.writeInt32LE(user && user.age !== undefined ? user.age : 1, offset);
     offset += 4;
@@ -344,7 +344,7 @@ function parsePersonData(buffer) {
     const length = buffer.readInt32LE(120);
     const weight = buffer.readFloatLE(124);
     const age = valAge > 1 ? valAge : undefined;
-    const sex = valSex === 2 ? user_1.Gender.FEMALE : user_1.Gender.MALE;
+    const sex = valSex === 2 ? types_1.Gender.FEMALE : types_1.Gender.MALE;
     return { length, weight, age, sex };
 }
 exports.parsePersonData = parsePersonData;

package/lib/serial/daum/types.d.ts

@@ -1,4 +1,4 @@
-export default abstract class DaumSerialComms {
+export declare abstract class DaumSerialComms {
     serial: any;
     abstract getPort(): string;
     abstract pauseLogging(): void;
@@ -9,3 +9,6 @@ export default abstract class DaumSerialComms {
     abstract setTargetSlope(slope: number): Promise<void>;
     abstract setTargetPower(power: number): Promise<void>;
 }
+export declare class ResponseTimeout extends Error {
+    constructor();
+}

package/lib/serial/daum/types.js

@@ -1,5 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ResponseTimeout = exports.DaumSerialComms = void 0;
 class DaumSerialComms {
 }
-exports.default = DaumSerialComms;
+exports.DaumSerialComms = DaumSerialComms;
+class ResponseTimeout extends Error {
+    constructor() {
+        super();
+        this.message = 'RESP timeout';
+    }
+}
+exports.ResponseTimeout = ResponseTimeout;

package/lib/serial/factories/adapter-factory.d.ts

@@ -0,0 +1,14 @@
+import { DeviceProperties } from '../../types';
+import { SerialIncyclistDevice } from '../base/adapter';
+import { SerialDeviceSettings } from "../types";
+export default class SerialAdapterFactory {
+    static _instance: SerialAdapterFactory;
+    adapters: Array<{
+        protocol: string;
+        AdapterClass: typeof SerialIncyclistDevice<DeviceProperties>;
+    }>;
+    static getInstance(): SerialAdapterFactory;
+    constructor();
+    registerAdapter(protocol: string, AdapterClass: typeof SerialIncyclistDevice<DeviceProperties>): void;
+    createInstance(props: SerialDeviceSettings, settings?: any): SerialIncyclistDevice<DeviceProperties>;
+}

package/lib/serial/factories/adapter-factory.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class SerialAdapterFactory {
+    static getInstance() {
+        if (!SerialAdapterFactory._instance)
+            SerialAdapterFactory._instance = new SerialAdapterFactory();
+        return SerialAdapterFactory._instance;
+    }
+    constructor() {
+        this.adapters = [];
+    }
+    registerAdapter(protocol, AdapterClass) {
+        const existing = this.adapters.findIndex(a => a.protocol === protocol);
+        if (existing !== -1)
+            this.adapters[existing].AdapterClass = AdapterClass;
+        else
+            this.adapters.push({ protocol, AdapterClass });
+    }
+    createInstance(props, settings) {
+        const { protocol } = props;
+        if (!protocol)
+            return null;
+        const adapter = this.adapters.find(a => a.protocol === protocol);
+        if (!adapter)
+            return null;
+        const { AdapterClass } = adapter;
+        return new AdapterClass(props, settings);
+    }
+}
+exports.default = SerialAdapterFactory;

package/lib/serial/index.d.ts

@@ -1,9 +1,12 @@
-import SerialPortProvider, { useSerialPortProvider } from './serialport';
-import SerialInterface, { SerialInterfaceProps } from './serial-interface';
-import SerialAdapterFactory from './adapter-factory';
-import { SerialIncyclistDevice, SerialDeviceSettings } from './adapter';
+import SerialPortProvider, { useSerialPortProvider } from './base/serialport';
+import SerialInterface from './base/serial-interface';
+import SerialAdapterFactory from './factories/adapter-factory';
 import DaumClassicAdapter from './daum/classic/adapter';
 import DaumPremiumAdapter from './daum/premium/adapter';
 import KettlerRacerAdapter from './kettler/ergo-racer/adapter';
+export { SerialIncyclistDevice } from './base/adapter';
+export { SerialInterfaceProps, SerialDeviceSettings, SerialScannerProps } from "./types";
 export { TCPBinding } from './bindings/tcp';
-export { SerialPortProvider, useSerialPortProvider, SerialInterface, SerialInterfaceProps, SerialDeviceSettings, SerialAdapterFactory, DaumClassicAdapter, DaumPremiumAdapter, KettlerRacerAdapter, SerialIncyclistDevice };
+export { DaumPremiumDeviceProperties, Route, Point } from './daum/premium/types';
+export { DaumClassicProperties } from './daum/classic/types';
+export { SerialAdapterFactory, DaumClassicAdapter, DaumPremiumAdapter, KettlerRacerAdapter, SerialPortProvider, useSerialPortProvider, SerialInterface };

package/lib/serial/index.js

@@ -26,24 +26,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SerialIncyclistDevice = exports.KettlerRacerAdapter = exports.DaumPremiumAdapter = exports.DaumClassicAdapter = exports.SerialAdapterFactory = exports.SerialInterface = exports.useSerialPortProvider = exports.SerialPortProvider = exports.TCPBinding = void 0;
-const serialport_1 = __importStar(require("./serialport"));
+exports.SerialInterface = exports.useSerialPortProvider = exports.SerialPortProvider = exports.KettlerRacerAdapter = exports.DaumPremiumAdapter = exports.DaumClassicAdapter = exports.SerialAdapterFactory = exports.TCPBinding = exports.SerialIncyclistDevice = void 0;
+const serialport_1 = __importStar(require("./base/serialport"));
 exports.SerialPortProvider = serialport_1.default;
 Object.defineProperty(exports, "useSerialPortProvider", { enumerable: true, get: function () { return serialport_1.useSerialPortProvider; } });
-const serial_interface_1 = __importDefault(require("./serial-interface"));
+const serial_interface_1 = __importDefault(require("./base/serial-interface"));
 exports.SerialInterface = serial_interface_1.default;
-const adapter_factory_1 = __importDefault(require("./adapter-factory"));
+const adapter_factory_1 = __importDefault(require("./factories/adapter-factory"));
 exports.SerialAdapterFactory = adapter_factory_1.default;
-const adapter_1 = require("./adapter");
-Object.defineProperty(exports, "SerialIncyclistDevice", { enumerable: true, get: function () { return adapter_1.SerialIncyclistDevice; } });
-const adapter_2 = __importDefault(require("./daum/classic/adapter"));
-exports.DaumClassicAdapter = adapter_2.default;
-const adapter_3 = __importDefault(require("./daum/premium/adapter"));
-exports.DaumPremiumAdapter = adapter_3.default;
-const adapter_4 = __importDefault(require("./kettler/ergo-racer/adapter"));
-exports.KettlerRacerAdapter = adapter_4.default;
+const adapter_1 = __importDefault(require("./daum/classic/adapter"));
+exports.DaumClassicAdapter = adapter_1.default;
+const adapter_2 = __importDefault(require("./daum/premium/adapter"));
+exports.DaumPremiumAdapter = adapter_2.default;
+const adapter_3 = __importDefault(require("./kettler/ergo-racer/adapter"));
+exports.KettlerRacerAdapter = adapter_3.default;
+var adapter_4 = require("./base/adapter");
+Object.defineProperty(exports, "SerialIncyclistDevice", { enumerable: true, get: function () { return adapter_4.SerialIncyclistDevice; } });
 var tcp_1 = require("./bindings/tcp");
 Object.defineProperty(exports, "TCPBinding", { enumerable: true, get: function () { return tcp_1.TCPBinding; } });
-adapter_factory_1.default.getInstance().registerAdapter('Daum Classic', adapter_2.default);
-adapter_factory_1.default.getInstance().registerAdapter('Daum Premium', adapter_3.default);
-adapter_factory_1.default.getInstance().registerAdapter('Kettler Racer', adapter_4.default);
+adapter_factory_1.default.getInstance().registerAdapter('Daum Classic', adapter_1.default);
+adapter_factory_1.default.getInstance().registerAdapter('Daum Premium', adapter_2.default);
+adapter_factory_1.default.getInstance().registerAdapter('Kettler Racer', adapter_3.default);

package/lib/serial/kettler/comms.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import { EventLogger } from "gd-eventlog";
-import { Command } from "../../types/command";
+import { Command } from "./types";
 import EventEmitter from "events";
 import { SerialInterface } from "..";
 export type SerialCommsProps = {

package/lib/serial/kettler/ergo-racer/adapter.d.ts

@@ -1,13 +1,11 @@
-import { DeviceProperties } from "../../../types/device";
 import { EventLogger } from "gd-eventlog";
 import SerialComms from "../comms";
-import { Command } from "../../../types/command";
-import ICyclingMode, { CyclingMode, IncyclistBikeData } from "../../../modes/types";
-import { SerialDeviceSettings, SerialIncyclistDevice } from "../../adapter";
-import { DeviceData } from "../../../types/data";
-import SerialInterface from "../../serial-interface";
-import { ControllableDevice } from "../../../base/adpater";
-import { IncyclistDeviceAdapter } from "../../../types/adapter";
+import { IncyclistBikeData } from "../../../types";
+import { SerialDeviceSettings } from "../../types";
+import { Command } from "../types";
+import { SerialIncyclistDevice } from "../../base/adapter";
+import SerialInterface from "../../base/serial-interface";
+import { ControllerConfig, IAdapter, IncyclistAdapterData, DeviceProperties } from "../../../types";
 export interface KettlerRacerCommand extends Command {
 }
 export interface KettlerExtendedBikeData {
@@ -23,28 +21,23 @@ export interface KettlerBikeData {
     time: number;
     power: number;
 }
-export declare class KettlerControl<P extends DeviceProperties> extends ControllableDevice<P> {
-    getSupportedCyclingModes(): Array<typeof CyclingMode>;
-    getDefaultCyclingMode(): ICyclingMode;
-    sendInitCommands(): Promise<boolean>;
-}
-export default class KettlerRacerAdapter extends SerialIncyclistDevice<KettlerControl<DeviceProperties>, DeviceProperties> {
+export default class KettlerRacerAdapter extends SerialIncyclistDevice<DeviceProperties> {
     private id;
     private iv;
     private requests;
-    private data;
     private internalData;
     private kettlerData;
     private updateBusy;
     private requestBusy;
     private comms;
     private prevDistance;
+    protected static ontrollers: ControllerConfig;
     constructor(settings: SerialDeviceSettings, props?: DeviceProperties);
     isBike(): boolean;
     isPower(): boolean;
     isHrm(): boolean;
     getProtocolName(): string;
-    isSame(device: IncyclistDeviceAdapter): boolean;
+    isSame(device: IAdapter): boolean;
     setID(id: any): void;
     getID(): string;
     getName(): string;
@@ -73,10 +66,10 @@ export default class KettlerRacerAdapter extends SerialIncyclistDevice<KettlerCo
     check(): Promise<boolean>;
     start(props?: any): Promise<boolean>;
     startUpdatePull(): void;
-    canSendUpdate(): boolean;
+    canEmitData(): boolean;
     stop(): Promise<boolean>;
     mapData(bikeData: KettlerBikeData): IncyclistBikeData;
-    transformData(internalData: IncyclistBikeData, bikeData: KettlerBikeData): DeviceData;
+    transformData(internalData: IncyclistBikeData, bikeData: KettlerBikeData): IncyclistAdapterData;
     update(): Promise<void>;
     sendRequest(request: any): Promise<any>;
     sendRequests(): Promise<void>;

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

@@ -12,30 +12,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.KettlerControl = void 0;
 const gd_eventlog_1 = require("gd-eventlog");
 const comms_1 = __importDefault(require("../comms"));
 const utils_1 = require("../../../utils/utils");
 const power_meter_1 = __importDefault(require("../../../modes/power-meter"));
 const kettler_erg_1 = __importDefault(require("../../../modes/kettler-erg"));
-const adapter_1 = require("../../adapter");
-const capabilities_1 = require("../../../types/capabilities");
-const adpater_1 = require("../../../base/adpater");
+const adapter_1 = require("../../base/adapter");
+const types_1 = require("../../../types");
 const PROTOCOL_NAME = 'Kettler Racer';
-class KettlerControl extends adpater_1.ControllableDevice {
-    getSupportedCyclingModes() {
-        return [power_meter_1.default, kettler_erg_1.default];
-    }
-    getDefaultCyclingMode() {
-        return new kettler_erg_1.default(this.adapter);
-    }
-    sendInitCommands() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return true;
-        });
-    }
-}
-exports.KettlerControl = KettlerControl;
 class KettlerRacerAdapter extends adapter_1.SerialIncyclistDevice {
     constructor(settings, props) {
         super(settings, props);
@@ -45,8 +29,8 @@ class KettlerRacerAdapter extends adapter_1.SerialIncyclistDevice {
         this.iv = null;
         this.comms = new comms_1.default({ interface: settings.interface, port: settings.port, logger: this.logger });
         this.capabilities = [
-            capabilities_1.IncyclistCapability.Power, capabilities_1.IncyclistCapability.Speed, capabilities_1.IncyclistCapability.Cadence, capabilities_1.IncyclistCapability.Gear, capabilities_1.IncyclistCapability.HeartRate,
-            capabilities_1.IncyclistCapability.Control
+            types_1.IncyclistCapability.Power, types_1.IncyclistCapability.Speed, types_1.IncyclistCapability.Cadence, types_1.IncyclistCapability.Gear, types_1.IncyclistCapability.HeartRate,
+            types_1.IncyclistCapability.Control
         ];
     }
     isBike() { return true; }
@@ -349,7 +333,7 @@ class KettlerRacerAdapter extends adapter_1.SerialIncyclistDevice {
             update: ivUpdate
         };
     }
-    canSendUpdate() {
+    canEmitData() {
         return !this.isPaused();
     }
     stop() {
@@ -583,4 +567,8 @@ class KettlerRacerAdapter extends adapter_1.SerialIncyclistDevice {
         });
     }
 }
+KettlerRacerAdapter.ontrollers = {
+    modes: [power_meter_1.default, kettler_erg_1.default],
+    default: kettler_erg_1.default
+};
 exports.default = KettlerRacerAdapter;

package/lib/serial/kettler/types.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="node" />
+export interface Command {
+    logStr?: string;
+    message: string | Buffer;
+    timeout?: number;
+    onError: (err: Error) => void;
+    onResponse: (response: string | Buffer) => void;
+}

package/lib/serial/kettler/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/serial/serial-interface.d.ts

@@ -3,39 +3,9 @@
 import EventEmitter from "events";
 import { BindingInterface } from "@serialport/bindings-interface";
 import { SerialPortStream } from '@serialport/stream';
-import { SerialDeviceSettings } from './adapter';
+import { SerialDeviceSettings, SerialScannerProps, PortMapping, SerialInterfaceProps } from "./types";
+import { IncyclistInterface } from "../types";
 import { EventLogger } from "gd-eventlog";
-import { IncyclistScanProps } from "../types/device";
-import { IncyclistInterface, InterfaceProps } from "../types/interface";
-export declare const SerialInterfaceType: {
-    SERIAL: string;
-    TCPIP: string;
-};
-export interface SerialInterfaceProps extends InterfaceProps {
-    ifaceName: string;
-    binding?: BindingInterface;
-}
-export type PortMapping = {
-    path: string;
-    port: SerialPortStream;
-};
-export interface SerialScannerProps extends IncyclistScanProps {
-    port?: string;
-    protocol: string;
-}
-export declare class SinglePathScanner {
-    path: string;
-    serial: SerialInterface;
-    result: SerialDeviceSettings;
-    isScanning: boolean;
-    props: SerialScannerProps;
-    logger: EventLogger;
-    isFound: boolean;
-    constructor(path: string, serial: SerialInterface, props: SerialScannerProps);
-    logEvent(event: any): void;
-    onStopRequest(resolve: any): Promise<void>;
-    scan(): Promise<SerialDeviceSettings | undefined>;
-}
 export default class SerialInterface extends EventEmitter implements IncyclistInterface {
     ifaceName: string;
     binding: BindingInterface;