incyclist-devices 1.4.9 → 1.4.12
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 +0 -1
- package/lib/Device.d.ts +2 -0
- package/lib/Device.js +2 -0
- package/lib/DeviceProtocol.d.ts +4 -1
- package/lib/DeviceProtocol.js +0 -1
- package/lib/DeviceSupport.d.ts +2 -0
- package/lib/DeviceSupport.js +11 -22
- package/lib/ant/AntAdapter.js +0 -1
- package/lib/ant/AntScanner.js +7 -20
- package/lib/ant/antfe/AntFEAdapter.js +8 -8
- package/lib/ant/anthrm/AntHrmAdapter.js +1 -1
- package/lib/ant/utils.js +1 -3
- package/lib/calculations.js +0 -1
- package/lib/daum/DaumAdapter.js +18 -13
- package/lib/daum/SmartTrainerCyclingMode.js +0 -1
- package/lib/daum/classic/DaumClassicAdapter.js +1 -1
- package/lib/daum/classic/DaumClassicProtocol.js +7 -19
- package/lib/daum/classic/bike.js +26 -26
- package/lib/daum/classic/utils.js +0 -1
- package/lib/daum/constants.js +0 -1
- package/lib/daum/premium/DaumPremiumAdapter.js +1 -1
- package/lib/daum/premium/DaumPremiumProtocol.js +7 -19
- package/lib/daum/premium/bike.js +17 -18
- package/lib/daum/premium/utils.js +0 -1
- package/lib/kettler/comms.d.ts +48 -0
- package/lib/kettler/comms.js +194 -0
- package/lib/kettler/ergo-racer/adapter.d.ts +99 -0
- package/lib/kettler/ergo-racer/adapter.js +659 -0
- package/lib/kettler/ergo-racer/modes/power-meter.d.ts +18 -0
- package/lib/kettler/ergo-racer/modes/power-meter.js +78 -0
- package/lib/kettler/ergo-racer/protocol.d.ts +41 -0
- package/lib/kettler/ergo-racer/protocol.js +191 -0
- package/lib/simulator/Simulator.js +2 -15
- package/lib/types/command.d.ts +8 -0
- package/lib/types/command.js +2 -0
- package/lib/types/route.js +0 -1
- package/lib/types/user.js +0 -1
- package/lib/utils.js +1 -3
- package/package.json +1 -1
package/lib/CyclingMode.js
CHANGED
package/lib/Device.d.ts
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { DeviceProtocol, Device } from './DeviceProtocol';
|
|
2
2
|
import CyclingMode from './CyclingMode';
|
|
3
|
+
export declare const DEFAULT_BIKE_WEIGHT = 10;
|
|
4
|
+
export declare const DEFAULT_USER_WEIGHT = 75;
|
|
3
5
|
export declare type DeviceData = {
|
|
4
6
|
speed?: number;
|
|
5
7
|
slope?: number;
|
package/lib/Device.js
CHANGED
package/lib/DeviceProtocol.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { User } from "./types/user";
|
|
1
2
|
export declare const INTERFACE: {
|
|
2
3
|
SERIAL: string;
|
|
3
4
|
ANT: string;
|
|
@@ -16,8 +17,10 @@ export declare type Device = {
|
|
|
16
17
|
export interface DeviceSettings {
|
|
17
18
|
name: string;
|
|
18
19
|
port: string;
|
|
20
|
+
userSettings?: User;
|
|
21
|
+
bikeSettings?: any;
|
|
19
22
|
}
|
|
20
|
-
export declare type DeviceFoundCallback = (device: Device, protocol:
|
|
23
|
+
export declare type DeviceFoundCallback = (device: Device, protocol: DeviceProtocol) => void;
|
|
21
24
|
export declare type ScanFinishedCallback = (id: number) => void;
|
|
22
25
|
export declare type ScanProps = {
|
|
23
26
|
id: number;
|
package/lib/DeviceProtocol.js
CHANGED
package/lib/DeviceSupport.d.ts
CHANGED
|
@@ -4,11 +4,13 @@ import DeviceProtocolBase, { INTERFACE, DeviceProtocol } from './DeviceProtocol'
|
|
|
4
4
|
import SimulatorProtocol from './simulator/Simulator';
|
|
5
5
|
import DaumPremiumProtocol from './daum/premium/DaumPremiumProtocol';
|
|
6
6
|
import DaumClassicProtocol from './daum/classic/DaumClassicProtocol';
|
|
7
|
+
import { KettlerRacerProtocol } from './kettler/ergo-racer/protocol';
|
|
7
8
|
import { AntScanner } from './ant/AntScanner';
|
|
8
9
|
import { CyclingModeProperyType } from './CyclingMode';
|
|
9
10
|
declare const Protocols: {
|
|
10
11
|
SimulatorProtocol: typeof SimulatorProtocol;
|
|
11
12
|
DaumClassicProtocol: typeof DaumClassicProtocol;
|
|
12
13
|
DaumPremiumProtocol: typeof DaumPremiumProtocol;
|
|
14
|
+
KettlerRacerProtocol: typeof KettlerRacerProtocol;
|
|
13
15
|
};
|
|
14
16
|
export { DeviceProtocolBase, DeviceProtocol, DeviceRegistry, INTERFACE, DeviceAdapter as Device, Protocols, AntScanner, CyclingModeProperyType };
|
package/lib/DeviceSupport.js
CHANGED
|
@@ -1,45 +1,34 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var
|
|
3
|
-
|
|
4
|
-
|
|
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
|
-
});
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
14
5
|
var __importStar = (this && this.__importStar) || function (mod) {
|
|
15
6
|
if (mod && mod.__esModule) return mod;
|
|
16
7
|
var result = {};
|
|
17
|
-
if (mod != null) for (var k in mod) if (
|
|
18
|
-
|
|
8
|
+
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
|
|
9
|
+
result["default"] = mod;
|
|
19
10
|
return result;
|
|
20
11
|
};
|
|
21
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
22
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
23
|
-
};
|
|
24
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
25
|
-
exports.CyclingModeProperyType = exports.AntScanner = exports.Protocols = exports.Device = exports.INTERFACE = exports.DeviceRegistry = exports.DeviceProtocolBase = void 0;
|
|
26
13
|
const DeviceRegistry_1 = __importDefault(require("./DeviceRegistry"));
|
|
27
14
|
exports.DeviceRegistry = DeviceRegistry_1.default;
|
|
28
15
|
const Device_1 = __importDefault(require("./Device"));
|
|
29
16
|
exports.Device = Device_1.default;
|
|
30
17
|
const DeviceProtocol_1 = __importStar(require("./DeviceProtocol"));
|
|
31
18
|
exports.DeviceProtocolBase = DeviceProtocol_1.default;
|
|
32
|
-
|
|
19
|
+
exports.INTERFACE = DeviceProtocol_1.INTERFACE;
|
|
33
20
|
const Simulator_1 = __importDefault(require("./simulator/Simulator"));
|
|
34
21
|
const DaumPremiumProtocol_1 = __importDefault(require("./daum/premium/DaumPremiumProtocol"));
|
|
35
22
|
const DaumClassicProtocol_1 = __importDefault(require("./daum/classic/DaumClassicProtocol"));
|
|
23
|
+
const protocol_1 = require("./kettler/ergo-racer/protocol");
|
|
36
24
|
const AntScanner_1 = require("./ant/AntScanner");
|
|
37
|
-
|
|
25
|
+
exports.AntScanner = AntScanner_1.AntScanner;
|
|
38
26
|
const CyclingMode_1 = require("./CyclingMode");
|
|
39
|
-
|
|
27
|
+
exports.CyclingModeProperyType = CyclingMode_1.CyclingModeProperyType;
|
|
40
28
|
const Protocols = {
|
|
41
29
|
SimulatorProtocol: Simulator_1.default,
|
|
42
30
|
DaumClassicProtocol: DaumClassicProtocol_1.default,
|
|
43
|
-
DaumPremiumProtocol: DaumPremiumProtocol_1.default
|
|
31
|
+
DaumPremiumProtocol: DaumPremiumProtocol_1.default,
|
|
32
|
+
KettlerRacerProtocol: protocol_1.KettlerRacerProtocol,
|
|
44
33
|
};
|
|
45
34
|
exports.Protocols = Protocols;
|
package/lib/ant/AntAdapter.js
CHANGED
|
@@ -3,7 +3,6 @@ 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;
|
|
7
6
|
const Device_1 = __importDefault(require("../Device"));
|
|
8
7
|
exports.DEFAULT_UPDATE_FREQUENCY = 1000;
|
|
9
8
|
class AntAdapter extends Device_1.default {
|
package/lib/ant/AntScanner.js
CHANGED
|
@@ -1,23 +1,4 @@
|
|
|
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
|
-
};
|
|
21
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
22
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
23
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -27,11 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
27
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
28
9
|
});
|
|
29
10
|
};
|
|
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
|
+
};
|
|
30
18
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
31
19
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
32
20
|
};
|
|
33
21
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
34
|
-
exports.AntScanner = exports.AntProtocol = void 0;
|
|
35
22
|
const gd_eventlog_1 = require("gd-eventlog");
|
|
36
23
|
const DeviceProtocol_1 = __importStar(require("../DeviceProtocol"));
|
|
37
24
|
const AntHrmAdapter_1 = __importDefault(require("./anthrm/AntHrmAdapter"));
|
|
@@ -52,7 +52,7 @@ 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 `${
|
|
55
|
+
return `${utils_1.getBrand(ManId)} FE ${DeviceID}${hrmStr}`;
|
|
56
56
|
}
|
|
57
57
|
onAttached() {
|
|
58
58
|
this.logger.logEvent({ message: 'Device connected' });
|
|
@@ -178,7 +178,7 @@ class AntFEAdapter extends AntAdapter_1.default {
|
|
|
178
178
|
yield _super.start.call(this, props);
|
|
179
179
|
this.logger.logEvent({ message: 'start()', props });
|
|
180
180
|
const opts = props || {};
|
|
181
|
-
const { args } = opts;
|
|
181
|
+
const { args = {} } = opts;
|
|
182
182
|
return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
|
|
183
183
|
if (this.ignoreHrm && this.ignoreBike && this.ignorePower) {
|
|
184
184
|
this.logger.logEvent({ message: 'start() not done: bike disabled' });
|
|
@@ -225,7 +225,7 @@ class AntFEAdapter extends AntAdapter_1.default {
|
|
|
225
225
|
trackResistanceSent: false,
|
|
226
226
|
userSent: false,
|
|
227
227
|
};
|
|
228
|
-
|
|
228
|
+
utils_2.runWithRetries(() => __awaiter(this, void 0, void 0, function* () {
|
|
229
229
|
if (this.isStopped())
|
|
230
230
|
resolve(false);
|
|
231
231
|
try {
|
|
@@ -310,18 +310,18 @@ class AntFEAdapter extends AntAdapter_1.default {
|
|
|
310
310
|
try {
|
|
311
311
|
const isReset = (!request || request.reset || Object.keys(request).length === 0);
|
|
312
312
|
if (request.slope !== undefined) {
|
|
313
|
-
yield
|
|
313
|
+
yield utils_2.runWithRetries(() => __awaiter(this, void 0, void 0, function* () { return yield this.sendTrackResistance(request.slope); }), 2, 100);
|
|
314
314
|
}
|
|
315
315
|
if (request.targetPower !== undefined) {
|
|
316
|
-
yield
|
|
316
|
+
yield utils_2.runWithRetries(() => __awaiter(this, void 0, void 0, function* () { return yield this.sendTargetPower(request.targetPower); }), 2, 100);
|
|
317
317
|
}
|
|
318
318
|
else if (request.maxPower !== undefined) {
|
|
319
319
|
if (this.data.power && this.data.power > request.maxPower)
|
|
320
|
-
yield
|
|
320
|
+
yield utils_2.runWithRetries(() => __awaiter(this, void 0, void 0, function* () { return yield this.sendTargetPower(request.maxPower); }), 2, 100);
|
|
321
321
|
}
|
|
322
322
|
else if (request.minPower !== undefined) {
|
|
323
323
|
if (this.data.power && this.data.power < request.minPower)
|
|
324
|
-
yield
|
|
324
|
+
yield utils_2.runWithRetries(() => __awaiter(this, void 0, void 0, function* () { return yield this.sendTargetPower(request.minPower); }), 2, 100);
|
|
325
325
|
}
|
|
326
326
|
}
|
|
327
327
|
catch (err) {
|
|
@@ -406,7 +406,7 @@ class AntFEAdapter extends AntAdapter_1.default {
|
|
|
406
406
|
this.currentCmd = this.queue.dequeue();
|
|
407
407
|
this.currentCmd.tsStart = Date.now();
|
|
408
408
|
const { msg, logStr } = this.currentCmd;
|
|
409
|
-
this.logger.logEvent({ message: "sending", cmd: logStr, msg:
|
|
409
|
+
this.logger.logEvent({ message: "sending", cmd: logStr, msg: utils_2.hexstr(msg), queueSize: this.queue.size() });
|
|
410
410
|
if (this.stick)
|
|
411
411
|
this.stick.write(msg);
|
|
412
412
|
}
|
|
@@ -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 `${
|
|
46
|
+
return `${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,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getBrand =
|
|
4
|
-
const getBrand = (manId) => {
|
|
3
|
+
exports.getBrand = (manId) => {
|
|
5
4
|
if (manId === undefined)
|
|
6
5
|
return "ANT+";
|
|
7
6
|
switch (manId) {
|
|
@@ -20,4 +19,3 @@ const getBrand = (manId) => {
|
|
|
20
19
|
return "ANT+";
|
|
21
20
|
}
|
|
22
21
|
};
|
|
23
|
-
exports.getBrand = getBrand;
|
package/lib/calculations.js
CHANGED
package/lib/daum/DaumAdapter.js
CHANGED
|
@@ -8,17 +8,22 @@ 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 __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
|
+
};
|
|
11
18
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
19
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
20
|
};
|
|
14
21
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
const Device_1 =
|
|
22
|
+
const Device_1 = __importStar(require("../Device"));
|
|
16
23
|
const ERGCyclingMode_1 = __importDefault(require("./ERGCyclingMode"));
|
|
17
24
|
const SmartTrainerCyclingMode_1 = __importDefault(require("./SmartTrainerCyclingMode"));
|
|
18
25
|
const PowerMeterCyclingMode_1 = __importDefault(require("./PowerMeterCyclingMode"));
|
|
19
26
|
const utils_1 = require("../utils");
|
|
20
|
-
const DEFAULT_BIKE_WEIGHT = 10;
|
|
21
|
-
const DEFAULT_USER_WEIGHT = 75;
|
|
22
27
|
class DaumAdapterBase extends Device_1.default {
|
|
23
28
|
constructor(props, bike) {
|
|
24
29
|
super(props);
|
|
@@ -79,7 +84,7 @@ class DaumAdapterBase extends Device_1.default {
|
|
|
79
84
|
this.bike.settings = { user: {} };
|
|
80
85
|
if (!this.bike.settings.user)
|
|
81
86
|
this.bike.settings.user = {};
|
|
82
|
-
this.bike.settings.user.weight = this.userSettings.weight || DEFAULT_USER_WEIGHT;
|
|
87
|
+
this.bike.settings.user.weight = this.userSettings.weight || Device_1.DEFAULT_USER_WEIGHT;
|
|
83
88
|
}
|
|
84
89
|
}
|
|
85
90
|
setBikeSettings(bikeSettings) {
|
|
@@ -87,12 +92,12 @@ class DaumAdapterBase extends Device_1.default {
|
|
|
87
92
|
if (this.bike) {
|
|
88
93
|
if (!this.bike.settings)
|
|
89
94
|
this.bike.settings = {};
|
|
90
|
-
this.bike.settings.weight = this.userSettings.weight || DEFAULT_BIKE_WEIGHT;
|
|
95
|
+
this.bike.settings.weight = this.userSettings.weight || Device_1.DEFAULT_BIKE_WEIGHT;
|
|
91
96
|
}
|
|
92
97
|
}
|
|
93
98
|
getWeight() {
|
|
94
|
-
const userWeight = this.userSettings.weight || DEFAULT_USER_WEIGHT;
|
|
95
|
-
const bikeWeight = this.bikeSettings.weight || DEFAULT_BIKE_WEIGHT;
|
|
99
|
+
const userWeight = this.userSettings.weight || Device_1.DEFAULT_USER_WEIGHT;
|
|
100
|
+
const bikeWeight = this.bikeSettings.weight || Device_1.DEFAULT_BIKE_WEIGHT;
|
|
96
101
|
return bikeWeight + userWeight;
|
|
97
102
|
}
|
|
98
103
|
getCurrentBikeData() {
|
|
@@ -291,16 +296,16 @@ class DaumAdapterBase extends Device_1.default {
|
|
|
291
296
|
return;
|
|
292
297
|
let distance = 0;
|
|
293
298
|
if (this.distanceInternal !== undefined && this.daumRunData.distanceInternal !== undefined) {
|
|
294
|
-
distance =
|
|
299
|
+
distance = utils_1.intVal(this.daumRunData.distanceInternal - this.distanceInternal);
|
|
295
300
|
}
|
|
296
301
|
if (this.daumRunData.distanceInternal !== undefined)
|
|
297
302
|
this.distanceInternal = this.daumRunData.distanceInternal;
|
|
298
303
|
let data = {
|
|
299
|
-
speed:
|
|
300
|
-
slope:
|
|
301
|
-
power:
|
|
302
|
-
cadence:
|
|
303
|
-
heartrate:
|
|
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),
|
|
304
309
|
distance,
|
|
305
310
|
timestamp: Date.now(),
|
|
306
311
|
deviceTime: this.daumRunData.time,
|
|
@@ -3,7 +3,6 @@ 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;
|
|
7
6
|
const gd_eventlog_1 = require("gd-eventlog");
|
|
8
7
|
const CyclingMode_1 = require("../CyclingMode");
|
|
9
8
|
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
|
|
89
|
+
return 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,23 +1,4 @@
|
|
|
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
|
-
};
|
|
21
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
22
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
23
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -27,6 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
27
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
28
9
|
});
|
|
29
10
|
};
|
|
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
|
+
};
|
|
30
18
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
31
19
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
32
20
|
};
|
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
|
|
55
|
+
return utils_1.getWeight(this.settings.user.weight);
|
|
56
56
|
else
|
|
57
|
-
return
|
|
57
|
+
return 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:
|
|
277
|
+
this.logger.logEvent({ message: "sendCommand:adding:", cmd: logStr, hex: 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:
|
|
296
|
+
this.logger.logEvent({ message: "sendCommand:received:", duration, hex: 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:
|
|
309
|
+
this.logger.logEvent({ message: "sendCommand:sending:", cmd: logStr, hex: 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(
|
|
324
|
+
reject(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(
|
|
330
|
+
this.sendDaum8008Command(`getAddress()`, [0x11], 2, (data) => resolve({ bike: data[1] }), (status, err) => reject(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:
|
|
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)));
|
|
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(
|
|
340
|
+
this.sendDaum8008Command(`resetDevice(${bikeNo})`, [0x12, bikeNo], 2, (data) => resolve({}), (status, err) => reject(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(
|
|
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)));
|
|
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(
|
|
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)));
|
|
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(
|
|
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)));
|
|
356
356
|
});
|
|
357
357
|
}
|
|
358
358
|
setBikeType(bikeType, bikeNo = 0) {
|
|
359
|
-
const bikeVal =
|
|
359
|
+
const bikeVal = 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(
|
|
361
|
+
this.sendDaum8008Command(`setBikeType(${bikeNo},${bikeType})`, [0x69, bikeNo, 0, 0, bikeVal], 3, (data) => resolve({}), (status, err) => reject(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 =
|
|
367
|
-
const length =
|
|
366
|
+
const gender = utils_1.getGender(user.sex);
|
|
367
|
+
const length = 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 =
|
|
370
|
+
const weight = 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(
|
|
393
|
+
reject(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(
|
|
399
|
+
}, (status, err) => reject(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 =
|
|
406
|
+
const parsed = utils_1.parseRunData(data);
|
|
407
407
|
resolve(parsed);
|
|
408
408
|
}
|
|
409
409
|
catch (e) {
|
|
410
|
-
reject(
|
|
410
|
+
reject(utils_1.buildError(500, e));
|
|
411
411
|
}
|
|
412
|
-
}, (status, err) => reject(
|
|
412
|
+
}, (status, err) => reject(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(
|
|
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)));
|
|
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(
|
|
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)));
|
|
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 =
|
|
447
|
+
const arr = 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(
|
|
452
|
+
this.sendDaum8008Command(`setSlope(${bikeNo},${slope})`, cmd, 6, (data) => resolve({ bike: data[1], slope: slope }), (status, err) => reject(utils_1.buildError(status, err)));
|
|
453
453
|
});
|
|
454
454
|
}
|
|
455
455
|
}
|
|
@@ -1,6 +1,5 @@
|
|
|
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;
|
|
4
3
|
exports.DEFAULT_AGE = 30;
|
|
5
4
|
exports.DEFAULT_USER_WEIGHT = 75;
|
|
6
5
|
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
|
|
75
|
+
return utils_1.runWithRetries(() => __awaiter(this, void 0, void 0, function* () {
|
|
76
76
|
if (this.isStopped())
|
|
77
77
|
return;
|
|
78
78
|
try {
|
|
@@ -1,23 +1,4 @@
|
|
|
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
|
-
};
|
|
21
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
22
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
23
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -27,6 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
27
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
28
9
|
});
|
|
29
10
|
};
|
|
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
|
+
};
|
|
30
18
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
31
19
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
32
20
|
};
|