incyclist-devices 2.2.10-beta.0 → 2.3.0-beta.2

package/lib/ble/tacx/adapter.js

@@ -14,17 +14,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 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 sensor_1 = __importDefault(require("./sensor"));
 const consts_1 = require("../../base/consts");
 const types_1 = require("../../types");
 class BleTacxAdapter extends fm_1.BleFmAdapter {
     constructor(settings, props) {
         super(settings, props);
         this.logger = new gd_eventlog_1.EventLogger('BLE-FEC-Tacx');
-        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.device = new sensor_1.default(this.getPeripheral(), { logger: this.logger });
         this.capabilities = [
             types_1.IncyclistCapability.Power, types_1.IncyclistCapability.Speed, types_1.IncyclistCapability.Cadence,
             types_1.IncyclistCapability.Control
@@ -35,72 +32,35 @@ class BleTacxAdapter extends fm_1.BleFmAdapter {
             return false;
         return this.isEqual(device.settings);
     }
+    updateSensor(peripheral) {
+        this.device = new sensor_1.default(peripheral, { logger: this.logger });
+    }
     getProfile() {
         return 'Smart Trainer';
     }
-    start() {
-        return __awaiter(this, arguments, void 0, function* (props = {}) {
-            const wasPaused = this.paused;
-            const wasStopped = this.stopped;
-            if (wasPaused)
-                this.resume();
-            if (wasStopped)
-                this.stopped = false;
-            if (this.started && !wasPaused && !wasStopped)
-                return true;
-            if (this.ble.isScanning()) {
-                this.logger.logEvent({ message: 'stop previous scan', isScanning: this.ble.isScanning() });
-                yield this.ble.stopScan();
-            }
-            const connected = yield this.connect();
-            if (!connected)
-                throw new Error(`could not start device, reason:could not connect`);
-            this.logger.logEvent({ message: 'start requested', protocol: this.getProtocolName(), props });
-            try {
-                const comms = this.device;
-                if (comms) {
-                    this.device = comms;
-                    const mode = this.getCyclingMode();
-                    if (mode && mode.getSetting('bikeType')) {
-                        const bikeType = mode.getSetting('bikeType').toLowerCase();
-                        comms.setCrr(fm_1.cRR);
-                        switch (bikeType) {
-                            case 'race':
-                                comms.setCw(fm_1.cwABike.race);
-                                break;
-                            case 'triathlon':
-                                comms.setCw(fm_1.cwABike.triathlon);
-                                break;
-                            case 'mountain':
-                                comms.setCw(fm_1.cwABike.mountain);
-                                break;
-                        }
-                    }
-                    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();
-                    yield this.sendUpdate(startRequest);
-                    comms.on('data', (data) => {
-                        this.onDeviceData(data);
-                    });
-                    this.resetData();
-                    this.stopped = false;
-                    this.started = true;
-                    this.paused = false;
-                    if (comms.features && comms.features.heartrate && !this.hasCapability(types_1.IncyclistCapability.HeartRate)) {
-                        this.capabilities.push(types_1.IncyclistCapability.HeartRate);
-                    }
-                    return true;
-                }
-            }
-            catch (err) {
-                this.logger.logEvent({ message: 'start result: error', error: err.message, profile: this.getProfile() });
-                throw new Error(`could not start device, reason:${err.message}`);
-            }
+    initControl(props) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const sensor = this.getComms();
+            const { user, wheelDiameter, gearRatio, bikeWeight = consts_1.DEFAULT_BIKE_WEIGHT } = props || {};
+            const userWeight = ((_a = user === null || user === void 0 ? void 0 : user.weight) !== null && _a !== void 0 ? _a : consts_1.DEFAULT_USER_WEIGHT);
+            sensor.sendTrackResistance(0.0);
+            sensor.sendUserConfiguration(userWeight, bikeWeight, wheelDiameter, gearRatio);
+            const startRequest = this.getCyclingMode().getBikeInitRequest();
+            yield this.sendUpdate(startRequest);
         });
     }
+    checkCapabilities() {
+        const before = this.capabilities.join(',');
+        const sensor = this.getComms();
+        if (sensor.features && sensor.features.heartrate && !this.hasCapability(types_1.IncyclistCapability.HeartRate)) {
+            this.capabilities.push(types_1.IncyclistCapability.HeartRate);
+        }
+        const after = this.capabilities.join(',');
+        if (before !== after) {
+            this.emit('device-info', this.getSettings(), { capabilities: this.capabilities });
+        }
+    }
 }
 BleTacxAdapter.INCYCLIST_PROFILE_NAME = 'Smart Trainer';
 exports.default = BleTacxAdapter;

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

@@ -1,7 +1,7 @@
 import { LegacyProfile } from "../../antv2/types";
 import { CrankData } from "../cp";
 import { IndoorBikeData } from "../fm";
-import BleFitnessMachineDevice from "../fm/comms";
+import BleFitnessMachineDevice from "../fm/sensor";
 import { BleProtocol, IBlePeripheralConnector } from "../types";
 import { BleFeBikeData } from "./types";
 export default class TacxAdvancedFitnessMachineDevice extends BleFitnessMachineDevice {

package/lib/ble/tacx/comms.js

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const consts_1 = require("../consts");
-const comms_1 = __importDefault(require("../fm/comms"));
+const sensor_1 = __importDefault(require("../fm/sensor"));
 const utils_1 = require("../utils");
 var ANTMessages;
 (function (ANTMessages) {
@@ -37,7 +37,7 @@ const PROFILE_ID = 'Tacx SmartTrainer';
 const SYNC_BYTE = 0xA4;
 const DEFAULT_CHANNEL = 5;
 const ACKNOWLEDGED_DATA = 0x4F;
-class TacxAdvancedFitnessMachineDevice extends comms_1.default {
+class TacxAdvancedFitnessMachineDevice extends sensor_1.default {
     constructor(props) {
         super(props);
         this.prevCrankData = undefined;

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

@@ -0,0 +1,23 @@
+export declare enum ANTMessages {
+    calibrationCommand = 1,
+    calibrationStatus = 2,
+    generalFE = 16,
+    generalSettings = 17,
+    trainerData = 25,
+    basicResistance = 48,
+    targetPower = 49,
+    windResistance = 50,
+    trackResistance = 51,
+    feCapabilities = 54,
+    userConfiguration = 55,
+    requestData = 70,
+    commandStatus = 71,
+    manufactererData = 80,
+    productInformation = 81
+}
+export declare const SYNC_BYTE = 164;
+export declare const DEFAULT_CHANNEL = 5;
+export declare const ACKNOWLEDGED_DATA = 79;
+export declare const TACX_FE_C_BLE = "6E40FEC1-B5A3-F393-E0A9-E50E24DCCA9E";
+export declare const TACX_FE_C_RX = "6E40FEC2-B5A3-F393-E0A9-E50E24DCCA9E";
+export declare const TACX_FE_C_TX = "6E40FEC3-B5A3-F393-E0A9-E50E24DCCA9E";

package/lib/ble/tacx/consts.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TACX_FE_C_TX = exports.TACX_FE_C_RX = exports.TACX_FE_C_BLE = exports.ACKNOWLEDGED_DATA = exports.DEFAULT_CHANNEL = exports.SYNC_BYTE = exports.ANTMessages = void 0;
+var ANTMessages;
+(function (ANTMessages) {
+    ANTMessages[ANTMessages["calibrationCommand"] = 1] = "calibrationCommand";
+    ANTMessages[ANTMessages["calibrationStatus"] = 2] = "calibrationStatus";
+    ANTMessages[ANTMessages["generalFE"] = 16] = "generalFE";
+    ANTMessages[ANTMessages["generalSettings"] = 17] = "generalSettings";
+    ANTMessages[ANTMessages["trainerData"] = 25] = "trainerData";
+    ANTMessages[ANTMessages["basicResistance"] = 48] = "basicResistance";
+    ANTMessages[ANTMessages["targetPower"] = 49] = "targetPower";
+    ANTMessages[ANTMessages["windResistance"] = 50] = "windResistance";
+    ANTMessages[ANTMessages["trackResistance"] = 51] = "trackResistance";
+    ANTMessages[ANTMessages["feCapabilities"] = 54] = "feCapabilities";
+    ANTMessages[ANTMessages["userConfiguration"] = 55] = "userConfiguration";
+    ANTMessages[ANTMessages["requestData"] = 70] = "requestData";
+    ANTMessages[ANTMessages["commandStatus"] = 71] = "commandStatus";
+    ANTMessages[ANTMessages["manufactererData"] = 80] = "manufactererData";
+    ANTMessages[ANTMessages["productInformation"] = 81] = "productInformation";
+})(ANTMessages || (exports.ANTMessages = ANTMessages = {}));
+exports.SYNC_BYTE = 0xA4;
+exports.DEFAULT_CHANNEL = 5;
+exports.ACKNOWLEDGED_DATA = 0x4F;
+exports.TACX_FE_C_BLE = '6E40FEC1-B5A3-F393-E0A9-E50E24DCCA9E';
+exports.TACX_FE_C_RX = '6E40FEC2-B5A3-F393-E0A9-E50E24DCCA9E';
+exports.TACX_FE_C_TX = '6E40FEC3-B5A3-F393-E0A9-E50E24DCCA9E';

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

@@ -1,4 +1,4 @@
-import BleTacxComms from "./comms";
+import BleTacxComms from "./sensor";
 import BleTacxAdapter from "./adapter";
 import { BleFeBikeData } from "./types";
 export { BleTacxAdapter, BleTacxComms, BleFeBikeData };

package/lib/ble/tacx/index.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BleTacxComms = exports.BleTacxAdapter = void 0;
-const comms_1 = __importDefault(require("./comms"));
-exports.BleTacxComms = comms_1.default;
+const sensor_1 = __importDefault(require("./sensor"));
+exports.BleTacxComms = sensor_1.default;
 const adapter_1 = __importDefault(require("./adapter"));
 exports.BleTacxAdapter = adapter_1.default;

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

@@ -0,0 +1,63 @@
+import { LegacyProfile } from "../../antv2/types";
+import { CrankData } from "../cp";
+import { IndoorBikeData } from "../fm";
+import BleFitnessMachineDevice from "../fm/sensor";
+import { BleProtocol } from "../types";
+import { BleFeBikeData } from "./types";
+export default class TacxAdvancedFitnessMachineDevice extends BleFitnessMachineDevice {
+    static readonly profile: LegacyProfile;
+    static readonly protocol: BleProtocol;
+    static readonly services: string[];
+    static readonly characteristics: string[];
+    static readonly detectionPriority = 10;
+    protected prevCrankData: CrankData;
+    protected currentCrankData: CrankData;
+    protected timeOffset: number;
+    protected tsPrevWrite: any;
+    protected data: BleFeBikeData;
+    protected hasFECData: boolean;
+    protected messageCnt: number;
+    protected tacxRx: string;
+    protected tacxTx: string;
+    protected prevMessages: Record<string, {
+        ts: number;
+        message: string;
+    }>;
+    constructor(peripheral: any, props?: any);
+    reset(): void;
+    protected getRequiredCharacteristics(): Array<string>;
+    onData(characteristic: string, data: Buffer): boolean;
+    protected isDuplicate(characteristic: string, data: Buffer): boolean;
+    setTargetPower(power: number): Promise<boolean>;
+    setSlope(slope: any): Promise<boolean>;
+    requestControl(): Promise<boolean>;
+    protected parseCrankData(crankData: any): {
+        rpm?: undefined;
+        time?: undefined;
+    } | {
+        rpm: number;
+        time: any;
+    };
+    protected parseCSC(_data: Buffer, logOnly?: boolean): IndoorBikeData;
+    protected parsePower(_data: Buffer, logOnly?: boolean): IndoorBikeData;
+    protected parseIndoorBikeData(_data: Buffer, logOnly?: boolean): IndoorBikeData;
+    protected resetState(): void;
+    protected parseFEState(capStateBF: number): void;
+    protected parseGeneralFE(data: Buffer): BleFeBikeData;
+    private parseFEEquipmentType;
+    private parseFEHeartrate;
+    private parseFETime;
+    private parseFEDistance;
+    private parseFERealSpeed;
+    protected parseTrainerData(data: Buffer): BleFeBikeData;
+    protected parseProductInformation(data: Buffer): BleFeBikeData;
+    protected parseFECMessage(_data: Buffer): BleFeBikeData;
+    protected getChecksum(message: any[]): number;
+    protected buildMessage(payload?: number[], msgID?: number): Buffer;
+    protected sendMessage(message: Buffer): Promise<boolean>;
+    sendUserConfiguration(userWeight: any, bikeWeight: any, wheelDiameter: any, gearRatio: any): Promise<boolean>;
+    sendBasicResistance(resistance: any): Promise<boolean>;
+    sendTargetPower(power: any): Promise<boolean>;
+    sendWindResistance(windCoeff: any, windSpeed: any, draftFactor: any): Promise<boolean>;
+    sendTrackResistance(slope: any, rrCoeff?: any): Promise<boolean>;
+}