incyclist-devices 1.4.55 → 1.4.56
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.js +1 -5
- package/lib/ant/AntScanner.js +1 -5
- package/lib/ble/ble-erg-mode.js +2 -2
- package/lib/ble/ble-st-mode.js +2 -2
- package/lib/ble/ble.d.ts +0 -1
- package/lib/ble/incyclist-protocol.js +1 -5
- package/lib/ble/wahoo-kickr.js +1 -5
- package/lib/daum/DaumAdapter.js +1 -5
- package/lib/daum/ERGCyclingMode.js +1 -1
- package/lib/daum/SmartTrainerCyclingMode.js +2 -2
- package/lib/daum/classic/DaumClassicCyclingMode.js +1 -1
- package/lib/daum/classic/DaumClassicProtocol.js +1 -5
- package/lib/daum/premium/DaumClassicCyclingMode.js +2 -2
- package/lib/daum/premium/DaumPremiumProtocol.js +1 -5
- package/lib/kettler/comms.d.ts +0 -1
- package/lib/kettler/ergo-racer/adapter.js +1 -5
- package/lib/kettler/ergo-racer/protocol.d.ts +1 -1
- package/lib/kettler/ergo-racer/protocol.js +1 -5
- package/lib/modes/power-meter.js +2 -2
- package/lib/modes/simulator.js +1 -1
- package/lib/simulator/Simulator.d.ts +1 -1
- package/lib/simulator/Simulator.js +1 -5
- package/package.json +1 -1
package/lib/DeviceSupport.js
CHANGED
|
@@ -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
|
-
|
|
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/lib/ant/AntScanner.js
CHANGED
|
@@ -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
|
-
|
|
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/lib/ble/ble-erg-mode.js
CHANGED
|
@@ -108,11 +108,11 @@ class BleERGCyclingMode extends power_base_1.default {
|
|
|
108
108
|
const { speed, distance } = this.calculateSpeedAndDistance(power, slope, m, t, { bikeType });
|
|
109
109
|
if (power === 0 && speed < MIN_SPEED) {
|
|
110
110
|
data.speed = Math.round(prevData.speed - 1) < 0 ? 0 : Math.round(prevData.speed - 1);
|
|
111
|
-
data.distanceInternal =
|
|
111
|
+
data.distanceInternal = distanceInternal + data.speed / 3.6 * t;
|
|
112
112
|
}
|
|
113
113
|
else {
|
|
114
114
|
data.speed = (power === 0 && speed < MIN_SPEED) ? 0 : speed;
|
|
115
|
-
data.distanceInternal = (power === 0 && speed < MIN_SPEED) ?
|
|
115
|
+
data.distanceInternal = (power === 0 && speed < MIN_SPEED) ? distanceInternal : distanceInternal + distance;
|
|
116
116
|
}
|
|
117
117
|
data.power = Math.round(power);
|
|
118
118
|
data.slope = slope;
|
package/lib/ble/ble-st-mode.js
CHANGED
|
@@ -78,11 +78,11 @@ class FtmsCyclingMode extends power_base_1.default {
|
|
|
78
78
|
const { speed, distance } = this.calculateSpeedAndDistance(power, slope, m, t, { bikeType });
|
|
79
79
|
if (power === 0 && speed < MIN_SPEED) {
|
|
80
80
|
data.speed = Math.round(prevData.speed - 1) < 0 ? 0 : Math.round(prevData.speed - 1);
|
|
81
|
-
data.distanceInternal =
|
|
81
|
+
data.distanceInternal = distanceInternal + data.speed / 3.6 * t;
|
|
82
82
|
}
|
|
83
83
|
else {
|
|
84
84
|
data.speed = (power === 0 && speed < MIN_SPEED) ? 0 : speed;
|
|
85
|
-
data.distanceInternal = (power === 0 && speed < MIN_SPEED) ?
|
|
85
|
+
data.distanceInternal = (power === 0 && speed < MIN_SPEED) ? distanceInternal : distanceInternal + distance;
|
|
86
86
|
}
|
|
87
87
|
data.power = Math.round(power);
|
|
88
88
|
data.slope = slope;
|
package/lib/ble/ble.d.ts
CHANGED
|
@@ -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
|
-
|
|
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/lib/ble/wahoo-kickr.js
CHANGED
|
@@ -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
|
-
|
|
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/lib/daum/DaumAdapter.js
CHANGED
|
@@ -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
|
-
|
|
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];
|
|
@@ -149,7 +149,7 @@ class ERGCyclingMode extends power_base_1.default {
|
|
|
149
149
|
const { speed, distance } = this.calculateSpeedAndDistance(power, slope, m, t, { bikeType });
|
|
150
150
|
data.speed = parseFloat(speed.toFixed(1));
|
|
151
151
|
data.power = Math.round(power);
|
|
152
|
-
data.distanceInternal =
|
|
152
|
+
data.distanceInternal = distanceInternal + distance;
|
|
153
153
|
data.slope = slope;
|
|
154
154
|
data.pedalRpm = rpm;
|
|
155
155
|
data.gear = gear;
|
|
@@ -222,7 +222,7 @@ class SmartTrainerCyclingMode extends CyclingMode_1.CyclingModeBase {
|
|
|
222
222
|
this.event.rpmUpdate = true;
|
|
223
223
|
let m = this.adapter.getWeight();
|
|
224
224
|
let distanceInternal = prevData.distanceInternal || 0;
|
|
225
|
-
let distance =
|
|
225
|
+
let distance = (distanceInternal / 100);
|
|
226
226
|
let ts = Date.now();
|
|
227
227
|
let duration = this.prevUpdateTS === 0 ? 0 : ((ts - this.prevUpdateTS) / 1000);
|
|
228
228
|
if (rpm === 0 || bikeData.isPedalling === false) {
|
|
@@ -238,7 +238,7 @@ class SmartTrainerCyclingMode extends CyclingMode_1.CyclingModeBase {
|
|
|
238
238
|
speed = this.calculateSpeed(gear, rpm, slope, speed, { fromPower, prevSpeed });
|
|
239
239
|
}
|
|
240
240
|
const v = speed / 3.6;
|
|
241
|
-
distanceInternal +=
|
|
241
|
+
distanceInternal += (v * duration);
|
|
242
242
|
}
|
|
243
243
|
data.speed = parseFloat(speed.toFixed(1));
|
|
244
244
|
data.power = Math.round(power);
|
|
@@ -78,7 +78,7 @@ class DaumClassicCyclingMode extends SmartTrainerCyclingMode_1.default {
|
|
|
78
78
|
else {
|
|
79
79
|
const duration = this.prevUpdateTS === 0 ? 0 : ((ts - this.prevUpdateTS) / 1000);
|
|
80
80
|
let v = speed / 3.6;
|
|
81
|
-
distanceInternal +=
|
|
81
|
+
distanceInternal += (v * duration);
|
|
82
82
|
}
|
|
83
83
|
data.speed = parseFloat(speed.toFixed(1));
|
|
84
84
|
data.power = Math.round(power);
|
|
@@ -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
|
-
|
|
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];
|
|
@@ -67,11 +67,11 @@ class DaumClassicCyclingMode extends DaumPowerMeterCyclingMode_1.default {
|
|
|
67
67
|
this.logger.logEvent({ message: '~~~ distance overflow', distanceBike, distancePrev });
|
|
68
68
|
let v = speed / 3.6;
|
|
69
69
|
let duration = this.prevUpdateTS === 0 ? 0 : ((ts - this.prevUpdateTS) / 1000);
|
|
70
|
-
distanceInternal = distancePrev +
|
|
70
|
+
distanceInternal = distancePrev + v * duration;
|
|
71
71
|
}
|
|
72
72
|
data.speed = parseFloat(speed.toFixed(1));
|
|
73
73
|
data.power = Math.round(power);
|
|
74
|
-
data.distanceInternal =
|
|
74
|
+
data.distanceInternal = distanceInternal;
|
|
75
75
|
data.slope = slope;
|
|
76
76
|
this.logger.logEvent({ message: "updateData result", data, bikeData, prevRequest: {}, prevSpeed: prevData.speed });
|
|
77
77
|
this.data = JSON.parse(JSON.stringify(data));
|
|
@@ -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
|
-
|
|
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/lib/kettler/comms.d.ts
CHANGED
|
@@ -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
|
-
|
|
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):
|
|
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
|
-
|
|
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/lib/modes/power-meter.js
CHANGED
|
@@ -59,11 +59,11 @@ class PowerMeterCyclingMode extends power_base_1.default {
|
|
|
59
59
|
data.slope = slope;
|
|
60
60
|
if (power === 0 && speed < MIN_SPEED) {
|
|
61
61
|
data.speed = Math.round(prevData.speed - 1) < 0 ? 0 : Math.round(prevData.speed - 1);
|
|
62
|
-
data.distanceInternal =
|
|
62
|
+
data.distanceInternal = distanceInternal + data.speed / 3.6 * t;
|
|
63
63
|
}
|
|
64
64
|
else {
|
|
65
65
|
data.speed = (power === 0 && speed < MIN_SPEED) ? 0 : speed;
|
|
66
|
-
data.distanceInternal = (power === 0 && speed < MIN_SPEED) ?
|
|
66
|
+
data.distanceInternal = (power === 0 && speed < MIN_SPEED) ? distanceInternal : distanceInternal + distance;
|
|
67
67
|
}
|
|
68
68
|
if (props.log)
|
|
69
69
|
this.logger.logEvent({ message: "updateData result", data, bikeData, prevSpeed: prevData.speed, stopped: speed < MIN_SPEED });
|
package/lib/modes/simulator.js
CHANGED
|
@@ -93,7 +93,7 @@ class SimulatorCyclingMode extends CyclingMode_1.CyclingModeBase {
|
|
|
93
93
|
speed = calculations_1.default.calculateSpeed(m, power, slope, { bikeType: 'race' });
|
|
94
94
|
}
|
|
95
95
|
let v = speed / 3.6;
|
|
96
|
-
distanceInternal +=
|
|
96
|
+
distanceInternal += (v * duration);
|
|
97
97
|
data.speed = parseFloat(speed.toFixed(1));
|
|
98
98
|
data.power = Math.round(power);
|
|
99
99
|
data.distanceInternal = distanceInternal;
|
|
@@ -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): 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
|
-
|
|
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];
|