incyclist-devices 1.5.34 → 1.5.36
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 +33 -24
- 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 = () => {
|
|
@@ -47,6 +47,8 @@ class ERGCyclingMode extends power_base_1.default {
|
|
|
47
47
|
};
|
|
48
48
|
this.logger.logEvent({ message: "processing update request", request, prev: this.prevRequest, data: getData(), event: this.event });
|
|
49
49
|
let newRequest = {};
|
|
50
|
+
let isRefreshOnly = request && request.refresh && Object.keys(request).length === 1;
|
|
51
|
+
let isInit = request && request.init;
|
|
50
52
|
try {
|
|
51
53
|
if (!request || request.reset || Object.keys(request).length === 0) {
|
|
52
54
|
this.prevRequest = {};
|
|
@@ -79,49 +81,56 @@ class ERGCyclingMode extends power_base_1.default {
|
|
|
79
81
|
}
|
|
80
82
|
if (request.refresh) {
|
|
81
83
|
delete request.refresh;
|
|
82
|
-
if (this.prevRequest !== undefined &&
|
|
84
|
+
if (this.prevRequest !== undefined && this.prevRequest.targetPower !== undefined && !this.prevRequest.init) {
|
|
83
85
|
newRequest.targetPower = this.prevRequest.targetPower;
|
|
84
86
|
}
|
|
85
|
-
else {
|
|
87
|
+
else if (this.event.gearUpdated || this.event.rpmUpdated) {
|
|
86
88
|
newRequest.targetPower = this.calculateTargetPower(request);
|
|
87
89
|
}
|
|
88
|
-
if (this.prevRequest !== undefined && Object.keys(this.prevRequest).length > 0) {
|
|
90
|
+
else if (this.prevRequest !== undefined && Object.keys(this.prevRequest).length > 0) {
|
|
89
91
|
request = Object.assign({}, this.prevRequest);
|
|
90
92
|
}
|
|
91
93
|
else {
|
|
92
94
|
newRequest.targetPower = this.calculateTargetPower(request);
|
|
93
95
|
}
|
|
94
96
|
}
|
|
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
97
|
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;
|
|
98
|
+
if (request.maxPower !== undefined && request.minPower !== undefined && request.maxPower === request.minPower) {
|
|
99
|
+
request.targetPower = request.maxPower;
|
|
108
100
|
}
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
newRequest.targetPower = request.
|
|
101
|
+
if (request.targetPower === undefined) {
|
|
102
|
+
newRequest.targetPower = this.calculateTargetPower(request);
|
|
103
|
+
}
|
|
104
|
+
else {
|
|
105
|
+
newRequest.targetPower = request.targetPower;
|
|
106
|
+
}
|
|
107
|
+
delete request.slope;
|
|
108
|
+
if (request.maxPower !== undefined) {
|
|
109
|
+
if (newRequest.targetPower !== undefined && newRequest.targetPower > request.maxPower) {
|
|
110
|
+
newRequest.targetPower = request.maxPower;
|
|
111
|
+
}
|
|
112
|
+
newRequest.maxPower = request.maxPower;
|
|
113
|
+
}
|
|
114
|
+
if (request.minPower !== undefined) {
|
|
115
|
+
if (newRequest.targetPower !== undefined && newRequest.targetPower < request.minPower) {
|
|
116
|
+
newRequest.targetPower = request.minPower;
|
|
117
|
+
}
|
|
118
|
+
newRequest.minPower = request.minPower;
|
|
114
119
|
}
|
|
115
|
-
newRequest.minPower = request.minPower;
|
|
116
120
|
}
|
|
121
|
+
if (!isRefreshOnly && !isInit)
|
|
122
|
+
this.prevRequest = JSON.parse(JSON.stringify(request));
|
|
123
|
+
else if (isInit)
|
|
124
|
+
this.prevRequest = {};
|
|
117
125
|
if (newRequest.targetPower !== undefined && prevData.power !== undefined && newRequest.targetPower === prevData.power) {
|
|
118
126
|
delete newRequest.targetPower;
|
|
119
127
|
}
|
|
120
|
-
this.prevRequest = JSON.parse(JSON.stringify(request));
|
|
121
128
|
}
|
|
122
129
|
catch (err) {
|
|
123
130
|
this.logger.logEvent({ message: "error", fn: 'sendBikeUpdate()', error: err.message || err, stack: err.stack });
|
|
124
131
|
}
|
|
132
|
+
this.event.gearUpdated = false;
|
|
133
|
+
this.event.rpmUpdated = false;
|
|
125
134
|
return newRequest;
|
|
126
135
|
}
|
|
127
136
|
updateData(bikeData) {
|
|
@@ -132,7 +141,7 @@ class ERGCyclingMode extends power_base_1.default {
|
|
|
132
141
|
const bikeType = this.getSetting('bikeType').toLowerCase();
|
|
133
142
|
delete this.event.gearUpdated;
|
|
134
143
|
delete this.event.rpmUpdated;
|
|
135
|
-
if (prevData ===
|
|
144
|
+
if (Object.keys(prevData).length === 0 || prevData.speed === undefined || prevData.speed === 0) {
|
|
136
145
|
this.event.starting = true;
|
|
137
146
|
this.event.tsStart = Date.now();
|
|
138
147
|
}
|