incyclist-devices 1.5.34 → 1.5.35
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/cycling-mode.d.ts +1 -0
- package/lib/daum/ERGCyclingMode.js +27 -23
- package/package.json +1 -1
package/lib/cycling-mode.d.ts
CHANGED
|
@@ -36,7 +36,7 @@ class ERGCyclingMode extends power_base_1.default {
|
|
|
36
36
|
}
|
|
37
37
|
getBikeInitRequest() {
|
|
38
38
|
const startPower = this.getSetting('startPower');
|
|
39
|
-
return { targetPower: startPower };
|
|
39
|
+
return { targetPower: startPower, init: true };
|
|
40
40
|
}
|
|
41
41
|
sendBikeUpdate(request) {
|
|
42
42
|
const getData = () => {
|
|
@@ -79,40 +79,42 @@ class ERGCyclingMode extends power_base_1.default {
|
|
|
79
79
|
}
|
|
80
80
|
if (request.refresh) {
|
|
81
81
|
delete request.refresh;
|
|
82
|
-
if (this.prevRequest !== undefined && !this.event.gearUpdated && !this.event.rpmUpdated) {
|
|
82
|
+
if (this.prevRequest !== undefined && this.prevRequest.targetPower !== undefined && !this.event.gearUpdated && !this.event.rpmUpdated) {
|
|
83
83
|
newRequest.targetPower = this.prevRequest.targetPower;
|
|
84
84
|
}
|
|
85
|
-
else {
|
|
85
|
+
else if (this.event.gearUpdated || this.event.rpmUpdated) {
|
|
86
86
|
newRequest.targetPower = this.calculateTargetPower(request);
|
|
87
87
|
}
|
|
88
|
-
if (this.prevRequest !== undefined && Object.keys(this.prevRequest).length > 0) {
|
|
88
|
+
else if (this.prevRequest !== undefined && Object.keys(this.prevRequest).length > 0) {
|
|
89
89
|
request = Object.assign({}, this.prevRequest);
|
|
90
90
|
}
|
|
91
91
|
else {
|
|
92
92
|
newRequest.targetPower = this.calculateTargetPower(request);
|
|
93
93
|
}
|
|
94
94
|
}
|
|
95
|
-
if (request.maxPower !== undefined && request.minPower !== undefined && request.maxPower === request.minPower) {
|
|
96
|
-
request.targetPower = request.maxPower;
|
|
97
|
-
}
|
|
98
|
-
if (request.targetPower === undefined) {
|
|
99
|
-
newRequest.targetPower = this.calculateTargetPower(request);
|
|
100
|
-
}
|
|
101
95
|
else {
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
delete request.slope;
|
|
105
|
-
if (request.maxPower !== undefined) {
|
|
106
|
-
if (newRequest.targetPower !== undefined && newRequest.targetPower > request.maxPower) {
|
|
107
|
-
newRequest.targetPower = request.maxPower;
|
|
96
|
+
if (request.maxPower !== undefined && request.minPower !== undefined && request.maxPower === request.minPower) {
|
|
97
|
+
request.targetPower = request.maxPower;
|
|
108
98
|
}
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
newRequest.targetPower = request.
|
|
99
|
+
if (request.targetPower === undefined) {
|
|
100
|
+
newRequest.targetPower = this.calculateTargetPower(request);
|
|
101
|
+
}
|
|
102
|
+
else {
|
|
103
|
+
newRequest.targetPower = request.targetPower;
|
|
104
|
+
}
|
|
105
|
+
delete request.slope;
|
|
106
|
+
if (request.maxPower !== undefined) {
|
|
107
|
+
if (newRequest.targetPower !== undefined && newRequest.targetPower > request.maxPower) {
|
|
108
|
+
newRequest.targetPower = request.maxPower;
|
|
109
|
+
}
|
|
110
|
+
newRequest.maxPower = request.maxPower;
|
|
111
|
+
}
|
|
112
|
+
if (request.minPower !== undefined) {
|
|
113
|
+
if (newRequest.targetPower !== undefined && newRequest.targetPower < request.minPower) {
|
|
114
|
+
newRequest.targetPower = request.minPower;
|
|
115
|
+
}
|
|
116
|
+
newRequest.minPower = request.minPower;
|
|
114
117
|
}
|
|
115
|
-
newRequest.minPower = request.minPower;
|
|
116
118
|
}
|
|
117
119
|
if (newRequest.targetPower !== undefined && prevData.power !== undefined && newRequest.targetPower === prevData.power) {
|
|
118
120
|
delete newRequest.targetPower;
|
|
@@ -122,6 +124,8 @@ class ERGCyclingMode extends power_base_1.default {
|
|
|
122
124
|
catch (err) {
|
|
123
125
|
this.logger.logEvent({ message: "error", fn: 'sendBikeUpdate()', error: err.message || err, stack: err.stack });
|
|
124
126
|
}
|
|
127
|
+
this.event.gearUpdated = false;
|
|
128
|
+
this.event.rpmUpdated = false;
|
|
125
129
|
return newRequest;
|
|
126
130
|
}
|
|
127
131
|
updateData(bikeData) {
|
|
@@ -132,7 +136,7 @@ class ERGCyclingMode extends power_base_1.default {
|
|
|
132
136
|
const bikeType = this.getSetting('bikeType').toLowerCase();
|
|
133
137
|
delete this.event.gearUpdated;
|
|
134
138
|
delete this.event.rpmUpdated;
|
|
135
|
-
if (prevData ===
|
|
139
|
+
if (Object.keys(prevData).length === 0 || prevData.speed === undefined || prevData.speed === 0) {
|
|
136
140
|
this.event.starting = true;
|
|
137
141
|
this.event.tsStart = Date.now();
|
|
138
142
|
}
|