@zimo-elektronik/zcan 1.0.51 → 1.0.52
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/.prettierrc.json +3 -1
- package/__tests__/accessoriesGroup.test.ts +26 -26
- package/__tests__/connection.test.ts +52 -52
- package/__tests__/dataGroup.test.ts +82 -92
- package/__tests__/infoGroup.test.ts +18 -18
- package/__tests__/lanDataGroup.test.ts +54 -66
- package/__tests__/lanInfoGroup.test.ts +34 -34
- package/__tests__/lanLocoStateGroup.test.ts +17 -17
- package/__tests__/systemControlGroup.test.ts +36 -36
- package/__tests__/trackCfgGroup.test.ts +38 -38
- package/__tests__/vehicleGroup.test.ts +109 -110
- package/dist/common/models.d.ts +1 -12
- package/dist/info/infoGroup.d.ts +0 -4
- package/dist/info/infoGroup.js +1 -28
- package/dist/info/infoGroup.js.map +1 -1
- package/dist/info/infoMsg.d.ts +4 -0
- package/dist/info/infoMsg.js +12 -0
- package/dist/info/infoMsg.js.map +1 -1
- package/package.json +1 -1
- package/src/common/models.ts +11 -11
- package/src/info/infoGroup.ts +21 -33
- package/src/info/infoMsg.ts +20 -0
|
@@ -1,27 +1,27 @@
|
|
|
1
1
|
import {createMX10, initConnection} from './util';
|
|
2
2
|
import {afterAll, beforeAll, expect, it} from '@jest/globals';
|
|
3
3
|
import {firstValueFrom} from 'rxjs';
|
|
4
|
-
import {delay} from '../src/
|
|
4
|
+
import { delay } from '../src/common/utils';
|
|
5
5
|
|
|
6
6
|
describe('LocoState group tests - 0x12', () => {
|
|
7
|
-
|
|
8
|
-
|
|
7
|
+
const mx10 = createMX10();
|
|
8
|
+
const testNID = 3;
|
|
9
9
|
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
10
|
+
beforeAll(async () => {
|
|
11
|
+
await initConnection(mx10);
|
|
12
|
+
});
|
|
13
13
|
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
14
|
+
afterAll(() => {
|
|
15
|
+
delay(1000).then(() => {
|
|
16
|
+
mx10.closeSocket();
|
|
17
|
+
});
|
|
18
|
+
});
|
|
19
19
|
|
|
20
|
-
|
|
21
|
-
|
|
20
|
+
it('0x00 - retrieve loco state', async () => {
|
|
21
|
+
const data = await firstValueFrom(mx10.lanLocoState.onLocoStateExtended);
|
|
22
22
|
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
23
|
+
expect(data.nid).toBe(testNID);
|
|
24
|
+
// testing on device ZimoApp
|
|
25
|
+
expect(data.ownerNid).toBe(mx10.myNID);
|
|
26
|
+
});
|
|
27
27
|
});
|
|
@@ -1,42 +1,42 @@
|
|
|
1
1
|
import {afterAll, beforeAll, describe, expect, jest} from '@jest/globals';
|
|
2
2
|
import {createMX10, initConnection} from './util';
|
|
3
3
|
import {SystemStateData, SystemStateMode} from '../src';
|
|
4
|
-
import {delay} from '../src/
|
|
4
|
+
import { delay } from '../src/common/utils';
|
|
5
5
|
|
|
6
6
|
describe('System Control Group group tests - 0x00', () => {
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
7
|
+
const mx10 = createMX10();
|
|
8
|
+
|
|
9
|
+
beforeAll(async () => {
|
|
10
|
+
await initConnection(mx10);
|
|
11
|
+
});
|
|
12
|
+
|
|
13
|
+
afterAll(() => {
|
|
14
|
+
mx10.systemControl.systemState(SystemStateMode.NORMAL);
|
|
15
|
+
|
|
16
|
+
delay(1000).then(() => {
|
|
17
|
+
mx10.closeSocket();
|
|
18
|
+
});
|
|
19
|
+
});
|
|
20
|
+
|
|
21
|
+
test.each<{mode: number}>([
|
|
22
|
+
{mode: SystemStateMode.SSPe},
|
|
23
|
+
{mode: SystemStateMode.OFF},
|
|
24
|
+
{mode: SystemStateMode.SSP0},
|
|
25
|
+
])('0x00 - System state test', ({mode}, done) => {
|
|
26
|
+
mx10.systemControl.systemState(mode);
|
|
27
|
+
|
|
28
|
+
const callback = jest.fn((data: SystemStateData) => {
|
|
29
|
+
if (data.nid === mx10.mx10NID) {
|
|
30
|
+
expect(data.port).toBeDefined();
|
|
31
|
+
expect(data.mode).toBe(mode);
|
|
32
|
+
|
|
33
|
+
if (callback.mock.calls.length === 3) {
|
|
34
|
+
sub.unsubscribe();
|
|
35
|
+
done();
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
});
|
|
39
|
+
|
|
40
|
+
const sub = mx10.systemControl.onSystemStateChange.subscribe(callback);
|
|
41
|
+
});
|
|
42
42
|
});
|
|
@@ -2,42 +2,42 @@ import {createMX10, initConnection} from './util';
|
|
|
2
2
|
import {afterAll, beforeAll, describe, it, expect} from '@jest/globals';
|
|
3
3
|
|
|
4
4
|
describe('LAN Data group tests - 0x16', () => {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
5
|
+
const mx10 = createMX10();
|
|
6
|
+
|
|
7
|
+
beforeAll(async () => {
|
|
8
|
+
await initConnection(mx10);
|
|
9
|
+
});
|
|
10
|
+
|
|
11
|
+
afterAll(() => {
|
|
12
|
+
mx10.closeSocket();
|
|
13
|
+
});
|
|
14
|
+
|
|
15
|
+
it('0x08 - Tse Prog Read Extended', (done) => {
|
|
16
|
+
mx10.trackCfg.tseProgRead(211, 8);
|
|
17
|
+
|
|
18
|
+
const prog = mx10.trackCfg.onTseProgReadExtended.subscribe((msg) => {
|
|
19
|
+
expect(msg.cvNum()).toBeDefined();
|
|
20
|
+
expect(msg.cvNum()).toBe(8);
|
|
21
|
+
expect(msg.cvVal()).toBeDefined();
|
|
22
|
+
expect(msg.cvVal()).toBe(145);
|
|
23
|
+
|
|
24
|
+
prog.unsubscribe();
|
|
25
|
+
done();
|
|
26
|
+
});
|
|
27
|
+
});
|
|
28
|
+
|
|
29
|
+
it('0x09 - Tse Prog Write Extended', (done) => {
|
|
30
|
+
// Please be sure if you want to CV write HU value on test
|
|
31
|
+
// mx10.trackCfg.tseProgWrite(211, 51, 20);
|
|
32
|
+
|
|
33
|
+
const prog = mx10.trackCfg.onTseProgWriteExtended.subscribe((msg) => {
|
|
34
|
+
expect(msg.cvNum()).toBeDefined();
|
|
35
|
+
expect(msg.cvNum()).toBe(51);
|
|
36
|
+
expect(msg.cvVal()).toBeDefined();
|
|
37
|
+
expect(msg.cvVal()).toBe(20);
|
|
38
|
+
|
|
39
|
+
prog.unsubscribe();
|
|
40
|
+
done();
|
|
41
|
+
});
|
|
42
|
+
});
|
|
43
43
|
});
|
|
@@ -4,114 +4,113 @@ import {firstValueFrom} from 'rxjs';
|
|
|
4
4
|
import {delay} from '../src/common/utils';
|
|
5
5
|
import {Direction, Manual, OperatingMode, ShuntingFunction, SpecialFunctionMode} from '../src';
|
|
6
6
|
|
|
7
|
-
describe('Vehicle group tests - 0x02', () =>
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
});
|
|
7
|
+
describe('Vehicle group tests - 0x02', () =>
|
|
8
|
+
{
|
|
9
|
+
const mx10 = createMX10();
|
|
10
|
+
const testNID = 211;
|
|
11
|
+
|
|
12
|
+
beforeAll(async () => {
|
|
13
|
+
await initConnection(mx10);
|
|
14
|
+
});
|
|
15
|
+
|
|
16
|
+
afterAll(() => {
|
|
17
|
+
mx10.vehicle.changeSpeed(testNID, 0, true);
|
|
18
|
+
|
|
19
|
+
delay(1000).then(() => {
|
|
20
|
+
mx10.closeSocket();
|
|
21
|
+
});
|
|
22
|
+
});
|
|
23
|
+
|
|
24
|
+
it('0x00 - retrieve operating state', async () => {
|
|
25
|
+
const msg = await firstValueFrom(mx10.vehicle.onVehicleState);
|
|
26
|
+
|
|
27
|
+
expect(msg.trainNid()).toBe(211);
|
|
28
|
+
// testing on device ZimoApp
|
|
29
|
+
mx10.vehicle.changeSpeed(testNID, 15, true);
|
|
30
|
+
expect(msg.lastCtlNid()).toBe(mx10.myNID);
|
|
31
|
+
});
|
|
32
|
+
|
|
33
|
+
it('0x01 - retrieve operating mode', async () => {
|
|
34
|
+
const msg = await mx10.vehicle.getMode(3);
|
|
35
|
+
|
|
36
|
+
expect(msg?.trainNid()).toBe(3);
|
|
37
|
+
expect(msg?.mode()).toBe(OperatingMode.DCC);
|
|
38
|
+
});
|
|
39
|
+
|
|
40
|
+
test.each([
|
|
41
|
+
{nid: testNID, speedStep: 10, forward: true, eastWest: Direction.UNDEFINED},
|
|
42
|
+
{nid: testNID, speedStep: 30, forward: false, eastWest: Direction.EAST},
|
|
43
|
+
{nid: testNID, speedStep: 40, forward: false, eastWest: Direction.WEST},
|
|
44
|
+
{nid: testNID, speedStep: 35, forward: true, eastWest: Direction.WEST},
|
|
45
|
+
])(
|
|
46
|
+
'0x02 - change speed and directions',
|
|
47
|
+
async ({nid, speedStep, forward, eastWest}) => {
|
|
48
|
+
|
|
49
|
+
const msg = await mx10.vehicle.setSpeed(nid, speedStep, 0, forward, false, eastWest);
|
|
50
|
+
expect(msg).toBeDefined();
|
|
51
|
+
expect(msg?.trainNid()).toBe(nid);
|
|
52
|
+
expect(msg?.divisor()).toBe(0);
|
|
53
|
+
expect(msg?.speedStep()).toBe(speedStep);
|
|
54
|
+
expect(msg?.forward()).toBe(forward);
|
|
55
|
+
expect(msg?.eastWest()).toBe(eastWest);
|
|
56
|
+
expect(msg?.emergencyStop()).toBe(false);
|
|
57
|
+
},
|
|
58
|
+
);
|
|
59
|
+
|
|
60
|
+
it('0x02 - change speed with bidi feedback', (done) => {
|
|
61
|
+
const speedStep = 500,
|
|
62
|
+
forward = true;
|
|
63
|
+
|
|
64
|
+
const sub = mx10.info.onBidiInfoChange.subscribe((msg) => {
|
|
65
|
+
if (msg.type() === 0x0100) {
|
|
66
|
+
expect(msg).toBeDefined();
|
|
67
|
+
expect(msg.type()).toBe(0x0100);
|
|
68
|
+
expect(msg.info()).toBeGreaterThan(10);
|
|
69
|
+
sub.unsubscribe();
|
|
70
|
+
done();
|
|
71
|
+
}
|
|
72
|
+
});
|
|
73
|
+
|
|
74
|
+
mx10.vehicle.changeSpeed(testNID, speedStep, forward);
|
|
75
|
+
});
|
|
76
|
+
|
|
77
|
+
it('0x04 - call function', async () => {
|
|
78
|
+
const nid = testNID,
|
|
79
|
+
buttonId = 1;
|
|
80
|
+
|
|
81
|
+
mx10.vehicle.callFunction(nid, buttonId, true);
|
|
82
|
+
const data = await firstValueFrom(mx10.vehicle.onCallFunction);
|
|
83
|
+
|
|
84
|
+
expect(data).toBeDefined();
|
|
85
|
+
expect(data.nid).toBe(nid);
|
|
86
|
+
expect(data.functionNumber).toBe(buttonId);
|
|
87
|
+
expect(data.functionState).toBe(true);
|
|
88
|
+
|
|
89
|
+
await delay(500);
|
|
90
|
+
|
|
91
|
+
mx10.vehicle.callFunction(nid, buttonId, false);
|
|
92
|
+
const data2 = await firstValueFrom(mx10.vehicle.onCallFunction);
|
|
93
|
+
|
|
94
|
+
expect(data2).toBeDefined();
|
|
95
|
+
expect(data2.nid).toBe(nid);
|
|
96
|
+
expect(data2.functionNumber).toBe(buttonId);
|
|
97
|
+
expect(data2.functionState).toBe(false);
|
|
98
|
+
});
|
|
99
|
+
|
|
100
|
+
test.each([
|
|
101
|
+
{mode: SpecialFunctionMode.MANUAL, state: Manual.OFF},
|
|
102
|
+
{mode: SpecialFunctionMode.SHUNTING_FUNCTION, state: ShuntingFunction.AZBZ},
|
|
103
|
+
{
|
|
104
|
+
mode: SpecialFunctionMode.DIRECTION_DEFAULT,
|
|
105
|
+
state: Direction.WEST,
|
|
106
|
+
},
|
|
107
|
+
])('0x05 - special function mode', async ({mode, state}) => {
|
|
108
|
+
mx10.vehicle.changeSpecialFunction(testNID, mode, state);
|
|
109
|
+
const data = await firstValueFrom(mx10.vehicle.onCallSpecialFunction);
|
|
110
|
+
|
|
111
|
+
expect(data).toBeDefined();
|
|
112
|
+
expect(data.nid).toBe(testNID);
|
|
113
|
+
expect(data.specialFunctionMode).toBe(mode);
|
|
114
|
+
expect(data.specialFunctionState).toBe(state);
|
|
115
|
+
});
|
|
117
116
|
});
|
package/dist/common/models.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { NameType, Direction, ExternalController, FunctionMode, OperatingMode, SystemStateMode, TrackMode, ImageType, FxConfigType, SpecialFunctionMode, Manual, ShuntingFunction,
|
|
1
|
+
import { NameType, Direction, ExternalController, FunctionMode, OperatingMode, SystemStateMode, TrackMode, ImageType, FxConfigType, SpecialFunctionMode, Manual, ShuntingFunction, AccessoryMode, FxModeType } from './enums';
|
|
2
2
|
import { ZcanDataArray } from './communication';
|
|
3
3
|
export interface Train {
|
|
4
4
|
nid: number;
|
|
@@ -94,17 +94,6 @@ export interface ModulePowerInfoData {
|
|
|
94
94
|
voltageTotal: number;
|
|
95
95
|
temperature: number;
|
|
96
96
|
}
|
|
97
|
-
export interface BidiInfoData {
|
|
98
|
-
nid: number;
|
|
99
|
-
type: BidiType;
|
|
100
|
-
data: BidiDirectionData | number;
|
|
101
|
-
}
|
|
102
|
-
export interface BidiDirectionData {
|
|
103
|
-
direction?: Direction;
|
|
104
|
-
forwardOrReverse?: ForwardOrReverse;
|
|
105
|
-
directionChange?: boolean;
|
|
106
|
-
directionConfirm?: boolean;
|
|
107
|
-
}
|
|
108
97
|
export interface VehicleStateData {
|
|
109
98
|
nid: number;
|
|
110
99
|
ctrlTick: number;
|
package/dist/info/infoGroup.d.ts
CHANGED
|
@@ -15,8 +15,4 @@ export default class InfoGroup {
|
|
|
15
15
|
parse(size: number, command: number, mode: number, nid: number, buffer: Buffer): void;
|
|
16
16
|
private parseModuleInfo;
|
|
17
17
|
private parseBidiInfo;
|
|
18
|
-
private parseEastWest;
|
|
19
|
-
private parseDirChange;
|
|
20
|
-
private parseFwdRev;
|
|
21
|
-
private parseDirectionConfirm;
|
|
22
18
|
}
|
package/dist/info/infoGroup.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Subject } from 'rxjs';
|
|
2
2
|
import { Query } from '../common/communication';
|
|
3
|
-
import {
|
|
3
|
+
import { MsgMode } from '../common/enums';
|
|
4
4
|
import { MsgBidiInfo, MsgModInfo } from './infoMsg';
|
|
5
5
|
export default class InfoGroup {
|
|
6
6
|
mx10;
|
|
@@ -84,35 +84,8 @@ export default class InfoGroup {
|
|
|
84
84
|
const NID = buffer.readUInt16LE(0);
|
|
85
85
|
const type = buffer.readUInt16LE(2);
|
|
86
86
|
const info = buffer.readUInt32LE(4);
|
|
87
|
-
let data = {};
|
|
88
|
-
switch (type) {
|
|
89
|
-
case BidiType.DIRECTION:
|
|
90
|
-
data.direction = this.parseEastWest(info);
|
|
91
|
-
data.directionChange = this.parseDirChange(info);
|
|
92
|
-
data.directionConfirm = this.parseDirectionConfirm(info);
|
|
93
|
-
data.forwardOrReverse = this.parseFwdRev(info);
|
|
94
|
-
break;
|
|
95
|
-
default:
|
|
96
|
-
data = info;
|
|
97
|
-
}
|
|
98
87
|
const msg = new MsgBidiInfo(MsgBidiInfo.header(mode, NID), type, undefined, info);
|
|
99
88
|
this.onBidiInfoChange.next(msg);
|
|
100
89
|
}
|
|
101
|
-
parseEastWest(data) {
|
|
102
|
-
if ((data & 0x02) == 0x02)
|
|
103
|
-
return Direction.EAST;
|
|
104
|
-
return Direction.WEST;
|
|
105
|
-
}
|
|
106
|
-
parseDirChange(data) {
|
|
107
|
-
return (data & 0x04) == 0x04;
|
|
108
|
-
}
|
|
109
|
-
parseFwdRev(data) {
|
|
110
|
-
if ((data & 0x01) == 0)
|
|
111
|
-
return ForwardOrReverse.REVERSE;
|
|
112
|
-
return ForwardOrReverse.FORWARD;
|
|
113
|
-
}
|
|
114
|
-
parseDirectionConfirm(data) {
|
|
115
|
-
return (data & 0x08) == 0x08;
|
|
116
|
-
}
|
|
117
90
|
}
|
|
118
91
|
//# sourceMappingURL=infoGroup.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"infoGroup.js","sourceRoot":"","sources":["../../src/info/infoGroup.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,OAAO,EAAC,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAC,KAAK,EAAC,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"infoGroup.js","sourceRoot":"","sources":["../../src/info/infoGroup.ts"],"names":[],"mappings":"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"}
|
package/dist/info/infoMsg.d.ts
CHANGED
|
@@ -12,4 +12,8 @@ export declare class MsgBidiInfo extends Message {
|
|
|
12
12
|
nid(): number;
|
|
13
13
|
type(): number;
|
|
14
14
|
info(): number | undefined;
|
|
15
|
+
static dirEast(info: number): boolean;
|
|
16
|
+
static dirChanging(info: number): boolean;
|
|
17
|
+
static dirForward(info: number): boolean;
|
|
18
|
+
static dirConfirm(info: number): boolean;
|
|
15
19
|
}
|
package/dist/info/infoMsg.js
CHANGED
|
@@ -27,5 +27,17 @@ export class MsgBidiInfo extends Message {
|
|
|
27
27
|
nid() { return this.header.mode === MsgMode.REQ ? this.data[0].value : this.header.nid || 0; }
|
|
28
28
|
type() { return this.data[this.header.mode === MsgMode.REQ ? 1 : 0].value; }
|
|
29
29
|
info() { return this.data.length > 1 ? this.data[1].value : undefined; }
|
|
30
|
+
static dirEast(info) {
|
|
31
|
+
return ((info & 0x02) == 0x02);
|
|
32
|
+
}
|
|
33
|
+
static dirChanging(info) {
|
|
34
|
+
return ((info & 0x04) == 0x04);
|
|
35
|
+
}
|
|
36
|
+
static dirForward(info) {
|
|
37
|
+
return ((info & 0x01) == 0x01);
|
|
38
|
+
}
|
|
39
|
+
static dirConfirm(info) {
|
|
40
|
+
return ((info & 0x08) == 0x08);
|
|
41
|
+
}
|
|
30
42
|
}
|
|
31
43
|
//# sourceMappingURL=infoMsg.js.map
|
package/dist/info/infoMsg.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"infoMsg.js","sourceRoot":"","sources":["../../src/info/infoMsg.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,OAAO,EAAiB,MAAM,yBAAyB,CAAC;AACzE,OAAO,EAAe,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAIvD,MAAM,OAAO,UAAW,SAAQ,OAAO;IAE/B,MAAM,CAAC,MAAM,CAAC,IAAa,EAAE,GAAW,IAC9C,OAAO,EAAC,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAC,CAAA,CAAA,CAAC;IAElD,YAAY,MAAc,EAAE,IAAiB,EAAE,OAAsB,EAAE;QAEtE,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,KAAK,CAAC,IAAI,CAAC,EAAC,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAC,CAAC,CAAC;QACrC,IAAG,IAAI,CAAC,MAAM;YACb,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IACD,IAAI,KAA6B,OAAS,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAiC,CAAA,CAAA,CAAC;IACzF,IAAI,KAAwB,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAe,CAAC,CAAC,CAAC,SAAS,CAAA,CAAA,CAAC;CACnG;AAED,MAAM,OAAO,WAAY,SAAQ,OAAO;IAEhC,MAAM,CAAC,MAAM,CAAC,IAAa,EAAE,GAAW,IAC9C,OAAO,EAAC,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAC,CAAA,CAAA,CAAC;IAElD,YAAY,MAAc,EAAE,IAAY,EAAE,GAAY,EAAE,IAAa;QAEpE,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,IAAG,MAAM,CAAC,IAAI,KAAK,OAAO,CAAC,GAAG,EAAE,CAAC;YAChC,KAAK,CAAC,IAAI,CAAC,EAAC,KAAK,EAAE,GAAG,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,EAAC,CAAC,CAAC;YACzC,KAAK,CAAC,IAAI,CAAC,EAAC,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAC,CAAC,CAAC;QACtC,CAAC;aAAM,CAAC;YACP,KAAK,CAAC,IAAI,CAAC,EAAC,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAC,CAAC,CAAC;YACrC,KAAK,CAAC,IAAI,CAAC,EAAC,KAAK,EAAE,IAAI,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,EAAC,CAAC,CAAC;QAC3C,CAAC;IACF,CAAC;IACD,GAAG,KAAY,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAe,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAA,CAAA,CAAC;IAC7G,IAAI,KAAY,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAe,CAAA,CAAA,CAAC;IAC3F,IAAI,KAAwB,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAe,CAAC,CAAC,CAAC,SAAS,CAAA,CAAA,CAAC;
|
|
1
|
+
{"version":3,"file":"infoMsg.js","sourceRoot":"","sources":["../../src/info/infoMsg.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
"types": "dist/index.d.ts",
|
|
6
6
|
"license": "MIT",
|
|
7
7
|
"repository": "https://github.com/ZIMO-Elektronik/zcan",
|
|
8
|
-
"version": "1.0.
|
|
8
|
+
"version": "1.0.52",
|
|
9
9
|
"scripts": {
|
|
10
10
|
"start": "node dist/main.js",
|
|
11
11
|
"start:dev": "nodemon --ext js,ts,json,env --exec \"node --experimental-specifier-resolution=node --loader ts-node/esm\" src/main.ts",
|
package/src/common/models.ts
CHANGED
|
@@ -110,18 +110,18 @@ export interface ModulePowerInfoData {
|
|
|
110
110
|
temperature: number;
|
|
111
111
|
}
|
|
112
112
|
|
|
113
|
-
export interface BidiInfoData {
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
}
|
|
113
|
+
// export interface BidiInfoData {
|
|
114
|
+
// nid: number;
|
|
115
|
+
// type: BidiType;
|
|
116
|
+
// data: BidiDirectionData | number;
|
|
117
|
+
// }
|
|
118
118
|
|
|
119
|
-
export interface BidiDirectionData {
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
}
|
|
119
|
+
// export interface BidiDirectionData {
|
|
120
|
+
// direction?: Direction;
|
|
121
|
+
// forwardOrReverse?: ForwardOrReverse;
|
|
122
|
+
// directionChange?: boolean;
|
|
123
|
+
// directionConfirm?: boolean;
|
|
124
|
+
// }
|
|
125
125
|
|
|
126
126
|
export interface VehicleStateData {
|
|
127
127
|
nid: number;
|