incyclist-devices 1.4.81 → 1.4.84

package/lib/DeviceSupport.d.ts

@@ -20,4 +20,15 @@ declare const Protocols: {
     KettlerRacerProtocol: typeof KettlerRacerProtocol;
     BleProtocol: typeof BleProtocol;
 };
+export interface FeatureList {
+    [key: string]: boolean;
+}
+export default class DeviceSupport {
+    static _features: FeatureList;
+    static init(props?: {
+        features?: FeatureList;
+    }): void;
+    static hasFeature(feature: string): boolean;
+    static setFeature(key: string, value: boolean): void;
+}
 export { DeviceProtocolBase, DeviceProtocol, DeviceRegistry, INTERFACE, DeviceAdapter as Device, Protocols, AntScanner, BleProtocol, CyclingModeProperyType, BleInterface, BleHrmDevice, BleCyclingPowerDevice, BleFitnessMachineDevice, WahooAdvancedFitnessMachineDevice };

package/lib/DeviceSupport.js

@@ -58,3 +58,21 @@ const Protocols = {
     BleProtocol: incyclist_protocol_1.default
 };
 exports.Protocols = Protocols;
+class DeviceSupport {
+    static init(props = {}) {
+        if (props.features) {
+            this._features = props.features;
+        }
+    }
+    static hasFeature(feature) {
+        const featureVal = this._features[feature];
+        if (featureVal === undefined)
+            return false;
+        return featureVal;
+    }
+    static setFeature(key, value) {
+        this._features[key] = value;
+    }
+}
+exports.default = DeviceSupport;
+DeviceSupport._features = {};

package/lib/ble/ble-interface.js

@@ -212,7 +212,7 @@ class BleInterface extends ble_1.BleInterfaceClass {
         if (Array.isArray(services)) {
             const sids = services.map(ble_1.uuid);
             return get(deviceTypes, s => {
-                const res = sids.find((s) => (0, ble_2.matches)(s, services));
+                const res = sids.find((service) => (0, ble_2.matches)(s, service));
                 return res !== undefined;
             });
         }

package/lib/ble/ble.js

@@ -73,10 +73,10 @@ const uuid = (s) => {
 };
 exports.uuid = uuid;
 const matches = (uuid1, uuid2) => {
-    if ((0, exports.uuid)(uuid1) === (0, exports.uuid)(uuid2))
-        return true;
     const ul1 = uuid1.toLowerCase();
     const ul2 = uuid2.toLowerCase();
+    if ((0, exports.uuid)(ul1) === (0, exports.uuid)(ul2))
+        return true;
     if (ul1.length < ul2.length && ul2.startsWith(ul1))
         return true;
     if (ul1.length > ul2.length && ul1.startsWith(ul2))

package/lib/ble/consts.d.ts

@@ -5,3 +5,7 @@ export declare const FTMS = "1826";
 export declare const FTMS_CP = "2ad9";
 export declare const FTMS_STATUS = "2ada";
 export declare const INDOOR_BIKE_DATA = "2ad2";
+export declare const CSP = "1818";
+export declare const CSP_MEASUREMENT = "2a63";
+export declare const CSP_FEATURE = "2a65";
+export declare const WAHOO_ADVANCED_TRAINER_CP = "a026e005";

package/lib/ble/consts.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.INDOOR_BIKE_DATA = exports.FTMS_STATUS = exports.FTMS_CP = exports.FTMS = exports.TACX_FE_C_TX = exports.TACX_FE_C_RX = exports.TACX_FE_C_BLE = void 0;
+exports.WAHOO_ADVANCED_TRAINER_CP = exports.CSP_FEATURE = exports.CSP_MEASUREMENT = exports.CSP = exports.INDOOR_BIKE_DATA = exports.FTMS_STATUS = exports.FTMS_CP = exports.FTMS = exports.TACX_FE_C_TX = exports.TACX_FE_C_RX = exports.TACX_FE_C_BLE = void 0;
 exports.TACX_FE_C_BLE = '6e40fec1';
 exports.TACX_FE_C_RX = '6e40fec2';
 exports.TACX_FE_C_TX = '6e40fec3';
@@ -8,3 +8,7 @@ exports.FTMS = '1826';
 exports.FTMS_CP = '2ad9';
 exports.FTMS_STATUS = '2ada';
 exports.INDOOR_BIKE_DATA = '2ad2';
+exports.CSP = '1818';
+exports.CSP_MEASUREMENT = '2a63';
+exports.CSP_FEATURE = '2a65';
+exports.WAHOO_ADVANCED_TRAINER_CP = 'a026e005';

package/lib/ble/pwr.js

@@ -36,9 +36,8 @@ const ble_device_1 = require("./ble-device");
 const ble_interface_1 = __importDefault(require("./ble-interface"));
 const Device_1 = __importStar(require("../Device"));
 const gd_eventlog_1 = require("gd-eventlog");
+const consts_1 = require("./consts");
 const power_meter_1 = __importDefault(require("../modes/power-meter"));
-const CP_MEASUREMENT = '2a63';
-const CP_FEATURE = '2a65';
 class BleCyclingPowerDevice extends ble_device_1.BleDevice {
     constructor(props) {
         super(props);
@@ -54,8 +53,8 @@ class BleCyclingPowerDevice extends ble_device_1.BleDevice {
     isMatching(characteristics) {
         if (!characteristics)
             return false;
-        const hasCPMeasurement = characteristics.find(c => c === CP_MEASUREMENT) !== undefined;
-        const hasCPFeature = characteristics.find(c => c === CP_FEATURE) !== undefined;
+        const hasCPMeasurement = characteristics.find(c => c === consts_1.CSP_MEASUREMENT) !== undefined;
+        const hasCPFeature = characteristics.find(c => c === consts_1.CSP_FEATURE) !== undefined;
         return hasCPMeasurement && hasCPFeature;
     }
     init() {
@@ -143,7 +142,7 @@ class BleCyclingPowerDevice extends ble_device_1.BleDevice {
         const isDuplicate = this.checkForDuplicate(characteristic, data);
         if (isDuplicate)
             return;
-        if (characteristic.toLocaleLowerCase() === CP_MEASUREMENT) {
+        if (characteristic.toLocaleLowerCase() === consts_1.CSP_MEASUREMENT) {
             const res = this.parsePower(data);
             this.emit('data', res);
         }
@@ -160,8 +159,8 @@ class BleCyclingPowerDevice extends ble_device_1.BleDevice {
     }
 }
 exports.default = BleCyclingPowerDevice;
-BleCyclingPowerDevice.services = ['1818'];
-BleCyclingPowerDevice.characteristics = [CP_MEASUREMENT, CP_FEATURE, '2a5d', '2a3c'];
+BleCyclingPowerDevice.services = [consts_1.CSP];
+BleCyclingPowerDevice.characteristics = [consts_1.CSP_MEASUREMENT, consts_1.CSP_FEATURE, '2a5d', '2a3c'];
 ble_interface_1.default.register('BleCyclingPowerDevice', 'cp', BleCyclingPowerDevice, BleCyclingPowerDevice.services);
 class PwrAdapter extends Device_1.default {
     constructor(device, protocol) {

package/lib/ble/wahoo-kickr.js

@@ -39,7 +39,6 @@ const gd_eventlog_1 = require("gd-eventlog");
 const fm_1 = __importStar(require("./fm"));
 const consts_1 = require("./consts");
 const WAHOO_ADVANCED_FTMS = 'a026ee0b';
-const WAHOO_ADVANCED_TRAINER_CP = 'a026e005';
 const cwABike = {
     race: 0.35,
     triathlon: 0.29,
@@ -56,12 +55,12 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
         this.tsPrevWrite = undefined;
         this.prevSlope = undefined;
         this.data = {};
-        this.wahooCP = WAHOO_ADVANCED_TRAINER_CP;
+        this.wahooCP = consts_1.WAHOO_ADVANCED_TRAINER_CP;
     }
     isMatching(characteristics) {
         if (!characteristics)
             return false;
-        const hasWahooCP = characteristics.find(c => (0, ble_1.matches)(c, WAHOO_ADVANCED_TRAINER_CP)) !== undefined;
+        const hasWahooCP = characteristics.find(c => (0, ble_1.matches)(c, consts_1.WAHOO_ADVANCED_TRAINER_CP)) !== undefined;
         const hasFTMS = characteristics.find(c => (0, ble_1.matches)(c, consts_1.FTMS_CP)) !== undefined;
         return hasWahooCP && !hasFTMS;
     }
@@ -83,7 +82,7 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
     }
     setCharacteristicUUIDs(uuids) {
         uuids.forEach(c => {
-            if ((0, ble_1.matches)(c, WAHOO_ADVANCED_TRAINER_CP))
+            if ((0, ble_1.matches)(c, consts_1.WAHOO_ADVANCED_TRAINER_CP))
                 this.wahooCP = c;
         });
     }
@@ -190,17 +189,18 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
     writeWahooFtmsMessage(requestedOpCode, data) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
+                this.logEvent({ message: 'wahoo cp:write', data: data.toString('hex') });
                 const opcode = Buffer.alloc(1);
                 opcode.writeUInt8(requestedOpCode, 0);
                 const message = Buffer.concat([opcode, data]);
                 const res = yield this.write(this.wahooCP, message);
                 const responseData = Buffer.from(res);
                 const result = responseData.readUInt8(0);
-                this.logEvent({ message: 'response', opCode: requestedOpCode, response: responseData.toString('hex') });
+                this.logEvent({ message: 'wahoo cp:response', opCode: requestedOpCode, response: responseData.toString('hex') });
                 return result === 1;
             }
             catch (err) {
-                this.logEvent({ message: 'writeWahooFtmsMessage failed', opCode: requestedOpCode, reason: err.message });
+                this.logEvent({ message: 'wahoo cp:write failed', opCode: requestedOpCode, reason: err.message });
                 return false;
             }
         });
@@ -210,8 +210,6 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
             if (this.hasControl)
                 return true;
             this.logEvent({ message: 'requestControl' });
-            this.hasControl = true;
-            return;
             const data = Buffer.alloc(2);
             data.writeUInt8(0xEE, 0);
             data.writeUInt8(0xFC, 1);
@@ -336,8 +334,8 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
     }
 }
 exports.default = WahooAdvancedFitnessMachineDevice;
-WahooAdvancedFitnessMachineDevice.services = ['1818'];
-WahooAdvancedFitnessMachineDevice.characteristics = ['2acc', '2ad2', '2ad6', '2ad8', '2ad9', '2ada', WAHOO_ADVANCED_TRAINER_CP];
+WahooAdvancedFitnessMachineDevice.services = [consts_1.CSP];
+WahooAdvancedFitnessMachineDevice.characteristics = ['2acc', '2ad2', '2ad6', '2ad8', '2ad9', '2ada', consts_1.WAHOO_ADVANCED_TRAINER_CP];
 ble_interface_1.default.register('WahooAdvancedFitnessMachineDevice', 'wahoo-fm', WahooAdvancedFitnessMachineDevice, WahooAdvancedFitnessMachineDevice.services);
 class WahooAdvancedFmAdapter extends fm_1.FmAdapter {
     constructor(device, protocol) {

package/package.json

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