incyclist-devices 2.3.26 → 2.3.28

package/lib/antv2/fe/adapter.d.ts

@@ -1,6 +1,6 @@
 import { FitnessEquipmentSensorState, Profile } from "incyclist-ant-plus";
 import AntAdapter from "../base/adapter";
-import { UpdateRequest } from '../../modes/types';
+import ICyclingMode, { UpdateRequest } from '../../modes/types';
 import { AntDeviceProperties, AntDeviceSettings, LegacyProfile } from "../types";
 import { IncyclistBikeData, ControllerConfig } from "../../types";
 interface AntFEStartDeviceProperties extends AntDeviceProperties {
@@ -20,6 +20,7 @@ export default class AntFEAdapter extends AntAdapter<FitnessEquipmentSensorState
     constructor(settings: AntDeviceSettings, props?: AntDeviceProperties);
     getDisplayName(): string;
     isReconnecting(): boolean;
+    getDefaultCyclingMode(): ICyclingMode;
     sendUpdate(request: UpdateRequest): Promise<UpdateRequest | void>;
     onDeviceData(deviceData: FitnessEquipmentSensorState): void;
     mapData(deviceData: FitnessEquipmentSensorState): IncyclistBikeData;

package/lib/antv2/fe/adapter.js

@@ -18,6 +18,7 @@ const ant_fe_adv_st_mode_1 = __importDefault(require("../../modes/ant-fe-adv-st-
 const consts_1 = require("../../base/consts");
 const antble_erg_1 = __importDefault(require("../../modes/antble-erg"));
 const antble_smarttrainer_1 = __importDefault(require("../../modes/antble-smarttrainer"));
+const power_meter_1 = __importDefault(require("../../modes/power-meter"));
 const DEFAULT_BIKE_WEIGHT_MOUNTAIN = 14.5;
 class AntFEAdapter extends adapter_1.default {
     constructor(settings, props) {
@@ -36,6 +37,11 @@ class AntFEAdapter extends adapter_1.default {
     isReconnecting() {
         return this.promiseReconnect !== null && this.promiseReconnect !== undefined;
     }
+    getDefaultCyclingMode() {
+        if (this.props.capabilities && this.props.capabilities.indexOf(types_1.IncyclistCapability.Control) === -1)
+            return new power_meter_1.default(this);
+        return super.getDefaultCyclingMode();
+    }
     sendUpdate(request) {
         return __awaiter(this, void 0, void 0, function* () {
             if ((this.paused || this.isReconnecting()) && !request.forced)

package/lib/ble/base/adapter.js

@@ -257,8 +257,10 @@ class BleAdapter extends adpater_1.default {
         });
     }
     getStartLogProps(props) {
+        var _a;
+        const capabilities = (_a = this.props) === null || _a === void 0 ? void 0 : _a.capabilities;
         const { user, userWeight, bikeWeight, timeout, wheelDiameter, restart, scanOnly } = props !== null && props !== void 0 ? props : {};
-        return { user, userWeight, bikeWeight, wheelDiameter, timeout, restart, scanOnly };
+        return { user, userWeight, bikeWeight, wheelDiameter, timeout, restart, scanOnly, capabilities };
     }
     startAdapter(startProps) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -292,7 +294,8 @@ class BleAdapter extends adpater_1.default {
                 }
                 yield this.waitForInitialData(timeout);
                 yield this.checkCapabilities();
-                if (this.hasCapability(types_1.IncyclistCapability.Control))
+                const skipControl = this.props.capabilities && !this.props.capabilities.includes(types_1.IncyclistCapability.Control);
+                if (this.hasCapability(types_1.IncyclistCapability.Control) && !skipControl)
                     yield this.initControl(startProps);
                 this.stopped = false;
                 this.started = true;

package/lib/ble/fm/adapter.js

@@ -47,6 +47,8 @@ class BleFmAdapter extends adapter_1.default {
     getSupportedCyclingModes() {
         var _a;
         const modes = [power_meter_1.default];
+        if (this.props.capabilities && this.props.capabilities.indexOf(types_1.IncyclistCapability.Control) === -1)
+            return modes;
         const features = (_a = this.getSensor()) === null || _a === void 0 ? void 0 : _a.features;
         if (!features)
             return [power_meter_1.default, antble_smarttrainer_1.default, antble_erg_1.default];
@@ -58,6 +60,8 @@ class BleFmAdapter extends adapter_1.default {
     }
     getDefaultCyclingMode() {
         var _a;
+        if (this.props.capabilities && this.props.capabilities.indexOf(types_1.IncyclistCapability.Control) === -1)
+            return new power_meter_1.default(this);
         const features = (_a = this.getSensor()) === null || _a === void 0 ? void 0 : _a.features;
         if (!features)
             return new antble_smarttrainer_1.default(this);

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

@@ -4,7 +4,7 @@ import { DaumSerialComms } from './types';
 import { SerialIncyclistDevice } from '../base/adapter';
 import SerialInterface from '../base/serial-interface';
 import EventEmitter from 'events';
-import { UpdateRequest } from '../../modes/types';
+import ICyclingMode, { UpdateRequest } from '../../modes/types';
 export default class DaumAdapter<S extends SerialDeviceSettings, P extends DeviceProperties, C extends DaumSerialComms> extends SerialIncyclistDevice<P> {
     protected static controllers: ControllerConfig;
     comms: C;
@@ -27,6 +27,7 @@ export default class DaumAdapter<S extends SerialDeviceSettings, P extends Devic
     constructor(settings: S, props?: P);
     getPort(): string;
     getSerialInterface(): SerialInterface;
+    getDefaultCyclingMode(): ICyclingMode;
     sendInitCommands(): Promise<boolean>;
     getCurrentBikeData(): Promise<IncyclistBikeData>;
     getComms(): C;

package/lib/serial/daum/DaumAdapter.js

@@ -50,6 +50,11 @@ class DaumAdapter extends adapter_1.SerialIncyclistDevice {
         var _a;
         return (_a = this.comms) === null || _a === void 0 ? void 0 : _a.serial;
     }
+    getDefaultCyclingMode() {
+        if (this.props.capabilities && this.props.capabilities.indexOf(types_1.IncyclistCapability.Control) === -1)
+            return new daum_power_1.default(this);
+        return super.getDefaultCyclingMode();
+    }
     sendInitCommands() {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.started && !this.stopped) {

package/lib/types/device.d.ts

@@ -1,6 +1,7 @@
 import { EventLogger } from "gd-eventlog";
 import { IncyclistInterface } from "./interface";
 import { User } from "./user";
+import { IncyclistCapability } from "./capabilities";
 export declare enum INTERFACE {
     SERIAL = "serial",
     TCPIP = "tcpip",
@@ -15,6 +16,7 @@ export type DeviceProperties = {
     user?: User;
     userWeight?: number;
     bikeWeight?: number;
+    capabilities?: IncyclistCapability[];
 };
 export interface DeviceStartProperties extends DeviceProperties {
     timeout?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-devices",
-  "version": "2.3.26",
+  "version": "2.3.28",
   "dependencies": {
     "@serialport/bindings-interface": "^1.2.2",
     "@serialport/parser-byte-length": "^9.0.1",