incyclist-devices 1.4.50 → 1.4.53
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.
- package/lib/DeviceSupport.d.ts +2 -1
- package/lib/DeviceSupport.js +8 -2
- package/lib/ant/AntScanner.js +5 -1
- package/lib/ble/ble-interface.js +1 -0
- package/lib/ble/ble.d.ts +1 -0
- package/lib/ble/fm.js +11 -0
- package/lib/ble/incyclist-protocol.js +6 -1
- package/lib/ble/wahoo-kickr.d.ts +73 -0
- package/lib/ble/wahoo-kickr.js +372 -0
- package/lib/daum/DaumAdapter.js +5 -1
- package/lib/daum/classic/DaumClassicProtocol.js +5 -1
- package/lib/daum/premium/DaumPremiumProtocol.js +5 -1
- package/lib/kettler/comms.d.ts +1 -0
- package/lib/kettler/ergo-racer/adapter.js +5 -1
- package/lib/kettler/ergo-racer/protocol.d.ts +1 -1
- package/lib/kettler/ergo-racer/protocol.js +5 -1
- package/lib/simulator/Simulator.d.ts +1 -1
- package/lib/simulator/Simulator.js +5 -1
- package/package.json +46 -46
package/lib/DeviceSupport.d.ts
CHANGED
|
@@ -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 };
|
package/lib/DeviceSupport.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
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
|
-
Object.
|
|
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);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -22,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
22
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
23
27
|
};
|
|
24
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
25
|
-
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;
|
|
29
|
+
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;
|
|
26
30
|
const DeviceRegistry_1 = __importDefault(require("./DeviceRegistry"));
|
|
27
31
|
exports.DeviceRegistry = DeviceRegistry_1.default;
|
|
28
32
|
const Device_1 = __importDefault(require("./Device"));
|
|
@@ -48,6 +52,8 @@ const pwr_1 = __importDefault(require("./ble/pwr"));
|
|
|
48
52
|
exports.BleCyclingPowerDevice = pwr_1.default;
|
|
49
53
|
const fm_1 = __importDefault(require("./ble/fm"));
|
|
50
54
|
exports.BleFitnessMachineDevice = fm_1.default;
|
|
55
|
+
const wahoo_kickr_1 = __importDefault(require("./ble/wahoo-kickr"));
|
|
56
|
+
exports.WahooAdvancedFitnessMachineDevice = wahoo_kickr_1.default;
|
|
51
57
|
const Protocols = {
|
|
52
58
|
SimulatorProtocol: Simulator_1.default,
|
|
53
59
|
DaumClassicProtocol: DaumClassicProtocol_1.default,
|
package/lib/ant/AntScanner.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
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
|
-
Object.
|
|
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);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
package/lib/ble/ble-interface.js
CHANGED
|
@@ -346,6 +346,7 @@ class BleInterface extends ble_1.BleInterfaceClass {
|
|
|
346
346
|
return DeviceClasses;
|
|
347
347
|
}
|
|
348
348
|
createDevice(DeviceClass, peripheral, characteristics) {
|
|
349
|
+
this.logEvent({ message: 'trying to create device', peripheral: peripheral.address, characteristics });
|
|
349
350
|
const C = DeviceClass;
|
|
350
351
|
const device = new C({ peripheral });
|
|
351
352
|
const existingDevice = this.devices.find(i => i.device.id === device.id && i.device.getProfile() === device.getProfile());
|
package/lib/ble/ble.d.ts
CHANGED
package/lib/ble/fm.js
CHANGED
|
@@ -332,6 +332,8 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
|
|
|
332
332
|
this.logEvent({ message: 'setTargetPower', power, skip: (this.data.targetPower !== undefined && this.data.targetPower === power) });
|
|
333
333
|
if (this.data.targetPower !== undefined && this.data.targetPower === power)
|
|
334
334
|
return true;
|
|
335
|
+
if (!this.hasControl)
|
|
336
|
+
return;
|
|
335
337
|
const hasControl = yield this.requestControl();
|
|
336
338
|
const data = Buffer.alloc(3);
|
|
337
339
|
data.writeUInt8(5, 0);
|
|
@@ -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,6 +371,8 @@ 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
377
|
const data = Buffer.alloc(7);
|
|
370
378
|
data.writeUInt8(17, 0);
|
|
@@ -569,6 +577,9 @@ class FmAdapter extends Device_1.default {
|
|
|
569
577
|
break;
|
|
570
578
|
}
|
|
571
579
|
}
|
|
580
|
+
this.device.requestControl();
|
|
581
|
+
const startRequest = this.getCyclingMode().getBikeInitRequest();
|
|
582
|
+
yield this.sendUpdate(startRequest);
|
|
572
583
|
bleDevice.on('data', (data) => {
|
|
573
584
|
this.onDeviceData(data);
|
|
574
585
|
});
|
|
@@ -1,7 +1,11 @@
|
|
|
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
|
-
Object.
|
|
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);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -73,6 +77,7 @@ class BleProtocol extends DeviceProtocol_1.default {
|
|
|
73
77
|
return new hrm_1.HrmAdapter(fromDevice ? bleDevice : new hrm_1.default(props()), this);
|
|
74
78
|
case 'fm':
|
|
75
79
|
case 'smart trainer':
|
|
80
|
+
case 'wahoo smart trainer':
|
|
76
81
|
case 'fitness machine':
|
|
77
82
|
let device;
|
|
78
83
|
if (fromDevice)
|
|
@@ -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,372 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
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);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
28
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
29
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
30
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
31
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
32
|
+
});
|
|
33
|
+
};
|
|
34
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
35
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
36
|
+
};
|
|
37
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
|
+
exports.WahooAdvancedFmAdapter = void 0;
|
|
39
|
+
const ble_interface_1 = __importDefault(require("./ble-interface"));
|
|
40
|
+
const Device_1 = require("../Device");
|
|
41
|
+
const gd_eventlog_1 = require("gd-eventlog");
|
|
42
|
+
const fm_1 = __importStar(require("./fm"));
|
|
43
|
+
const WAHOO_ADVANCED_FTMS = 'a026e005';
|
|
44
|
+
const WAHOO_ADVANCED_TRAINER_CP = 'a026e037';
|
|
45
|
+
const cwABike = {
|
|
46
|
+
race: 0.35,
|
|
47
|
+
triathlon: 0.29,
|
|
48
|
+
mountain: 0.57
|
|
49
|
+
};
|
|
50
|
+
const cRR = 0.0036;
|
|
51
|
+
const ErgWriteDelay = 2000;
|
|
52
|
+
class WahooAdvancedFitnessMachineDevice extends fm_1.default {
|
|
53
|
+
constructor(props) {
|
|
54
|
+
super(props);
|
|
55
|
+
this.prevCrankData = undefined;
|
|
56
|
+
this.currentCrankData = undefined;
|
|
57
|
+
this.timeOffset = 0;
|
|
58
|
+
this.tsPrevWrite = undefined;
|
|
59
|
+
this.data = {};
|
|
60
|
+
}
|
|
61
|
+
init() {
|
|
62
|
+
const _super = Object.create(null, {
|
|
63
|
+
init: { get: () => super.init }
|
|
64
|
+
});
|
|
65
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
66
|
+
try {
|
|
67
|
+
this.logEvent({ message: 'get device info' });
|
|
68
|
+
yield _super.init.call(this);
|
|
69
|
+
this.logEvent({ message: 'device info', deviceInfo: this.deviceInfo, features: this.features });
|
|
70
|
+
}
|
|
71
|
+
catch (err) {
|
|
72
|
+
return Promise.resolve(false);
|
|
73
|
+
}
|
|
74
|
+
});
|
|
75
|
+
}
|
|
76
|
+
getProfile() {
|
|
77
|
+
return 'Wahoo Smart Trainer';
|
|
78
|
+
}
|
|
79
|
+
getServiceUUids() {
|
|
80
|
+
return WahooAdvancedFitnessMachineDevice.services;
|
|
81
|
+
}
|
|
82
|
+
isBike() {
|
|
83
|
+
return true;
|
|
84
|
+
}
|
|
85
|
+
isPower() {
|
|
86
|
+
return true;
|
|
87
|
+
}
|
|
88
|
+
isHrm() {
|
|
89
|
+
return this.hasService('180d');
|
|
90
|
+
}
|
|
91
|
+
parseCrankData(crankData) {
|
|
92
|
+
if (!this.prevCrankData)
|
|
93
|
+
this.prevCrankData = { revolutions: 0, time: 0, cntUpdateMissing: -1 };
|
|
94
|
+
const c = this.currentCrankData = crankData;
|
|
95
|
+
const p = this.prevCrankData;
|
|
96
|
+
let rpm = this.data.cadence;
|
|
97
|
+
let hasUpdate = c.time !== p.time;
|
|
98
|
+
if (hasUpdate) {
|
|
99
|
+
let time = c.time - p.time;
|
|
100
|
+
let revs = c.revolutions - p.revolutions;
|
|
101
|
+
if (c.time < p.time) {
|
|
102
|
+
time += 0x10000;
|
|
103
|
+
this.timeOffset += 0x10000;
|
|
104
|
+
}
|
|
105
|
+
if (c.revolutions < p.revolutions)
|
|
106
|
+
revs += 0x10000;
|
|
107
|
+
rpm = 1024 * 60 * revs / time;
|
|
108
|
+
}
|
|
109
|
+
else {
|
|
110
|
+
if (p.cntUpdateMissing < 0 || p.cntUpdateMissing > 2) {
|
|
111
|
+
rpm = 0;
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
const cntUpdateMissing = p.cntUpdateMissing;
|
|
115
|
+
this.prevCrankData = this.currentCrankData;
|
|
116
|
+
if (hasUpdate)
|
|
117
|
+
this.prevCrankData.cntUpdateMissing = 0;
|
|
118
|
+
else
|
|
119
|
+
this.prevCrankData.cntUpdateMissing = cntUpdateMissing + 1;
|
|
120
|
+
return { rpm, time: this.timeOffset + c.time };
|
|
121
|
+
}
|
|
122
|
+
parsePower(_data) {
|
|
123
|
+
const data = Buffer.from(_data);
|
|
124
|
+
try {
|
|
125
|
+
let offset = 4;
|
|
126
|
+
const flags = data.readUInt16LE(0);
|
|
127
|
+
this.data.instantaneousPower = data.readUInt16LE(2);
|
|
128
|
+
if (flags & 0x1)
|
|
129
|
+
data.readUInt8(offset++);
|
|
130
|
+
if (flags & 0x4) {
|
|
131
|
+
data.readUInt16LE(offset);
|
|
132
|
+
offset += 2;
|
|
133
|
+
}
|
|
134
|
+
if (flags & 0x20) {
|
|
135
|
+
const crankData = {
|
|
136
|
+
revolutions: data.readUInt16LE(offset),
|
|
137
|
+
time: data.readUInt16LE(offset + 2)
|
|
138
|
+
};
|
|
139
|
+
const { rpm, time } = this.parseCrankData(crankData);
|
|
140
|
+
this.data.cadence = rpm;
|
|
141
|
+
this.data.time = time;
|
|
142
|
+
offset += 4;
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
catch (err) {
|
|
146
|
+
}
|
|
147
|
+
const { instantaneousPower, cadence, time } = this.data;
|
|
148
|
+
return { instantaneousPower, cadence, time, raw: data.toString('hex') };
|
|
149
|
+
}
|
|
150
|
+
onData(characteristic, data) {
|
|
151
|
+
super.onData(characteristic, data);
|
|
152
|
+
const uuid = characteristic.toLocaleLowerCase();
|
|
153
|
+
let res = undefined;
|
|
154
|
+
switch (uuid) {
|
|
155
|
+
case '2a63':
|
|
156
|
+
res = this.parsePower(data);
|
|
157
|
+
break;
|
|
158
|
+
case '2ad2':
|
|
159
|
+
res = this.parseIndoorBikeData(data);
|
|
160
|
+
break;
|
|
161
|
+
case '2a37':
|
|
162
|
+
res = this.parseHrm(data);
|
|
163
|
+
break;
|
|
164
|
+
case '2ada':
|
|
165
|
+
res = this.parseFitnessMachineStatus(data);
|
|
166
|
+
break;
|
|
167
|
+
default:
|
|
168
|
+
break;
|
|
169
|
+
}
|
|
170
|
+
if (res)
|
|
171
|
+
this.emit('data', res);
|
|
172
|
+
}
|
|
173
|
+
writeWahooFtmsMessage(requestedOpCode, data) {
|
|
174
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
175
|
+
try {
|
|
176
|
+
const opcode = Buffer.alloc(1);
|
|
177
|
+
opcode.writeUInt8(requestedOpCode, 0);
|
|
178
|
+
const message = Buffer.concat([opcode, data]);
|
|
179
|
+
const res = yield this.write(WAHOO_ADVANCED_FTMS, message);
|
|
180
|
+
const responseData = Buffer.from(res);
|
|
181
|
+
const result = responseData.readUInt8(0);
|
|
182
|
+
this.logEvent({ message: 'response', opCode: requestedOpCode, response: responseData.toString('hex') });
|
|
183
|
+
return result === 1;
|
|
184
|
+
}
|
|
185
|
+
catch (err) {
|
|
186
|
+
this.logEvent({ message: 'writeWahooFtmsMessage failed', opCode: requestedOpCode, reason: err.message });
|
|
187
|
+
return false;
|
|
188
|
+
}
|
|
189
|
+
});
|
|
190
|
+
}
|
|
191
|
+
requestControl() {
|
|
192
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
193
|
+
if (this.hasControl)
|
|
194
|
+
return true;
|
|
195
|
+
this.logEvent({ message: 'requestControl' });
|
|
196
|
+
const data = Buffer.alloc(2);
|
|
197
|
+
data.writeUInt8(0xEE, 0);
|
|
198
|
+
data.writeUInt8(0xFC, 1);
|
|
199
|
+
const res = yield this.writeWahooFtmsMessage(32, data);
|
|
200
|
+
if (res === true) {
|
|
201
|
+
this.hasControl = true;
|
|
202
|
+
}
|
|
203
|
+
else {
|
|
204
|
+
this.logEvent({ message: 'requestControl failed' });
|
|
205
|
+
}
|
|
206
|
+
return this.hasControl;
|
|
207
|
+
});
|
|
208
|
+
}
|
|
209
|
+
setPowerAdjusting() {
|
|
210
|
+
this.tsPrevWrite = Date.now();
|
|
211
|
+
}
|
|
212
|
+
isPowerAdjusting() {
|
|
213
|
+
if (this.tsPrevWrite === undefined)
|
|
214
|
+
return false;
|
|
215
|
+
if (this.tsPrevWrite < Date.now() - ErgWriteDelay) {
|
|
216
|
+
this.tsPrevWrite = undefined;
|
|
217
|
+
return false;
|
|
218
|
+
}
|
|
219
|
+
return true;
|
|
220
|
+
}
|
|
221
|
+
setErgMode(power) {
|
|
222
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
223
|
+
if (this.isPowerAdjusting())
|
|
224
|
+
return false;
|
|
225
|
+
const data = Buffer.alloc(2);
|
|
226
|
+
data.writeInt16LE(Math.round(power), 0);
|
|
227
|
+
const res = yield this.writeWahooFtmsMessage(66, data);
|
|
228
|
+
if (res === true) {
|
|
229
|
+
this.setPowerAdjusting();
|
|
230
|
+
this.data.targetPower = power;
|
|
231
|
+
}
|
|
232
|
+
return res;
|
|
233
|
+
});
|
|
234
|
+
}
|
|
235
|
+
setSimMode(weight, crr, cw) {
|
|
236
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
237
|
+
const data = Buffer.alloc(6);
|
|
238
|
+
data.writeInt16LE(Math.round(weight * 100), 0);
|
|
239
|
+
data.writeInt16LE(Math.round(crr * 10000), 2);
|
|
240
|
+
data.writeInt16LE(Math.round(cw * 1000), 4);
|
|
241
|
+
const res = yield this.writeWahooFtmsMessage(67, data);
|
|
242
|
+
return res;
|
|
243
|
+
});
|
|
244
|
+
}
|
|
245
|
+
setSimCRR(crr) {
|
|
246
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
247
|
+
const data = Buffer.alloc(2);
|
|
248
|
+
data.writeInt16LE(Math.round(crr * 10000), 0);
|
|
249
|
+
const res = yield this.writeWahooFtmsMessage(68, data);
|
|
250
|
+
return res;
|
|
251
|
+
});
|
|
252
|
+
}
|
|
253
|
+
setSimWindResistance(cw) {
|
|
254
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
255
|
+
const data = Buffer.alloc(2);
|
|
256
|
+
data.writeInt16LE(Math.round(cw * 1000), 0);
|
|
257
|
+
const res = yield this.writeWahooFtmsMessage(69, data);
|
|
258
|
+
return res;
|
|
259
|
+
});
|
|
260
|
+
}
|
|
261
|
+
setSimGrade(slope) {
|
|
262
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
263
|
+
const value = (Math.min(1, Math.max(-1, slope)) + 1.0) * 65535 / 2.0;
|
|
264
|
+
const data = Buffer.alloc(2);
|
|
265
|
+
data.writeInt16LE(Math.round(value), 0);
|
|
266
|
+
const res = yield this.writeWahooFtmsMessage(70, data);
|
|
267
|
+
return res;
|
|
268
|
+
});
|
|
269
|
+
}
|
|
270
|
+
setSimWindSpeed(v) {
|
|
271
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
272
|
+
const value = (Math.max(-32.767, Math.min(32.767, v)) + 32.767) * 1000;
|
|
273
|
+
const data = Buffer.alloc(2);
|
|
274
|
+
data.writeInt16LE(Math.round(value), 0);
|
|
275
|
+
const res = yield this.writeWahooFtmsMessage(71, data);
|
|
276
|
+
return res;
|
|
277
|
+
});
|
|
278
|
+
}
|
|
279
|
+
setTargetPower(power) {
|
|
280
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
281
|
+
this.logEvent({ message: 'setTargetPower', power, skip: (this.data.targetPower !== undefined && this.data.targetPower === power) });
|
|
282
|
+
if (this.data.targetPower !== undefined && this.data.targetPower === power)
|
|
283
|
+
return true;
|
|
284
|
+
const hasControl = yield this.requestControl();
|
|
285
|
+
if (!hasControl) {
|
|
286
|
+
this.logEvent({ message: 'setTargetPower failed', reason: 'control is disabled' });
|
|
287
|
+
return false;
|
|
288
|
+
}
|
|
289
|
+
return yield this.setErgMode(power);
|
|
290
|
+
});
|
|
291
|
+
}
|
|
292
|
+
setSlope(slope) {
|
|
293
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
294
|
+
this.logEvent({ message: 'setSlope', slope });
|
|
295
|
+
const { windSpeed, crr, cw } = this;
|
|
296
|
+
return yield this.setIndoorBikeSimulation(windSpeed, slope, crr, cw);
|
|
297
|
+
});
|
|
298
|
+
}
|
|
299
|
+
reset() {
|
|
300
|
+
this.data = {};
|
|
301
|
+
}
|
|
302
|
+
}
|
|
303
|
+
exports.default = WahooAdvancedFitnessMachineDevice;
|
|
304
|
+
WahooAdvancedFitnessMachineDevice.services = ['a026ee0b'];
|
|
305
|
+
WahooAdvancedFitnessMachineDevice.characteristics = ['2acc', '2ad2', '2ad6', '2ad8', '2ad9', '2ada', WAHOO_ADVANCED_FTMS, WAHOO_ADVANCED_TRAINER_CP];
|
|
306
|
+
ble_interface_1.default.register('WahooAdvancedFitnessMachineDevice', 'wahoo-fm', WahooAdvancedFitnessMachineDevice, WahooAdvancedFitnessMachineDevice.services);
|
|
307
|
+
class WahooAdvancedFmAdapter extends fm_1.FmAdapter {
|
|
308
|
+
constructor(device, protocol) {
|
|
309
|
+
super(device, protocol);
|
|
310
|
+
this.device = device;
|
|
311
|
+
this.ble = protocol.ble;
|
|
312
|
+
this.cyclingMode = this.getDefaultCyclingMode();
|
|
313
|
+
this.logger = new gd_eventlog_1.EventLogger('BLE-WahooFM');
|
|
314
|
+
if (this.device)
|
|
315
|
+
this.device.setLogger(this.logger);
|
|
316
|
+
}
|
|
317
|
+
isSame(device) {
|
|
318
|
+
if (!(device instanceof WahooAdvancedFmAdapter))
|
|
319
|
+
return false;
|
|
320
|
+
const adapter = device;
|
|
321
|
+
return (adapter.getName() === this.getName() && adapter.getProfile() === this.getProfile());
|
|
322
|
+
}
|
|
323
|
+
getProfile() {
|
|
324
|
+
return 'Wahoo Smart Trainer';
|
|
325
|
+
}
|
|
326
|
+
start(props) {
|
|
327
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
328
|
+
this.logger.logEvent({ message: 'start requested', profile: this.getProfile(), props });
|
|
329
|
+
if (this.ble.isScanning())
|
|
330
|
+
yield this.ble.stopScan();
|
|
331
|
+
try {
|
|
332
|
+
const bleDevice = yield this.ble.connectDevice(this.device);
|
|
333
|
+
bleDevice.setLogger(this.logger);
|
|
334
|
+
if (bleDevice) {
|
|
335
|
+
this.device = bleDevice;
|
|
336
|
+
const mode = this.getCyclingMode();
|
|
337
|
+
if (mode && mode.getSetting('bikeType')) {
|
|
338
|
+
const bikeType = mode.getSetting('bikeType').toLowerCase();
|
|
339
|
+
this.device.setCrr(cRR);
|
|
340
|
+
switch (bikeType) {
|
|
341
|
+
case 'race':
|
|
342
|
+
this.device.setCw(cwABike.race);
|
|
343
|
+
break;
|
|
344
|
+
case 'triathlon':
|
|
345
|
+
this.device.setCw(cwABike.triathlon);
|
|
346
|
+
break;
|
|
347
|
+
case 'mountain':
|
|
348
|
+
this.device.setCw(cwABike.mountain);
|
|
349
|
+
break;
|
|
350
|
+
}
|
|
351
|
+
}
|
|
352
|
+
const { user } = props || {};
|
|
353
|
+
const weight = (user && user.weight ? user.weight : Device_1.DEFAULT_USER_WEIGHT) + Device_1.DEFAULT_BIKE_WEIGHT;
|
|
354
|
+
this.device.setSimMode(weight, this.device.getCrr(), this.device.getCw());
|
|
355
|
+
const startRequest = this.getCyclingMode().getBikeInitRequest();
|
|
356
|
+
yield this.sendUpdate(startRequest);
|
|
357
|
+
bleDevice.on('data', (data) => {
|
|
358
|
+
this.onDeviceData(data);
|
|
359
|
+
});
|
|
360
|
+
return true;
|
|
361
|
+
}
|
|
362
|
+
}
|
|
363
|
+
catch (err) {
|
|
364
|
+
this.logger.logEvent({ message: 'start result: error', error: err.message, profile: this.getProfile() });
|
|
365
|
+
throw new Error(`could not start device, reason:${err.message}`);
|
|
366
|
+
}
|
|
367
|
+
});
|
|
368
|
+
}
|
|
369
|
+
pause() { this.paused = true; return Promise.resolve(true); }
|
|
370
|
+
resume() { this.paused = false; return Promise.resolve(true); }
|
|
371
|
+
}
|
|
372
|
+
exports.WahooAdvancedFmAdapter = WahooAdvancedFmAdapter;
|
package/lib/daum/DaumAdapter.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
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
|
-
Object.
|
|
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);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -1,7 +1,11 @@
|
|
|
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
|
-
Object.
|
|
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);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -1,7 +1,11 @@
|
|
|
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
|
-
Object.
|
|
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);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
package/lib/kettler/comms.d.ts
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
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
|
-
Object.
|
|
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);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
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):
|
|
31
|
+
add(settings: DeviceSettings): import("../../DeviceProtocol").Device;
|
|
32
32
|
scan(props: KettlerRacerScanProps): void;
|
|
33
33
|
checkDevice(port: string): boolean;
|
|
34
34
|
doScan(port: string): Promise<void>;
|
|
@@ -1,7 +1,11 @@
|
|
|
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
|
-
Object.
|
|
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);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -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):
|
|
54
|
+
add(settings: SimulatorSettings): Simulator;
|
|
55
55
|
getName(): string;
|
|
56
56
|
getInterfaces(): string[];
|
|
57
57
|
isBike(): boolean;
|
|
@@ -1,7 +1,11 @@
|
|
|
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
|
-
Object.
|
|
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);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
package/package.json
CHANGED
|
@@ -1,46 +1,46 @@
|
|
|
1
|
-
{
|
|
2
|
-
"name": "incyclist-devices",
|
|
3
|
-
"version": "1.4.
|
|
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.53",
|
|
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
|
+
}
|