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
package/lib/CyclingMode.js
CHANGED
package/lib/Device.js
CHANGED
package/lib/DeviceProtocol.js
CHANGED
package/lib/DeviceSupport.js
CHANGED
|
@@ -1,30 +1,43 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var
|
|
3
|
-
|
|
4
|
-
};
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
5
|
+
}) : (function(o, m, k, k2) {
|
|
6
|
+
if (k2 === undefined) k2 = k;
|
|
7
|
+
o[k2] = m[k];
|
|
8
|
+
}));
|
|
9
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
10
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
11
|
+
}) : function(o, v) {
|
|
12
|
+
o["default"] = v;
|
|
13
|
+
});
|
|
5
14
|
var __importStar = (this && this.__importStar) || function (mod) {
|
|
6
15
|
if (mod && mod.__esModule) return mod;
|
|
7
16
|
var result = {};
|
|
8
|
-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result
|
|
9
|
-
result
|
|
17
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
|
+
__setModuleDefault(result, mod);
|
|
10
19
|
return result;
|
|
11
20
|
};
|
|
21
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
22
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
23
|
+
};
|
|
12
24
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
25
|
+
exports.CyclingModeProperyType = exports.AntScanner = exports.Protocols = exports.Device = exports.INTERFACE = exports.DeviceRegistry = exports.DeviceProtocolBase = void 0;
|
|
13
26
|
const DeviceRegistry_1 = __importDefault(require("./DeviceRegistry"));
|
|
14
27
|
exports.DeviceRegistry = DeviceRegistry_1.default;
|
|
15
28
|
const Device_1 = __importDefault(require("./Device"));
|
|
16
29
|
exports.Device = Device_1.default;
|
|
17
30
|
const DeviceProtocol_1 = __importStar(require("./DeviceProtocol"));
|
|
18
31
|
exports.DeviceProtocolBase = DeviceProtocol_1.default;
|
|
19
|
-
exports
|
|
32
|
+
Object.defineProperty(exports, "INTERFACE", { enumerable: true, get: function () { return DeviceProtocol_1.INTERFACE; } });
|
|
20
33
|
const Simulator_1 = __importDefault(require("./simulator/Simulator"));
|
|
21
34
|
const DaumPremiumProtocol_1 = __importDefault(require("./daum/premium/DaumPremiumProtocol"));
|
|
22
35
|
const DaumClassicProtocol_1 = __importDefault(require("./daum/classic/DaumClassicProtocol"));
|
|
23
36
|
const protocol_1 = __importDefault(require("./kettler/ergo-racer/protocol"));
|
|
24
37
|
const AntScanner_1 = require("./ant/AntScanner");
|
|
25
|
-
exports
|
|
38
|
+
Object.defineProperty(exports, "AntScanner", { enumerable: true, get: function () { return AntScanner_1.AntScanner; } });
|
|
26
39
|
const CyclingMode_1 = require("./CyclingMode");
|
|
27
|
-
exports
|
|
40
|
+
Object.defineProperty(exports, "CyclingModeProperyType", { enumerable: true, get: function () { return CyclingMode_1.CyclingModeProperyType; } });
|
|
28
41
|
const Protocols = {
|
|
29
42
|
SimulatorProtocol: Simulator_1.default,
|
|
30
43
|
DaumClassicProtocol: DaumClassicProtocol_1.default,
|
package/lib/ant/AntAdapter.js
CHANGED
|
@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.DEFAULT_UPDATE_FREQUENCY = void 0;
|
|
6
7
|
const Device_1 = __importDefault(require("../Device"));
|
|
7
8
|
exports.DEFAULT_UPDATE_FREQUENCY = 1000;
|
|
8
9
|
class AntAdapter extends Device_1.default {
|
package/lib/ant/AntScanner.js
CHANGED
|
@@ -1,4 +1,23 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
5
|
+
}) : (function(o, m, k, k2) {
|
|
6
|
+
if (k2 === undefined) k2 = k;
|
|
7
|
+
o[k2] = m[k];
|
|
8
|
+
}));
|
|
9
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
10
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
11
|
+
}) : function(o, v) {
|
|
12
|
+
o["default"] = v;
|
|
13
|
+
});
|
|
14
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
15
|
+
if (mod && mod.__esModule) return mod;
|
|
16
|
+
var result = {};
|
|
17
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
|
+
__setModuleDefault(result, mod);
|
|
19
|
+
return result;
|
|
20
|
+
};
|
|
2
21
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
22
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
23
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -8,17 +27,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
27
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
28
|
});
|
|
10
29
|
};
|
|
11
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
12
|
-
if (mod && mod.__esModule) return mod;
|
|
13
|
-
var result = {};
|
|
14
|
-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
|
|
15
|
-
result["default"] = mod;
|
|
16
|
-
return result;
|
|
17
|
-
};
|
|
18
30
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
19
31
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
20
32
|
};
|
|
21
33
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
34
|
+
exports.AntScanner = exports.AntProtocol = void 0;
|
|
22
35
|
const gd_eventlog_1 = require("gd-eventlog");
|
|
23
36
|
const DeviceProtocol_1 = __importStar(require("../DeviceProtocol"));
|
|
24
37
|
const AntHrmAdapter_1 = __importDefault(require("./anthrm/AntHrmAdapter"));
|
|
@@ -16,6 +16,7 @@ export default class AntFEAdapter extends AntAdapter {
|
|
|
16
16
|
getName(): string;
|
|
17
17
|
getDisplayName(): string;
|
|
18
18
|
onAttached(): void;
|
|
19
|
+
getLogData(data: any, excludeList: any): any;
|
|
19
20
|
onDeviceData(deviceData: any): void;
|
|
20
21
|
onDeviceEvent(data: any): void;
|
|
21
22
|
updateData(data: any, deviceData: any): any;
|
|
@@ -52,12 +52,19 @@ class AntFEAdapter extends AntAdapter_1.default {
|
|
|
52
52
|
getDisplayName() {
|
|
53
53
|
const { DeviceID, ManId, ComputedHeartRate } = this.deviceData;
|
|
54
54
|
const hrmStr = ComputedHeartRate ? ` (${ComputedHeartRate})` : '';
|
|
55
|
-
return `${utils_1.getBrand(ManId)} FE ${DeviceID}${hrmStr}`;
|
|
55
|
+
return `${(0, utils_1.getBrand)(ManId)} FE ${DeviceID}${hrmStr}`;
|
|
56
56
|
}
|
|
57
57
|
onAttached() {
|
|
58
58
|
this.logger.logEvent({ message: 'Device connected' });
|
|
59
59
|
this.connected = true;
|
|
60
60
|
}
|
|
61
|
+
getLogData(data, excludeList) {
|
|
62
|
+
const logData = JSON.parse(JSON.stringify(data));
|
|
63
|
+
excludeList.forEach((key) => {
|
|
64
|
+
delete logData[key];
|
|
65
|
+
});
|
|
66
|
+
return logData;
|
|
67
|
+
}
|
|
61
68
|
onDeviceData(deviceData) {
|
|
62
69
|
if (!this.started || this.isStopped())
|
|
63
70
|
return;
|
|
@@ -65,7 +72,8 @@ class AntFEAdapter extends AntAdapter_1.default {
|
|
|
65
72
|
try {
|
|
66
73
|
if (this.onDataFn && !(this.ignoreHrm && this.ignoreBike && this.ignorePower) && !this.paused) {
|
|
67
74
|
if (!this.lastUpdate || (Date.now() - this.lastUpdate) > this.updateFrequency) {
|
|
68
|
-
this.
|
|
75
|
+
const logData = this.getLogData(deviceData, ['PairedDevices', 'RawData']);
|
|
76
|
+
this.logger.logEvent({ message: 'onDeviceData', data: logData });
|
|
69
77
|
this.data = this.updateData(this.data, deviceData);
|
|
70
78
|
const data = this.transformData(this.data);
|
|
71
79
|
this.onDataFn(data);
|
|
@@ -225,7 +233,7 @@ class AntFEAdapter extends AntAdapter_1.default {
|
|
|
225
233
|
trackResistanceSent: false,
|
|
226
234
|
userSent: false,
|
|
227
235
|
};
|
|
228
|
-
utils_2.runWithRetries(() => __awaiter(this, void 0, void 0, function* () {
|
|
236
|
+
(0, utils_2.runWithRetries)(() => __awaiter(this, void 0, void 0, function* () {
|
|
229
237
|
if (this.isStopped())
|
|
230
238
|
resolve(false);
|
|
231
239
|
try {
|
|
@@ -310,18 +318,18 @@ class AntFEAdapter extends AntAdapter_1.default {
|
|
|
310
318
|
try {
|
|
311
319
|
const isReset = (!request || request.reset || Object.keys(request).length === 0);
|
|
312
320
|
if (request.slope !== undefined) {
|
|
313
|
-
yield utils_2.runWithRetries(() => __awaiter(this, void 0, void 0, function* () { return yield this.sendTrackResistance(request.slope); }), 2, 100);
|
|
321
|
+
yield (0, utils_2.runWithRetries)(() => __awaiter(this, void 0, void 0, function* () { return yield this.sendTrackResistance(request.slope); }), 2, 100);
|
|
314
322
|
}
|
|
315
323
|
if (request.targetPower !== undefined) {
|
|
316
|
-
yield utils_2.runWithRetries(() => __awaiter(this, void 0, void 0, function* () { return yield this.sendTargetPower(request.targetPower); }), 2, 100);
|
|
324
|
+
yield (0, utils_2.runWithRetries)(() => __awaiter(this, void 0, void 0, function* () { return yield this.sendTargetPower(request.targetPower); }), 2, 100);
|
|
317
325
|
}
|
|
318
326
|
else if (request.maxPower !== undefined) {
|
|
319
327
|
if (this.data.power && this.data.power > request.maxPower)
|
|
320
|
-
yield utils_2.runWithRetries(() => __awaiter(this, void 0, void 0, function* () { return yield this.sendTargetPower(request.maxPower); }), 2, 100);
|
|
328
|
+
yield (0, utils_2.runWithRetries)(() => __awaiter(this, void 0, void 0, function* () { return yield this.sendTargetPower(request.maxPower); }), 2, 100);
|
|
321
329
|
}
|
|
322
330
|
else if (request.minPower !== undefined) {
|
|
323
331
|
if (this.data.power && this.data.power < request.minPower)
|
|
324
|
-
yield utils_2.runWithRetries(() => __awaiter(this, void 0, void 0, function* () { return yield this.sendTargetPower(request.minPower); }), 2, 100);
|
|
332
|
+
yield (0, utils_2.runWithRetries)(() => __awaiter(this, void 0, void 0, function* () { return yield this.sendTargetPower(request.minPower); }), 2, 100);
|
|
325
333
|
}
|
|
326
334
|
}
|
|
327
335
|
catch (err) {
|
|
@@ -406,7 +414,7 @@ class AntFEAdapter extends AntAdapter_1.default {
|
|
|
406
414
|
this.currentCmd = this.queue.dequeue();
|
|
407
415
|
this.currentCmd.tsStart = Date.now();
|
|
408
416
|
const { msg, logStr } = this.currentCmd;
|
|
409
|
-
this.logger.logEvent({ message: "sending", cmd: logStr, msg: utils_2.hexstr(msg), queueSize: this.queue.size() });
|
|
417
|
+
this.logger.logEvent({ message: "sending", cmd: logStr, msg: (0, utils_2.hexstr)(msg), queueSize: this.queue.size() });
|
|
410
418
|
if (this.stick)
|
|
411
419
|
this.stick.write(msg);
|
|
412
420
|
}
|
|
@@ -43,7 +43,7 @@ class AntHrmAdapter extends AntAdapter_1.default {
|
|
|
43
43
|
getDisplayName() {
|
|
44
44
|
const { DeviceID, manID, ComputedHeartRate } = this.deviceData;
|
|
45
45
|
const hrmStr = ComputedHeartRate ? ` (${ComputedHeartRate})` : '';
|
|
46
|
-
return `${utils_1.getBrand(manID)} Hrm ${DeviceID}${hrmStr}`;
|
|
46
|
+
return `${(0, utils_1.getBrand)(manID)} Hrm ${DeviceID}${hrmStr}`;
|
|
47
47
|
}
|
|
48
48
|
onDeviceData(deviceData) {
|
|
49
49
|
if (!this.started)
|
package/lib/ant/utils.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getBrand =
|
|
3
|
+
exports.getBrand = void 0;
|
|
4
|
+
const getBrand = (manId) => {
|
|
4
5
|
if (manId === undefined)
|
|
5
6
|
return "ANT+";
|
|
6
7
|
switch (manId) {
|
|
@@ -19,3 +20,4 @@ exports.getBrand = (manId) => {
|
|
|
19
20
|
return "ANT+";
|
|
20
21
|
}
|
|
21
22
|
};
|
|
23
|
+
exports.getBrand = getBrand;
|
package/lib/calculations.js
CHANGED
package/lib/daum/DaumAdapter.js
CHANGED
|
@@ -1,4 +1,23 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
5
|
+
}) : (function(o, m, k, k2) {
|
|
6
|
+
if (k2 === undefined) k2 = k;
|
|
7
|
+
o[k2] = m[k];
|
|
8
|
+
}));
|
|
9
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
10
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
11
|
+
}) : function(o, v) {
|
|
12
|
+
o["default"] = v;
|
|
13
|
+
});
|
|
14
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
15
|
+
if (mod && mod.__esModule) return mod;
|
|
16
|
+
var result = {};
|
|
17
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
|
+
__setModuleDefault(result, mod);
|
|
19
|
+
return result;
|
|
20
|
+
};
|
|
2
21
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
22
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
23
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -8,13 +27,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
27
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
28
|
});
|
|
10
29
|
};
|
|
11
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
12
|
-
if (mod && mod.__esModule) return mod;
|
|
13
|
-
var result = {};
|
|
14
|
-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
|
|
15
|
-
result["default"] = mod;
|
|
16
|
-
return result;
|
|
17
|
-
};
|
|
18
30
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
19
31
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
20
32
|
};
|
|
@@ -296,16 +308,16 @@ class DaumAdapterBase extends Device_1.default {
|
|
|
296
308
|
return;
|
|
297
309
|
let distance = 0;
|
|
298
310
|
if (this.distanceInternal !== undefined && this.daumRunData.distanceInternal !== undefined) {
|
|
299
|
-
distance = utils_1.intVal(this.daumRunData.distanceInternal - this.distanceInternal);
|
|
311
|
+
distance = (0, utils_1.intVal)(this.daumRunData.distanceInternal - this.distanceInternal);
|
|
300
312
|
}
|
|
301
313
|
if (this.daumRunData.distanceInternal !== undefined)
|
|
302
314
|
this.distanceInternal = this.daumRunData.distanceInternal;
|
|
303
315
|
let data = {
|
|
304
|
-
speed: utils_1.floatVal(this.daumRunData.speed),
|
|
305
|
-
slope: utils_1.floatVal(this.daumRunData.slope),
|
|
306
|
-
power: utils_1.intVal(this.daumRunData.power),
|
|
307
|
-
cadence: utils_1.intVal(this.daumRunData.pedalRpm),
|
|
308
|
-
heartrate: utils_1.intVal(this.daumRunData.heartrate),
|
|
316
|
+
speed: (0, utils_1.floatVal)(this.daumRunData.speed),
|
|
317
|
+
slope: (0, utils_1.floatVal)(this.daumRunData.slope),
|
|
318
|
+
power: (0, utils_1.intVal)(this.daumRunData.power),
|
|
319
|
+
cadence: (0, utils_1.intVal)(this.daumRunData.pedalRpm),
|
|
320
|
+
heartrate: (0, utils_1.intVal)(this.daumRunData.heartrate),
|
|
309
321
|
distance,
|
|
310
322
|
timestamp: Date.now(),
|
|
311
323
|
deviceTime: this.daumRunData.time,
|
|
@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.direction = void 0;
|
|
6
7
|
const gd_eventlog_1 = require("gd-eventlog");
|
|
7
8
|
const CyclingMode_1 = require("../CyclingMode");
|
|
8
9
|
const calculations_1 = __importDefault(require("../calculations"));
|
|
@@ -86,7 +86,7 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
|
|
|
86
86
|
const { user } = props;
|
|
87
87
|
this.initData();
|
|
88
88
|
let startState = {};
|
|
89
|
-
return utils_1.runWithRetries(() => __awaiter(this, void 0, void 0, function* () {
|
|
89
|
+
return (0, utils_1.runWithRetries)(() => __awaiter(this, void 0, void 0, function* () {
|
|
90
90
|
try {
|
|
91
91
|
if (!this.bike.isConnected())
|
|
92
92
|
yield this.bike.saveConnect();
|
|
@@ -1,4 +1,23 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
5
|
+
}) : (function(o, m, k, k2) {
|
|
6
|
+
if (k2 === undefined) k2 = k;
|
|
7
|
+
o[k2] = m[k];
|
|
8
|
+
}));
|
|
9
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
10
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
11
|
+
}) : function(o, v) {
|
|
12
|
+
o["default"] = v;
|
|
13
|
+
});
|
|
14
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
15
|
+
if (mod && mod.__esModule) return mod;
|
|
16
|
+
var result = {};
|
|
17
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
|
+
__setModuleDefault(result, mod);
|
|
19
|
+
return result;
|
|
20
|
+
};
|
|
2
21
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
22
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
23
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -8,13 +27,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
27
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
28
|
});
|
|
10
29
|
};
|
|
11
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
12
|
-
if (mod && mod.__esModule) return mod;
|
|
13
|
-
var result = {};
|
|
14
|
-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
|
|
15
|
-
result["default"] = mod;
|
|
16
|
-
return result;
|
|
17
|
-
};
|
|
18
30
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
19
31
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
20
32
|
};
|
package/lib/daum/classic/bike.js
CHANGED
|
@@ -52,9 +52,9 @@ class Daum8008 {
|
|
|
52
52
|
}
|
|
53
53
|
getUserWeight() {
|
|
54
54
|
if (this.settings && this.settings.user && this.settings.user.weight)
|
|
55
|
-
return utils_1.getWeight(this.settings.user.weight);
|
|
55
|
+
return (0, utils_1.getWeight)(this.settings.user.weight);
|
|
56
56
|
else
|
|
57
|
-
return utils_1.getWeight();
|
|
57
|
+
return (0, utils_1.getWeight)();
|
|
58
58
|
}
|
|
59
59
|
getBikeWeight() {
|
|
60
60
|
if (this.settings && this.settings.weight) {
|
|
@@ -274,7 +274,7 @@ class Daum8008 {
|
|
|
274
274
|
};
|
|
275
275
|
this.queue.enqueue(cmdInfo);
|
|
276
276
|
if (this.queue.size() > 1)
|
|
277
|
-
this.logger.logEvent({ message: "sendCommand:adding:", cmd: logStr, hex: utils_1.hexstr(payload), queueSize: this.queue.size() });
|
|
277
|
+
this.logger.logEvent({ message: "sendCommand:adding:", cmd: logStr, hex: (0, utils_1.hexstr)(payload), queueSize: this.queue.size() });
|
|
278
278
|
if (this.bikeCmdWorker === undefined) {
|
|
279
279
|
this.startWorker();
|
|
280
280
|
}
|
|
@@ -293,7 +293,7 @@ class Daum8008 {
|
|
|
293
293
|
const parser = serialPort.pipe(new ByteLength({ length: expected }));
|
|
294
294
|
parser.on('data', (data) => {
|
|
295
295
|
let duration = Date.now() - this.cmdStart;
|
|
296
|
-
this.logger.logEvent({ message: "sendCommand:received:", duration, hex: utils_1.hexstr(data), port: this.getPort() });
|
|
296
|
+
this.logger.logEvent({ message: "sendCommand:received:", duration, hex: (0, utils_1.hexstr)(data), port: this.getPort() });
|
|
297
297
|
serialPort.unpipe();
|
|
298
298
|
if (callbackErr !== undefined) {
|
|
299
299
|
if (data[0] !== payload[0]) {
|
|
@@ -306,7 +306,7 @@ class Daum8008 {
|
|
|
306
306
|
callback(data);
|
|
307
307
|
done();
|
|
308
308
|
});
|
|
309
|
-
this.logger.logEvent({ message: "sendCommand:sending:", cmd: logStr, hex: utils_1.hexstr(payload), port: this.getPort() });
|
|
309
|
+
this.logger.logEvent({ message: "sendCommand:sending:", cmd: logStr, hex: (0, utils_1.hexstr)(payload), port: this.getPort() });
|
|
310
310
|
this.cmdCurrent.start = this.cmdStart = Date.now();
|
|
311
311
|
serialPort.write(payload);
|
|
312
312
|
}
|
|
@@ -321,53 +321,53 @@ class Daum8008 {
|
|
|
321
321
|
this.sendDaum8008Command(`checkCockpit(${bikeNo})`, [0x10, bikeNo], 3, (data) => resolve({ bike: data[1], version: data[2] }), (status, err) => {
|
|
322
322
|
if (status === 408)
|
|
323
323
|
return resolve({ bike: bikeNo, version: undefined });
|
|
324
|
-
reject(utils_1.buildError(status, err));
|
|
324
|
+
reject((0, utils_1.buildError)(status, err));
|
|
325
325
|
});
|
|
326
326
|
});
|
|
327
327
|
}
|
|
328
328
|
getAddress() {
|
|
329
329
|
return new Promise((resolve, reject) => {
|
|
330
|
-
this.sendDaum8008Command(`getAddress()`, [0x11], 2, (data) => resolve({ bike: data[1] }), (status, err) => reject(utils_1.buildError(status, err)));
|
|
330
|
+
this.sendDaum8008Command(`getAddress()`, [0x11], 2, (data) => resolve({ bike: data[1] }), (status, err) => reject((0, utils_1.buildError)(status, err)));
|
|
331
331
|
});
|
|
332
332
|
}
|
|
333
333
|
getVersion(bikeNo = 0) {
|
|
334
334
|
return new Promise((resolve, reject) => {
|
|
335
|
-
this.sendDaum8008Command(`getVersion(${bikeNo})`, [0x73, bikeNo], 11, (data) => resolve({ bike: data[1], serialNo: utils_1.hexstr(data, 2, 8), cockpit: utils_1.getCockpit(data[10]) }), (status, err) => reject(utils_1.buildError(status, err)));
|
|
335
|
+
this.sendDaum8008Command(`getVersion(${bikeNo})`, [0x73, bikeNo], 11, (data) => resolve({ bike: data[1], serialNo: (0, utils_1.hexstr)(data, 2, 8), cockpit: (0, utils_1.getCockpit)(data[10]) }), (status, err) => reject((0, utils_1.buildError)(status, err)));
|
|
336
336
|
});
|
|
337
337
|
}
|
|
338
338
|
resetDevice(bikeNo = 0) {
|
|
339
339
|
return new Promise((resolve, reject) => {
|
|
340
|
-
this.sendDaum8008Command(`resetDevice(${bikeNo})`, [0x12, bikeNo], 2, (data) => resolve({}), (status, err) => reject(utils_1.buildError(status, err)));
|
|
340
|
+
this.sendDaum8008Command(`resetDevice(${bikeNo})`, [0x12, bikeNo], 2, (data) => resolve({}), (status, err) => reject((0, utils_1.buildError)(status, err)));
|
|
341
341
|
});
|
|
342
342
|
}
|
|
343
343
|
startProg(bikeNo = 0) {
|
|
344
344
|
return new Promise((resolve, reject) => {
|
|
345
|
-
this.sendDaum8008Command(`startProg(${bikeNo})`, [0x21, bikeNo], 3, (data) => resolve({ bike: data[1], pedalling: data[2] > 0 }), (status, err) => reject(utils_1.buildError(status, err)));
|
|
345
|
+
this.sendDaum8008Command(`startProg(${bikeNo})`, [0x21, bikeNo], 3, (data) => resolve({ bike: data[1], pedalling: data[2] > 0 }), (status, err) => reject((0, utils_1.buildError)(status, err)));
|
|
346
346
|
});
|
|
347
347
|
}
|
|
348
348
|
stopProg(bikeNo = 0) {
|
|
349
349
|
return new Promise((resolve, reject) => {
|
|
350
|
-
this.sendDaum8008Command(`stopProg(${bikeNo})`, [0x22, bikeNo], 3, (data) => resolve({ bike: data[1], pedalling: data[2] !== 0 }), (status, err) => reject(utils_1.buildError(status, err)));
|
|
350
|
+
this.sendDaum8008Command(`stopProg(${bikeNo})`, [0x22, bikeNo], 3, (data) => resolve({ bike: data[1], pedalling: data[2] !== 0 }), (status, err) => reject((0, utils_1.buildError)(status, err)));
|
|
351
351
|
});
|
|
352
352
|
}
|
|
353
353
|
setProg(progNo = 0, bikeNo = 0) {
|
|
354
354
|
return new Promise((resolve, reject) => {
|
|
355
|
-
this.sendDaum8008Command(`setProg(${bikeNo},${progNo})`, [0x23, bikeNo, progNo], 4, (data) => resolve({ bike: data[1], progNo: data[2], pedalling: data[3] !== 0 }), (status, err) => reject(utils_1.buildError(status, err)));
|
|
355
|
+
this.sendDaum8008Command(`setProg(${bikeNo},${progNo})`, [0x23, bikeNo, progNo], 4, (data) => resolve({ bike: data[1], progNo: data[2], pedalling: data[3] !== 0 }), (status, err) => reject((0, utils_1.buildError)(status, err)));
|
|
356
356
|
});
|
|
357
357
|
}
|
|
358
358
|
setBikeType(bikeType, bikeNo = 0) {
|
|
359
|
-
const bikeVal = utils_1.getBikeType(bikeType);
|
|
359
|
+
const bikeVal = (0, utils_1.getBikeType)(bikeType);
|
|
360
360
|
return new Promise((resolve, reject) => {
|
|
361
|
-
this.sendDaum8008Command(`setBikeType(${bikeNo},${bikeType})`, [0x69, bikeNo, 0, 0, bikeVal], 3, (data) => resolve({}), (status, err) => reject(utils_1.buildError(status, err)));
|
|
361
|
+
this.sendDaum8008Command(`setBikeType(${bikeNo},${bikeType})`, [0x69, bikeNo, 0, 0, bikeVal], 3, (data) => resolve({}), (status, err) => reject((0, utils_1.buildError)(status, err)));
|
|
362
362
|
});
|
|
363
363
|
}
|
|
364
364
|
setPerson(user = {}, bikeNo = 0) {
|
|
365
365
|
const age = user.age !== undefined ? user.age : utils_1.DEFAULT_AGE;
|
|
366
|
-
const gender = utils_1.getGender(user.sex);
|
|
367
|
-
const length = utils_1.getLength(user.length);
|
|
366
|
+
const gender = (0, utils_1.getGender)(user.sex);
|
|
367
|
+
const length = (0, utils_1.getLength)(user.length);
|
|
368
368
|
const maxPower = this.settings.maxPower === undefined ? 800 : this.settings.maxPower;
|
|
369
369
|
const mUser = user.weight || this.getUserWeight();
|
|
370
|
-
const weight = utils_1.getWeight(mUser) + this.getBikeWeight();
|
|
370
|
+
const weight = (0, utils_1.getWeight)(mUser) + this.getBikeWeight();
|
|
371
371
|
var cmd = [0x24, bikeNo, 0];
|
|
372
372
|
cmd.push(age);
|
|
373
373
|
cmd.push(gender);
|
|
@@ -390,26 +390,26 @@ class Daum8008 {
|
|
|
390
390
|
if (data[i] === 0 || data[i] === 80)
|
|
391
391
|
return;
|
|
392
392
|
}
|
|
393
|
-
reject(utils_1.buildError(512, 'illegal response'));
|
|
393
|
+
reject((0, utils_1.buildError)(512, 'illegal response'));
|
|
394
394
|
ok = false;
|
|
395
395
|
}
|
|
396
396
|
});
|
|
397
397
|
if (ok)
|
|
398
398
|
resolve({ bike: data[1], age, gender, length, weight });
|
|
399
|
-
}, (status, err) => reject(utils_1.buildError(status, err)));
|
|
399
|
+
}, (status, err) => reject((0, utils_1.buildError)(status, err)));
|
|
400
400
|
});
|
|
401
401
|
}
|
|
402
402
|
runData(bikeNo = 0) {
|
|
403
403
|
return new Promise((resolve, reject) => {
|
|
404
404
|
this.sendDaum8008Command(`runData(${bikeNo})`, [0x40, bikeNo], 19, (data) => {
|
|
405
405
|
try {
|
|
406
|
-
const parsed = utils_1.parseRunData(data);
|
|
406
|
+
const parsed = (0, utils_1.parseRunData)(data);
|
|
407
407
|
resolve(parsed);
|
|
408
408
|
}
|
|
409
409
|
catch (e) {
|
|
410
|
-
reject(utils_1.buildError(500, e));
|
|
410
|
+
reject((0, utils_1.buildError)(500, e));
|
|
411
411
|
}
|
|
412
|
-
}, (status, err) => reject(utils_1.buildError(status, err)));
|
|
412
|
+
}, (status, err) => reject((0, utils_1.buildError)(status, err)));
|
|
413
413
|
});
|
|
414
414
|
}
|
|
415
415
|
setGear(gear, bikeNo = 0) {
|
|
@@ -419,7 +419,7 @@ class Daum8008 {
|
|
|
419
419
|
if (gear > 28)
|
|
420
420
|
gearVal = 28;
|
|
421
421
|
return new Promise((resolve, reject) => {
|
|
422
|
-
this.sendDaum8008Command(`setGear(${bikeNo},${gearVal})`, [0x53, bikeNo, gearVal], 3, (data) => resolve({ bike: data[1], gear: data[2] }), (status, err) => reject(utils_1.buildError(status, err)));
|
|
422
|
+
this.sendDaum8008Command(`setGear(${bikeNo},${gearVal})`, [0x53, bikeNo, gearVal], 3, (data) => resolve({ bike: data[1], gear: data[2] }), (status, err) => reject((0, utils_1.buildError)(status, err)));
|
|
423
423
|
});
|
|
424
424
|
}
|
|
425
425
|
setPower(power, bikeNo = 0) {
|
|
@@ -434,7 +434,7 @@ class Daum8008 {
|
|
|
434
434
|
if (power > 800)
|
|
435
435
|
powerRequest = 800;
|
|
436
436
|
const powerVal = Math.round(powerRequest / 5);
|
|
437
|
-
this.sendDaum8008Command(`setPower(${bikeNo},${power})`, [0x51, bikeNo, powerVal], 3, (data) => resolve({ bike: data[1], power: (data[2] * 5) }), (status, err) => reject(utils_1.buildError(status, err)));
|
|
437
|
+
this.sendDaum8008Command(`setPower(${bikeNo},${power})`, [0x51, bikeNo, powerVal], 3, (data) => resolve({ bike: data[1], power: (data[2] * 5) }), (status, err) => reject((0, utils_1.buildError)(status, err)));
|
|
438
438
|
});
|
|
439
439
|
}
|
|
440
440
|
setSlope(slope, bikeNo = 0) {
|
|
@@ -444,12 +444,12 @@ class Daum8008 {
|
|
|
444
444
|
return;
|
|
445
445
|
}
|
|
446
446
|
const cmd = [0x55, bikeNo];
|
|
447
|
-
const arr = utils_1.Float32ToIntArray(slope);
|
|
447
|
+
const arr = (0, utils_1.Float32ToIntArray)(slope);
|
|
448
448
|
cmd.push(arr[3]);
|
|
449
449
|
cmd.push(arr[2]);
|
|
450
450
|
cmd.push(arr[1]);
|
|
451
451
|
cmd.push(arr[0]);
|
|
452
|
-
this.sendDaum8008Command(`setSlope(${bikeNo},${slope})`, cmd, 6, (data) => resolve({ bike: data[1], slope: slope }), (status, err) => reject(utils_1.buildError(status, err)));
|
|
452
|
+
this.sendDaum8008Command(`setSlope(${bikeNo},${slope})`, cmd, 6, (data) => resolve({ bike: data[1], slope: slope }), (status, err) => reject((0, utils_1.buildError)(status, err)));
|
|
453
453
|
});
|
|
454
454
|
}
|
|
455
455
|
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.Float32ToIntArray = exports.Float32ToHex = exports.hexstr = exports.buildError = exports.parseRunData = exports.getWeight = exports.getLength = exports.getGender = exports.getBikeType = exports.getCockpit = exports.DEFAULT_BIKE_WEIGHT = exports.DEFAULT_USER_WEIGHT = exports.DEFAULT_AGE = void 0;
|
|
3
4
|
exports.DEFAULT_AGE = 30;
|
|
4
5
|
exports.DEFAULT_USER_WEIGHT = 75;
|
|
5
6
|
exports.DEFAULT_BIKE_WEIGHT = 10;
|
package/lib/daum/constants.js
CHANGED
|
@@ -72,7 +72,7 @@ class DaumPremiumDevice extends DaumAdapter_1.default {
|
|
|
72
72
|
const route = opts.route;
|
|
73
73
|
var info = {};
|
|
74
74
|
this.initData();
|
|
75
|
-
return utils_1.runWithRetries(() => __awaiter(this, void 0, void 0, function* () {
|
|
75
|
+
return (0, utils_1.runWithRetries)(() => __awaiter(this, void 0, void 0, function* () {
|
|
76
76
|
if (this.isStopped())
|
|
77
77
|
return;
|
|
78
78
|
try {
|
|
@@ -1,4 +1,23 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
5
|
+
}) : (function(o, m, k, k2) {
|
|
6
|
+
if (k2 === undefined) k2 = k;
|
|
7
|
+
o[k2] = m[k];
|
|
8
|
+
}));
|
|
9
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
10
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
11
|
+
}) : function(o, v) {
|
|
12
|
+
o["default"] = v;
|
|
13
|
+
});
|
|
14
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
15
|
+
if (mod && mod.__esModule) return mod;
|
|
16
|
+
var result = {};
|
|
17
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
|
+
__setModuleDefault(result, mod);
|
|
19
|
+
return result;
|
|
20
|
+
};
|
|
2
21
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
22
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
23
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -8,13 +27,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
27
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
28
|
});
|
|
10
29
|
};
|
|
11
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
12
|
-
if (mod && mod.__esModule) return mod;
|
|
13
|
-
var result = {};
|
|
14
|
-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
|
|
15
|
-
result["default"] = mod;
|
|
16
|
-
return result;
|
|
17
|
-
};
|
|
18
30
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
19
31
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
20
32
|
};
|