incyclist-devices 2.3.7 → 2.3.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -143,7 +143,7 @@ class AntAdapter extends adpater_1.default {
|
|
|
143
143
|
this.emit('device-info', this.getSettings(), { manufacturer: (0, utils_2.getBrand)(deviceData.ManId) });
|
|
144
144
|
}
|
|
145
145
|
const logData = this.getLogData(deviceData, ['PairedDevices', 'RawData', '_RawData']);
|
|
146
|
-
this.logEvent({ message: 'onDeviceData', data: logData, paused: this.paused, started: this.started, canEmit: this.canEmitData() });
|
|
146
|
+
this.logEvent({ message: 'onDeviceData', device: this.getName(), interface: this.getInterface(), data: logData, paused: this.paused, started: this.started, canEmit: this.canEmitData() });
|
|
147
147
|
if (this.isStopped() || !this.canEmitData())
|
|
148
148
|
return;
|
|
149
149
|
if (this.isControllable()) {
|
|
@@ -171,7 +171,7 @@ class AntAdapter extends adpater_1.default {
|
|
|
171
171
|
clearInterval(iv);
|
|
172
172
|
resolve(true);
|
|
173
173
|
}
|
|
174
|
-
if (!this.promiseWaitForData) {
|
|
174
|
+
if (!this.promiseWaitForData || this.stopped) {
|
|
175
175
|
resolve(false);
|
|
176
176
|
clearInterval(iv);
|
|
177
177
|
}
|
package/lib/ble/tacx/sensor.d.ts
CHANGED
|
@@ -51,7 +51,7 @@ export default class TacxAdvancedFitnessMachineDevice extends BleFitnessMachineD
|
|
|
51
51
|
private parseFERealSpeed;
|
|
52
52
|
protected parseTrainerData(data: Buffer): BleFeBikeData;
|
|
53
53
|
protected parseProductInformation(data: Buffer): BleFeBikeData;
|
|
54
|
-
protected parseFECMessage(
|
|
54
|
+
protected parseFECMessage(data: Buffer): BleFeBikeData;
|
|
55
55
|
protected getChecksum(message: any[]): number;
|
|
56
56
|
protected buildMessage(payload?: number[], msgID?: number): Buffer;
|
|
57
57
|
protected sendMessage(message: Buffer): Promise<boolean>;
|
package/lib/ble/tacx/sensor.js
CHANGED
|
@@ -76,7 +76,7 @@ class TacxAdvancedFitnessMachineDevice extends sensor_1.default {
|
|
|
76
76
|
return res;
|
|
77
77
|
}
|
|
78
78
|
catch (err) {
|
|
79
|
-
this.logEvent({ message: 'error', fn: 'tacx.onData()', error: err.message || err, stack: err.stack, dataType: typeof (characteristicData) });
|
|
79
|
+
this.logEvent({ message: 'error', fn: 'tacx.onData()', error: err.message || err, stack: err.stack, dataType: typeof (characteristicData), characteristicData });
|
|
80
80
|
}
|
|
81
81
|
}
|
|
82
82
|
isDuplicate(characteristic, data) {
|
|
@@ -401,8 +401,7 @@ class TacxAdvancedFitnessMachineDevice extends sensor_1.default {
|
|
|
401
401
|
}
|
|
402
402
|
return this.data;
|
|
403
403
|
}
|
|
404
|
-
parseFECMessage(
|
|
405
|
-
const data = Buffer.from(_data);
|
|
404
|
+
parseFECMessage(data) {
|
|
406
405
|
this.logEvent({ message: 'FE-C message', data: data.toString('hex') });
|
|
407
406
|
const c = data.readUInt8(0);
|
|
408
407
|
if (c !== consts_2.SYNC_BYTE) {
|
|
@@ -415,13 +414,13 @@ class TacxAdvancedFitnessMachineDevice extends sensor_1.default {
|
|
|
415
414
|
try {
|
|
416
415
|
switch (messageId) {
|
|
417
416
|
case consts_2.ANTMessages.generalFE:
|
|
418
|
-
res = this.parseGeneralFE(data.subarray(4, len + 3));
|
|
417
|
+
res = this.parseGeneralFE(Buffer.from(data.subarray(4, len + 3)));
|
|
419
418
|
break;
|
|
420
419
|
case consts_2.ANTMessages.trainerData:
|
|
421
|
-
res = this.parseTrainerData(data.subarray(4, len + 3));
|
|
420
|
+
res = this.parseTrainerData(Buffer.from(data.subarray(4, len + 3)));
|
|
422
421
|
break;
|
|
423
422
|
case consts_2.ANTMessages.productInformation:
|
|
424
|
-
res = this.parseProductInformation(data.subarray(4, len + 3));
|
|
423
|
+
res = this.parseProductInformation(Buffer.from(data.subarray(4, len + 3)));
|
|
425
424
|
break;
|
|
426
425
|
}
|
|
427
426
|
if (res)
|