incyclist-devices 1.4.49 → 1.4.52

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.
@@ -12,6 +12,7 @@ import BleInterface from './ble/ble-interface';
12
12
  import BleHrmDevice from './ble/hrm';
13
13
  import BleCyclingPowerDevice from './ble/pwr';
14
14
  import BleFitnessMachineDevice from './ble/fm';
15
+ import WahooAdvancedFitnessMachineDevice from './ble/wahoo-kickr';
15
16
  declare const Protocols: {
16
17
  SimulatorProtocol: typeof SimulatorProtocol;
17
18
  DaumClassicProtocol: typeof DaumClassicProtocol;
@@ -19,4 +20,4 @@ declare const Protocols: {
19
20
  KettlerRacerProtocol: typeof KettlerRacerProtocol;
20
21
  BleProtocol: typeof BleProtocol;
21
22
  };
22
- export { DeviceProtocolBase, DeviceProtocol, DeviceRegistry, INTERFACE, DeviceAdapter as Device, Protocols, AntScanner, BleProtocol, CyclingModeProperyType, BleInterface, BleHrmDevice, BleCyclingPowerDevice, BleFitnessMachineDevice };
23
+ export { DeviceProtocolBase, DeviceProtocol, DeviceRegistry, INTERFACE, DeviceAdapter as Device, Protocols, AntScanner, BleProtocol, CyclingModeProperyType, BleInterface, BleHrmDevice, BleCyclingPowerDevice, BleFitnessMachineDevice, WahooAdvancedFitnessMachineDevice };
@@ -1,11 +1,7 @@
1
1
  "use strict";
2
2
  var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
3
  if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
4
+ Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
9
5
  }) : (function(o, m, k, k2) {
10
6
  if (k2 === undefined) k2 = k;
11
7
  o[k2] = m[k];
@@ -26,7 +22,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
26
22
  return (mod && mod.__esModule) ? mod : { "default": mod };
27
23
  };
28
24
  Object.defineProperty(exports, "__esModule", { value: true });
29
- exports.BleFitnessMachineDevice = exports.BleCyclingPowerDevice = exports.BleHrmDevice = exports.BleInterface = exports.CyclingModeProperyType = exports.BleProtocol = exports.AntScanner = exports.Protocols = exports.Device = exports.INTERFACE = exports.DeviceRegistry = exports.DeviceProtocolBase = void 0;
25
+ exports.WahooAdvancedFitnessMachineDevice = exports.BleFitnessMachineDevice = exports.BleCyclingPowerDevice = exports.BleHrmDevice = exports.BleInterface = exports.CyclingModeProperyType = exports.BleProtocol = exports.AntScanner = exports.Protocols = exports.Device = exports.INTERFACE = exports.DeviceRegistry = exports.DeviceProtocolBase = void 0;
30
26
  const DeviceRegistry_1 = __importDefault(require("./DeviceRegistry"));
31
27
  exports.DeviceRegistry = DeviceRegistry_1.default;
32
28
  const Device_1 = __importDefault(require("./Device"));
@@ -52,6 +48,8 @@ const pwr_1 = __importDefault(require("./ble/pwr"));
52
48
  exports.BleCyclingPowerDevice = pwr_1.default;
53
49
  const fm_1 = __importDefault(require("./ble/fm"));
54
50
  exports.BleFitnessMachineDevice = fm_1.default;
51
+ const wahoo_kickr_1 = __importDefault(require("./ble/wahoo-kickr"));
52
+ exports.WahooAdvancedFitnessMachineDevice = wahoo_kickr_1.default;
55
53
  const Protocols = {
56
54
  SimulatorProtocol: Simulator_1.default,
57
55
  DaumClassicProtocol: DaumClassicProtocol_1.default,
@@ -1,11 +1,7 @@
1
1
  "use strict";
2
2
  var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
3
  if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
4
+ Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
9
5
  }) : (function(o, m, k, k2) {
10
6
  if (k2 === undefined) k2 = k;
11
7
  o[k2] = m[k];
@@ -29,6 +29,7 @@ export declare abstract class BleDevice extends BleDeviceClass {
29
29
  writeQueue: CommandQueueItem[];
30
30
  constructor(props?: BleDeviceConstructProps);
31
31
  logEvent(event: any): void;
32
+ setLogger(logger: EventLogger): void;
32
33
  setInterface(ble: BleInterfaceClass): void;
33
34
  cleanupListeners(): void;
34
35
  onDisconnect(): void;
@@ -39,7 +39,7 @@ class BleDevice extends ble_1.BleDeviceClass {
39
39
  if (props.logger) {
40
40
  this.logger = props.logger;
41
41
  }
42
- else if (props.log) {
42
+ else if (props.log !== false) {
43
43
  this.logger = new gd_eventlog_1.EventLogger('BleDevice');
44
44
  }
45
45
  }
@@ -51,6 +51,9 @@ class BleDevice extends ble_1.BleDeviceClass {
51
51
  console.log('~~~BLE:', event);
52
52
  }
53
53
  }
54
+ setLogger(logger) {
55
+ this.logger = logger;
56
+ }
54
57
  setInterface(ble) {
55
58
  this.ble = ble;
56
59
  }
@@ -13,6 +13,7 @@ const config = {
13
13
  { key: 'startPower', name: 'Starting Power', description: 'Initial power in Watts at start of training', type: CyclingMode_1.CyclingModeProperyType.Integer, default: 50, min: 25, max: 800 },
14
14
  ]
15
15
  };
16
+ const MIN_SPEED = 10;
16
17
  class BleERGCyclingMode extends power_base_1.default {
17
18
  constructor(adapter, props) {
18
19
  super(adapter, props);
@@ -96,21 +97,26 @@ class BleERGCyclingMode extends power_base_1.default {
96
97
  const data = this.data || {};
97
98
  const bikeType = this.getSetting('bikeType').toLowerCase();
98
99
  try {
99
- const rpm = bikeData.pedalRpm || 0;
100
100
  let power = bikeData.power || 0;
101
101
  const slope = (prevData.slope !== undefined ? prevData.slope : prevRequest.slope || 0);
102
102
  const distanceInternal = prevData.distanceInternal || 0;
103
- if (!bikeData.pedalRpm || bikeData.isPedalling === false) {
103
+ if (bikeData.pedalRpm === 0 || bikeData.isPedalling === false) {
104
104
  power = 0;
105
105
  }
106
106
  const m = this.getWeight();
107
107
  const t = this.getTimeSinceLastUpdate();
108
108
  const { speed, distance } = this.calculateSpeedAndDistance(power, slope, m, t, { bikeType });
109
- data.speed = parseFloat(speed.toFixed(1));
109
+ if (power === 0 && speed < MIN_SPEED) {
110
+ data.speed = Math.round(prevData.speed - 1) < 0 ? 0 : Math.round(prevData.speed - 1);
111
+ data.distanceInternal = Math.round(distanceInternal + data.speed / 3.6 * t);
112
+ }
113
+ else {
114
+ data.speed = (power === 0 && speed < MIN_SPEED) ? 0 : speed;
115
+ data.distanceInternal = (power === 0 && speed < MIN_SPEED) ? Math.round(distanceInternal) : Math.round(distanceInternal + distance);
116
+ }
110
117
  data.power = Math.round(power);
111
- data.distanceInternal = Math.round(distanceInternal + distance);
112
118
  data.slope = slope;
113
- data.pedalRpm = rpm;
119
+ data.pedalRpm = bikeData.pedalRpm || 0;
114
120
  if (data.time !== undefined && data.speed > 0)
115
121
  data.time += t;
116
122
  else
@@ -12,6 +12,7 @@ const config = {
12
12
  { key: 'bikeType', name: 'Bike Type', description: '', type: CyclingMode_1.CyclingModeProperyType.SingleSelect, options: ['Race', 'Mountain', 'Triathlon'], default: 'Race' }
13
13
  ]
14
14
  };
15
+ const MIN_SPEED = 10;
15
16
  class FtmsCyclingMode extends power_base_1.default {
16
17
  constructor(adapter, props) {
17
18
  super(adapter, props);
@@ -66,21 +67,26 @@ class FtmsCyclingMode extends power_base_1.default {
66
67
  const data = this.data || {};
67
68
  const bikeType = this.getSetting('bikeType').toLowerCase();
68
69
  try {
69
- const rpm = bikeData.pedalRpm || 0;
70
70
  let power = bikeData.power || 0;
71
71
  const slope = (prevData.slope !== undefined ? prevData.slope : prevRequest.slope || 0);
72
72
  const distanceInternal = prevData.distanceInternal || 0;
73
- if (!bikeData.pedalRpm || bikeData.isPedalling === false) {
73
+ if (bikeData.pedalRpm === 0 || bikeData.isPedalling === false) {
74
74
  power = 0;
75
75
  }
76
76
  const m = this.getWeight();
77
77
  const t = this.getTimeSinceLastUpdate();
78
78
  const { speed, distance } = this.calculateSpeedAndDistance(power, slope, m, t, { bikeType });
79
- data.speed = parseFloat(speed.toFixed(1));
79
+ if (power === 0 && speed < MIN_SPEED) {
80
+ data.speed = Math.round(prevData.speed - 1) < 0 ? 0 : Math.round(prevData.speed - 1);
81
+ data.distanceInternal = Math.round(distanceInternal + data.speed / 3.6 * t);
82
+ }
83
+ else {
84
+ data.speed = (power === 0 && speed < MIN_SPEED) ? 0 : speed;
85
+ data.distanceInternal = (power === 0 && speed < MIN_SPEED) ? Math.round(distanceInternal) : Math.round(distanceInternal + distance);
86
+ }
80
87
  data.power = Math.round(power);
81
- data.distanceInternal = Math.round(distanceInternal + distance);
82
88
  data.slope = slope;
83
- data.pedalRpm = rpm;
89
+ data.pedalRpm = bikeData.pedalRpm || 0;
84
90
  if (data.time !== undefined)
85
91
  data.time += t;
86
92
  else
package/lib/ble/ble.d.ts CHANGED
@@ -1,5 +1,4 @@
1
1
  /// <reference types="node" />
2
- /// <reference types="node" />
3
2
  import EventEmitter from "events";
4
3
  import BlePeripheralConnector from "./ble-peripheral";
5
4
  export declare type ConnectProps = {
package/lib/ble/fm.js CHANGED
@@ -314,12 +314,16 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
314
314
  return __awaiter(this, void 0, void 0, function* () {
315
315
  if (this.hasControl)
316
316
  return true;
317
+ this.logEvent({ message: 'requestControl' });
317
318
  const data = Buffer.alloc(1);
318
319
  data.writeUInt8(0, 0);
319
320
  const res = yield this.writeFtmsMessage(0, data);
320
321
  if (res === 1) {
321
322
  this.hasControl = true;
322
323
  }
324
+ else {
325
+ this.logEvent({ message: 'requestControl failed' });
326
+ }
323
327
  return this.hasControl;
324
328
  });
325
329
  }
@@ -328,11 +332,9 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
328
332
  this.logEvent({ message: 'setTargetPower', power, skip: (this.data.targetPower !== undefined && this.data.targetPower === power) });
329
333
  if (this.data.targetPower !== undefined && this.data.targetPower === power)
330
334
  return true;
335
+ if (!this.hasControl)
336
+ return;
331
337
  const hasControl = yield this.requestControl();
332
- if (!hasControl) {
333
- this.logEvent({ message: 'setTargetPower failed', reason: 'control is disabled' });
334
- return false;
335
- }
336
338
  const data = Buffer.alloc(3);
337
339
  data.writeUInt8(5, 0);
338
340
  data.writeInt16LE(Math.round(power), 1);
@@ -343,6 +345,8 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
343
345
  setSlope(slope) {
344
346
  return __awaiter(this, void 0, void 0, function* () {
345
347
  this.logEvent({ message: 'setSlope', slope });
348
+ if (!this.hasControl)
349
+ return;
346
350
  const { windSpeed, crr, cw } = this;
347
351
  return yield this.setIndoorBikeSimulation(windSpeed, slope, crr, cw);
348
352
  });
@@ -351,6 +355,8 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
351
355
  return __awaiter(this, void 0, void 0, function* () {
352
356
  if (this.data.targetInclination !== undefined && this.data.targetInclination === inclination)
353
357
  return true;
358
+ if (!this.hasControl)
359
+ return;
354
360
  const hasControl = yield this.requestControl();
355
361
  if (!hasControl) {
356
362
  this.logEvent({ message: 'setTargetInclination failed', reason: 'control is disabled' });
@@ -365,11 +371,9 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
365
371
  }
366
372
  setIndoorBikeSimulation(windSpeed, gradient, crr, cw) {
367
373
  return __awaiter(this, void 0, void 0, function* () {
374
+ if (!this.hasControl)
375
+ return;
368
376
  const hasControl = yield this.requestControl();
369
- if (!hasControl) {
370
- this.logEvent({ message: 'setTargetInclination failed', reason: 'control is disabled' });
371
- return false;
372
- }
373
377
  const data = Buffer.alloc(7);
374
378
  data.writeUInt8(17, 0);
375
379
  data.writeInt16LE(Math.round(windSpeed * 1000), 1);
@@ -439,6 +443,8 @@ class FmAdapter extends Device_1.default {
439
443
  this.ble = protocol.ble;
440
444
  this.cyclingMode = this.getDefaultCyclingMode();
441
445
  this.logger = new gd_eventlog_1.EventLogger('BLE-FM');
446
+ if (this.device)
447
+ this.device.setLogger(this.logger);
442
448
  }
443
449
  isBike() { return this.device.isBike(); }
444
450
  isHrm() { return this.device.isHrm(); }
@@ -552,6 +558,7 @@ class FmAdapter extends Device_1.default {
552
558
  yield this.ble.stopScan();
553
559
  try {
554
560
  const bleDevice = yield this.ble.connectDevice(this.device);
561
+ bleDevice.setLogger(this.logger);
555
562
  if (bleDevice) {
556
563
  this.device = bleDevice;
557
564
  const mode = this.getCyclingMode();
@@ -570,6 +577,9 @@ class FmAdapter extends Device_1.default {
570
577
  break;
571
578
  }
572
579
  }
580
+ this.device.requestControl();
581
+ const startRequest = this.getCyclingMode().getBikeInitRequest();
582
+ yield this.sendUpdate(startRequest);
573
583
  bleDevice.on('data', (data) => {
574
584
  this.onDeviceData(data);
575
585
  });
@@ -594,12 +604,13 @@ class FmAdapter extends Device_1.default {
594
604
  return __awaiter(this, void 0, void 0, function* () {
595
605
  if (this.paused || !this.device)
596
606
  return;
597
- const requested = this.getCyclingMode().sendBikeUpdate(request);
598
- if (requested.slope !== undefined) {
599
- yield this.device.setSlope(requested.slope);
607
+ const update = this.getCyclingMode().sendBikeUpdate(request);
608
+ this.logger.logEvent({ message: 'send bike update requested', profile: this.getProfile(), update, request });
609
+ if (update.slope !== undefined) {
610
+ yield this.device.setSlope(update.slope);
600
611
  }
601
- if (requested.targetPower !== undefined) {
602
- yield this.device.setTargetPower(requested.targetPower);
612
+ if (update.targetPower !== undefined) {
613
+ yield this.device.setTargetPower(update.targetPower);
603
614
  }
604
615
  });
605
616
  }
@@ -1,11 +1,7 @@
1
1
  "use strict";
2
2
  var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
3
  if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
4
+ Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
9
5
  }) : (function(o, m, k, k2) {
10
6
  if (k2 === undefined) k2 = k;
11
7
  o[k2] = m[k];
@@ -0,0 +1,73 @@
1
+ /// <reference types="node" />
2
+ import BleProtocol from './incyclist-protocol';
3
+ import { BleDeviceClass } from './ble';
4
+ import DeviceAdapter from '../Device';
5
+ import BleFitnessMachineDevice, { FmAdapter } from './fm';
6
+ declare type IndoorBikeData = {
7
+ speed?: number;
8
+ averageSpeed?: number;
9
+ cadence?: number;
10
+ averageCadence?: number;
11
+ totalDistance?: number;
12
+ resistanceLevel?: number;
13
+ instantaneousPower?: number;
14
+ averagePower?: number;
15
+ expendedEnergy?: number;
16
+ heartrate?: number;
17
+ metabolicEquivalent?: number;
18
+ time?: number;
19
+ remainingTime?: number;
20
+ raw?: string;
21
+ targetPower?: number;
22
+ targetInclination?: number;
23
+ status?: string;
24
+ };
25
+ declare type CrankData = {
26
+ revolutions?: number;
27
+ time?: number;
28
+ cntUpdateMissing?: number;
29
+ };
30
+ export default class WahooAdvancedFitnessMachineDevice extends BleFitnessMachineDevice {
31
+ static services: string[];
32
+ static characteristics: string[];
33
+ prevCrankData: CrankData;
34
+ currentCrankData: CrankData;
35
+ timeOffset: number;
36
+ tsPrevWrite: any;
37
+ constructor(props?: any);
38
+ init(): Promise<boolean>;
39
+ getProfile(): string;
40
+ getServiceUUids(): string[];
41
+ isBike(): boolean;
42
+ isPower(): boolean;
43
+ isHrm(): boolean;
44
+ parseCrankData(crankData: any): {
45
+ rpm: number;
46
+ time: any;
47
+ };
48
+ parsePower(_data: Buffer): IndoorBikeData;
49
+ onData(characteristic: string, data: Buffer): void;
50
+ writeWahooFtmsMessage(requestedOpCode: number, data: Buffer): Promise<boolean>;
51
+ requestControl(): Promise<boolean>;
52
+ setPowerAdjusting(): void;
53
+ isPowerAdjusting(): boolean;
54
+ setErgMode(power: number): Promise<boolean>;
55
+ setSimMode(weight: number, crr: number, cw: number): Promise<boolean>;
56
+ setSimCRR(crr: number): Promise<boolean>;
57
+ setSimWindResistance(cw: number): Promise<boolean>;
58
+ setSimGrade(slope: number): Promise<boolean>;
59
+ setSimWindSpeed(v: number): Promise<boolean>;
60
+ setTargetPower(power: number): Promise<boolean>;
61
+ setSlope(slope: any): Promise<boolean>;
62
+ reset(): void;
63
+ }
64
+ export declare class WahooAdvancedFmAdapter extends FmAdapter {
65
+ device: WahooAdvancedFitnessMachineDevice;
66
+ constructor(device: BleDeviceClass, protocol: BleProtocol);
67
+ isSame(device: DeviceAdapter): boolean;
68
+ getProfile(): string;
69
+ start(props?: any): Promise<any>;
70
+ pause(): Promise<boolean>;
71
+ resume(): Promise<boolean>;
72
+ }
73
+ export {};
@@ -0,0 +1,368 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
5
+ }) : (function(o, m, k, k2) {
6
+ if (k2 === undefined) k2 = k;
7
+ o[k2] = m[k];
8
+ }));
9
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
10
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
11
+ }) : function(o, v) {
12
+ o["default"] = v;
13
+ });
14
+ var __importStar = (this && this.__importStar) || function (mod) {
15
+ if (mod && mod.__esModule) return mod;
16
+ var result = {};
17
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
18
+ __setModuleDefault(result, mod);
19
+ return result;
20
+ };
21
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
22
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
23
+ return new (P || (P = Promise))(function (resolve, reject) {
24
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
25
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
26
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
27
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
28
+ });
29
+ };
30
+ var __importDefault = (this && this.__importDefault) || function (mod) {
31
+ return (mod && mod.__esModule) ? mod : { "default": mod };
32
+ };
33
+ Object.defineProperty(exports, "__esModule", { value: true });
34
+ exports.WahooAdvancedFmAdapter = void 0;
35
+ const ble_interface_1 = __importDefault(require("./ble-interface"));
36
+ const Device_1 = require("../Device");
37
+ const gd_eventlog_1 = require("gd-eventlog");
38
+ const fm_1 = __importStar(require("./fm"));
39
+ const WAHOO_ADVANCED_FTMS = 'a026e005';
40
+ const WAHOO_ADVANCED_TRAINER_CP = 'a026e037';
41
+ const cwABike = {
42
+ race: 0.35,
43
+ triathlon: 0.29,
44
+ mountain: 0.57
45
+ };
46
+ const cRR = 0.0036;
47
+ const ErgWriteDelay = 2000;
48
+ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
49
+ constructor(props) {
50
+ super(props);
51
+ this.prevCrankData = undefined;
52
+ this.currentCrankData = undefined;
53
+ this.timeOffset = 0;
54
+ this.tsPrevWrite = undefined;
55
+ this.data = {};
56
+ }
57
+ init() {
58
+ const _super = Object.create(null, {
59
+ init: { get: () => super.init }
60
+ });
61
+ return __awaiter(this, void 0, void 0, function* () {
62
+ try {
63
+ this.logEvent({ message: 'get device info' });
64
+ yield _super.init.call(this);
65
+ this.logEvent({ message: 'device info', deviceInfo: this.deviceInfo, features: this.features });
66
+ }
67
+ catch (err) {
68
+ return Promise.resolve(false);
69
+ }
70
+ });
71
+ }
72
+ getProfile() {
73
+ return 'Wahoo Smart Trainer';
74
+ }
75
+ getServiceUUids() {
76
+ return WahooAdvancedFitnessMachineDevice.services;
77
+ }
78
+ isBike() {
79
+ return true;
80
+ }
81
+ isPower() {
82
+ return true;
83
+ }
84
+ isHrm() {
85
+ return this.hasService('180d');
86
+ }
87
+ parseCrankData(crankData) {
88
+ if (!this.prevCrankData)
89
+ this.prevCrankData = { revolutions: 0, time: 0, cntUpdateMissing: -1 };
90
+ const c = this.currentCrankData = crankData;
91
+ const p = this.prevCrankData;
92
+ let rpm = this.data.cadence;
93
+ let hasUpdate = c.time !== p.time;
94
+ if (hasUpdate) {
95
+ let time = c.time - p.time;
96
+ let revs = c.revolutions - p.revolutions;
97
+ if (c.time < p.time) {
98
+ time += 0x10000;
99
+ this.timeOffset += 0x10000;
100
+ }
101
+ if (c.revolutions < p.revolutions)
102
+ revs += 0x10000;
103
+ rpm = 1024 * 60 * revs / time;
104
+ }
105
+ else {
106
+ if (p.cntUpdateMissing < 0 || p.cntUpdateMissing > 2) {
107
+ rpm = 0;
108
+ }
109
+ }
110
+ const cntUpdateMissing = p.cntUpdateMissing;
111
+ this.prevCrankData = this.currentCrankData;
112
+ if (hasUpdate)
113
+ this.prevCrankData.cntUpdateMissing = 0;
114
+ else
115
+ this.prevCrankData.cntUpdateMissing = cntUpdateMissing + 1;
116
+ return { rpm, time: this.timeOffset + c.time };
117
+ }
118
+ parsePower(_data) {
119
+ const data = Buffer.from(_data);
120
+ try {
121
+ let offset = 4;
122
+ const flags = data.readUInt16LE(0);
123
+ this.data.instantaneousPower = data.readUInt16LE(2);
124
+ if (flags & 0x1)
125
+ data.readUInt8(offset++);
126
+ if (flags & 0x4) {
127
+ data.readUInt16LE(offset);
128
+ offset += 2;
129
+ }
130
+ if (flags & 0x20) {
131
+ const crankData = {
132
+ revolutions: data.readUInt16LE(offset),
133
+ time: data.readUInt16LE(offset + 2)
134
+ };
135
+ const { rpm, time } = this.parseCrankData(crankData);
136
+ this.data.cadence = rpm;
137
+ this.data.time = time;
138
+ offset += 4;
139
+ }
140
+ }
141
+ catch (err) {
142
+ }
143
+ const { instantaneousPower, cadence, time } = this.data;
144
+ return { instantaneousPower, cadence, time, raw: data.toString('hex') };
145
+ }
146
+ onData(characteristic, data) {
147
+ super.onData(characteristic, data);
148
+ const uuid = characteristic.toLocaleLowerCase();
149
+ let res = undefined;
150
+ switch (uuid) {
151
+ case '2a63':
152
+ res = this.parsePower(data);
153
+ break;
154
+ case '2ad2':
155
+ res = this.parseIndoorBikeData(data);
156
+ break;
157
+ case '2a37':
158
+ res = this.parseHrm(data);
159
+ break;
160
+ case '2ada':
161
+ res = this.parseFitnessMachineStatus(data);
162
+ break;
163
+ default:
164
+ break;
165
+ }
166
+ if (res)
167
+ this.emit('data', res);
168
+ }
169
+ writeWahooFtmsMessage(requestedOpCode, data) {
170
+ return __awaiter(this, void 0, void 0, function* () {
171
+ try {
172
+ const opcode = Buffer.alloc(1);
173
+ opcode.writeUInt8(requestedOpCode, 0);
174
+ const message = Buffer.concat([opcode, data]);
175
+ const res = yield this.write(WAHOO_ADVANCED_FTMS, message);
176
+ const responseData = Buffer.from(res);
177
+ const result = responseData.readUInt8(0);
178
+ this.logEvent({ message: 'response', opCode: requestedOpCode, response: responseData.toString('hex') });
179
+ return result === 1;
180
+ }
181
+ catch (err) {
182
+ this.logEvent({ message: 'writeWahooFtmsMessage failed', opCode: requestedOpCode, reason: err.message });
183
+ return false;
184
+ }
185
+ });
186
+ }
187
+ requestControl() {
188
+ return __awaiter(this, void 0, void 0, function* () {
189
+ if (this.hasControl)
190
+ return true;
191
+ this.logEvent({ message: 'requestControl' });
192
+ const data = Buffer.alloc(2);
193
+ data.writeUInt8(0xEE, 0);
194
+ data.writeUInt8(0xFC, 1);
195
+ const res = yield this.writeWahooFtmsMessage(32, data);
196
+ if (res === true) {
197
+ this.hasControl = true;
198
+ }
199
+ else {
200
+ this.logEvent({ message: 'requestControl failed' });
201
+ }
202
+ return this.hasControl;
203
+ });
204
+ }
205
+ setPowerAdjusting() {
206
+ this.tsPrevWrite = Date.now();
207
+ }
208
+ isPowerAdjusting() {
209
+ if (this.tsPrevWrite === undefined)
210
+ return false;
211
+ if (this.tsPrevWrite < Date.now() - ErgWriteDelay) {
212
+ this.tsPrevWrite = undefined;
213
+ return false;
214
+ }
215
+ return true;
216
+ }
217
+ setErgMode(power) {
218
+ return __awaiter(this, void 0, void 0, function* () {
219
+ if (this.isPowerAdjusting())
220
+ return false;
221
+ const data = Buffer.alloc(2);
222
+ data.writeInt16LE(Math.round(power), 0);
223
+ const res = yield this.writeWahooFtmsMessage(66, data);
224
+ if (res === true) {
225
+ this.setPowerAdjusting();
226
+ this.data.targetPower = power;
227
+ }
228
+ return res;
229
+ });
230
+ }
231
+ setSimMode(weight, crr, cw) {
232
+ return __awaiter(this, void 0, void 0, function* () {
233
+ const data = Buffer.alloc(6);
234
+ data.writeInt16LE(Math.round(weight * 100), 0);
235
+ data.writeInt16LE(Math.round(crr * 10000), 2);
236
+ data.writeInt16LE(Math.round(cw * 1000), 4);
237
+ const res = yield this.writeWahooFtmsMessage(67, data);
238
+ return res;
239
+ });
240
+ }
241
+ setSimCRR(crr) {
242
+ return __awaiter(this, void 0, void 0, function* () {
243
+ const data = Buffer.alloc(2);
244
+ data.writeInt16LE(Math.round(crr * 10000), 0);
245
+ const res = yield this.writeWahooFtmsMessage(68, data);
246
+ return res;
247
+ });
248
+ }
249
+ setSimWindResistance(cw) {
250
+ return __awaiter(this, void 0, void 0, function* () {
251
+ const data = Buffer.alloc(2);
252
+ data.writeInt16LE(Math.round(cw * 1000), 0);
253
+ const res = yield this.writeWahooFtmsMessage(69, data);
254
+ return res;
255
+ });
256
+ }
257
+ setSimGrade(slope) {
258
+ return __awaiter(this, void 0, void 0, function* () {
259
+ const value = (Math.min(1, Math.max(-1, slope)) + 1.0) * 65535 / 2.0;
260
+ const data = Buffer.alloc(2);
261
+ data.writeInt16LE(Math.round(value), 0);
262
+ const res = yield this.writeWahooFtmsMessage(70, data);
263
+ return res;
264
+ });
265
+ }
266
+ setSimWindSpeed(v) {
267
+ return __awaiter(this, void 0, void 0, function* () {
268
+ const value = (Math.max(-32.767, Math.min(32.767, v)) + 32.767) * 1000;
269
+ const data = Buffer.alloc(2);
270
+ data.writeInt16LE(Math.round(value), 0);
271
+ const res = yield this.writeWahooFtmsMessage(71, data);
272
+ return res;
273
+ });
274
+ }
275
+ setTargetPower(power) {
276
+ return __awaiter(this, void 0, void 0, function* () {
277
+ this.logEvent({ message: 'setTargetPower', power, skip: (this.data.targetPower !== undefined && this.data.targetPower === power) });
278
+ if (this.data.targetPower !== undefined && this.data.targetPower === power)
279
+ return true;
280
+ const hasControl = yield this.requestControl();
281
+ if (!hasControl) {
282
+ this.logEvent({ message: 'setTargetPower failed', reason: 'control is disabled' });
283
+ return false;
284
+ }
285
+ return yield this.setErgMode(power);
286
+ });
287
+ }
288
+ setSlope(slope) {
289
+ return __awaiter(this, void 0, void 0, function* () {
290
+ this.logEvent({ message: 'setSlope', slope });
291
+ const { windSpeed, crr, cw } = this;
292
+ return yield this.setIndoorBikeSimulation(windSpeed, slope, crr, cw);
293
+ });
294
+ }
295
+ reset() {
296
+ this.data = {};
297
+ }
298
+ }
299
+ exports.default = WahooAdvancedFitnessMachineDevice;
300
+ WahooAdvancedFitnessMachineDevice.services = ['a026ee0b'];
301
+ WahooAdvancedFitnessMachineDevice.characteristics = ['2acc', '2ad2', '2ad6', '2ad8', '2ad9', '2ada', WAHOO_ADVANCED_FTMS, WAHOO_ADVANCED_TRAINER_CP];
302
+ ble_interface_1.default.register('WahooAdvancedFitnessMachineDevice', 'wahoo-fm', WahooAdvancedFitnessMachineDevice, WahooAdvancedFitnessMachineDevice.services);
303
+ class WahooAdvancedFmAdapter extends fm_1.FmAdapter {
304
+ constructor(device, protocol) {
305
+ super(device, protocol);
306
+ this.device = device;
307
+ this.ble = protocol.ble;
308
+ this.cyclingMode = this.getDefaultCyclingMode();
309
+ this.logger = new gd_eventlog_1.EventLogger('BLE-WahooFM');
310
+ if (this.device)
311
+ this.device.setLogger(this.logger);
312
+ }
313
+ isSame(device) {
314
+ if (!(device instanceof WahooAdvancedFmAdapter))
315
+ return false;
316
+ const adapter = device;
317
+ return (adapter.getName() === this.getName() && adapter.getProfile() === this.getProfile());
318
+ }
319
+ getProfile() {
320
+ return 'Wahoo Smart Trainer';
321
+ }
322
+ start(props) {
323
+ return __awaiter(this, void 0, void 0, function* () {
324
+ this.logger.logEvent({ message: 'start requested', profile: this.getProfile(), props });
325
+ if (this.ble.isScanning())
326
+ yield this.ble.stopScan();
327
+ try {
328
+ const bleDevice = yield this.ble.connectDevice(this.device);
329
+ bleDevice.setLogger(this.logger);
330
+ if (bleDevice) {
331
+ this.device = bleDevice;
332
+ const mode = this.getCyclingMode();
333
+ if (mode && mode.getSetting('bikeType')) {
334
+ const bikeType = mode.getSetting('bikeType').toLowerCase();
335
+ this.device.setCrr(cRR);
336
+ switch (bikeType) {
337
+ case 'race':
338
+ this.device.setCw(cwABike.race);
339
+ break;
340
+ case 'triathlon':
341
+ this.device.setCw(cwABike.triathlon);
342
+ break;
343
+ case 'mountain':
344
+ this.device.setCw(cwABike.mountain);
345
+ break;
346
+ }
347
+ }
348
+ const { user } = props || {};
349
+ const weight = (user && user.weight ? user.weight : Device_1.DEFAULT_USER_WEIGHT) + Device_1.DEFAULT_BIKE_WEIGHT;
350
+ this.device.setSimMode(weight, this.device.getCrr(), this.device.getCw());
351
+ const startRequest = this.getCyclingMode().getBikeInitRequest();
352
+ yield this.sendUpdate(startRequest);
353
+ bleDevice.on('data', (data) => {
354
+ this.onDeviceData(data);
355
+ });
356
+ return true;
357
+ }
358
+ }
359
+ catch (err) {
360
+ this.logger.logEvent({ message: 'start result: error', error: err.message, profile: this.getProfile() });
361
+ throw new Error(`could not start device, reason:${err.message}`);
362
+ }
363
+ });
364
+ }
365
+ pause() { this.paused = true; return Promise.resolve(true); }
366
+ resume() { this.paused = false; return Promise.resolve(true); }
367
+ }
368
+ exports.WahooAdvancedFmAdapter = WahooAdvancedFmAdapter;
@@ -1,11 +1,7 @@
1
1
  "use strict";
2
2
  var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
3
  if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
4
+ Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
9
5
  }) : (function(o, m, k, k2) {
10
6
  if (k2 === undefined) k2 = k;
11
7
  o[k2] = m[k];
@@ -1,11 +1,7 @@
1
1
  "use strict";
2
2
  var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
3
  if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
4
+ Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
9
5
  }) : (function(o, m, k, k2) {
10
6
  if (k2 === undefined) k2 = k;
11
7
  o[k2] = m[k];
@@ -1,11 +1,7 @@
1
1
  "use strict";
2
2
  var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
3
  if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
4
+ Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
9
5
  }) : (function(o, m, k, k2) {
10
6
  if (k2 === undefined) k2 = k;
11
7
  o[k2] = m[k];
@@ -1,5 +1,4 @@
1
1
  /// <reference types="node" />
2
- /// <reference types="node" />
3
2
  import { DeviceProtocol } from "../DeviceProtocol";
4
3
  import { EventLogger } from "gd-eventlog";
5
4
  import { Command } from "../types/command";
@@ -1,11 +1,7 @@
1
1
  "use strict";
2
2
  var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
3
  if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
4
+ Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
9
5
  }) : (function(o, m, k, k2) {
10
6
  if (k2 === undefined) k2 = k;
11
7
  o[k2] = m[k];
@@ -28,7 +28,7 @@ export default class KettlerRacerProtocol extends DeviceProtocolBase implements
28
28
  isBike(): boolean;
29
29
  isHrm(): boolean;
30
30
  isPower(): boolean;
31
- add(settings: DeviceSettings): import("../../DeviceProtocol").Device;
31
+ add(settings: DeviceSettings): any;
32
32
  scan(props: KettlerRacerScanProps): void;
33
33
  checkDevice(port: string): boolean;
34
34
  doScan(port: string): Promise<void>;
@@ -1,11 +1,7 @@
1
1
  "use strict";
2
2
  var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
3
  if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
4
+ Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
9
5
  }) : (function(o, m, k, k2) {
10
6
  if (k2 === undefined) k2 = k;
11
7
  o[k2] = m[k];
@@ -53,7 +53,7 @@ class PowerMeterCyclingMode extends power_base_1.default {
53
53
  power = 0;
54
54
  }
55
55
  const m = this.getWeight();
56
- let t = this.getTimeSinceLastUpdate();
56
+ const t = this.getTimeSinceLastUpdate();
57
57
  const { speed, distance } = this.calculateSpeedAndDistance(power, slope, m, t);
58
58
  data.power = Math.round(power);
59
59
  data.slope = slope;
@@ -51,7 +51,7 @@ export declare class Simulator extends DeviceAdapter {
51
51
  export default class SimulatorProtocol extends DeviceProtocolBase {
52
52
  static NAME: string;
53
53
  constructor();
54
- add(settings: SimulatorSettings): Simulator;
54
+ add(settings: SimulatorSettings): any;
55
55
  getName(): string;
56
56
  getInterfaces(): string[];
57
57
  isBike(): boolean;
@@ -1,11 +1,7 @@
1
1
  "use strict";
2
2
  var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
3
  if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
4
+ Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
9
5
  }) : (function(o, m, k, k2) {
10
6
  if (k2 === undefined) k2 = k;
11
7
  o[k2] = m[k];
package/package.json CHANGED
@@ -1,46 +1,46 @@
1
- {
2
- "name": "incyclist-devices",
3
- "version": "1.4.49",
4
- "dependencies": {
5
- "@serialport/parser-byte-length": "^9.0.1",
6
- "@serialport/parser-delimiter": "^9.0.1",
7
- "@types/serialport": "^8.0.1",
8
- "gd-ant-plus": "^0.0.33",
9
- "win32filetime": "^1.0.2"
10
- },
11
- "peerDependencies": {
12
- "gd-eventlog": "^0.1.22"
13
- },
14
- "devDependencies": {
15
- "@types/jest": "^27.0.3",
16
- "@types/node": "^10.17.58",
17
- "eslint": "^7.32.0",
18
- "eslint-config-react-app": "^6.0.0",
19
- "eslint-loader": "^4.0.2",
20
- "jest": "^27.4.3",
21
- "ts-jest": "^27.1.0",
22
- "typescript": "^4.5.2"
23
- },
24
- "scripts": {
25
- "lint": "eslint . --ext .ts",
26
- "build": "tsc",
27
- "test": "jest --coverage",
28
- "dev": "nodemon --watch src -e ts,js --exec npm run build"
29
- },
30
- "files": [
31
- "lib/"
32
- ],
33
- "main": "lib/DeviceSupport.js",
34
- "directories": {
35
- "example": "./sample",
36
- "lib": "./src"
37
- },
38
- "eslintConfig": {
39
- "extends": "react-app",
40
- "rules": {
41
- "jsx-a11y/anchor-is-valid": [
42
- "off"
43
- ]
44
- }
45
- }
46
- }
1
+ {
2
+ "name": "incyclist-devices",
3
+ "version": "1.4.52",
4
+ "dependencies": {
5
+ "@serialport/parser-byte-length": "^9.0.1",
6
+ "@serialport/parser-delimiter": "^9.0.1",
7
+ "@types/serialport": "^8.0.1",
8
+ "gd-ant-plus": "^0.0.33",
9
+ "win32filetime": "^1.0.2"
10
+ },
11
+ "peerDependencies": {
12
+ "gd-eventlog": "^0.1.22"
13
+ },
14
+ "devDependencies": {
15
+ "@types/jest": "^27.0.3",
16
+ "@types/node": "^10.17.58",
17
+ "eslint": "^7.32.0",
18
+ "eslint-config-react-app": "^6.0.0",
19
+ "eslint-loader": "^4.0.2",
20
+ "jest": "^27.4.3",
21
+ "ts-jest": "^27.1.0",
22
+ "typescript": "^4.5.2"
23
+ },
24
+ "scripts": {
25
+ "lint": "eslint . --ext .ts",
26
+ "build": "tsc",
27
+ "test": "jest --coverage",
28
+ "dev": "nodemon --watch src -e ts,js --exec npm run build"
29
+ },
30
+ "files": [
31
+ "lib/"
32
+ ],
33
+ "main": "lib/DeviceSupport.js",
34
+ "directories": {
35
+ "example": "./sample",
36
+ "lib": "./src"
37
+ },
38
+ "eslintConfig": {
39
+ "extends": "react-app",
40
+ "rules": {
41
+ "jsx-a11y/anchor-is-valid": [
42
+ "off"
43
+ ]
44
+ }
45
+ }
46
+ }