incyclist-devices 2.1.0 → 2.1.2

package/lib/ble/elite/adapter.d.ts

@@ -1,20 +1,19 @@
-import BleAdapter, { BlePowerControl } from '../base/adapter';
-import ICyclingMode, { IncyclistBikeData } from '../../modes/types';
+import BleAdapter from '../base/adapter';
+import ICyclingMode from '../../modes/types';
 import { PowerData } from '../cp';
-import { DeviceProperties } from '../../types/device';
-import { DeviceData } from '../../types/data';
+import { DeviceProperties, IncyclistAdapterData, IncyclistBikeData, ControllerConfig, IAdapter } from '../../types';
 import { BleDeviceSettings } from '../types';
-import { IncyclistDeviceAdapter } from '../../types/adapter';
-export default class BleEliteAdapter extends BleAdapter<BlePowerControl> {
+export default class BleEliteAdapter extends BleAdapter {
+    protected static controllers: ControllerConfig;
     distanceInternal: number;
     constructor(settings: BleDeviceSettings, props?: DeviceProperties);
-    isSame(device: IncyclistDeviceAdapter): boolean;
+    isSame(device: IAdapter): boolean;
     getProfile(): string;
     getName(): string;
     getDefaultCyclingMode(): ICyclingMode;
     getSupportedCyclingModes(): any[];
     mapData(deviceData: PowerData): IncyclistBikeData;
-    transformData(bikeData: IncyclistBikeData): DeviceData;
+    transformData(bikeData: IncyclistBikeData): IncyclistAdapterData;
     start(props?: any): Promise<any>;
     sendUpdate(request: any): Promise<void>;
 }

package/lib/ble/elite/adapter.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -36,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const gd_eventlog_1 = require("gd-eventlog");
-const adapter_1 = __importStar(require("../base/adapter"));
+const adapter_1 = __importDefault(require("../base/adapter"));
 const comms_1 = __importDefault(require("./comms"));
 const power_meter_1 = __importDefault(require("../../modes/power-meter"));
 const capabilities_1 = require("../../types/capabilities");
@@ -44,7 +21,6 @@ class BleEliteAdapter extends adapter_1.default {
     constructor(settings, props) {
         super(settings, props);
         this.distanceInternal = 0;
-        this.setControl(new adapter_1.BlePowerControl(this, props));
         this.logger = new gd_eventlog_1.EventLogger('BLE-Elite');
         const { id, address, name } = settings;
         const logger = this.logger;
@@ -141,4 +117,8 @@ class BleEliteAdapter extends adapter_1.default {
         });
     }
 }
+BleEliteAdapter.controllers = {
+    modes: [power_meter_1.default],
+    default: power_meter_1.default
+};
 exports.default = BleEliteAdapter;

package/lib/ble/fm/adapter.d.ts

@@ -1,22 +1,21 @@
 import BleAdapter from '../base/adapter';
-import ICyclingMode, { CyclingMode, IncyclistBikeData } from '../../modes/types';
+import ICyclingMode, { CyclingMode } from '../../modes/types';
 import { IndoorBikeData } from './types';
-import { DeviceData } from '../../types/data';
 import { BleDeviceProperties, BleDeviceSettings, BleStartProperties } from '../types';
-import { ControllableDevice } from '../../base/adpater';
-import { IncyclistDeviceAdapter } from '../../types/adapter';
-export default class BleFmAdapter extends BleAdapter<ControllableDevice<BleDeviceProperties>> {
+import { IAdapter, IncyclistAdapterData, IncyclistBikeData } from '../../types';
+export default class BleFmAdapter extends BleAdapter {
     distanceInternal: number;
     connectPromise: Promise<boolean>;
     constructor(settings: BleDeviceSettings, props?: BleDeviceProperties);
-    isSame(device: IncyclistDeviceAdapter): boolean;
+    isSame(device: IAdapter): boolean;
     getProfile(): string;
     getName(): string;
     getDisplayName(): string;
+    isControllable(): boolean;
     getSupportedCyclingModes(): Array<typeof CyclingMode>;
     getDefaultCyclingMode(): ICyclingMode;
     mapData(deviceData: IndoorBikeData): IncyclistBikeData;
-    transformData(bikeData: IncyclistBikeData): DeviceData;
+    transformData(bikeData: IncyclistBikeData): IncyclistAdapterData;
     start(props?: BleStartProperties): Promise<any>;
     sendUpdate(request: any, enforced?: boolean): Promise<void>;
     sendInitCommands(): Promise<boolean>;

package/lib/ble/fm/adapter.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -40,23 +17,22 @@ const power_meter_1 = __importDefault(require("../../modes/power-meter"));
 const antble_smarttrainer_1 = __importDefault(require("../../modes/antble-smarttrainer"));
 const antble_erg_1 = __importDefault(require("../../modes/antble-erg"));
 const comms_1 = __importDefault(require("./comms"));
-const adapter_1 = __importStar(require("../base/adapter"));
+const adapter_1 = __importDefault(require("../base/adapter"));
 const consts_1 = require("./consts");
 const utils_1 = require("../../utils/utils");
-const capabilities_1 = require("../../types/capabilities");
+const types_1 = require("../../types");
 class BleFmAdapter extends adapter_1.default {
     constructor(settings, props) {
         super(settings, props);
         this.distanceInternal = 0;
-        this.setControl(new adapter_1.BlePowerControl(this, props));
         this.logger = new gd_eventlog_1.EventLogger('BLE-FM');
         const { id, address, name } = settings;
         const logger = this.logger;
         const ble = this.ble;
         this.device = new comms_1.default({ id, address, name, ble, logger });
         this.capabilities = [
-            capabilities_1.IncyclistCapability.Power, capabilities_1.IncyclistCapability.Speed, capabilities_1.IncyclistCapability.Cadence,
-            capabilities_1.IncyclistCapability.Control
+            types_1.IncyclistCapability.Power, types_1.IncyclistCapability.Speed, types_1.IncyclistCapability.Cadence,
+            types_1.IncyclistCapability.Control
         ];
     }
     isSame(device) {
@@ -73,6 +49,9 @@ class BleFmAdapter extends adapter_1.default {
     getDisplayName() {
         return this.getName();
     }
+    isControllable() {
+        return true;
+    }
     getSupportedCyclingModes() {
         var _a;
         const modes = [power_meter_1.default];
@@ -209,14 +188,14 @@ class BleFmAdapter extends adapter_1.default {
                         comms.on('disconnected', this.emit);
                     }
                     const before = this.capabilities.join(',');
-                    if (comms.features.heartrate && !this.hasCapability(capabilities_1.IncyclistCapability.HeartRate)) {
-                        this.capabilities.push(capabilities_1.IncyclistCapability.HeartRate);
+                    if (comms.features.heartrate && !this.hasCapability(types_1.IncyclistCapability.HeartRate)) {
+                        this.capabilities.push(types_1.IncyclistCapability.HeartRate);
                     }
-                    if (comms.features.cadence && !this.hasCapability(capabilities_1.IncyclistCapability.Cadence)) {
-                        this.capabilities.push(capabilities_1.IncyclistCapability.Cadence);
+                    if (comms.features.cadence && !this.hasCapability(types_1.IncyclistCapability.Cadence)) {
+                        this.capabilities.push(types_1.IncyclistCapability.Cadence);
                     }
-                    if (comms.features.power && !this.hasCapability(capabilities_1.IncyclistCapability.Power)) {
-                        this.capabilities.push(capabilities_1.IncyclistCapability.Power);
+                    if (comms.features.power && !this.hasCapability(types_1.IncyclistCapability.Power)) {
+                        this.capabilities.push(types_1.IncyclistCapability.Power);
                     }
                     const after = this.capabilities.join(',');
                     if (before !== after) {

package/lib/ble/hr/adapter.d.ts

@@ -1,16 +1,13 @@
 import BleAdapter from '../base/adapter';
-import { DeviceProperties } from '../../types/device';
-import { BleDeviceProperties, BleDeviceSettings } from '../types';
+import { IncyclistAdapterData, IAdapter, DeviceProperties } from '../../types';
+import { BleDeviceSettings } from '../types';
 import { HrmData } from './types';
-import { DeviceData } from '../../types/data';
-import { NonControllableDevice } from '../../base/adpater';
-import { IncyclistDeviceAdapter } from '../../types/adapter';
-export default class HrmAdapter extends BleAdapter<NonControllableDevice<BleDeviceProperties>> {
+export default class HrmAdapter extends BleAdapter {
     ignore: boolean;
     constructor(settings: BleDeviceSettings, props?: DeviceProperties);
-    isSame(device: IncyclistDeviceAdapter): boolean;
+    isSame(device: IAdapter): boolean;
     getProfile(): string;
     getName(): string;
     getDisplayName(): string;
-    mapData(deviceData: HrmData): DeviceData;
+    mapData(deviceData: HrmData): IncyclistAdapterData;
 }

package/lib/ble/hr/adapter.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const gd_eventlog_1 = require("gd-eventlog");
 const adapter_1 = __importDefault(require("../base/adapter"));
 const comm_1 = __importDefault(require("./comm"));
-const capabilities_1 = require("../../types/capabilities");
+const types_1 = require("../../types");
 class HrmAdapter extends adapter_1.default {
     constructor(settings, props) {
         super(settings, props);
@@ -17,7 +17,7 @@ class HrmAdapter extends adapter_1.default {
         const ble = this.ble;
         this.device = new comm_1.default({ id, address, name, ble, logger });
         this.capabilities = [
-            capabilities_1.IncyclistCapability.HeartRate
+            types_1.IncyclistCapability.HeartRate
         ];
     }
     isSame(device) {

package/lib/ble/peripheral-cache.d.ts

@@ -1,7 +1,6 @@
-import { Controllable } from "../types/adapter";
 import BleAdapter from "./base/adapter";
 import BlePeripheralConnector from "./ble-peripheral";
-import { BleCharacteristic, BleDeviceProperties, BlePeripheral } from "./types";
+import { BleCharacteristic, BlePeripheral } from "./types";
 export interface PeripheralState {
     isLoading: boolean;
     isConfigured: boolean;
@@ -19,7 +18,7 @@ export interface PeripheralCacheItem {
 }
 export default class BlePeripheralCache {
     peripherals: PeripheralCacheItem[];
-    findAdapter(adapter: BleAdapter<Controllable<BleDeviceProperties>>): PeripheralCacheItem;
+    findAdapter(adapter: BleAdapter): PeripheralCacheItem;
     getConnector(peripheral: BlePeripheral): BlePeripheralConnector;
     getPeripheral(query: {
         id?: string;

package/lib/ble/tacx/adapter.d.ts

@@ -1,10 +1,9 @@
 import { BleFmAdapter } from '../fm';
-import { DeviceProperties } from '../../types/device';
 import { BleDeviceSettings, BleStartProperties } from '../types';
-import { IncyclistDeviceAdapter } from '../../types/adapter';
+import { DeviceProperties, IAdapter } from '../../types';
 export default class BleTacxFEAdapter extends BleFmAdapter {
     constructor(settings: BleDeviceSettings, props?: DeviceProperties);
-    isSame(device: IncyclistDeviceAdapter): boolean;
+    isSame(device: IAdapter): boolean;
     getProfile(): string;
     start(props?: BleStartProperties): Promise<any>;
 }

package/lib/ble/tacx/adapter.js

@@ -15,8 +15,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const gd_eventlog_1 = require("gd-eventlog");
 const fm_1 = require("../fm");
 const comms_1 = __importDefault(require("./comms"));
-const adpater_1 = require("../../base/adpater");
-const capabilities_1 = require("../../types/capabilities");
+const consts_1 = require("../../base/consts");
+const types_1 = require("../../types");
 class BleTacxFEAdapter extends fm_1.BleFmAdapter {
     constructor(settings, props) {
         super(settings, props);
@@ -26,8 +26,8 @@ class BleTacxFEAdapter extends fm_1.BleFmAdapter {
         const ble = this.ble;
         this.device = new comms_1.default({ id, address, name, ble, logger });
         this.capabilities = [
-            capabilities_1.IncyclistCapability.Power, capabilities_1.IncyclistCapability.Speed, capabilities_1.IncyclistCapability.Cadence,
-            capabilities_1.IncyclistCapability.Control
+            types_1.IncyclistCapability.Power, types_1.IncyclistCapability.Speed, types_1.IncyclistCapability.Cadence,
+            types_1.IncyclistCapability.Control
         ];
     }
     isSame(device) {
@@ -76,8 +76,8 @@ class BleTacxFEAdapter extends fm_1.BleFmAdapter {
                                 break;
                         }
                     }
-                    const { user, wheelDiameter, gearRatio, bikeWeight = adpater_1.DEFAULT_BIKE_WEIGHT } = props || {};
-                    const userWeight = (user && user.weight ? user.weight : adpater_1.DEFAULT_USER_WEIGHT);
+                    const { user, wheelDiameter, gearRatio, bikeWeight = consts_1.DEFAULT_BIKE_WEIGHT } = props || {};
+                    const userWeight = (user && user.weight ? user.weight : consts_1.DEFAULT_USER_WEIGHT);
                     comms.sendTrackResistance(0.0);
                     comms.sendUserConfiguration(userWeight, bikeWeight, wheelDiameter, gearRatio);
                     const startRequest = this.getCyclingMode().getBikeInitRequest();
@@ -89,8 +89,8 @@ class BleTacxFEAdapter extends fm_1.BleFmAdapter {
                     this.stopped = false;
                     this.started = true;
                     this.paused = false;
-                    if (comms.features && comms.features.heartrate && !this.hasCapability(capabilities_1.IncyclistCapability.HeartRate)) {
-                        this.capabilities.push(capabilities_1.IncyclistCapability.HeartRate);
+                    if (comms.features && comms.features.heartrate && !this.hasCapability(types_1.IncyclistCapability.HeartRate)) {
+                        this.capabilities.push(types_1.IncyclistCapability.HeartRate);
                     }
                     return true;
                 }

package/lib/ble/types.d.ts

@@ -2,8 +2,7 @@
 /// <reference types="node" />
 import EventEmitter from "events";
 import { EventLogger } from "gd-eventlog";
-import { DeviceProperties, DeviceSettings, DeviceStartProperties, IncyclistScanProps } from "../types/device";
-import { InterfaceProps } from "../types/interface";
+import { DeviceProperties, DeviceSettings, DeviceStartProperties, IncyclistScanProps, InterfaceProps } from "../types";
 export type BleProtocol = 'hr' | 'fm' | 'cp' | 'tacx' | 'wahoo' | 'elite';
 export type BleInterfaceState = 'unknown' | 'resetting' | 'unsupported' | 'unauthorized' | 'poweredOff' | 'poweredOn';
 export interface BleBinding extends EventEmitter {

package/lib/ble/wahoo/adapter.d.ts

@@ -1,9 +1,9 @@
 import { BleFmAdapter } from '../fm';
 import { BleDeviceProperties, BleDeviceSettings, BleStartProperties } from '../types';
-import { IncyclistDeviceAdapter } from '../../types/adapter';
+import { IAdapter } from '../../types';
 export default class BleWahooAdapter extends BleFmAdapter {
     constructor(settings: BleDeviceSettings, props?: BleDeviceProperties);
-    isSame(device: IncyclistDeviceAdapter): boolean;
+    isSame(device: IAdapter): boolean;
     getProfile(): string;
     start(props?: BleStartProperties): Promise<any>;
 }

package/lib/ble/wahoo/adapter.js

@@ -15,8 +15,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const gd_eventlog_1 = require("gd-eventlog");
 const fm_1 = require("../fm");
 const comms_1 = __importDefault(require("./comms"));
-const adpater_1 = require("../../base/adpater");
-const capabilities_1 = require("../../types/capabilities");
+const consts_1 = require("../../base/consts");
+const types_1 = require("../../types");
 class BleWahooAdapter extends fm_1.BleFmAdapter {
     constructor(settings, props) {
         super(settings, props);
@@ -26,8 +26,8 @@ class BleWahooAdapter extends fm_1.BleFmAdapter {
         const ble = this.ble;
         this.device = new comms_1.default({ id, address, name, ble, logger });
         this.capabilities = [
-            capabilities_1.IncyclistCapability.Power, capabilities_1.IncyclistCapability.Speed, capabilities_1.IncyclistCapability.Cadence,
-            capabilities_1.IncyclistCapability.Control
+            types_1.IncyclistCapability.Power, types_1.IncyclistCapability.Speed, types_1.IncyclistCapability.Cadence,
+            types_1.IncyclistCapability.Control
         ];
     }
     isSame(device) {
@@ -75,8 +75,8 @@ class BleWahooAdapter extends fm_1.BleFmAdapter {
                                 break;
                         }
                     }
-                    const { user, bikeWeight = adpater_1.DEFAULT_BIKE_WEIGHT } = props || {};
-                    const weight = (user && user.weight ? Number(user.weight) : adpater_1.DEFAULT_USER_WEIGHT) + bikeWeight;
+                    const { user, bikeWeight = consts_1.DEFAULT_BIKE_WEIGHT } = props || {};
+                    const weight = (user && user.weight ? Number(user.weight) : consts_1.DEFAULT_USER_WEIGHT) + bikeWeight;
                     yield comms.setSimMode(weight, comms.getCrr(), comms.getCw());
                     const startRequest = this.getCyclingMode().getBikeInitRequest();
                     yield this.sendUpdate(startRequest);

package/lib/ble/wahoo/comms.js

@@ -13,8 +13,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const _1 = require(".");
-const adpater_1 = require("../../base/adpater");
-const consts_1 = require("../consts");
+const consts_1 = require("../../base/consts");
+const consts_2 = require("../consts");
 const comms_1 = __importDefault(require("../fm/comms"));
 const utils_1 = require("../utils");
 const ErgWriteDelay = 2000;
@@ -27,15 +27,15 @@ class BleWahooDevice extends comms_1.default {
         this.tsPrevWrite = undefined;
         this.prevSlope = undefined;
         this.isRequestControlBusy = false;
-        this.weight = adpater_1.DEFAULT_BIKE_WEIGHT + adpater_1.DEFAULT_USER_WEIGHT;
+        this.weight = consts_1.DEFAULT_BIKE_WEIGHT + consts_1.DEFAULT_USER_WEIGHT;
         this.data = {};
-        this.wahooCP = consts_1.WAHOO_ADVANCED_TRAINER_CP;
+        this.wahooCP = consts_2.WAHOO_ADVANCED_TRAINER_CP;
     }
     static isMatching(characteristics) {
         if (!characteristics)
             return false;
-        const hasWahooCP = characteristics.find(c => (0, utils_1.matches)(c, consts_1.WAHOO_ADVANCED_TRAINER_CP)) !== undefined;
-        const hasFTMS = characteristics.find(c => (0, utils_1.matches)(c, consts_1.FTMS_CP)) !== undefined;
+        const hasWahooCP = characteristics.find(c => (0, utils_1.matches)(c, consts_2.WAHOO_ADVANCED_TRAINER_CP)) !== undefined;
+        const hasFTMS = characteristics.find(c => (0, utils_1.matches)(c, consts_2.FTMS_CP)) !== undefined;
         return hasWahooCP && !hasFTMS;
     }
     init() {
@@ -46,8 +46,8 @@ class BleWahooDevice extends comms_1.default {
             try {
                 yield this.subscribeWriteResponse(this.wahooCP);
                 try {
-                    if (this.wahooCP !== consts_1.WAHOO_ADVANCED_TRAINER_CP_FULL.toLowerCase())
-                        yield this.subscribeWriteResponse(consts_1.WAHOO_ADVANCED_TRAINER_CP_FULL.toLowerCase());
+                    if (this.wahooCP !== consts_2.WAHOO_ADVANCED_TRAINER_CP_FULL.toLowerCase())
+                        yield this.subscribeWriteResponse(consts_2.WAHOO_ADVANCED_TRAINER_CP_FULL.toLowerCase());
                 }
                 catch (err) {
                 }
@@ -62,7 +62,7 @@ class BleWahooDevice extends comms_1.default {
     setCharacteristicUUIDs(uuids) {
         this.logEvent({ message: 'set uuids', uuids });
         uuids.forEach(c => {
-            if ((0, utils_1.matches)(c, consts_1.WAHOO_ADVANCED_TRAINER_CP))
+            if ((0, utils_1.matches)(c, consts_2.WAHOO_ADVANCED_TRAINER_CP))
                 this.wahooCP = c;
         });
     }
@@ -143,16 +143,16 @@ class BleWahooDevice extends comms_1.default {
         const uuid = characteristic.toLowerCase();
         let res = undefined;
         switch (uuid) {
-            case consts_1.CSP_MEASUREMENT:
+            case consts_2.CSP_MEASUREMENT:
                 res = this.parsePower(data);
                 break;
-            case consts_1.INDOOR_BIKE_DATA:
+            case consts_2.INDOOR_BIKE_DATA:
                 res = this.parseIndoorBikeData(data);
                 break;
-            case consts_1.HR_MEASUREMENT:
+            case consts_2.HR_MEASUREMENT:
                 res = this.parseHrm(data);
                 break;
-            case consts_1.FTMS_STATUS:
+            case consts_2.FTMS_STATUS:
                 res = this.parseFitnessMachineStatus(data);
                 break;
             default:
@@ -166,7 +166,7 @@ class BleWahooDevice extends comms_1.default {
         return true;
     }
     subscribeAll(conn) {
-        return this.subscribeMultiple([consts_1.CSP_MEASUREMENT, consts_1.INDOOR_BIKE_DATA, consts_1.HR_MEASUREMENT, consts_1.FTMS_STATUS, this.wahooCP], conn);
+        return this.subscribeMultiple([consts_2.CSP_MEASUREMENT, consts_2.INDOOR_BIKE_DATA, consts_2.HR_MEASUREMENT, consts_2.FTMS_STATUS, this.wahooCP], conn);
     }
     writeWahooFtmsMessage(requestedOpCode, data, props) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -392,7 +392,7 @@ class BleWahooDevice extends comms_1.default {
     }
 }
 BleWahooDevice.protocol = 'wahoo';
-BleWahooDevice.services = [consts_1.CSP];
-BleWahooDevice.characteristics = ['2acc', '2ad2', '2ad6', '2ad8', '2ad9', '2ada', consts_1.WAHOO_ADVANCED_TRAINER_CP];
+BleWahooDevice.services = [consts_2.CSP];
+BleWahooDevice.characteristics = ['2acc', '2ad2', '2ad6', '2ad8', '2ad9', '2ada', consts_2.WAHOO_ADVANCED_TRAINER_CP];
 BleWahooDevice.detectionPriority = 5;
 exports.default = BleWahooDevice;

package/lib/factories/adapters.d.ts

@@ -0,0 +1,7 @@
+import { IncyclistDeviceAdapter } from "../base/adpater";
+import { DeviceProperties, DeviceSettings } from "../types/device";
+export default class AdapterFactory {
+    static adapters: IncyclistDeviceAdapter[];
+    static reset(): void;
+    static create(settings: DeviceSettings, props?: DeviceProperties): any;
+}

package/lib/factories/adapters.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const antv2_1 = require("../antv2");
+const ble_1 = require("../ble");
+const serial_1 = require("../serial");
+const Simulator_1 = require("../simulator/Simulator");
+const device_1 = require("../types/device");
+class AdapterFactory {
+    static reset() {
+        AdapterFactory.adapters = [];
+        ble_1.BleAdapterFactory.getInstance().instances = [];
+    }
+    static create(settings, props) {
+        const adapters = AdapterFactory.adapters;
+        if (!settings.interface && settings.protocol === 'Simulator') {
+            const adapter = new Simulator_1.Simulator(settings);
+            if (adapter) {
+                adapters.push(adapter);
+            }
+            return adapter;
+        }
+        const existing = adapters.find(a => a.isEqual(settings));
+        if (existing)
+            return existing;
+        const ifaceName = typeof settings.interface === 'string' ? settings.interface : settings.interface.getName();
+        let adapter;
+        switch (ifaceName) {
+            case device_1.INTERFACE.SERIAL:
+            case device_1.INTERFACE.TCPIP:
+                adapter = serial_1.SerialAdapterFactory.getInstance().createInstance(settings, props);
+                break;
+            case device_1.INTERFACE.ANT:
+                adapter = antv2_1.AntAdapterFactory.getInstance().createInstance(settings, props);
+                break;
+            case device_1.INTERFACE.BLE:
+                adapter = ble_1.BleAdapterFactory.getInstance().createInstance(settings, props);
+                break;
+            case device_1.INTERFACE.SIMULATOR:
+                adapter = new Simulator_1.Simulator(settings, props);
+                break;
+        }
+        if (adapter) {
+            adapters.push(adapter);
+        }
+        return adapter;
+    }
+}
+AdapterFactory.adapters = [];
+exports.default = AdapterFactory;

package/lib/factories/index.d.ts

@@ -0,0 +1,3 @@
+import AdapterFactory from "./adapters";
+import InterfaceFactory from "./interfaces";
+export { AdapterFactory, InterfaceFactory };

package/lib/factories/index.js

@@ -0,0 +1,10 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InterfaceFactory = exports.AdapterFactory = void 0;
+const adapters_1 = __importDefault(require("./adapters"));
+exports.AdapterFactory = adapters_1.default;
+const interfaces_1 = __importDefault(require("./interfaces"));
+exports.InterfaceFactory = interfaces_1.default;

package/lib/factories/interfaces.d.ts

@@ -0,0 +1,7 @@
+import { InterfaceProps } from "../types/interface";
+import { SerialInterface } from "../serial";
+import AntInterface from "../antv2/base/interface";
+import { BleInterface } from "../ble";
+export default class InterfaceFactory {
+    static create(ifaceName: string, props?: InterfaceProps): AntInterface | BleInterface | SerialInterface;
+}

package/lib/factories/interfaces.js

@@ -0,0 +1,27 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const serial_1 = require("../serial");
+const interface_1 = __importDefault(require("../antv2/base/interface"));
+const device_1 = require("../types/device");
+const ble_1 = require("../ble");
+class InterfaceFactory {
+    static create(ifaceName, props) {
+        switch (ifaceName) {
+            case device_1.INTERFACE.SERIAL:
+            case device_1.INTERFACE.TCPIP:
+                const serialProps = props;
+                serialProps.ifaceName = ifaceName;
+                return serial_1.SerialInterface.getInstance(serialProps);
+            case device_1.INTERFACE.ANT:
+                const antProps = props;
+                return interface_1.default.getInstance(antProps);
+            case device_1.INTERFACE.BLE:
+                const bleProps = props;
+                return ble_1.BleInterface.getInstance(bleProps);
+        }
+    }
+}
+exports.default = InterfaceFactory;

package/lib/index.d.ts

@@ -1,16 +1,15 @@
 import { INTERFACE } from './types/device';
-import InterfaceFactory from './interfaces';
-import AdapterFactory from './adapters';
 import { IncyclistInterface, InterfaceProps } from './types/interface';
-import { IncyclistDeviceAdapter, Controllable } from './types/adapter';
-import { ControllableDevice as ControllableDeviceAdapter } from './base/adpater';
 import { IncyclistCapability } from './types/capabilities';
-import { DeviceData } from './types/data';
+import { IncyclistAdapterData } from './types/data';
 import { DeviceSettings, DeviceProperties } from './types/device';
 import ICyclingMode from './modes/types';
 import calc from './utils/calculations';
+import IncyclistDevice, { IncyclistDeviceAdapter } from './base/adpater';
+import { IAdapter } from './types/adapter';
+export * from './factories';
 export * from './modes/types';
 export * from './serial';
 export * from './ble';
 export * from './antv2';
-export { IncyclistInterface, INTERFACE, InterfaceFactory, InterfaceProps, DeviceSettings, DeviceProperties, ICyclingMode, AdapterFactory, IncyclistDeviceAdapter, Controllable, ControllableDeviceAdapter, DeviceData, IncyclistCapability, calc, };
+export { IAdapter, IncyclistDevice, IncyclistDeviceAdapter, DeviceSettings, DeviceProperties, IncyclistInterface, INTERFACE, InterfaceProps, ICyclingMode, IncyclistAdapterData as DeviceData, IncyclistCapability, calc, };

package/lib/index.js

@@ -17,21 +17,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calc = exports.IncyclistCapability = exports.ControllableDeviceAdapter = exports.Controllable = exports.AdapterFactory = exports.InterfaceFactory = exports.INTERFACE = void 0;
+exports.calc = exports.IncyclistCapability = exports.INTERFACE = exports.IncyclistDevice = void 0;
 const device_1 = require("./types/device");
 Object.defineProperty(exports, "INTERFACE", { enumerable: true, get: function () { return device_1.INTERFACE; } });
-const interfaces_1 = __importDefault(require("./interfaces"));
-exports.InterfaceFactory = interfaces_1.default;
-const adapters_1 = __importDefault(require("./adapters"));
-exports.AdapterFactory = adapters_1.default;
-const adapter_1 = require("./types/adapter");
-Object.defineProperty(exports, "Controllable", { enumerable: true, get: function () { return adapter_1.Controllable; } });
-const adpater_1 = require("./base/adpater");
-Object.defineProperty(exports, "ControllableDeviceAdapter", { enumerable: true, get: function () { return adpater_1.ControllableDevice; } });
 const capabilities_1 = require("./types/capabilities");
 Object.defineProperty(exports, "IncyclistCapability", { enumerable: true, get: function () { return capabilities_1.IncyclistCapability; } });
 const calculations_1 = __importDefault(require("./utils/calculations"));
 exports.calc = calculations_1.default;
+const adpater_1 = __importDefault(require("./base/adpater"));
+exports.IncyclistDevice = adpater_1.default;
+__exportStar(require("./factories"), exports);
 __exportStar(require("./modes/types"), exports);
 __exportStar(require("./serial"), exports);
 __exportStar(require("./ble"), exports);

package/lib/interfaces.d.ts

@@ -3,5 +3,5 @@ import { SerialInterface } from "./serial";
 import AntInterface from "./antv2/ant-interface";
 import { BleInterface } from "./ble";
 export default class InterfaceFactory {
-    static create(ifaceName: string, props?: InterfaceProps): AntInterface | SerialInterface | BleInterface;
+    static create(ifaceName: string, props?: InterfaceProps): AntInterface | BleInterface | SerialInterface;
 }