incyclist-devices 1.4.21 → 1.4.22
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/CyclingMode.js +1 -0
- package/lib/Device.js +1 -0
- package/lib/DeviceProtocol.js +1 -0
- package/lib/DeviceSupport.js +21 -8
- package/lib/ant/AntAdapter.js +1 -0
- package/lib/ant/AntScanner.js +20 -7
- package/lib/ant/antfe/AntFEAdapter.d.ts +1 -0
- package/lib/ant/antfe/AntFEAdapter.js +16 -8
- package/lib/ant/anthrm/AntHrmAdapter.js +1 -1
- package/lib/ant/utils.js +3 -1
- package/lib/calculations.js +1 -0
- package/lib/daum/DaumAdapter.js +25 -13
- package/lib/daum/SmartTrainerCyclingMode.js +1 -0
- package/lib/daum/classic/DaumClassicAdapter.js +1 -1
- package/lib/daum/classic/DaumClassicProtocol.js +19 -7
- package/lib/daum/classic/bike.js +26 -26
- package/lib/daum/classic/utils.js +1 -0
- package/lib/daum/constants.js +1 -0
- package/lib/daum/premium/DaumPremiumAdapter.js +1 -1
- package/lib/daum/premium/DaumPremiumProtocol.js +19 -7
- package/lib/daum/premium/bike.js +18 -17
- package/lib/daum/premium/utils.js +1 -0
- package/lib/kettler/comms.js +2 -1
- package/lib/kettler/ergo-racer/adapter.js +21 -9
- package/lib/kettler/ergo-racer/protocol.js +19 -7
- package/lib/simulator/Simulator.d.ts +20 -4
- package/lib/simulator/Simulator.js +121 -56
- package/lib/simulator/simulator-mode.d.ts +28 -0
- package/lib/simulator/simulator-mode.js +120 -0
- package/lib/types/route.js +1 -0
- package/lib/types/user.js +1 -0
- package/lib/utils.js +3 -1
- package/package.json +1 -1
|
@@ -0,0 +1,120 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const gd_eventlog_1 = require("gd-eventlog");
|
|
7
|
+
const CyclingMode_1 = require("../CyclingMode");
|
|
8
|
+
const calculations_1 = __importDefault(require("../calculations"));
|
|
9
|
+
const config = {
|
|
10
|
+
name: "Simulator",
|
|
11
|
+
description: "Simulates a ride with constant speed or power output",
|
|
12
|
+
properties: [
|
|
13
|
+
{ key: 'mode', name: 'Simulation Type', description: '', type: CyclingMode_1.CyclingModeProperyType.SingleSelect, options: ['Speed', 'Power'], default: 'Power' },
|
|
14
|
+
{ key: 'delay', name: 'Start Delay', description: 'Delay (in s) at start of training', type: CyclingMode_1.CyclingModeProperyType.Integer, default: 2, min: 0, max: 30 },
|
|
15
|
+
{ key: 'power', name: 'Power', description: 'Power (in W) at start of training', condition: (s) => !s.simType || s.simType === 'Power', type: CyclingMode_1.CyclingModeProperyType.Integer, default: 150, min: 25, max: 800 },
|
|
16
|
+
{ key: 'speed', name: 'Speed', description: 'Speed (in km/h) at start of training', condition: (s) => s.simType === 'Speed', type: CyclingMode_1.CyclingModeProperyType.Integer, default: 30, min: 5, max: 50 },
|
|
17
|
+
]
|
|
18
|
+
};
|
|
19
|
+
class SimulatorCyclingMode extends CyclingMode_1.CyclingModeBase {
|
|
20
|
+
constructor(adapter, props) {
|
|
21
|
+
super(adapter, props);
|
|
22
|
+
this.prevUpdateTS = 0;
|
|
23
|
+
this.hasBikeUpdate = false;
|
|
24
|
+
this.event = {};
|
|
25
|
+
this.logger = adapter.logger || new gd_eventlog_1.EventLogger('SIMMode');
|
|
26
|
+
this.data = {};
|
|
27
|
+
this.logger.logEvent({ message: 'constructor', props });
|
|
28
|
+
}
|
|
29
|
+
getName() {
|
|
30
|
+
return config.name;
|
|
31
|
+
}
|
|
32
|
+
getDescription() {
|
|
33
|
+
return config.description;
|
|
34
|
+
}
|
|
35
|
+
getProperties() {
|
|
36
|
+
return config.properties;
|
|
37
|
+
}
|
|
38
|
+
getProperty(name) {
|
|
39
|
+
return config.properties.find(p => p.name === name);
|
|
40
|
+
}
|
|
41
|
+
getBikeInitRequest() {
|
|
42
|
+
return {};
|
|
43
|
+
}
|
|
44
|
+
sendBikeUpdate(request) {
|
|
45
|
+
this.logger.logEvent({ message: 'bike update request', request });
|
|
46
|
+
const r = request || { refresh: true };
|
|
47
|
+
if (r.refresh) {
|
|
48
|
+
if (Object.keys(r).length === 1)
|
|
49
|
+
return this.prevRequest || {};
|
|
50
|
+
delete r.refresh;
|
|
51
|
+
}
|
|
52
|
+
if (request.slope !== undefined) {
|
|
53
|
+
if (!this.data)
|
|
54
|
+
this.data = {};
|
|
55
|
+
this.data.slope = request.slope;
|
|
56
|
+
}
|
|
57
|
+
this.prevRequest = request ? JSON.parse(JSON.stringify(request)) : {};
|
|
58
|
+
return r;
|
|
59
|
+
}
|
|
60
|
+
updateData(bikeData) {
|
|
61
|
+
const prevData = JSON.parse(JSON.stringify(this.data || {}));
|
|
62
|
+
const prevSpeed = prevData.speed;
|
|
63
|
+
const prevRequest = this.prevRequest || {};
|
|
64
|
+
const data = this.data || {};
|
|
65
|
+
const mode = this.getSetting('mode');
|
|
66
|
+
delete this.event.gearUpdated;
|
|
67
|
+
delete this.event.rpmUpdated;
|
|
68
|
+
try {
|
|
69
|
+
let rpm = 90;
|
|
70
|
+
let power = (mode === 'Power' || !mode) ? this.getSetting('power') : bikeData.power || 0;
|
|
71
|
+
let slope = (prevData.slope !== undefined ? prevData.slope : prevRequest.slope || 0);
|
|
72
|
+
let speed = mode === 'Speed' ? this.getSetting('speed') : bikeData.speed || 0;
|
|
73
|
+
let m = 75;
|
|
74
|
+
let distanceInternal = prevData.distanceInternal || 0;
|
|
75
|
+
let ts = Date.now();
|
|
76
|
+
let duration = this.prevUpdateTS === 0 ? 0 : ((ts - this.prevUpdateTS) / 1000);
|
|
77
|
+
if (mode === 'Power' || !mode) {
|
|
78
|
+
speed = calculations_1.default.calculateSpeed(m, power, slope, { bikeType: 'race' });
|
|
79
|
+
}
|
|
80
|
+
else if (mode === 'Speed') {
|
|
81
|
+
power = calculations_1.default.calculatePower(m, speed / 3.6, slope, { bikeType: 'race' });
|
|
82
|
+
}
|
|
83
|
+
if (prevRequest.targetPower) {
|
|
84
|
+
power = prevRequest.targetPower;
|
|
85
|
+
speed = calculations_1.default.calculateSpeed(m, power, slope, { bikeType: 'race' });
|
|
86
|
+
}
|
|
87
|
+
if (prevRequest.maxPower && power > prevRequest.maxPower) {
|
|
88
|
+
power = prevRequest.maxPower;
|
|
89
|
+
speed = calculations_1.default.calculateSpeed(m, power, slope, { bikeType: 'race' });
|
|
90
|
+
}
|
|
91
|
+
else if (prevRequest.minPower && power < prevRequest.minPower) {
|
|
92
|
+
power = prevRequest.minPower;
|
|
93
|
+
speed = calculations_1.default.calculateSpeed(m, power, slope, { bikeType: 'race' });
|
|
94
|
+
}
|
|
95
|
+
let v = speed / 3.6;
|
|
96
|
+
distanceInternal += Math.round(v * duration);
|
|
97
|
+
data.speed = parseFloat(speed.toFixed(1));
|
|
98
|
+
data.power = Math.round(power);
|
|
99
|
+
data.distanceInternal = distanceInternal;
|
|
100
|
+
data.slope = slope;
|
|
101
|
+
data.pedalRpm = rpm;
|
|
102
|
+
if (data.time !== undefined)
|
|
103
|
+
data.time += duration;
|
|
104
|
+
else
|
|
105
|
+
data.time = 0;
|
|
106
|
+
data.heartrate = bikeData.heartrate;
|
|
107
|
+
data.isPedalling = true;
|
|
108
|
+
this.prevUpdateTS = ts;
|
|
109
|
+
}
|
|
110
|
+
catch (err) {
|
|
111
|
+
this.logger.logEvent({ message: 'error', fn: 'updateData()', error: err.message || err });
|
|
112
|
+
}
|
|
113
|
+
this.logger.logEvent({ message: "updateData result", data, bikeData, prevRequest, prevSpeed });
|
|
114
|
+
this.data = data;
|
|
115
|
+
return data;
|
|
116
|
+
}
|
|
117
|
+
calculateTargetPower(request, updateMode = true) {
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
exports.default = SimulatorCyclingMode;
|
package/lib/types/route.js
CHANGED
package/lib/types/user.js
CHANGED
package/lib/utils.js
CHANGED
|
@@ -9,9 +9,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.sleep =
|
|
12
|
+
exports.Queue = exports.hexstr = exports.intVal = exports.floatVal = exports.runWithRetries = exports.sleep = void 0;
|
|
13
|
+
const sleep = (ms) => {
|
|
13
14
|
return new Promise(resolve => setTimeout(resolve, ms));
|
|
14
15
|
};
|
|
16
|
+
exports.sleep = sleep;
|
|
15
17
|
function runWithRetries(fn, maxRetries, timeBetween) {
|
|
16
18
|
return new Promise((resolve, reject) => {
|
|
17
19
|
let retries = 0;
|