incyclist-devices 1.4.26 → 1.4.27
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 +1 -1
- package/lib/Device.js +2 -3
- package/lib/DeviceProtocol.d.ts +2 -1
- package/lib/DeviceProtocol.js +1 -1
- package/lib/DeviceSupport.d.ts +6 -1
- package/lib/DeviceSupport.js +17 -21
- package/lib/ant/AntAdapter.js +0 -1
- package/lib/ant/AntScanner.js +7 -20
- package/lib/ant/antfe/AntFEAdapter.js +7 -7
- package/lib/ant/anthrm/AntHrmAdapter.js +1 -1
- package/lib/ant/antpwr/pwr-adapter.js +1 -1
- package/lib/ant/utils.js +1 -3
- package/lib/ble/ble-device.d.ts +36 -0
- package/lib/ble/ble-device.js +174 -0
- package/lib/ble/ble-interface.d.ts +51 -0
- package/lib/ble/ble-interface.js +330 -0
- package/lib/ble/ble.d.ts +81 -0
- package/lib/ble/ble.js +51 -0
- package/lib/ble/hrm.d.ts +48 -0
- package/lib/ble/hrm.js +128 -0
- package/lib/ble/incyclist-protocol.d.ts +31 -0
- package/lib/ble/incyclist-protocol.js +106 -0
- package/lib/ble/pwr.d.ts +32 -0
- package/lib/ble/pwr.js +96 -0
- package/lib/calculations.js +0 -1
- package/lib/daum/DaumAdapter.d.ts +2 -2
- package/lib/daum/DaumAdapter.js +13 -25
- 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.js +1 -2
- package/lib/kettler/ergo-racer/adapter.js +9 -21
- package/lib/kettler/ergo-racer/protocol.js +7 -19
- package/lib/modes/power-meter.js +0 -1
- package/lib/simulator/Simulator.js +7 -20
- 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
|
@@ -0,0 +1,106 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
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
|
+
};
|
|
18
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
19
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
20
|
+
};
|
|
21
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
|
+
const gd_eventlog_1 = require("gd-eventlog");
|
|
23
|
+
const DeviceProtocol_1 = __importStar(require("../DeviceProtocol"));
|
|
24
|
+
const DeviceRegistry_1 = __importDefault(require("../DeviceRegistry"));
|
|
25
|
+
const ble_1 = require("./ble");
|
|
26
|
+
const ble_interface_1 = __importDefault(require("./ble-interface"));
|
|
27
|
+
const hrm_1 = __importStar(require("./hrm"));
|
|
28
|
+
const pwr_1 = __importDefault(require("./pwr"));
|
|
29
|
+
const supportedDeviceTypes = [hrm_1.default, pwr_1.default];
|
|
30
|
+
class BleProtocol extends DeviceProtocol_1.default {
|
|
31
|
+
constructor(binding) {
|
|
32
|
+
super();
|
|
33
|
+
const b = binding || BleProtocol._defaultBinding;
|
|
34
|
+
this.logger = new gd_eventlog_1.EventLogger('BLE');
|
|
35
|
+
this.ble = new ble_interface_1.default({ binding: b, logger: this.logger });
|
|
36
|
+
BleProtocol._instances.push(this);
|
|
37
|
+
}
|
|
38
|
+
static setDefaultBinding(binding) {
|
|
39
|
+
BleProtocol._defaultBinding = binding;
|
|
40
|
+
BleProtocol._instances.forEach((p) => {
|
|
41
|
+
if (p.ble && !p.ble.getBinding()) {
|
|
42
|
+
p.ble.setBinding(binding);
|
|
43
|
+
}
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
setBinding(binding) {
|
|
47
|
+
if (this.ble)
|
|
48
|
+
this.ble.setBinding(binding);
|
|
49
|
+
}
|
|
50
|
+
createDevice(bleDevice) {
|
|
51
|
+
const fromDevice = bleDevice instanceof ble_1.BleDeviceClass;
|
|
52
|
+
const profile = bleDevice instanceof ble_1.BleDeviceClass ? bleDevice.getProfile() : bleDevice.profile;
|
|
53
|
+
const props = () => {
|
|
54
|
+
const { id, name, address } = bleDevice;
|
|
55
|
+
return { id, name, address };
|
|
56
|
+
};
|
|
57
|
+
switch (profile.toLocaleLowerCase()) {
|
|
58
|
+
case 'hr':
|
|
59
|
+
case 'heartrate monitor':
|
|
60
|
+
return new hrm_1.HrmAdapter(fromDevice ? bleDevice : new hrm_1.default(props()), this);
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
getName() { return 'BLE'; }
|
|
64
|
+
getInterfaces() { return [DeviceProtocol_1.INTERFACE.BLE]; }
|
|
65
|
+
isBike() { return true; }
|
|
66
|
+
isHrm() { return true; }
|
|
67
|
+
isPower() { return true; }
|
|
68
|
+
add(settings) {
|
|
69
|
+
this.logger.logEvent({ message: 'adding device', settings });
|
|
70
|
+
const device = this.createDevice(settings);
|
|
71
|
+
return device;
|
|
72
|
+
}
|
|
73
|
+
scan(props) {
|
|
74
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
75
|
+
try {
|
|
76
|
+
this.ble.on('device', (bleDevice) => {
|
|
77
|
+
if (props && props.onDeviceFound) {
|
|
78
|
+
const device = this.createDevice(bleDevice);
|
|
79
|
+
props.onDeviceFound(device, this);
|
|
80
|
+
}
|
|
81
|
+
});
|
|
82
|
+
this.logger.logEvent({ message: 'scan started' });
|
|
83
|
+
yield this.ble.scan({ deviceTypes: supportedDeviceTypes });
|
|
84
|
+
if (props && props.onScanFinished) {
|
|
85
|
+
props.onScanFinished(props.id);
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
catch (err) {
|
|
89
|
+
this.logger.logEvent({ message: 'error', error: err.message });
|
|
90
|
+
}
|
|
91
|
+
});
|
|
92
|
+
}
|
|
93
|
+
stopScan() {
|
|
94
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
95
|
+
yield this.ble.stopScan();
|
|
96
|
+
return;
|
|
97
|
+
});
|
|
98
|
+
}
|
|
99
|
+
isScanning() {
|
|
100
|
+
return this.ble.isScanning();
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
exports.default = BleProtocol;
|
|
104
|
+
BleProtocol._defaultBinding = undefined;
|
|
105
|
+
BleProtocol._instances = [];
|
|
106
|
+
DeviceRegistry_1.default.register(new BleProtocol());
|
package/lib/ble/pwr.d.ts
ADDED
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
2
|
+
import { BleDevice } from './ble-device';
|
|
3
|
+
declare type PowerData = {
|
|
4
|
+
instantaneousPower?: number;
|
|
5
|
+
balance?: number;
|
|
6
|
+
accTorque?: number;
|
|
7
|
+
rpm: number;
|
|
8
|
+
raw?: Buffer;
|
|
9
|
+
};
|
|
10
|
+
declare type CrankData = {
|
|
11
|
+
revolutions?: number;
|
|
12
|
+
time?: number;
|
|
13
|
+
cntUpdateMissing?: number;
|
|
14
|
+
};
|
|
15
|
+
export default class BleCyclingPowerDevice extends BleDevice {
|
|
16
|
+
static services: string[];
|
|
17
|
+
static characteristics: string[];
|
|
18
|
+
instantaneousPower: number;
|
|
19
|
+
balance: number;
|
|
20
|
+
accTorque: number;
|
|
21
|
+
currentCrankData: CrankData;
|
|
22
|
+
prevCrankData: CrankData;
|
|
23
|
+
rpm: number;
|
|
24
|
+
getProfile(): string;
|
|
25
|
+
getServiceUUids(): string[];
|
|
26
|
+
getRpm(crankData: any): number;
|
|
27
|
+
parsePower(data: Buffer): PowerData;
|
|
28
|
+
onData(characteristic: string, data: Buffer): void;
|
|
29
|
+
write(characteristic: any, data: any): Promise<boolean>;
|
|
30
|
+
read(characteristic: any): Promise<Buffer>;
|
|
31
|
+
}
|
|
32
|
+
export {};
|
package/lib/ble/pwr.js
ADDED
|
@@ -0,0 +1,96 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const ble_device_1 = require("./ble-device");
|
|
7
|
+
const ble_interface_1 = __importDefault(require("./ble-interface"));
|
|
8
|
+
class BleCyclingPowerDevice extends ble_device_1.BleDevice {
|
|
9
|
+
constructor() {
|
|
10
|
+
super(...arguments);
|
|
11
|
+
this.instantaneousPower = undefined;
|
|
12
|
+
this.balance = undefined;
|
|
13
|
+
this.accTorque = undefined;
|
|
14
|
+
this.currentCrankData = undefined;
|
|
15
|
+
this.prevCrankData = undefined;
|
|
16
|
+
this.rpm = undefined;
|
|
17
|
+
}
|
|
18
|
+
getProfile() {
|
|
19
|
+
return 'cp';
|
|
20
|
+
}
|
|
21
|
+
getServiceUUids() {
|
|
22
|
+
return BleCyclingPowerDevice.services;
|
|
23
|
+
}
|
|
24
|
+
getRpm(crankData) {
|
|
25
|
+
if (!this.prevCrankData)
|
|
26
|
+
this.prevCrankData = { revolutions: 0, time: 0, cntUpdateMissing: -1 };
|
|
27
|
+
const c = this.currentCrankData = crankData;
|
|
28
|
+
const p = this.prevCrankData;
|
|
29
|
+
let rpm = this.rpm;
|
|
30
|
+
let hasUpdate = c.time !== p.time;
|
|
31
|
+
if (hasUpdate) {
|
|
32
|
+
let time = c.time - p.time;
|
|
33
|
+
let revs = c.revolutions - p.revolutions;
|
|
34
|
+
if (c.time < p.time)
|
|
35
|
+
time += 0x10000;
|
|
36
|
+
if (c.revolutions < p.revolutions)
|
|
37
|
+
revs += 0x10000;
|
|
38
|
+
rpm = 1024 * 60 * revs / time;
|
|
39
|
+
}
|
|
40
|
+
else {
|
|
41
|
+
if (p.cntUpdateMissing < 0 || p.cntUpdateMissing > 2) {
|
|
42
|
+
rpm = 0;
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
const cntUpdateMissing = p.cntUpdateMissing;
|
|
46
|
+
this.prevCrankData = this.currentCrankData;
|
|
47
|
+
if (hasUpdate)
|
|
48
|
+
this.prevCrankData.cntUpdateMissing = 0;
|
|
49
|
+
else
|
|
50
|
+
this.prevCrankData.cntUpdateMissing = cntUpdateMissing + 1;
|
|
51
|
+
return rpm;
|
|
52
|
+
}
|
|
53
|
+
parsePower(data) {
|
|
54
|
+
try {
|
|
55
|
+
let offset = 4;
|
|
56
|
+
const flags = data.readUInt16LE(0);
|
|
57
|
+
this.instantaneousPower = data.readUInt16LE(2);
|
|
58
|
+
if (flags & 0x1)
|
|
59
|
+
this.balance = data.readUInt8(offset++);
|
|
60
|
+
if (flags & 0x4) {
|
|
61
|
+
this.accTorque = data.readUInt16LE(offset);
|
|
62
|
+
offset += 2;
|
|
63
|
+
}
|
|
64
|
+
if (flags & 0x20) {
|
|
65
|
+
const crankData = {
|
|
66
|
+
revolutions: data.readUInt16LE(offset),
|
|
67
|
+
time: data.readUInt16LE(offset + 2)
|
|
68
|
+
};
|
|
69
|
+
this.rpm = this.getRpm(crankData);
|
|
70
|
+
offset += 4;
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
catch (err) {
|
|
74
|
+
}
|
|
75
|
+
const { instantaneousPower, balance, accTorque, rpm } = this;
|
|
76
|
+
return { instantaneousPower, balance, accTorque, rpm, raw: data };
|
|
77
|
+
}
|
|
78
|
+
onData(characteristic, data) {
|
|
79
|
+
if (characteristic.toLocaleLowerCase() === '2a63') {
|
|
80
|
+
const res = this.parsePower(data);
|
|
81
|
+
this.emit('data', res);
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
write(characteristic, data) {
|
|
85
|
+
console.log('write', characteristic, data);
|
|
86
|
+
return Promise.resolve(true);
|
|
87
|
+
}
|
|
88
|
+
read(characteristic) {
|
|
89
|
+
console.log('read', characteristic);
|
|
90
|
+
return Promise.resolve(Buffer.from([]));
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
exports.default = BleCyclingPowerDevice;
|
|
94
|
+
BleCyclingPowerDevice.services = ['1818'];
|
|
95
|
+
BleCyclingPowerDevice.characteristics = ['2a63', '2a65', '2a5d', '2a3c'];
|
|
96
|
+
ble_interface_1.default.register('BleCyclingPowerDevice', 'cp', BleCyclingPowerDevice, BleCyclingPowerDevice.services);
|
package/lib/calculations.js
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { EventLogger } from 'gd-eventlog';
|
|
2
2
|
import CyclingMode, { IncyclistBikeData } from '../CyclingMode';
|
|
3
|
-
import
|
|
3
|
+
import IncyclistDevice, { Bike, DeviceAdapter, DeviceData } from '../Device';
|
|
4
4
|
import { User } from '../types/user';
|
|
5
5
|
interface DaumAdapter {
|
|
6
6
|
getCurrentBikeData(): Promise<any>;
|
|
7
7
|
}
|
|
8
|
-
export default class DaumAdapterBase extends
|
|
8
|
+
export default class DaumAdapterBase extends IncyclistDevice implements DeviceAdapter, DaumAdapter, Bike {
|
|
9
9
|
bike: any;
|
|
10
10
|
ignoreHrm: boolean;
|
|
11
11
|
ignoreBike: boolean;
|
package/lib/daum/DaumAdapter.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,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
|
};
|
|
@@ -312,16 +300,16 @@ class DaumAdapterBase extends Device_1.default {
|
|
|
312
300
|
return;
|
|
313
301
|
let distance = 0;
|
|
314
302
|
if (this.distanceInternal !== undefined && this.cyclingData.distanceInternal !== undefined) {
|
|
315
|
-
distance =
|
|
303
|
+
distance = utils_1.intVal(this.cyclingData.distanceInternal - this.distanceInternal);
|
|
316
304
|
}
|
|
317
305
|
if (this.cyclingData.distanceInternal !== undefined)
|
|
318
306
|
this.distanceInternal = this.cyclingData.distanceInternal;
|
|
319
307
|
let data = {
|
|
320
|
-
speed:
|
|
321
|
-
slope:
|
|
322
|
-
power:
|
|
323
|
-
cadence:
|
|
324
|
-
heartrate:
|
|
308
|
+
speed: utils_1.floatVal(this.cyclingData.speed),
|
|
309
|
+
slope: utils_1.floatVal(this.cyclingData.slope),
|
|
310
|
+
power: utils_1.intVal(this.cyclingData.power),
|
|
311
|
+
cadence: utils_1.intVal(this.cyclingData.pedalRpm),
|
|
312
|
+
heartrate: utils_1.intVal(this.cyclingData.heartrate),
|
|
325
313
|
distance,
|
|
326
314
|
timestamp: Date.now(),
|
|
327
315
|
deviceTime: this.cyclingData.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
|
};
|