incyclist-devices 1.2.0 → 1.4.0

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.
Files changed (70) hide show
  1. package/LICENSE +21 -0
  2. package/lib/CyclingMode.d.ts +72 -0
  3. package/lib/CyclingMode.js +66 -0
  4. package/lib/Device.d.ts +48 -10
  5. package/lib/Device.js +9 -8
  6. package/lib/DeviceProtocol.d.ts +40 -12
  7. package/lib/DeviceProtocol.js +16 -16
  8. package/lib/DeviceRegistry.d.ts +4 -4
  9. package/lib/DeviceRegistry.js +10 -10
  10. package/lib/DeviceSupport.d.ts +4 -3
  11. package/lib/DeviceSupport.js +32 -8
  12. package/lib/ant/AntAdapter.d.ts +9 -2
  13. package/lib/ant/AntAdapter.js +26 -2
  14. package/lib/ant/AntScanner.d.ts +16 -6
  15. package/lib/ant/AntScanner.js +379 -138
  16. package/lib/ant/antfe/AntFEAdapter.d.ts +4 -2
  17. package/lib/ant/antfe/AntFEAdapter.js +209 -72
  18. package/lib/ant/anthrm/AntHrmAdapter.d.ts +4 -1
  19. package/lib/ant/anthrm/AntHrmAdapter.js +73 -19
  20. package/lib/ant/utils.js +2 -1
  21. package/lib/calculations.d.ts +12 -13
  22. package/lib/calculations.js +88 -125
  23. package/lib/daum/DaumAdapter.d.ts +29 -6
  24. package/lib/daum/DaumAdapter.js +219 -96
  25. package/lib/daum/ERGCyclingMode.d.ts +28 -0
  26. package/lib/daum/ERGCyclingMode.js +207 -0
  27. package/lib/daum/PowerMeterCyclingMode.d.ts +18 -0
  28. package/lib/daum/PowerMeterCyclingMode.js +79 -0
  29. package/lib/daum/SmartTrainerCyclingMode.d.ts +41 -0
  30. package/lib/daum/SmartTrainerCyclingMode.js +344 -0
  31. package/lib/daum/classic/DaumClassicAdapter.d.ts +3 -1
  32. package/lib/daum/classic/DaumClassicAdapter.js +46 -32
  33. package/lib/daum/classic/DaumClassicCyclingMode.d.ts +13 -0
  34. package/lib/daum/classic/DaumClassicCyclingMode.js +98 -0
  35. package/lib/daum/classic/DaumClassicProtocol.d.ts +5 -3
  36. package/lib/daum/classic/DaumClassicProtocol.js +39 -6
  37. package/lib/daum/classic/ERGCyclingMode.d.ts +23 -0
  38. package/lib/daum/classic/ERGCyclingMode.js +171 -0
  39. package/lib/daum/classic/bike.d.ts +41 -37
  40. package/lib/daum/classic/bike.js +86 -53
  41. package/lib/daum/classic/utils.d.ts +3 -3
  42. package/lib/daum/classic/utils.js +16 -10
  43. package/lib/daum/indoorbike.d.ts +2 -1
  44. package/lib/daum/indoorbike.js +23 -21
  45. package/lib/daum/premium/DaumPremiumAdapter.d.ts +2 -2
  46. package/lib/daum/premium/DaumPremiumAdapter.js +30 -20
  47. package/lib/daum/premium/DaumPremiumProtocol.d.ts +11 -2
  48. package/lib/daum/premium/DaumPremiumProtocol.js +49 -8
  49. package/lib/daum/premium/bike.d.ts +63 -52
  50. package/lib/daum/premium/bike.js +258 -207
  51. package/lib/daum/premium/tcpserial.d.ts +18 -14
  52. package/lib/daum/premium/tcpserial.js +50 -20
  53. package/lib/daum/premium/utils.d.ts +2 -2
  54. package/lib/simulator/Simulator.d.ts +13 -7
  55. package/lib/simulator/Simulator.js +62 -21
  56. package/lib/utils.d.ts +3 -1
  57. package/lib/utils.js +39 -18
  58. package/package.json +12 -11
  59. package/lib/ant/AntScanner.unit.tests.d.ts +0 -1
  60. package/lib/ant/AntScanner.unit.tests.js +0 -25
  61. package/lib/ant/antfe/AntFEProcessor.d.ts +0 -40
  62. package/lib/ant/antfe/AntFEProcessor.js +0 -238
  63. package/lib/ant/antfe/AntHrmProtocol.d.ts +0 -9
  64. package/lib/ant/antfe/AntHrmProtocol.js +0 -30
  65. package/lib/ant/antfe/bike.d.ts +0 -47
  66. package/lib/ant/antfe/bike.js +0 -602
  67. package/lib/ant/anthrm/anthrm.d.ts +0 -33
  68. package/lib/ant/anthrm/anthrm.js +0 -523
  69. package/lib/simulator/Simulator.unit.tests.d.ts +0 -1
  70. package/lib/simulator/Simulator.unit.tests.js +0 -79
@@ -0,0 +1,79 @@
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: "PowerMeter",
11
+ description: "Power and cadence are taken from device. Speed is calculated from power and current slope\nThis mode will not respect maximum power and/or workout limits",
12
+ properties: []
13
+ };
14
+ class PowerMeterCyclingMode extends CyclingMode_1.CyclingModeBase {
15
+ constructor(adapter, props) {
16
+ super(adapter, props);
17
+ this.prevUpdateTS = 0;
18
+ this.hasBikeUpdate = false;
19
+ this.logger = adapter ? adapter.logger : undefined;
20
+ if (!this.logger)
21
+ this.logger = new gd_eventlog_1.EventLogger('PowerMeter');
22
+ }
23
+ getName() {
24
+ return config.name;
25
+ }
26
+ getDescription() {
27
+ return config.description;
28
+ }
29
+ getProperties() {
30
+ return config.properties;
31
+ }
32
+ getProperty(name) {
33
+ return config.properties.find(p => p.name === name);
34
+ }
35
+ getBikeInitRequest() {
36
+ return { slope: 0 };
37
+ }
38
+ sendBikeUpdate(request) {
39
+ if (request.slope)
40
+ this.data.slope = request.slope;
41
+ this.logger.logEvent({ message: "processing update request", request, prev: this.prevRequest });
42
+ this.prevRequest = {};
43
+ return {};
44
+ }
45
+ updateData(data) {
46
+ try {
47
+ const prevData = this.data || {};
48
+ const prevRequest = this.prevRequest || {};
49
+ const bikeData = JSON.parse(JSON.stringify(data));
50
+ let power = data.power || 0;
51
+ let speed = data.speed || 0;
52
+ let slope = (prevData.slope !== undefined ? prevData.slope : prevRequest.slope || 0);
53
+ let distanceInternal = prevData.distanceInternal || 0;
54
+ if (!bikeData.pedalRpm || bikeData.isPedalling === false) {
55
+ speed = 0;
56
+ power = 0;
57
+ }
58
+ let ts = Date.now();
59
+ const m = this.adapter.getWeight();
60
+ speed = calculations_1.default.calculateSpeed(m, power, slope);
61
+ let v = speed / 3.6;
62
+ let duration = this.prevUpdateTS === 0 ? 0 : ((ts - this.prevUpdateTS) / 1000);
63
+ distanceInternal += Math.round(v * duration);
64
+ data.speed = parseFloat(speed.toFixed(1));
65
+ data.power = Math.round(power);
66
+ data.distanceInternal = Math.round(distanceInternal);
67
+ data.distance = Math.round(distanceInternal / 100);
68
+ data.slope = slope;
69
+ this.logger.logEvent({ message: "updateData result", data, bikeData, prevRequest: {}, prevSpeed: prevData.speed });
70
+ this.data = JSON.parse(JSON.stringify(data));
71
+ this.prevUpdateTS = ts;
72
+ }
73
+ catch (err) {
74
+ this.logger.logEvent({ message: 'error', fn: 'updateData()', error: err.message || err });
75
+ }
76
+ return data;
77
+ }
78
+ }
79
+ exports.default = PowerMeterCyclingMode;
@@ -0,0 +1,41 @@
1
+ import { EventLogger } from "gd-eventlog";
2
+ import CyclingMode, { CyclingModeProperty, IncyclistBikeData, Settings, UpdateRequest, CyclingModeBase } from "../CyclingMode";
3
+ import DaumAdapter from "./DaumAdapter";
4
+ interface STUpdateRequest extends UpdateRequest {
5
+ calculatedPower?: number;
6
+ delta?: number;
7
+ enforced?: boolean;
8
+ belowMin?: boolean;
9
+ aboveMax?: boolean;
10
+ }
11
+ export declare enum direction {
12
+ up = "up",
13
+ down = "down"
14
+ }
15
+ interface STEvent {
16
+ gearUpdate?: direction;
17
+ rpmUpdate?: boolean;
18
+ targetNotReached?: number;
19
+ }
20
+ export default class SmartTrainerCyclingMode extends CyclingModeBase implements CyclingMode {
21
+ logger: EventLogger;
22
+ data: IncyclistBikeData;
23
+ prevRequest: STUpdateRequest;
24
+ prevUpdateTS: number;
25
+ chain: number[];
26
+ cassette: number[];
27
+ event: STEvent;
28
+ constructor(adapter: DaumAdapter, props?: Settings);
29
+ getName(): string;
30
+ getDescription(): string;
31
+ getProperties(): CyclingModeProperty[];
32
+ getProperty(name: string): CyclingModeProperty;
33
+ getBikeInitRequest(): STUpdateRequest;
34
+ useGearSimulation(): boolean;
35
+ getMinMaxGears(source: string): [number, number];
36
+ sendBikeUpdate(request: STUpdateRequest): STUpdateRequest;
37
+ updateData(bikeData: IncyclistBikeData): any;
38
+ calculateSpeed(gear: any, rpm: any, slope: any, bikeSpeed: any, props?: any): any;
39
+ calculateTargetPower(request: STUpdateRequest, speed?: number): STUpdateRequest;
40
+ }
41
+ export {};
@@ -0,0 +1,344 @@
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
+ exports.direction = void 0;
7
+ const gd_eventlog_1 = require("gd-eventlog");
8
+ const CyclingMode_1 = require("../CyclingMode");
9
+ const calculations_1 = __importDefault(require("../calculations"));
10
+ const SEC_DELAY = 3;
11
+ const config = {
12
+ name: "SmartTrainer",
13
+ description: "Calculates power based on speed and slope.",
14
+ properties: [
15
+ { key: 'bikeType', name: 'Bike Type', description: '', type: CyclingMode_1.CyclingModeProperyType.SingleSelect, options: ['Race', 'Mountain', 'Triathlon'], default: 'Race' },
16
+ { key: 'startPower', name: 'Starting Power', description: 'Initial power in Watts at start of raining', type: CyclingMode_1.CyclingModeProperyType.Integer, default: 50 },
17
+ { key: 'minPower', name: 'Minimum Power', description: 'Minimum power in declines', type: CyclingMode_1.CyclingModeProperyType.Integer, default: 50 },
18
+ { key: 'simulation', name: 'Simulate ', description: 'Simulate ', type: CyclingMode_1.CyclingModeProperyType.Boolean, default: false },
19
+ { key: 'chainRings', name: 'Chain Rings', description: 'Simulated chain rings (format: <min>-<max>)', type: CyclingMode_1.CyclingModeProperyType.String, validation: '', default: '36-52', condition: (s) => s.simulation },
20
+ { key: 'cassetteRings', name: 'Cassette', description: 'Simulated cassette (format: <min>-<max>)', type: CyclingMode_1.CyclingModeProperyType.String, validation: '', default: '11-30', condition: (s) => s.simulation },
21
+ ]
22
+ };
23
+ var direction;
24
+ (function (direction) {
25
+ direction["up"] = "up";
26
+ direction["down"] = "down";
27
+ })(direction = exports.direction || (exports.direction = {}));
28
+ class SmartTrainerCyclingMode extends CyclingMode_1.CyclingModeBase {
29
+ constructor(adapter, props) {
30
+ super(adapter, props);
31
+ this.prevUpdateTS = 0;
32
+ this.event = {};
33
+ this.logger = adapter ? adapter.logger : undefined;
34
+ if (!this.logger)
35
+ this.logger = new gd_eventlog_1.EventLogger('SmartTrainer');
36
+ }
37
+ getName() {
38
+ return config.name;
39
+ }
40
+ getDescription() {
41
+ return config.description;
42
+ }
43
+ getProperties() {
44
+ return config.properties;
45
+ }
46
+ getProperty(name) {
47
+ return config.properties.find(p => p.name === name);
48
+ }
49
+ getBikeInitRequest() {
50
+ const startPower = this.getSetting('startPower');
51
+ return { targetPower: startPower };
52
+ }
53
+ useGearSimulation() {
54
+ const simulation = this.getSetting('simulation');
55
+ if (simulation === false)
56
+ return false;
57
+ const chain = this.getSetting('chainRings');
58
+ const cassette = this.getSetting('cassetteRings');
59
+ return (chain && this.getMinMaxGears('chain') !== undefined && cassette && this.getMinMaxGears('cassette') !== undefined);
60
+ }
61
+ getMinMaxGears(source) {
62
+ const minMaxStr = this.getSetting(`${source}Rings`);
63
+ const values = minMaxStr.split('-');
64
+ if (values[0] && values[1] && values[0] < values[1]) {
65
+ return [parseInt(values[0]), parseInt(values[1])];
66
+ }
67
+ if (values[0] && values[1] && values[0] > values[1]) {
68
+ return [parseInt(values[1]), parseInt(values[0])];
69
+ }
70
+ return;
71
+ }
72
+ sendBikeUpdate(request) {
73
+ const getData = () => {
74
+ if (!this.data)
75
+ return {};
76
+ const { gear, pedalRpm, slope, power, speed } = this.data;
77
+ return { gear, pedalRpm, slope, power, speed };
78
+ };
79
+ const event = Object.assign({}, this.event);
80
+ if (this.data === undefined)
81
+ event.noData = true;
82
+ const slope = request.slope === undefined ? request.slope : parseFloat(request.slope.toFixed(1));
83
+ if (slope !== undefined && (event.noData || Math.abs(slope - this.data.slope) >= 0.1))
84
+ event.slopeUpdate = true;
85
+ if (this.prevRequest === undefined)
86
+ event.initialCall = true;
87
+ this.logger.logEvent({ message: "processing update request", request, prev: this.prevRequest, data: getData(), event });
88
+ const minPower = this.getSetting('minPower');
89
+ let newRequest = {};
90
+ try {
91
+ let targetEnforced = false;
92
+ const updateRequestFromCalculated = calculatedRequest => {
93
+ newRequest.calculatedPower = calculatedRequest.calculatedPower;
94
+ newRequest.delta = calculatedRequest.delta;
95
+ if (!calculatedRequest.belowMin || calculatedRequest.targetPower !== minPower)
96
+ this.event.targetNotReached = 1;
97
+ else
98
+ newRequest.belowMin = true;
99
+ };
100
+ const enforceCalculated = calculatedRequest => {
101
+ delete this.event.targetNotReached;
102
+ delete newRequest.calculatedPower;
103
+ delete newRequest.delta;
104
+ newRequest.targetPower = calculatedRequest.calculatedPower;
105
+ targetEnforced = true;
106
+ };
107
+ if (!request || request.reset || Object.keys(request).length === 0) {
108
+ this.prevRequest = {};
109
+ return {};
110
+ }
111
+ if (request.refresh && !event.initialCall && !event.gearUpdate && !event.rpmUpdate && !event.targetNotReached) {
112
+ request = JSON.parse(JSON.stringify(this.prevRequest));
113
+ delete request.refresh;
114
+ this.logger.log('returning previous request');
115
+ return request;
116
+ }
117
+ else if (request.refresh && event.targetNotReached && !event.slopeUpdate && !event.gearUpdate) {
118
+ const { delta, calculatedPower } = this.prevRequest;
119
+ const prevPower = calculatedPower - delta;
120
+ if (delta === undefined || prevPower === undefined || calculatedPower === undefined) {
121
+ delete this.event.targetNotReached;
122
+ return request;
123
+ }
124
+ const retryCnt = ++this.event.targetNotReached;
125
+ newRequest.targetPower = prevPower + delta * retryCnt / SEC_DELAY;
126
+ if (retryCnt < SEC_DELAY) {
127
+ newRequest.delta = delta;
128
+ newRequest.calculatedPower = calculatedPower;
129
+ }
130
+ else {
131
+ delete this.event.targetNotReached;
132
+ }
133
+ delete request.refresh;
134
+ if (newRequest.targetPower <= minPower) {
135
+ newRequest.belowMin = true;
136
+ }
137
+ this.prevRequest = JSON.parse(JSON.stringify(newRequest));
138
+ return newRequest;
139
+ }
140
+ if (request.targetPower !== undefined) {
141
+ newRequest.targetPower = request.targetPower;
142
+ newRequest.enforced = true;
143
+ this.event = {};
144
+ }
145
+ else if (request.maxPower !== undefined && request.minPower !== undefined && request.maxPower === request.minPower) {
146
+ newRequest.targetPower = request.maxPower;
147
+ newRequest.enforced = true;
148
+ this.event = {};
149
+ }
150
+ else {
151
+ let calculatedRequest = this.calculateTargetPower(request);
152
+ if (event.gearUpdate && !event.noData) {
153
+ const { gear, pedalRpm, slope } = this.data;
154
+ const speed = this.calculateSpeed(gear, pedalRpm, slope, this.data.speed);
155
+ calculatedRequest = this.calculateTargetPower(request, speed);
156
+ newRequest.targetPower = calculatedRequest.targetPower;
157
+ if (calculatedRequest.belowMin)
158
+ newRequest.belowMin = true;
159
+ if (calculatedRequest.calculatedPower && calculatedRequest.targetPower !== calculatedRequest.calculatedPower) {
160
+ updateRequestFromCalculated(calculatedRequest);
161
+ }
162
+ else if (calculatedRequest.calculatedPower && Math.abs(calculatedRequest.targetPower - calculatedRequest.calculatedPower) < 0.1) {
163
+ delete this.event.targetNotReached;
164
+ }
165
+ if ((event.gearUpdate === direction.up && calculatedRequest.calculatedPower && calculatedRequest.calculatedPower > calculatedRequest.targetPower)
166
+ || (event.gearUpdate === direction.down && calculatedRequest.calculatedPower && calculatedRequest.calculatedPower < calculatedRequest.targetPower)) {
167
+ enforceCalculated(calculatedRequest);
168
+ }
169
+ }
170
+ if (event.slopeUpdate && !targetEnforced) {
171
+ newRequest.targetPower = calculatedRequest.targetPower;
172
+ if (calculatedRequest.calculatedPower && calculatedRequest.targetPower !== calculatedRequest.calculatedPower) {
173
+ updateRequestFromCalculated(calculatedRequest);
174
+ }
175
+ }
176
+ if (request.maxPower !== undefined) {
177
+ if (calculatedRequest.targetPower !== undefined && calculatedRequest.targetPower > request.maxPower) {
178
+ newRequest.targetPower = request.maxPower;
179
+ newRequest.aboveMax = true;
180
+ }
181
+ }
182
+ if (request.minPower !== undefined) {
183
+ if (calculatedRequest.targetPower !== undefined && calculatedRequest.targetPower < request.minPower) {
184
+ newRequest.targetPower = request.minPower;
185
+ newRequest.belowMin = true;
186
+ }
187
+ }
188
+ if (!event.slopeUpdate && !event.gearUpdate) {
189
+ newRequest.targetPower = calculatedRequest.targetPower;
190
+ if (calculatedRequest.calculatedPower && calculatedRequest.targetPower !== calculatedRequest.calculatedPower) {
191
+ updateRequestFromCalculated(calculatedRequest);
192
+ }
193
+ }
194
+ }
195
+ if (newRequest.targetPower !== undefined)
196
+ newRequest.targetPower = Math.round(newRequest.targetPower);
197
+ this.prevRequest = JSON.parse(JSON.stringify(newRequest));
198
+ }
199
+ catch (err) {
200
+ this.logger.logEvent({ message: "error", fn: 'sendBikeUpdate()', request, error: err.message || err, stack: err.stack });
201
+ }
202
+ return newRequest;
203
+ }
204
+ updateData(bikeData) {
205
+ const prevData = JSON.parse(JSON.stringify(this.data || {}));
206
+ const prevSpeed = prevData.speed;
207
+ const prevRequest = this.prevRequest || {};
208
+ const data = this.data || {};
209
+ const gearSimulation = this.useGearSimulation();
210
+ const fromPower = (prevRequest.belowMin || prevRequest.aboveMax);
211
+ delete this.event.gearUpdate;
212
+ delete this.event.rpmUpdate;
213
+ try {
214
+ let rpm = bikeData.pedalRpm || 0;
215
+ let gear = bikeData.gear || 0;
216
+ let power = bikeData.power || 0;
217
+ let slope = (prevData.slope !== undefined ? prevData.slope : prevRequest.slope || 0);
218
+ let speed;
219
+ if (gear !== prevData.gear)
220
+ this.event.gearUpdate = gear > prevData.gear ? direction.up : direction.down;
221
+ if (rpm !== prevData.pedalRpm)
222
+ this.event.rpmUpdate = true;
223
+ let m = this.adapter.getWeight();
224
+ let distanceInternal = prevData.distanceInternal || 0;
225
+ let distance = Math.round(distanceInternal / 100);
226
+ let ts = Date.now();
227
+ let duration = this.prevUpdateTS === 0 ? 0 : ((ts - this.prevUpdateTS) / 1000);
228
+ if (rpm === 0 || bikeData.isPedalling === false) {
229
+ speed = 0;
230
+ power = 0;
231
+ delete prevRequest.belowMin;
232
+ }
233
+ else {
234
+ if (prevRequest.enforced) {
235
+ speed = calculations_1.default.calculateSpeed(m, power, slope, { previous: prevSpeed });
236
+ }
237
+ else {
238
+ speed = this.calculateSpeed(gear, rpm, slope, speed, { fromPower, prevSpeed });
239
+ }
240
+ const v = speed / 3.6;
241
+ distanceInternal += Math.round(v * duration);
242
+ }
243
+ data.speed = parseFloat(speed.toFixed(1));
244
+ data.power = Math.round(power);
245
+ data.distanceInternal = distanceInternal;
246
+ data.distance = distance;
247
+ data.slope = slope;
248
+ data.pedalRpm = rpm;
249
+ data.gear = gear;
250
+ if (data.time)
251
+ data.time += duration;
252
+ else
253
+ data.time = 0;
254
+ data.heartrate = bikeData.heartrate;
255
+ data.isPedalling = bikeData.isPedalling;
256
+ }
257
+ catch (err) {
258
+ this.logger.logEvent({ message: 'error', fn: 'updateData()', error: err.message || err });
259
+ }
260
+ this.logger.logEvent({ message: "updateData result", data, bikeData, prevRequest, prevSpeed, gearSimulation, event: this.event, speedProps: fromPower });
261
+ this.data = data;
262
+ this.prevUpdateTS = Date.now();
263
+ return data;
264
+ }
265
+ calculateSpeed(gear, rpm, slope, bikeSpeed, props = {}) {
266
+ const gearSimulation = this.useGearSimulation();
267
+ const prevRequest = this.prevRequest || {};
268
+ const minPower = this.getSetting('minPower');
269
+ const bikeType = this.getSetting('bikeType').toLowerCase();
270
+ const m = this.adapter.getWeight();
271
+ let speed = bikeSpeed;
272
+ const Ekin = (m, speed) => {
273
+ const v = speed / 3.6;
274
+ return 1 / 2 * m * v * v;
275
+ };
276
+ if (gearSimulation) {
277
+ if (!this.chain)
278
+ this.chain = this.getMinMaxGears('chain');
279
+ if (!this.cassette)
280
+ this.cassette = this.getMinMaxGears('cassette');
281
+ speed = calculations_1.default.calculateSpeedBike(gear, rpm, this.chain, this.cassette, { numGears: 28, wheelCirc: 2125 });
282
+ }
283
+ else {
284
+ speed = calculations_1.default.calculateSpeedDaum(gear, rpm, bikeType);
285
+ }
286
+ if (props.fromPower) {
287
+ let calculatedPower = calculations_1.default.calculatePower(m, bikeSpeed / 3.6, slope, { bikeType });
288
+ if (calculatedPower <= minPower || (prevRequest.minPower && calculatedPower < prevRequest.minPower)) {
289
+ const speedTarget = calculations_1.default.calculateSpeed(m, minPower, slope, { previous: props.prevSpeed });
290
+ const EkinBefore = Ekin(m, bikeSpeed);
291
+ const powerDelta = minPower - calculatedPower;
292
+ const EkinAfter1s = EkinBefore + powerDelta;
293
+ if (EkinAfter1s > EkinBefore) {
294
+ const vAfter1s = Math.sqrt(2 * EkinAfter1s / m);
295
+ const speedAfter = vAfter1s * 3.6;
296
+ if (speedAfter > speedTarget)
297
+ speed = speedTarget;
298
+ }
299
+ }
300
+ else if (prevRequest.maxPower && calculatedPower > prevRequest.maxPower)
301
+ speed = calculations_1.default.calculateSpeed(m, minPower, slope, { previous: props.prevSpeed });
302
+ }
303
+ return speed;
304
+ }
305
+ calculateTargetPower(request, speed) {
306
+ const defaultPower = this.getSetting('startPower');
307
+ const minPower = this.getSetting('minPower');
308
+ const bikeType = this.getSetting('bikeType').toLowerCase();
309
+ const m = this.adapter.getWeight();
310
+ const prevData = this.data || {};
311
+ const slope = parseFloat((request.slope === undefined ? prevData.slope || 0 : request.slope).toFixed(1));
312
+ let target = request.targetPower || defaultPower;
313
+ if (prevData.speed !== undefined || speed !== undefined) {
314
+ const v = speed ? speed / 3.6 : prevData.speed / 3.6;
315
+ const calculatedPower = calculations_1.default.calculatePower(m, v, slope, { bikeType });
316
+ const power = (calculatedPower < minPower) ? minPower : calculatedPower;
317
+ let belowMin = (calculatedPower < minPower);
318
+ const powerDelta = power - prevData.power || 0;
319
+ let target;
320
+ if (Math.abs(powerDelta) > 10) {
321
+ target = Math.round(prevData.power + powerDelta / SEC_DELAY);
322
+ if (target < minPower) {
323
+ target = minPower;
324
+ belowMin = true;
325
+ }
326
+ }
327
+ else {
328
+ target = power;
329
+ }
330
+ if (!speed)
331
+ this.logger.logEvent({ message: 'request:targetPower', info: { prev: prevData.power || 0, calculated: calculatedPower, required: power, delta: powerDelta, target, belowMin } });
332
+ request.targetPower = target;
333
+ request.calculatedPower = power;
334
+ request.delta = powerDelta;
335
+ request.belowMin = belowMin;
336
+ }
337
+ else {
338
+ request.targetPower = target;
339
+ request.calculatedPower = target;
340
+ }
341
+ return request;
342
+ }
343
+ }
344
+ exports.default = SmartTrainerCyclingMode;
@@ -1,3 +1,4 @@
1
+ import CyclingMode from '../../CyclingMode';
1
2
  import DaumAdapter from '../DaumAdapter';
2
3
  export default class DaumClassicAdapter extends DaumAdapter {
3
4
  static NAME: string;
@@ -9,8 +10,9 @@ export default class DaumClassicAdapter extends DaumAdapter {
9
10
  getName(): string;
10
11
  setName(name: any): void;
11
12
  getPort(): any;
13
+ getSupportedCyclingModes(): Array<any>;
14
+ getDefaultCyclingMode(): CyclingMode;
12
15
  check(): Promise<unknown>;
13
16
  start(props: any): Promise<unknown>;
14
17
  getCurrentBikeData(): any;
15
- updateData(data: any, bikeData: any): any;
16
18
  }
@@ -8,10 +8,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
8
8
  step((generator = generator.apply(thisArg, _arguments || [])).next());
9
9
  });
10
10
  };
11
+ var __importDefault = (this && this.__importDefault) || function (mod) {
12
+ return (mod && mod.__esModule) ? mod : { "default": mod };
13
+ };
11
14
  Object.defineProperty(exports, "__esModule", { value: true });
12
15
  const gd_eventlog_1 = require("gd-eventlog");
13
16
  const utils_1 = require("../../utils");
14
- const DaumAdapter_1 = require("../DaumAdapter");
17
+ const DaumAdapter_1 = __importDefault(require("../DaumAdapter"));
18
+ const DaumClassicCyclingMode_1 = __importDefault(require("./DaumClassicCyclingMode"));
15
19
  const PROTOCOL_NAME = "Daum Classic";
16
20
  class DaumClassicAdapter extends DaumAdapter_1.default {
17
21
  constructor(protocol, bike) {
@@ -41,10 +45,21 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
41
45
  getPort() {
42
46
  return this.bike.getPort();
43
47
  }
48
+ getSupportedCyclingModes() {
49
+ const supported = super.getSupportedCyclingModes();
50
+ supported.push(DaumClassicCyclingMode_1.default);
51
+ return supported;
52
+ }
53
+ getDefaultCyclingMode() {
54
+ return new DaumClassicCyclingMode_1.default(this);
55
+ }
44
56
  check() {
45
57
  var info = {};
46
58
  return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
47
59
  this.logger.logEvent({ message: "check()", port: this.getPort() });
60
+ const iv = setTimeout(() => __awaiter(this, void 0, void 0, function* () {
61
+ reject(new Error(`timeout`));
62
+ }), 5000);
48
63
  try {
49
64
  if (!this.bike.isConnected())
50
65
  yield this.bike.saveConnect();
@@ -55,10 +70,11 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
55
70
  info.cockpit = version.cockpit;
56
71
  this.setName('Daum ' + info.cockpit);
57
72
  this.setID(info.serialNo);
58
- console.log('found', info);
73
+ clearTimeout(iv);
59
74
  resolve(info);
60
75
  }
61
76
  catch (err) {
77
+ clearTimeout(iv);
62
78
  reject(err);
63
79
  }
64
80
  }));
@@ -69,29 +85,42 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
69
85
  const opts = props || {};
70
86
  const person = props;
71
87
  this.initData();
72
- return utils_1.runWithRetries(() => __awaiter(this, void 0, void 0, function* () {
73
- const state = {};
88
+ let startState = {};
89
+ return (0, utils_1.runWithRetries)(() => __awaiter(this, void 0, void 0, function* () {
74
90
  try {
75
- if (!state.reset) {
76
- yield this.getBike().resetDevice();
77
- state.reset = true;
91
+ if (!this.bike.isConnected())
92
+ yield this.bike.saveConnect();
93
+ yield this.getBike().resetDevice();
94
+ if (!startState.setProg) {
95
+ yield this.getBike().setProg(0);
96
+ startState.setProg = true;
97
+ }
98
+ if (!startState.setPerson) {
99
+ yield this.getBike().setPerson({ person });
100
+ startState.setPerson = true;
78
101
  }
79
- if (!state.startProg) {
102
+ if (!startState.startProg) {
80
103
  yield this.getBike().startProg();
81
- state.startProg = true;
104
+ startState.startProg = true;
82
105
  }
83
- if (!state.setProg) {
84
- yield this.getBike().setProg(0);
85
- state.setProg = true;
106
+ if (!startState.setGear) {
107
+ yield this.bike.setGear(this.data.gear || (opts.gear || 10));
108
+ startState.setGear = true;
86
109
  }
87
- if (!state.setPerson) {
88
- yield this.getBike().setPerson({ person });
89
- state.setPerson = true;
110
+ const startRequest = this.getCyclingMode().getBikeInitRequest();
111
+ yield this.sendRequest(startRequest);
112
+ startState.checkRunData = true;
113
+ const data = yield this.bike.runData();
114
+ if (startRequest.targetPower && startRequest.targetPower !== 25 && data.power === 25) {
115
+ throw new Error('invalid device response: runData');
90
116
  }
91
- return yield this.bike.setGear(this.data.gear || (opts.gear || 10));
117
+ return data;
92
118
  }
93
119
  catch (err) {
94
- throw (err);
120
+ if (startState.checkRunData) {
121
+ startState = {};
122
+ }
123
+ throw (new Error(`could not start device, reason:${err.message}`));
95
124
  }
96
125
  }), 5, 1000)
97
126
  .then(data => {
@@ -103,21 +132,6 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
103
132
  getCurrentBikeData() {
104
133
  return this.getBike().runData();
105
134
  }
106
- updateData(data, bikeData) {
107
- data.isPedalling = bikeData.cadence > 0;
108
- data.power = bikeData.power;
109
- data.pedalRpm = bikeData.cadence;
110
- data.speed = bikeData.speed;
111
- data.heartrate = bikeData.heartrate;
112
- data.distance = bikeData.distance / 100;
113
- data.distanceInternal = bikeData.distance;
114
- data.time = bikeData.time;
115
- data.gear = bikeData.gear;
116
- if (this.bike.processor !== undefined) {
117
- data = this.bike.processor.getValues(data);
118
- }
119
- return data;
120
- }
121
135
  }
122
136
  exports.default = DaumClassicAdapter;
123
137
  DaumClassicAdapter.NAME = PROTOCOL_NAME;
@@ -0,0 +1,13 @@
1
+ import CyclingMode, { CyclingModeProperty, IncyclistBikeData, Settings, UpdateRequest } from "../../CyclingMode";
2
+ import SmartTrainerCyclingMode from "../SmartTrainerCyclingMode";
3
+ import DaumAdapter from "../DaumAdapter";
4
+ export default class DaumClassicCyclingMode extends SmartTrainerCyclingMode implements CyclingMode {
5
+ constructor(adapter: DaumAdapter, props?: Settings);
6
+ getName(): string;
7
+ getDescription(): string;
8
+ getProperties(): CyclingModeProperty[];
9
+ getProperty(name: string): CyclingModeProperty;
10
+ getBikeInitRequest(): UpdateRequest;
11
+ sendBikeUpdate(request: UpdateRequest): UpdateRequest;
12
+ updateData(data: IncyclistBikeData): IncyclistBikeData;
13
+ }