motion-master-client 0.0.244 → 0.0.246
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/README.md +24 -18
- package/package.json +1 -1
- package/src/api.js +21 -5
- package/src/api.js.map +1 -1
- package/src/cli.js +47 -19
- package/src/cli.js.map +1 -1
- package/src/lib/cia402.js +11 -36
- package/src/lib/cia402.js.map +1 -1
- package/src/lib/config-file.js +3 -1
- package/src/lib/config-file.js.map +1 -1
- package/src/lib/data-monitoring.d.ts +4 -4
- package/src/lib/data-monitoring.js +8 -6
- package/src/lib/data-monitoring.js.map +1 -1
- package/src/lib/device-parameter.d.ts +5 -5
- package/src/lib/device-parameter.js +10 -44
- package/src/lib/device-parameter.js.map +1 -1
- package/src/lib/device.d.ts +4 -4
- package/src/lib/device.js +9 -7
- package/src/lib/device.js.map +1 -1
- package/src/lib/encoder.js +4 -1
- package/src/lib/encoder.js.map +1 -1
- package/src/lib/error-report.d.ts +4 -4
- package/src/lib/error-report.js +0 -1
- package/src/lib/error-report.js.map +1 -1
- package/src/lib/ethercat.js +119 -33
- package/src/lib/ethercat.js.map +1 -1
- package/src/lib/ethernet.d.ts +3 -3
- package/src/lib/ethernet.js +5 -5
- package/src/lib/ethernet.js.map +1 -1
- package/src/lib/fetch.d.ts +1 -1
- package/src/lib/fetch.js +7 -7
- package/src/lib/fetch.js.map +1 -1
- package/src/lib/firmware.d.ts +17 -14
- package/src/lib/firmware.js +23 -19
- package/src/lib/firmware.js.map +1 -1
- package/src/lib/homing.d.ts +1 -1
- package/src/lib/homing.js.map +1 -1
- package/src/lib/integro-encoder-calibration.js +11 -4
- package/src/lib/integro-encoder-calibration.js.map +1 -1
- package/src/lib/integro-variant.js +36 -95
- package/src/lib/integro-variant.js.map +1 -1
- package/src/lib/is-online.js +2 -2
- package/src/lib/is-online.js.map +1 -1
- package/src/lib/logger.js +1 -1
- package/src/lib/mmcidb.js.map +1 -1
- package/src/lib/monitoring-config.d.ts +1 -1
- package/src/lib/monitoring-entry.d.ts +3 -3
- package/src/lib/motion-composer.d.ts +4 -4
- package/src/lib/motion-composer.js +3 -2
- package/src/lib/motion-composer.js.map +1 -1
- package/src/lib/motion-master-client.d.ts +10 -10
- package/src/lib/motion-master-client.js +15 -10
- package/src/lib/motion-master-client.js.map +1 -1
- package/src/lib/motion-master-pub-sub-client.d.ts +4 -4
- package/src/lib/motion-master-pub-sub-client.js +2 -2
- package/src/lib/motion-master-pub-sub-client.js.map +1 -1
- package/src/lib/motion-master-pub-sub-socket.d.ts +2 -2
- package/src/lib/motion-master-pub-sub-web-socket.d.ts +3 -3
- package/src/lib/motion-master-pub-sub-web-socket.js.map +1 -1
- package/src/lib/motion-master-pub-sub-worker-socket.d.ts +3 -3
- package/src/lib/motion-master-pub-sub-worker-socket.js +1 -1
- package/src/lib/motion-master-pub-sub-worker-socket.js.map +1 -1
- package/src/lib/motion-master-req-res-client.d.ts +225 -15
- package/src/lib/motion-master-req-res-client.js +420 -57
- package/src/lib/motion-master-req-res-client.js.map +1 -1
- package/src/lib/motion-master-req-res-socket.d.ts +2 -2
- package/src/lib/motion-master-req-res-web-socket.d.ts +3 -3
- package/src/lib/motion-master-req-res-web-socket.js +2 -2
- package/src/lib/motion-master-req-res-web-socket.js.map +1 -1
- package/src/lib/motion-master-req-res-worker-socket.d.ts +3 -3
- package/src/lib/motion-master-req-res-worker-socket.js.map +1 -1
- package/src/lib/online.d.ts +1 -1
- package/src/lib/online.js +3 -2
- package/src/lib/online.js.map +1 -1
- package/src/lib/operators.js.map +1 -1
- package/src/lib/options.js +5 -5
- package/src/lib/options.js.map +1 -1
- package/src/lib/os-command.d.ts +24 -22
- package/src/lib/os-command.js +85 -55
- package/src/lib/os-command.js.map +1 -1
- package/src/lib/parameter.js +3 -1
- package/src/lib/parameter.js.map +1 -1
- package/src/lib/product-id-range.js +5 -5
- package/src/lib/product-id-range.js.map +1 -1
- package/src/lib/product.js +256 -34
- package/src/lib/product.js.map +1 -1
- package/src/lib/request-status-resolver.d.ts +1 -1
- package/src/lib/request-status-resolver.js +8 -6
- package/src/lib/request-status-resolver.js.map +1 -1
- package/src/lib/sii.js +4 -11
- package/src/lib/sii.js.map +1 -1
- package/src/lib/smm.d.ts +62 -0
- package/src/lib/smm.js +175 -0
- package/src/lib/smm.js.map +1 -0
- package/src/lib/types.d.ts +8 -8
- package/src/lib/types.js +0 -4
- package/src/lib/types.js.map +1 -1
- package/src/lib/units.js +11 -23
- package/src/lib/units.js.map +1 -1
- package/src/lib/util.d.ts +3 -2
- package/src/lib/util.js +23 -11
- package/src/lib/util.js.map +1 -1
- package/src/lib/web-socket-connection-close-codes.js +2 -2
- package/src/lib/web-socket-connection-close-codes.js.map +1 -1
package/src/lib/cia402.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cia402.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/cia402.ts"],"names":[],"mappings":";;;AAAa,QAAA,cAAc,GAAG;IAC5B,2BAA2B;IAC3B,kBAAkB;IAClB,wBAAwB;IACxB,WAAW;IACX,sBAAsB;IACtB,iBAAiB;IACjB,0BAA0B;IAC1B,aAAa;IACb,4BAA4B;IAC5B,aAAa;IACb,qBAAqB;IACrB,6BAA6B;IAC7B,+BAA+B;IAC/B,+BAA+B;IAC/B,4BAA4B;IAC5B,4BAA4B;CAC7B,CAAC;AAEF;;;;;GAKG;AACH,IAAY,WAkEX;AAlED,WAAY,WAAW;IACrB;;;;;OAKG;IACH,gEAAiD,CAAA;IAEjD;;;;;OAKG;IACH,wDAAyC,CAAA;IAEzC;;;;;OAKG;IACH,wDAAyC,CAAA;IAEzC;;;;;OAKG;IACH,0CAA2B,CAAA;IAE3B;;;;;OAKG;IACH,sDAAuC,CAAA;IAEvC;;;;;OAKG;IACH,sDAAuC,CAAA;IAEvC;;;;;;OAMG;IACH,8DAA+C,CAAA;IAE/C;;;;;;OAMG;IACH,8BAAe,CAAA;AACjB,CAAC,EAlEW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAkEtB;
|
|
1
|
+
{"version":3,"file":"cia402.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/cia402.ts"],"names":[],"mappings":"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"}
|
package/src/lib/config-file.js
CHANGED
|
@@ -61,7 +61,9 @@ class ConfigFile {
|
|
|
61
61
|
return (_b = (_a = this.parameters) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0;
|
|
62
62
|
}
|
|
63
63
|
toString() {
|
|
64
|
-
let out = this.parameters
|
|
64
|
+
let out = this.parameters
|
|
65
|
+
.map((p) => { var _a, _b; return `0x${(_a = p.index) === null || _a === void 0 ? void 0 : _a.toString(16)}, ${(_b = p.subindex) === null || _b === void 0 ? void 0 : _b.toString(10)}, ${p.value}`; })
|
|
66
|
+
.join('\n');
|
|
65
67
|
if (this.header) {
|
|
66
68
|
out = this.header + '\n' + out;
|
|
67
69
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-file.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/config-file.ts"],"names":[],"mappings":";;;AAAA,yCAA+C;AAC/C,2CAAyE;AAKzE;;GAEG;AACH,MAAa,UAAU;
|
|
1
|
+
{"version":3,"file":"config-file.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/config-file.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { Observable } from
|
|
2
|
-
import { MonitoringConfig } from
|
|
3
|
-
import { MotionMasterClient } from
|
|
4
|
-
import { DeviceParameterIds, ParameterValueType } from
|
|
1
|
+
import { Observable } from 'rxjs';
|
|
2
|
+
import { MonitoringConfig } from './monitoring-config';
|
|
3
|
+
import { MotionMasterClient } from './motion-master-client';
|
|
4
|
+
import { DeviceParameterIds, ParameterValueType } from './types';
|
|
5
5
|
/**
|
|
6
6
|
* The DataMonitoring class tracks and collects device parameter values.
|
|
7
7
|
*
|
|
@@ -39,7 +39,8 @@ class DataMonitoring {
|
|
|
39
39
|
* 0x6040:00,0x6060:00,0x6071:00,0x607A:00,0x60FF:00
|
|
40
40
|
*/
|
|
41
41
|
get header() {
|
|
42
|
-
return this.ids
|
|
42
|
+
return this.ids
|
|
43
|
+
.map((value) => {
|
|
43
44
|
if (typeof value === 'string') {
|
|
44
45
|
const [, index, subindex] = (0, device_parameter_1.splitDeviceParameterId)(value);
|
|
45
46
|
return (0, parameter_1.makeParameterId)(index, subindex);
|
|
@@ -47,13 +48,14 @@ class DataMonitoring {
|
|
|
47
48
|
else {
|
|
48
49
|
return (0, parameter_1.makeParameterId)(value[1], value[2]);
|
|
49
50
|
}
|
|
50
|
-
})
|
|
51
|
+
})
|
|
52
|
+
.join(',');
|
|
51
53
|
}
|
|
52
54
|
/**
|
|
53
55
|
* Converts the collected data to CSV format.
|
|
54
56
|
*/
|
|
55
57
|
get csv() {
|
|
56
|
-
const rows = this.data.map(values => values.join(','));
|
|
58
|
+
const rows = this.data.map((values) => values.join(','));
|
|
57
59
|
return [this.header, ...rows].join('\n');
|
|
58
60
|
}
|
|
59
61
|
/**
|
|
@@ -72,17 +74,17 @@ class DataMonitoring {
|
|
|
72
74
|
return this.client.startMonitoring(this.ids, this.monitoringInterval, this.config, 5000).pipe((0, rxjs_1.tap)((values) => this.data.push(values)), (0, rxjs_1.takeUntil)(this.finalize$));
|
|
73
75
|
}
|
|
74
76
|
else {
|
|
75
|
-
return this.client
|
|
77
|
+
return this.client
|
|
78
|
+
.startMonitoring(this.ids, this.monitoringInterval, this.config, 5000)
|
|
79
|
+
.pipe((0, rxjs_1.takeUntil)(this.finalize$));
|
|
76
80
|
}
|
|
77
81
|
}
|
|
78
|
-
;
|
|
79
82
|
/**
|
|
80
83
|
* Emits a value on `finalize$` to properly stop monitoring and complete the observable.
|
|
81
84
|
*/
|
|
82
85
|
stop() {
|
|
83
86
|
this.finalize$.next();
|
|
84
87
|
}
|
|
85
|
-
;
|
|
86
88
|
}
|
|
87
89
|
exports.DataMonitoring = DataMonitoring;
|
|
88
90
|
//# sourceMappingURL=data-monitoring.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-monitoring.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/data-monitoring.ts"],"names":[],"mappings":";;;AAAA,+BAA2D;AAI3D,yDAA4D;AAC5D,2CAA8C;AAE9C;;;;;GAKG;AACH,MAAa,cAAc;
|
|
1
|
+
{"version":3,"file":"data-monitoring.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/data-monitoring.ts"],"names":[],"mappings":";;;AAAA,+BAA2D;AAI3D,yDAA4D;AAC5D,2CAA8C;AAE9C;;;;;GAKG;AACH,MAAa,cAAc;IAmBzB,YACkB,MAA0B,EAC1B,GAAuB,EACvB,kBAA0B,EAC1B,MAAyB;QAHzB,WAAM,GAAN,MAAM,CAAoB;QAC1B,QAAG,GAAH,GAAG,CAAoB;QACvB,uBAAkB,GAAlB,kBAAkB,CAAQ;QAC1B,WAAM,GAAN,MAAM,CAAmB;QAtB3C;;;;WAIG;QACa,SAAI,GAA2B,EAAE,CAAC;QAElD;;;WAGG;QACI,YAAO,GAAG,IAAI,CAAC;QAEtB;;WAEG;QACK,cAAS,GAAG,IAAI,cAAO,EAAQ,CAAC;IAOrC,CAAC;IAEJ;;;;;OAKG;IACH,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,GAAG;aACZ,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACb,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;gBAC7B,MAAM,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,yCAAsB,EAAC,KAAK,CAAC,CAAC;gBAC1D,OAAO,IAAA,2BAAe,EAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;aACzC;iBAAM;gBACL,OAAO,IAAA,2BAAe,EAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;aAC5C;QACH,CAAC,CAAC;aACD,IAAI,CAAC,GAAG,CAAC,CAAC;IACf,CAAC;IAED;;OAEG;IACH,IAAI,GAAG;QACL,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACzD,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;IAED;;OAEG;IACH,KAAK;QACH,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;IACvB,CAAC;IAED;;;;OAIG;IACH,KAAK;QACH,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,OAAO,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,IAAI,CAC3F,IAAA,UAAG,EAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EACvC,IAAA,gBAAS,EAAC,IAAI,CAAC,SAAS,CAAC,CAC1B,CAAC;SACH;aAAM;YACL,OAAO,IAAI,CAAC,MAAM;iBACf,eAAe,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC;iBACrE,IAAI,CAAC,IAAA,gBAAS,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;SACpC;IACH,CAAC;IAED;;OAEG;IACH,IAAI;QACF,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;IACxB,CAAC;CACF;AApFD,wCAoFC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Parameter } from
|
|
1
|
+
import { Parameter } from './parameter';
|
|
2
2
|
export interface DeviceParameter extends Parameter {
|
|
3
3
|
id: string;
|
|
4
4
|
flags?: {
|
|
@@ -16,7 +16,7 @@ export interface DeviceParameter extends Parameter {
|
|
|
16
16
|
* @throws {Error} if index or subindex are less than 0
|
|
17
17
|
* @returns combined index and subindex in uppercase hexadecimal format and device serial number, e.g. "0x60FE:02.9002-02-0000466-2339"
|
|
18
18
|
*/
|
|
19
|
-
export declare function makeDeviceParameterId(serialNumber: string, tuple: [
|
|
19
|
+
export declare function makeDeviceParameterId(serialNumber: string, tuple: [number | null | undefined, number | null | undefined]): string;
|
|
20
20
|
/**
|
|
21
21
|
* Make device parameter id by providing a device serial number and object which has index and subindex properties.
|
|
22
22
|
*
|
|
@@ -26,8 +26,8 @@ export declare function makeDeviceParameterId(serialNumber: string, tuple: [(num
|
|
|
26
26
|
* @returns combined index and subindex in uppercase hexadecimal format and device serial number, e.g. "0x60FE:02.9002-02-0000466-2339"
|
|
27
27
|
*/
|
|
28
28
|
export declare function makeDeviceParameterId(serialNumber: string, parameter: {
|
|
29
|
-
index?:
|
|
30
|
-
subindex?:
|
|
29
|
+
index?: number | null;
|
|
30
|
+
subindex?: number | null;
|
|
31
31
|
}): string;
|
|
32
32
|
/**
|
|
33
33
|
* Make parameter id by providing a device serial number and index and subindex.
|
|
@@ -38,7 +38,7 @@ export declare function makeDeviceParameterId(serialNumber: string, parameter: {
|
|
|
38
38
|
* @throws {Error} if index or subindex are less than 0
|
|
39
39
|
* @returns combined index and subindex in uppercase hexadecimal format and device serial number, e.g. "0x60FE:02.9002-02-0000466-2339"
|
|
40
40
|
*/
|
|
41
|
-
export declare function makeDeviceParameterId(serialNumber: string, index?:
|
|
41
|
+
export declare function makeDeviceParameterId(serialNumber: string, index?: number | null, subindex?: number | null): string;
|
|
42
42
|
/**
|
|
43
43
|
* Example of device parameter id is "0x2110:1A.8502-03-0001353-2115" where:
|
|
44
44
|
* - 0x2110 is object index in hexadecimal format
|
|
@@ -37,10 +37,10 @@ function isDeviceParameterId(id) {
|
|
|
37
37
|
}
|
|
38
38
|
exports.isDeviceParameterId = isDeviceParameterId;
|
|
39
39
|
function parsePdoSubItemValue(value) {
|
|
40
|
-
const b0 = value &
|
|
41
|
-
const b1 = (value >> 8) &
|
|
42
|
-
const b2 = (value >> 16) &
|
|
43
|
-
const b3 = (value >> 24) &
|
|
40
|
+
const b0 = value & 0xff;
|
|
41
|
+
const b1 = (value >> 8) & 0xff;
|
|
42
|
+
const b2 = (value >> 16) & 0xff;
|
|
43
|
+
const b3 = (value >> 24) & 0xff;
|
|
44
44
|
const index = (b3 << 8) | b2;
|
|
45
45
|
const subindex = b1;
|
|
46
46
|
const bitlen = b0;
|
|
@@ -48,26 +48,9 @@ function parsePdoSubItemValue(value) {
|
|
|
48
48
|
}
|
|
49
49
|
exports.parsePdoSubItemValue = parsePdoSubItemValue;
|
|
50
50
|
exports.defaultRxPdoGroupedValues = [
|
|
51
|
-
[
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
0x60600008,
|
|
55
|
-
0x60710010,
|
|
56
|
-
0x607a0020,
|
|
57
|
-
0x60ff0020,
|
|
58
|
-
0x60b20010,
|
|
59
|
-
0x27010020,
|
|
60
|
-
],
|
|
61
|
-
[
|
|
62
|
-
0x2,
|
|
63
|
-
0x60fe0120,
|
|
64
|
-
0x60fe0220,
|
|
65
|
-
],
|
|
66
|
-
[
|
|
67
|
-
0x2,
|
|
68
|
-
0x27030020,
|
|
69
|
-
0x60b10020,
|
|
70
|
-
],
|
|
51
|
+
[0x7, 0x60400010, 0x60600008, 0x60710010, 0x607a0020, 0x60ff0020, 0x60b20010, 0x27010020],
|
|
52
|
+
[0x2, 0x60fe0120, 0x60fe0220],
|
|
53
|
+
[0x2, 0x27030020, 0x60b10020],
|
|
71
54
|
[],
|
|
72
55
|
];
|
|
73
56
|
exports.defaultTxPdoGroupedValues = [
|
|
@@ -80,25 +63,8 @@ exports.defaultTxPdoGroupedValues = [
|
|
|
80
63
|
0x60770010,
|
|
81
64
|
0x60f40020, // Following error actual value (0x60F4:00) is added in additon to the default values
|
|
82
65
|
],
|
|
83
|
-
[
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
0x24020010,
|
|
87
|
-
0x24030010,
|
|
88
|
-
0x24040010,
|
|
89
|
-
0x27020020,
|
|
90
|
-
],
|
|
91
|
-
[
|
|
92
|
-
0x1,
|
|
93
|
-
0x60fd0020,
|
|
94
|
-
],
|
|
95
|
-
[
|
|
96
|
-
0x5,
|
|
97
|
-
0x27040020,
|
|
98
|
-
0x20f00020,
|
|
99
|
-
0x60fc0020,
|
|
100
|
-
0x606b0020,
|
|
101
|
-
0x60740010,
|
|
102
|
-
],
|
|
66
|
+
[0x5, 0x24010010, 0x24020010, 0x24030010, 0x24040010, 0x27020020],
|
|
67
|
+
[0x1, 0x60fd0020],
|
|
68
|
+
[0x5, 0x27040020, 0x20f00020, 0x60fc0020, 0x606b0020, 0x60740010],
|
|
103
69
|
];
|
|
104
70
|
//# sourceMappingURL=device-parameter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"device-parameter.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/device-parameter.ts"],"names":[],"mappings":";;;AAAA,2CAAyD;
|
|
1
|
+
{"version":3,"file":"device-parameter.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/device-parameter.ts"],"names":[],"mappings":";;;AAAA,2CAAyD;AAiDzD,SAAgB,qBAAqB,CACnC,YAAoB,EACpB,CAG0D,EAC1D,CAAiB;IAEjB,MAAM,WAAW,GAAG,IAAA,2BAAe,EAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1C,OAAO,GAAG,WAAW,IAAI,YAAY,EAAE,CAAC;AAC1C,CAAC;AAVD,sDAUC;AAED;;;;;GAKG;AACU,QAAA,uBAAuB,GAAG,kDAAkD,CAAC;AAE1F;;;;;GAKG;AACH,SAAgB,sBAAsB,CAAC,EAAU;IAC/C,MAAM,KAAK,GAAG,EAAE,CAAC,KAAK,CAAC,+BAAuB,CAAC,CAAC;IAEhD,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,wBAAwB,EAAE,2CAA2C,+BAAuB,EAAE,CAAC,CAAC;KACjH;IAED,OAAO;QACL,KAAK,CAAC,CAAC,CAAC;QACR,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QACtB,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,WAAW;KACpC,CAAC;AACJ,CAAC;AAZD,wDAYC;AAED,SAAgB,mBAAmB,CAAC,EAAU;IAC5C,OAAO,+BAAuB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAC1C,CAAC;AAFD,kDAEC;AAED,SAAgB,oBAAoB,CAAC,KAAa;IAChD,MAAM,EAAE,GAAG,KAAK,GAAG,IAAI,CAAC;IACxB,MAAM,EAAE,GAAG,CAAC,KAAK,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC;IAC/B,MAAM,EAAE,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC;IAChC,MAAM,EAAE,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC;IAEhC,MAAM,KAAK,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC;IAC7B,MAAM,QAAQ,GAAG,EAAE,CAAC;IACpB,MAAM,MAAM,GAAG,EAAE,CAAC;IAElB,OAAO,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;AACnC,CAAC;AAXD,oDAWC;AAEY,QAAA,yBAAyB,GAAG;IACvC,CAAC,GAAG,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC;IACzF,CAAC,GAAG,EAAE,UAAU,EAAE,UAAU,CAAC;IAC7B,CAAC,GAAG,EAAE,UAAU,EAAE,UAAU,CAAC;IAC7B,EAAE;CACH,CAAC;AAEW,QAAA,yBAAyB,GAAG;IACvC;QACE,GAAG;QACH,UAAU;QACV,UAAU;QACV,UAAU;QACV,UAAU;QACV,UAAU;QACV,UAAU,EAAE,qFAAqF;KAClG;IACD,CAAC,GAAG,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC;IACjE,CAAC,GAAG,EAAE,UAAU,CAAC;IACjB,CAAC,GAAG,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC;CAClE,CAAC"}
|
package/src/lib/device.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { DeviceLogLine } from
|
|
2
|
-
import { HardwareDescription, StackInfo } from
|
|
3
|
-
import { IntegroVariant } from
|
|
4
|
-
import { DeviceRef, DeviceRefObj } from
|
|
1
|
+
import { DeviceLogLine } from './device-log-line';
|
|
2
|
+
import { HardwareDescription, StackInfo } from './hardware-description';
|
|
3
|
+
import { IntegroVariant } from './integro-variant';
|
|
4
|
+
import { DeviceRef, DeviceRefObj } from './types';
|
|
5
5
|
export declare const filenamePartRegExp: RegExp;
|
|
6
6
|
/**
|
|
7
7
|
* Represents a single device with extended properties beyond those provided by the Motion Master API.
|
package/src/lib/device.js
CHANGED
|
@@ -19,7 +19,7 @@ exports.ensureDeviceRef = ensureDeviceRef;
|
|
|
19
19
|
function makeDeviceRefObj(deviceRef) {
|
|
20
20
|
deviceRef = ensureDeviceRef(deviceRef);
|
|
21
21
|
if (typeof deviceRef === 'number') {
|
|
22
|
-
if (deviceRef <=
|
|
22
|
+
if (deviceRef <= 0xffff) {
|
|
23
23
|
return { devicePosition: deviceRef };
|
|
24
24
|
}
|
|
25
25
|
else {
|
|
@@ -32,14 +32,15 @@ function makeDeviceRefObj(deviceRef) {
|
|
|
32
32
|
}
|
|
33
33
|
exports.makeDeviceRefObj = makeDeviceRefObj;
|
|
34
34
|
function isDeviceRef(deviceRef) {
|
|
35
|
-
return deviceRef !== undefined &&
|
|
36
|
-
|
|
35
|
+
return (deviceRef !== undefined &&
|
|
36
|
+
deviceRef !== null &&
|
|
37
|
+
(typeof deviceRef === 'string' || (typeof deviceRef === 'number' && deviceRef >= 0)));
|
|
37
38
|
}
|
|
38
39
|
exports.isDeviceRef = isDeviceRef;
|
|
39
40
|
function isValidDeviceRefObj(obj) {
|
|
40
|
-
return Number.isFinite(Number(obj.deviceAddress))
|
|
41
|
-
|
|
42
|
-
|
|
41
|
+
return (Number.isFinite(Number(obj.deviceAddress)) ||
|
|
42
|
+
(typeof obj.devicePosition === 'number' && obj.devicePosition >= 0) ||
|
|
43
|
+
typeof obj.deviceSerialNumber === 'string');
|
|
43
44
|
}
|
|
44
45
|
exports.isValidDeviceRefObj = isValidDeviceRefObj;
|
|
45
46
|
function parseDeviceLog(line) {
|
|
@@ -56,7 +57,8 @@ function parseDeviceLog(line) {
|
|
|
56
57
|
}
|
|
57
58
|
exports.parseDeviceLog = parseDeviceLog;
|
|
58
59
|
function parseDeviceLogContent(content) {
|
|
59
|
-
return content
|
|
60
|
+
return content
|
|
61
|
+
.split('\n')
|
|
60
62
|
.map((v) => parseDeviceLog(v))
|
|
61
63
|
.filter((l) => l !== undefined);
|
|
62
64
|
}
|
package/src/lib/device.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"device.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/device.ts"],"names":[],"mappings":";;;AAKa,QAAA,kBAAkB,GAAG,gCAAgC,CAAC;AA+DnE,SAAgB,4BAA4B,CAAC,YAA0B;IACrE,KAAK,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;QACrD,IAAI,KAAK,KAAK,SAAS,EAAE;YACvB,OAAO,KAAK,CAAC;SACd;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAPD,oEAOC;AAED,SAAgB,eAAe,CAAC,SAAoB;IAClD,MAAM,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;IAC5B,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;AAClC,CAAC;AAHD,0CAGC;AAED,SAAgB,gBAAgB,CAAC,SAAoB;IACnD,SAAS,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;IACvC,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;QACjC,IAAI,SAAS,IAAI,MAAM,EAAE;YACvB,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,CAAC;SACtC;aAAM;YACL,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC;SACrC;KACF;SAAM;QACL,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,CAAC;KAC1C;AACH,CAAC;AAXD,4CAWC;AAED,SAAgB,WAAW,CAAC,SAAc;IACxC,OAAO,SAAS,KAAK,SAAS,
|
|
1
|
+
{"version":3,"file":"device.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/device.ts"],"names":[],"mappings":"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"}
|
package/src/lib/encoder.js
CHANGED
|
@@ -143,7 +143,10 @@ function getCirculoEncoderBatteryModeOptions(productId, shaft) {
|
|
|
143
143
|
const defaultValue = getCirculoEncoderBatteryModeDefaultValue(shaft);
|
|
144
144
|
return [
|
|
145
145
|
{ key: 'Default', value: defaultValue },
|
|
146
|
-
...arr.map(({ maxAcceleration, maxCurrent, value }) => ({
|
|
146
|
+
...arr.map(({ maxAcceleration, maxCurrent, value }) => ({
|
|
147
|
+
key: `${maxAcceleration} kRPM/s | ${maxCurrent} μA`,
|
|
148
|
+
value,
|
|
149
|
+
})),
|
|
147
150
|
];
|
|
148
151
|
}
|
|
149
152
|
}
|
package/src/lib/encoder.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"encoder.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/encoder.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"encoder.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/encoder.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,10 +5,10 @@ export interface ErrorReport {
|
|
|
5
5
|
explanation: string;
|
|
6
6
|
errorCodeList: string;
|
|
7
7
|
remedy: string;
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
8
|
+
'v4.2': boolean;
|
|
9
|
+
'v4.4': boolean;
|
|
10
|
+
'v5.0': boolean;
|
|
11
|
+
'v5.1': boolean;
|
|
12
12
|
firmwares: string[];
|
|
13
13
|
errorCode: number;
|
|
14
14
|
id: string;
|
package/src/lib/error-report.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-report.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/error-report.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"error-report.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/error-report.ts"],"names":[],"mappings":""}
|
package/src/lib/ethercat.js
CHANGED
|
@@ -5,9 +5,9 @@ exports.EthercatState = exports.ObjectCodeDefinition = exports.findBaseDataTypeB
|
|
|
5
5
|
* List of base data types as defined in ETG.1020 Protocol Enhancements, Table 98.
|
|
6
6
|
*/
|
|
7
7
|
exports.baseDataTypes = [
|
|
8
|
-
{ index: 0x0001, name: 'BOOLEAN', baseDataType: 'BOOL\nBIT', bitSize: 1, description: '
|
|
9
|
-
{ index:
|
|
10
|
-
{ index:
|
|
8
|
+
{ index: 0x0001, name: 'BOOLEAN', baseDataType: 'BOOL\nBIT', bitSize: 1, description: "'0': FALSE\n'1': TRUE" },
|
|
9
|
+
{ index: 0x001e, name: 'BYTE', baseDataType: 'BYTE', bitSize: 8, description: 'Unsigned Byte, Octet' },
|
|
10
|
+
{ index: 0x001f, name: 'WORD', baseDataType: 'WORD', bitSize: 16, description: 'Two Octet' },
|
|
11
11
|
{ index: 0x0020, name: 'DWORD', baseDataType: 'DWORD', bitSize: 32, description: 'Four Octet' },
|
|
12
12
|
// Bit String
|
|
13
13
|
{ index: 0x0030, name: 'BIT1', baseDataType: 'BIT1', bitSize: 1, description: 'Can be used as UNSIGNED1' },
|
|
@@ -20,60 +20,147 @@ exports.baseDataTypes = [
|
|
|
20
20
|
{ index: 0x0037, name: 'BIT8', baseDataType: 'BIT8', bitSize: 8, description: 'Can be used as UNSIGNED8' },
|
|
21
21
|
{ index: 0x0038, name: 'BIT9', baseDataType: 'BIT9', bitSize: 9, description: 'Can be used as UNSIGNED9' },
|
|
22
22
|
{ index: 0x0039, name: 'BIT10', baseDataType: 'BIT10', bitSize: 10, description: 'Can be used as UNSIGNED10' },
|
|
23
|
-
{ index:
|
|
24
|
-
{ index:
|
|
25
|
-
{ index:
|
|
26
|
-
{ index:
|
|
27
|
-
{ index:
|
|
28
|
-
{ index:
|
|
29
|
-
{ index:
|
|
30
|
-
{ index:
|
|
31
|
-
{ index:
|
|
23
|
+
{ index: 0x003a, name: 'BIT11', baseDataType: 'BIT11', bitSize: 11, description: 'Can be used as UNSIGNED11' },
|
|
24
|
+
{ index: 0x003b, name: 'BIT12', baseDataType: 'BIT12', bitSize: 12, description: 'Can be used as UNSIGNED12' },
|
|
25
|
+
{ index: 0x003c, name: 'BIT13', baseDataType: 'BIT13', bitSize: 13, description: 'Can be used as UNSIGNED13' },
|
|
26
|
+
{ index: 0x003d, name: 'BIT14', baseDataType: 'BIT14', bitSize: 14, description: 'Can be used as UNSIGNED14' },
|
|
27
|
+
{ index: 0x003e, name: 'BIT15', baseDataType: 'BIT15', bitSize: 15, description: 'Can be used as UNSIGNED15' },
|
|
28
|
+
{ index: 0x003f, name: 'BIT16', baseDataType: 'BIT16', bitSize: 16, description: 'Can be used as UNSIGNED16' },
|
|
29
|
+
{ index: 0x002d, name: 'BITARR8', baseDataType: 'BITARR8', bitSize: 8, description: '8 individual Bits' },
|
|
30
|
+
{ index: 0x002e, name: 'BITARR16', baseDataType: 'BITARR16', bitSize: 16, description: '16 individual Bits' },
|
|
31
|
+
{ index: 0x002f, name: 'BITARR32', baseDataType: 'BITARR32', bitSize: 32, description: '32 individual Bits' },
|
|
32
32
|
// Signed Integer
|
|
33
|
-
{
|
|
34
|
-
|
|
33
|
+
{
|
|
34
|
+
index: 0x0002,
|
|
35
|
+
name: 'INTEGER8',
|
|
36
|
+
baseDataType: 'SINT',
|
|
37
|
+
bitSize: 8,
|
|
38
|
+
description: 'Short Integer',
|
|
39
|
+
range: [-128, 127],
|
|
40
|
+
},
|
|
41
|
+
{
|
|
42
|
+
index: 0x0003,
|
|
43
|
+
name: 'INTEGER16',
|
|
44
|
+
baseDataType: 'INT',
|
|
45
|
+
bitSize: 16,
|
|
46
|
+
description: 'Integer',
|
|
47
|
+
range: [-32768, 32767],
|
|
48
|
+
},
|
|
35
49
|
{ index: 0x0010, name: 'INTEGER24', baseDataType: 'INT24', bitSize: 24, range: [-8388608, 8388607] },
|
|
36
|
-
{
|
|
50
|
+
{
|
|
51
|
+
index: 0x0004,
|
|
52
|
+
name: 'INTEGER32',
|
|
53
|
+
baseDataType: 'DINT',
|
|
54
|
+
bitSize: 32,
|
|
55
|
+
description: 'Double Integer',
|
|
56
|
+
range: [-2147483648, 2147483647],
|
|
57
|
+
},
|
|
37
58
|
{ index: 0x0012, name: 'INTEGER40', baseDataType: 'INT40', bitSize: 40 },
|
|
38
59
|
{ index: 0x0013, name: 'INTEGER48', baseDataType: 'INT48', bitSize: 48 },
|
|
39
60
|
{ index: 0x0014, name: 'INTEGER56', baseDataType: 'INT56', bitSize: 56 },
|
|
40
61
|
{ index: 0x0015, name: 'INTEGER64', baseDataType: 'LINT', bitSize: 64, description: 'Long Integer' },
|
|
41
62
|
// Unsigned Integer
|
|
42
|
-
{
|
|
43
|
-
|
|
63
|
+
{
|
|
64
|
+
index: 0x0005,
|
|
65
|
+
name: 'UNSIGNED8',
|
|
66
|
+
baseDataType: 'USINT',
|
|
67
|
+
bitSize: 8,
|
|
68
|
+
description: 'Unsigned Short Integer',
|
|
69
|
+
range: [0, 255],
|
|
70
|
+
},
|
|
71
|
+
{
|
|
72
|
+
index: 0x0006,
|
|
73
|
+
name: 'UNSIGNED16',
|
|
74
|
+
baseDataType: 'UINT',
|
|
75
|
+
bitSize: 16,
|
|
76
|
+
description: 'Unsigned Integer / Word',
|
|
77
|
+
range: [0, 65535],
|
|
78
|
+
},
|
|
44
79
|
{ index: 0x0016, name: 'UNSIGNED24', baseDataType: 'UINT24', bitSize: 24 },
|
|
45
|
-
{
|
|
80
|
+
{
|
|
81
|
+
index: 0x0007,
|
|
82
|
+
name: 'UNSIGNED32',
|
|
83
|
+
baseDataType: 'UDINT',
|
|
84
|
+
bitSize: 32,
|
|
85
|
+
description: 'Unsigned Double Integer',
|
|
86
|
+
range: [0, 4294967295],
|
|
87
|
+
},
|
|
46
88
|
{ index: 0x0018, name: 'UNSIGNED40', baseDataType: 'UINT40', bitSize: 40 },
|
|
47
89
|
{ index: 0x0019, name: 'UNSIGNED48', baseDataType: 'UINT48', bitSize: 48 },
|
|
48
|
-
{ index:
|
|
49
|
-
{ index:
|
|
90
|
+
{ index: 0x001a, name: 'UNSIGNED56', baseDataType: 'UINT56', bitSize: 56 },
|
|
91
|
+
{ index: 0x001b, name: 'UNSIGNED64', baseDataType: 'ULINT', bitSize: 64, description: 'Unsigned Long Integer' },
|
|
50
92
|
// Floating
|
|
51
93
|
{ index: 0x0008, name: 'REAL32', baseDataType: 'REAL', bitSize: 32, description: 'Floating point' },
|
|
52
94
|
{ index: 0x0011, name: 'REAL64', baseDataType: 'LREAL', bitSize: 64, description: 'Long float' },
|
|
53
95
|
// GUID
|
|
54
|
-
{
|
|
96
|
+
{
|
|
97
|
+
index: 0x001d,
|
|
98
|
+
name: 'GUID',
|
|
99
|
+
baseDataType: 'GUID',
|
|
100
|
+
bitSize: 128,
|
|
101
|
+
description: 'Globally unique identifier with a length of 128 Bit',
|
|
102
|
+
},
|
|
55
103
|
];
|
|
56
104
|
/**
|
|
57
105
|
* List of base data types with variable length, as specified in ETG.1020 Protocol Enhancements, Table 99.
|
|
58
106
|
*/
|
|
59
107
|
exports.baseDataTypesWithVariableLength = [
|
|
60
108
|
// Strings
|
|
61
|
-
{
|
|
109
|
+
{
|
|
110
|
+
index: 0x0009,
|
|
111
|
+
name: 'VISIBLE_STRING',
|
|
112
|
+
baseDataType: 'STRING(n)',
|
|
113
|
+
bitSize: 0,
|
|
114
|
+
description: 'VisibleString\n(1 octet per character)',
|
|
115
|
+
},
|
|
62
116
|
// Octet field
|
|
63
|
-
{
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
117
|
+
{
|
|
118
|
+
index: 0x000a,
|
|
119
|
+
name: 'OCTET_STRING',
|
|
120
|
+
baseDataType: 'ARRAY[0..n] OF BYTE',
|
|
121
|
+
bitSize: 0,
|
|
122
|
+
description: 'Sequence of octets (data type BYTE)',
|
|
123
|
+
},
|
|
124
|
+
{
|
|
125
|
+
index: 0x000b,
|
|
126
|
+
name: 'UNICODE_STRING',
|
|
127
|
+
baseDataType: 'ARRAY[0..n] OF UINT',
|
|
128
|
+
bitSize: 0,
|
|
129
|
+
description: 'Sequence of UINT',
|
|
130
|
+
},
|
|
131
|
+
{
|
|
132
|
+
index: 0x0260,
|
|
133
|
+
name: 'ARRAY_OF_INT',
|
|
134
|
+
baseDataType: 'ARRAY[0..n] OF INT',
|
|
135
|
+
bitSize: 0,
|
|
136
|
+
description: 'Sequence of INT',
|
|
137
|
+
},
|
|
138
|
+
{
|
|
139
|
+
index: 0x0261,
|
|
140
|
+
name: 'ARRAY_OF_SINT',
|
|
141
|
+
baseDataType: 'ARRAY[0..n] OF SINT',
|
|
142
|
+
bitSize: 0,
|
|
143
|
+
description: 'Sequence of SINT',
|
|
144
|
+
},
|
|
145
|
+
{
|
|
146
|
+
index: 0x0262,
|
|
147
|
+
name: 'ARRAY_OF_DINT',
|
|
148
|
+
baseDataType: 'ARRAY[0..n] OF DINT',
|
|
149
|
+
bitSize: 0,
|
|
150
|
+
description: 'Sequence of DINT',
|
|
151
|
+
},
|
|
152
|
+
{
|
|
153
|
+
index: 0x0263,
|
|
154
|
+
name: 'ARRAY_OF_UDINT',
|
|
155
|
+
baseDataType: 'ARRAY[0..n] OF UDINT',
|
|
156
|
+
bitSize: 0,
|
|
157
|
+
description: 'Sequence of UDINT',
|
|
158
|
+
},
|
|
69
159
|
];
|
|
70
160
|
/**
|
|
71
161
|
* Combines all base data types, including those from Table 98 and Table 99.
|
|
72
162
|
*/
|
|
73
|
-
exports.allBaseDataTypes = [
|
|
74
|
-
...exports.baseDataTypes,
|
|
75
|
-
...exports.baseDataTypesWithVariableLength,
|
|
76
|
-
];
|
|
163
|
+
exports.allBaseDataTypes = [...exports.baseDataTypes, ...exports.baseDataTypesWithVariableLength];
|
|
77
164
|
/**
|
|
78
165
|
* Finds a base data type that matches the specified index.
|
|
79
166
|
* @param index - The index to search for.
|
|
@@ -83,7 +170,6 @@ function findBaseDataTypeByIndex(index) {
|
|
|
83
170
|
return exports.allBaseDataTypes.find((baseDataType) => baseDataType.index === index);
|
|
84
171
|
}
|
|
85
172
|
exports.findBaseDataTypeByIndex = findBaseDataTypeByIndex;
|
|
86
|
-
;
|
|
87
173
|
/**
|
|
88
174
|
* Enum for object code definitions, based on ETG.1000.6 EtherCAT Specification - Part 6, Table 62.
|
|
89
175
|
*/
|