incyclist-devices 1.4.84 → 1.4.85

package/lib/ble/ble-device.js

@@ -202,6 +202,8 @@ class BleDevice extends ble_1.BleDeviceClass {
                                 this.peripheral = devices[0].peripheral;
                                 yield this.connectPeripheral(this.peripheral);
                                 this.logEvent({ message: 'connect result: success', mode: 'device', device: { id, name, address } });
+                                this.connectState.isConnecting = false;
+                                this.connectState.isConnected = true;
                                 return true;
                             }
                         }

package/lib/ble/ble-interface.js

@@ -362,7 +362,7 @@ class BleInterface extends ble_1.BleInterfaceClass {
     createDevice(DeviceClass, peripheral, characteristics) {
         try {
             const C = DeviceClass;
-            const device = new C({ peripheral });
+            const device = new C({ peripheral, logger: this.logger });
             const cids = characteristics ? characteristics.map(c => (0, ble_1.uuid)(c.uuid)) : [];
             this.logEvent({ message: 'trying to create device', peripheral: peripheral.address, characteristics: cids, profile: device.getProfile() });
             const existingDevice = this.devices.find(i => i.device.id === device.id && i.device.getProfile() === device.getProfile());
@@ -395,6 +395,7 @@ class BleInterface extends ble_1.BleInterfaceClass {
             this.scanState.isConnecting = true;
             const existing = this.devices.find(i => (!profile || i.device.getProfile() === profile) && (i.device.address === requested.address || i.device.id === requested.id || i.device.name === requested.name));
             if (existing) {
+                this.logEvent({ message: 'connect existing device' });
                 yield existing.device.connect();
                 this.scanState.isConnecting = false;
                 return existing.device;
@@ -415,6 +416,9 @@ class BleInterface extends ble_1.BleInterfaceClass {
                         }
                     }
                 }
+                const connectedDevice = this.devices.find(d => d.isConnected);
+                if (connectedDevice)
+                    return connectedDevice.device;
             }
             let devices = [];
             let retry = false;
@@ -649,26 +653,26 @@ class BleInterface extends ble_1.BleInterfaceClass {
         });
     }
     stopScan() {
-        if (!this.scanState.isScanning) {
-            return Promise.resolve(true);
-        }
-        if (!this.getBinding())
-            return Promise.reject(new Error('no binding defined'));
-        this.getBinding().removeAllListeners('discover');
-        const ongoing = this.peripheralCache.filter(i => i.state.isLoading);
-        if (ongoing)
-            ongoing.forEach(i => { i.isInterrupted = true; });
-        this.logEvent({ message: 'scan stop request' });
-        return new Promise(resolve => {
-            this.getBinding().stopScanning(() => {
-                this.scanState.isScanning = false;
-                this.logEvent({ message: 'scan stop result: success' });
-                resolve(true);
-            });
+        return __awaiter(this, void 0, void 0, function* () {
+            this.logEvent({ message: 'scan stop request' });
+            if (!this.scanState.isScanning) {
+                this.logEvent({ message: 'scan stop result: not scanning' });
+                return true;
+            }
+            if (!this.getBinding())
+                throw new Error('no binding defined');
+            this.getBinding().removeAllListeners('discover');
+            const ongoing = this.peripheralCache.filter(i => i.state.isLoading);
+            if (ongoing)
+                ongoing.forEach(i => { i.isInterrupted = true; });
+            yield this.getBinding().stopScanning();
+            this.scanState.isScanning = false;
+            this.logEvent({ message: 'scan stop result: success' });
+            return true;
         });
     }
     isScanning() {
-        return this.scanState.isScanning;
+        return this.scanState.isScanning === true;
     }
     addConnectedDevice(device) {
         const existigDevice = this.devices.find(i => i.device.id === device.id && i.device.getProfile() === device.getProfile());

package/lib/ble/ble-st-mode.js

@@ -70,9 +70,6 @@ class FtmsCyclingMode extends power_base_1.default {
             let power = bikeData.power || 0;
             const slope = (prevData.slope !== undefined ? prevData.slope : prevRequest.slope || 0);
             const distanceInternal = prevData.distanceInternal || 0;
-            if (bikeData.pedalRpm === 0 || bikeData.isPedalling === false) {
-                power = 0;
-            }
             const m = this.getWeight();
             const t = this.getTimeSinceLastUpdate();
             const { speed, distance } = this.calculateSpeedAndDistance(power, slope, m, t, { bikeType });

package/lib/ble/consts.d.ts

@@ -9,3 +9,4 @@ 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";
+export declare const WAHOO_ADVANCED_TRAINER_CP_FULL = "A026E005-0A7D-4AB3-97FA-F1500F9FEB8B";

package/lib/ble/consts.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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.WAHOO_ADVANCED_TRAINER_CP_FULL = 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';
@@ -12,3 +12,4 @@ exports.CSP = '1818';
 exports.CSP_MEASUREMENT = '2a63';
 exports.CSP_FEATURE = '2a65';
 exports.WAHOO_ADVANCED_TRAINER_CP = 'a026e005';
+exports.WAHOO_ADVANCED_TRAINER_CP_FULL = 'A026E005-0A7D-4AB3-97FA-F1500F9FEB8B';

package/lib/ble/fm.js

@@ -105,6 +105,7 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
     }
     subscribeWriteResponse(cuuid) {
         return __awaiter(this, void 0, void 0, function* () {
+            this.logEvent({ message: 'subscribe to CP response', characteristics: cuuid });
             const connector = this.ble.getConnector(this.peripheral);
             const isAlreadySubscribed = connector.isSubscribed(cuuid);
             if (!isAlreadySubscribed) {
@@ -610,7 +611,7 @@ class FmAdapter extends Device_1.default {
     }
     start(props) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.logger.logEvent({ message: 'start requested', profile: this.getProfile(), props });
+            this.logger.logEvent({ message: 'ftms: start requested', profile: this.getProfile(), props });
             if (this.ble.isScanning())
                 yield this.ble.stopScan();
             try {

package/lib/ble/hrm.js

@@ -102,7 +102,7 @@ class HrmAdapter extends Device_1.default {
     }
     start(props) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.logger.logEvent({ message: 'start requested', profile: this.getProfile(), props });
+            this.logger.logEvent({ message: 'hrm: start requested', profile: this.getProfile(), props });
             try {
                 const bleDevice = yield this.ble.connectDevice(this.device);
                 if (bleDevice) {

package/lib/ble/incyclist-protocol.js

@@ -39,8 +39,8 @@ const ble_interface_1 = __importDefault(require("./ble-interface"));
 const fm_1 = __importStar(require("./fm"));
 const hrm_1 = __importStar(require("./hrm"));
 const pwr_1 = __importStar(require("./pwr"));
-const wahoo_kickr_1 = __importDefault(require("./wahoo-kickr"));
-const tacx_1 = __importDefault(require("./tacx"));
+const wahoo_kickr_1 = __importStar(require("./wahoo-kickr"));
+const tacx_1 = __importStar(require("./tacx"));
 class BleProtocol extends DeviceProtocol_1.default {
     constructor(binding) {
         super();
@@ -82,16 +82,19 @@ class BleProtocol extends DeviceProtocol_1.default {
                     device = bleDevice;
                 else {
                     device = this.ble.findDeviceInCache(Object.assign(Object.assign({}, props()), { profile }));
-                    if (!device) {
-                        if (profile.toLowerCase() === 'wahoo smart trainer')
-                            device = new wahoo_kickr_1.default(props());
-                        else if (profile === tacx_1.default.PROFILE)
-                            device = new tacx_1.default(props());
-                        else
-                            device = new fm_1.default(props());
-                    }
                 }
-                return new fm_1.FmAdapter(device, this);
+                if (profile.toLowerCase() === 'wahoo smart trainer') {
+                    device = device || new wahoo_kickr_1.default(props());
+                    return new wahoo_kickr_1.WahooAdvancedFmAdapter(device, this);
+                }
+                else if (profile === tacx_1.default.PROFILE) {
+                    device = device || new tacx_1.default(props());
+                    return new tacx_1.TacxBleFEAdapter(device, this);
+                }
+                else {
+                    device = device || new fm_1.default(props());
+                    return new fm_1.FmAdapter(device, this);
+                }
             case 'cp':
             case 'power meter':
                 return new pwr_1.PwrAdapter(fromDevice ? bleDevice : new pwr_1.default(props()), this);

package/lib/ble/pwr.d.ts

@@ -62,6 +62,7 @@ export declare class PwrAdapter extends DeviceAdapter {
         weight?: number;
     };
     constructor(device: BleDeviceClass, protocol: BleProtocol);
+    select(): void;
     isBike(): boolean;
     isHrm(): boolean;
     isPower(): boolean;

package/lib/ble/pwr.js

@@ -173,6 +173,7 @@ class PwrAdapter extends Device_1.default {
         this.mode = this.getDefaultCyclingMode();
         this.logger = new gd_eventlog_1.EventLogger('Ble-CP');
     }
+    select() { this.selected = true; }
     isBike() { return true; }
     isHrm() { return false; }
     isPower() { return true; }
@@ -277,7 +278,7 @@ class PwrAdapter extends Device_1.default {
                 this.userSettings = props.user;
             if (props && props.bikeSettings)
                 this.bikeSettings = props.bikeSettings;
-            this.logger.logEvent({ message: 'start requested', profile: this.getProfile(), props });
+            this.logger.logEvent({ message: 'csp: start requested', profile: this.getProfile(), props });
             try {
                 const bleDevice = yield this.ble.connectDevice(this.device);
                 if (bleDevice) {

package/lib/ble/tacx.js

@@ -673,7 +673,7 @@ class TacxBleFEAdapter extends fm_1.FmAdapter {
     }
     start(props) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.logger.logEvent({ message: 'start requested', profile: this.getProfile(), props });
+            this.logger.logEvent({ message: 'tacx: start requested', profile: this.getProfile(), props });
             if (this.ble.isScanning())
                 yield this.ble.stopScan();
             try {

package/lib/ble/wahoo-kickr.d.ts

@@ -36,6 +36,7 @@ export default class WahooAdvancedFitnessMachineDevice extends BleFitnessMachine
     tsPrevWrite: any;
     prevSlope: any;
     wahooCP: string;
+    isSimMode: boolean;
     constructor(props?: any);
     isMatching(characteristics: string[]): boolean;
     init(): Promise<boolean>;

package/lib/ble/wahoo-kickr.js

@@ -71,6 +71,11 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 yield this.subscribeWriteResponse(this.wahooCP);
+                try {
+                    yield this.subscribeWriteResponse(consts_1.WAHOO_ADVANCED_TRAINER_CP_FULL.toLowerCase());
+                }
+                catch (err) {
+                }
                 yield _super.initDevice.call(this);
                 return true;
             }
@@ -81,6 +86,7 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
         });
     }
     setCharacteristicUUIDs(uuids) {
+        this.logEvent({ message: 'set uuids', uuids });
         uuids.forEach(c => {
             if ((0, ble_1.matches)(c, consts_1.WAHOO_ADVANCED_TRAINER_CP))
                 this.wahooCP = c;
@@ -163,9 +169,7 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
     onData(characteristic, data) {
         super.onData(characteristic, data);
         const isDuplicate = this.checkForDuplicate(characteristic, data);
-        if (isDuplicate)
-            return;
-        const uuid = characteristic.toLocaleLowerCase();
+        const uuid = characteristic.toLowerCase();
         let res = undefined;
         switch (uuid) {
             case '2a63':
@@ -181,6 +185,7 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
                 res = this.parseFitnessMachineStatus(data);
                 break;
             default:
+                this.logEvent({ message: 'data', uuid, data: data.toString('hex') });
                 break;
         }
         if (res)
@@ -189,14 +194,13 @@ 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]);
+                this.logEvent({ message: 'wahoo cp:write', data: message.toString('hex') });
                 const res = yield this.write(this.wahooCP, message);
                 const responseData = Buffer.from(res);
                 const result = responseData.readUInt8(0);
-                this.logEvent({ message: 'wahoo cp:response', opCode: requestedOpCode, response: responseData.toString('hex') });
                 return result === 1;
             }
             catch (err) {
@@ -237,61 +241,105 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
     }
     setErgMode(power) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.isPowerAdjusting())
+            this.logger.logEvent({ message: 'setErgMode', power });
+            try {
+                if (this.isPowerAdjusting())
+                    return false;
+                const data = Buffer.alloc(2);
+                data.writeInt16LE(Math.round(power), 0);
+                const res = yield this.writeWahooFtmsMessage(66, data);
+                if (res === true) {
+                    this.setPowerAdjusting();
+                    this.data.targetPower = power;
+                    this.isSimMode = false;
+                }
+                return res;
+            }
+            catch (err) {
+                this.logEvent({ message: 'error', fn: 'setErgMode', error: err.message || err, stack: err.stack });
                 return false;
-            const data = Buffer.alloc(2);
-            data.writeInt16LE(Math.round(power), 0);
-            const res = yield this.writeWahooFtmsMessage(66, data);
-            if (res === true) {
-                this.setPowerAdjusting();
-                this.data.targetPower = power;
             }
-            return res;
         });
     }
     setSimMode(weight, crr, cw) {
         return __awaiter(this, void 0, void 0, function* () {
-            const data = Buffer.alloc(6);
-            data.writeInt16LE(Math.round(weight * 100), 0);
-            data.writeInt16LE(Math.round(crr * 10000), 2);
-            data.writeInt16LE(Math.round(cw * 1000), 4);
-            const res = yield this.writeWahooFtmsMessage(67, data);
-            return res;
+            this.logger.logEvent({ message: 'setSimMode', weight, crr, cw });
+            try {
+                const data = Buffer.alloc(6);
+                data.writeInt16LE(Math.round(weight * 100), 0);
+                data.writeInt16LE(Math.round(crr * 10000), 2);
+                data.writeInt16LE(Math.round(cw * 1000), 4);
+                const res = yield this.writeWahooFtmsMessage(67, data);
+                this.isSimMode = true;
+                return res;
+            }
+            catch (err) {
+                this.logEvent({ message: 'error', fn: 'setSimMode', error: err.message || err, stack: err.stack });
+                return false;
+            }
         });
     }
     setSimCRR(crr) {
         return __awaiter(this, void 0, void 0, function* () {
-            const data = Buffer.alloc(2);
-            data.writeInt16LE(Math.round(crr * 10000), 0);
-            const res = yield this.writeWahooFtmsMessage(68, data);
-            return res;
+            this.logger.logEvent({ message: 'setSimCRR', crr });
+            try {
+                const data = Buffer.alloc(2);
+                data.writeInt16LE(Math.round(crr * 10000), 0);
+                const res = yield this.writeWahooFtmsMessage(68, data);
+                return res;
+            }
+            catch (err) {
+                this.logEvent({ message: 'error', fn: 'setSimCRR', error: err.message || err, stack: err.stack });
+                return false;
+            }
         });
     }
     setSimWindResistance(cw) {
         return __awaiter(this, void 0, void 0, function* () {
-            const data = Buffer.alloc(2);
-            data.writeInt16LE(Math.round(cw * 1000), 0);
-            const res = yield this.writeWahooFtmsMessage(69, data);
-            return res;
+            this.logger.logEvent({ message: 'setSimWindResistance', cw });
+            try {
+                const data = Buffer.alloc(2);
+                data.writeInt16LE(Math.round(cw * 1000), 0);
+                const res = yield this.writeWahooFtmsMessage(69, data);
+                return res;
+            }
+            catch (err) {
+                this.logEvent({ message: 'error', fn: 'setSimWindResistance', error: err.message || err, stack: err.stack });
+                return false;
+            }
         });
     }
     setSimGrade(slope) {
         return __awaiter(this, void 0, void 0, function* () {
-            const value = (Math.min(1, Math.max(-1, slope)) + 1.0) * 65535 / 2.0;
-            const slopeVal = Math.floor(value);
-            const data = Buffer.alloc(2);
-            data.writeInt16LE(slopeVal, 0);
-            const res = yield this.writeWahooFtmsMessage(70, data);
-            return res;
+            this.logger.logEvent({ message: 'setSimGrade', slope });
+            try {
+                const value = (Math.min(1, Math.max(-1, slope)) + 1.0) * 65535 / 2.0;
+                const slopeVal = Math.floor(value);
+                const data = Buffer.alloc(2);
+                data.writeInt16LE(slopeVal, 0);
+                const res = yield this.writeWahooFtmsMessage(70, data);
+                return res;
+            }
+            catch (err) {
+                this.logEvent({ message: 'error', fn: 'setSimGrade', error: err.message || err, stack: err.stack });
+                return false;
+            }
         });
     }
     setSimWindSpeed(v) {
         return __awaiter(this, void 0, void 0, function* () {
-            const value = (Math.max(-32.767, Math.min(32.767, v)) + 32.767) * 1000;
-            const data = Buffer.alloc(2);
-            data.writeInt16LE(Math.round(value), 0);
-            const res = yield this.writeWahooFtmsMessage(71, data);
-            return res;
+            this.logger.logEvent({ message: 'setSimWindSpeed', v });
+            try {
+                const value = (Math.max(-32.767, Math.min(32.767, v)) + 32.767) * 1000;
+                const data = Buffer.alloc(2);
+                data.writeInt16LE(Math.round(value), 0);
+                const res = yield this.writeWahooFtmsMessage(71, data);
+                return res;
+            }
+            catch (err) {
+                this.logEvent({ message: 'error', fn: 'setSimWindSpeed', error: err.message || err, stack: err.stack });
+                return false;
+            }
         });
     }
     setTargetPower(power) {
@@ -315,7 +363,7 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
             try {
                 const hasControl = yield this.requestControl();
                 if (!hasControl) {
-                    this.logEvent({ message: 'setTargetPower failed', reason: 'control is disabled' });
+                    this.logEvent({ message: 'setSlope failed', reason: 'control is disabled' });
                     return false;
                 }
                 const res = yield this.setSimGrade(slope);
@@ -331,6 +379,7 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
     }
     reset() {
         this.data = {};
+        this.isSimMode = undefined;
     }
 }
 exports.default = WahooAdvancedFitnessMachineDevice;
@@ -358,12 +407,14 @@ class WahooAdvancedFmAdapter extends fm_1.FmAdapter {
     }
     start(props) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.logger.logEvent({ message: 'start requested', profile: this.getProfile(), props });
-            if (this.ble.isScanning())
-                yield this.ble.stopScan();
+            this.logger.logEvent({ message: 'wahoo: start requested', profile: this.getProfile(), props, isScanning: this.ble.isScanning() });
             try {
+                this.logger.logEvent({ message: 'wahoo: stop previous scan', isScanning: this.ble.isScanning() });
+                if (this.ble.isScanning())
+                    yield this.ble.stopScan();
+                this.logger.logEvent({ message: 'wahoo trying device connect' });
                 const bleDevice = yield this.ble.connectDevice(this.device);
-                bleDevice.setLogger(this.logger);
+                this.logger.logEvent({ message: 'wahoo device connected', connected: (bleDevice !== null && bleDevice !== undefined) });
                 if (bleDevice) {
                     this.device = bleDevice;
                     const mode = this.getCyclingMode();
@@ -383,8 +434,8 @@ class WahooAdvancedFmAdapter extends fm_1.FmAdapter {
                         }
                     }
                     const { user } = props || {};
-                    const weight = (user && user.weight ? user.weight : Device_1.DEFAULT_USER_WEIGHT) + Device_1.DEFAULT_BIKE_WEIGHT;
-                    this.device.setSimMode(weight, this.device.getCrr(), this.device.getCw());
+                    const weight = (user && user.weight ? Number(user.weight) : Device_1.DEFAULT_USER_WEIGHT) + Device_1.DEFAULT_BIKE_WEIGHT;
+                    yield this.device.setSimMode(weight, this.device.getCrr(), this.device.getCw());
                     const startRequest = this.getCyclingMode().getBikeInitRequest();
                     yield this.sendUpdate(startRequest);
                     bleDevice.on('data', (data) => {

package/package.json

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