@zimo-elektronik/zcan 1.0.34 → 1.0.36
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/Makefile +21 -0
- package/README.md +11 -4
- package/__tests__/vehicleGroup.test.ts +15 -26
- package/dist/MX10.d.ts +5 -5
- package/dist/MX10.js +12 -16
- package/dist/MX10.js.map +1 -1
- package/dist/{zcan → accessory}/accessoryCommandGroup.d.ts +1 -1
- package/dist/{zcan → accessory}/accessoryCommandGroup.js +1 -1
- package/dist/accessory/accessoryCommandGroup.js.map +1 -0
- package/dist/{internal → accessory}/accessoryUtils.d.ts +1 -1
- package/dist/{internal → accessory}/accessoryUtils.js +1 -1
- package/dist/accessory/accessoryUtils.js.map +1 -0
- package/dist/common/bites.js.map +1 -0
- package/dist/{@types → common}/communication.d.ts +3 -2
- package/dist/{@types → common}/communication.js +9 -6
- package/dist/common/communication.js.map +1 -0
- package/dist/{util → common}/enums.d.ts +0 -5
- package/dist/{util → common}/enums.js +0 -6
- package/dist/common/enums.js.map +1 -0
- package/dist/{util/extended-ascii.js → common/extendedAscii.js} +1 -1
- package/dist/{util/extended-ascii.js.map → common/extendedAscii.js.map} +1 -1
- package/dist/{@types → common}/models.d.ts +3 -24
- package/dist/common/models.js +2 -0
- package/dist/common/models.js.map +1 -0
- package/dist/{internal → common}/speedUtils.d.ts +1 -1
- package/dist/{internal → common}/speedUtils.js +2 -2
- package/dist/common/speedUtils.js.map +1 -0
- package/dist/common/utils.d.ts +14 -0
- package/dist/common/utils.js +15 -0
- package/dist/common/utils.js.map +1 -0
- package/dist/{zcan → data}/dataGroup.d.ts +2 -2
- package/dist/{zcan → data}/dataGroup.js +2 -2
- package/dist/data/dataGroup.js.map +1 -0
- package/dist/data/dataMsg.d.ts +26 -0
- package/dist/data/dataMsg.js +49 -0
- package/dist/data/dataMsg.js.map +1 -0
- package/dist/{zcan → data}/lanDataGroup.d.ts +2 -2
- package/dist/{zcan → data}/lanDataGroup.js +4 -4
- package/dist/data/lanDataGroup.js.map +1 -0
- package/dist/docs_entrypoint.d.ts +4 -4
- package/dist/docs_entrypoint.js +4 -4
- package/dist/docs_entrypoint.js.map +1 -1
- package/dist/file/fileControlGroup.js.map +1 -0
- package/dist/file/fileTransferGroup.js.map +1 -0
- package/dist/index.d.ts +44 -3
- package/dist/index.js +44 -3
- package/dist/index.js.map +1 -1
- package/dist/{zcan → info}/infoGroup.d.ts +3 -2
- package/dist/{zcan → info}/infoGroup.js +3 -3
- package/dist/info/infoGroup.js.map +1 -0
- package/dist/info/infoMsg.d.ts +8 -0
- package/dist/info/infoMsg.js +13 -0
- package/dist/info/infoMsg.js.map +1 -0
- package/dist/{zcan → info}/lanInfoGroup.d.ts +1 -1
- package/dist/{zcan → info}/lanInfoGroup.js +1 -1
- package/dist/info/lanInfoGroup.js.map +1 -0
- package/dist/{zcan → loco}/vehicleGroup.d.ts +13 -7
- package/dist/loco/vehicleGroup.js +214 -0
- package/dist/loco/vehicleGroup.js.map +1 -0
- package/dist/loco/vehicleMsg.d.ts +46 -0
- package/dist/loco/vehicleMsg.js +96 -0
- package/dist/loco/vehicleMsg.js.map +1 -0
- package/dist/{zcan → misc}/lanLocoStateGroup.d.ts +1 -1
- package/dist/{zcan → misc}/lanLocoStateGroup.js.map +1 -1
- package/dist/misc/propertyConfigGroup.js.map +1 -0
- package/dist/misc/railwayControlGroup.js.map +1 -0
- package/dist/network/lanNetworkGroup.js.map +1 -0
- package/dist/{zcan → network}/networkGroup.d.ts +1 -1
- package/dist/network/networkGroup.js.map +1 -0
- package/dist/{zcan/lanZimoProgrammableScriptGroup.js → script/lanScriptGroup.js} +1 -1
- package/dist/script/lanScriptGroup.js.map +1 -0
- package/dist/{zcan/zimoProgrammableScriptGroup.js → script/scriptGroup.js} +1 -1
- package/dist/script/scriptGroup.js.map +1 -0
- package/dist/{zcan → system}/systemControlGroup.d.ts +2 -2
- package/dist/system/systemControlGroup.js.map +1 -0
- package/dist/{zcan/trackCfgGroup.d.ts → track/trackGroup.d.ts} +10 -9
- package/dist/{zcan/trackCfgGroup.js → track/trackGroup.js} +62 -64
- package/dist/track/trackGroup.js.map +1 -0
- package/dist/track/trackMsg.d.ts +17 -0
- package/dist/track/trackMsg.js +29 -0
- package/dist/track/trackMsg.js.map +1 -0
- package/dist/train/trainControlGroup.js.map +1 -0
- package/package.json +1 -1
- package/protocol_docs/docs/command-groups/vehicles/vehicle-special-function-switch.md +1 -1
- package/src/MX10.ts +304 -353
- package/src/{zcan → accessory}/accessoryCommandGroup.ts +2 -2
- package/src/{internal → accessory}/accessoryUtils.ts +1 -1
- package/src/common/communication.ts +223 -0
- package/src/common/enums.ts +192 -0
- package/src/common/extendedAscii.ts +179 -0
- package/src/common/models.ts +279 -0
- package/src/common/speedUtils.ts +36 -0
- package/src/common/utils.ts +20 -0
- package/src/data/dataGroup.ts +411 -0
- package/src/data/dataMsg.ts +71 -0
- package/src/data/lanDataGroup.ts +445 -0
- package/src/docs_entrypoint.ts +4 -4
- package/src/file/fileControlGroup.ts +25 -0
- package/src/file/fileTransferGroup.ts +25 -0
- package/src/index.ts +65 -4
- package/src/info/infoGroup.ts +143 -0
- package/src/info/infoMsg.ts +21 -0
- package/src/info/lanInfoGroup.ts +87 -0
- package/src/loco/vehicleGroup.ts +279 -0
- package/src/loco/vehicleMsg.ts +105 -0
- package/src/misc/lanLocoStateGroup.ts +77 -0
- package/src/misc/propertyConfigGroup.ts +25 -0
- package/src/misc/railwayControlGroup.ts +25 -0
- package/src/network/lanNetworkGroup.ts +73 -0
- package/src/network/networkGroup.ts +94 -0
- package/src/script/lanScriptGroup.ts +27 -0
- package/src/script/scriptGroup.ts +26 -0
- package/src/system/systemControlGroup.ts +63 -0
- package/src/track/trackGroup.ts +206 -0
- package/src/track/trackMsg.ts +46 -0
- package/src/{zcan → train}/trainControlGroup.ts +2 -1
- package/dist/@types/communication.js.map +0 -1
- package/dist/@types/models.js +0 -63
- package/dist/@types/models.js.map +0 -1
- package/dist/internal/accessoryUtils.js.map +0 -1
- package/dist/internal/bites.js.map +0 -1
- package/dist/internal/speedUtils.js.map +0 -1
- package/dist/internal/utils.d.ts +0 -1
- package/dist/internal/utils.js +0 -4
- package/dist/internal/utils.js.map +0 -1
- package/dist/util/enums.js.map +0 -1
- package/dist/zcan/accessoryCommandGroup.js.map +0 -1
- package/dist/zcan/dataGroup.js.map +0 -1
- package/dist/zcan/fileControlGroup.js.map +0 -1
- package/dist/zcan/fileTransferGroup.js.map +0 -1
- package/dist/zcan/index.d.ts +0 -19
- package/dist/zcan/index.js +0 -20
- package/dist/zcan/index.js.map +0 -1
- package/dist/zcan/infoGroup.js.map +0 -1
- package/dist/zcan/lanDataGroup.js.map +0 -1
- package/dist/zcan/lanInfoGroup.js.map +0 -1
- package/dist/zcan/lanNetworkGroup.js.map +0 -1
- package/dist/zcan/lanZimoProgrammableScriptGroup.js.map +0 -1
- package/dist/zcan/networkGroup.js.map +0 -1
- package/dist/zcan/propertyConfigGroup.js.map +0 -1
- package/dist/zcan/railwayControlGroup.js.map +0 -1
- package/dist/zcan/systemControlGroup.js.map +0 -1
- package/dist/zcan/trackCfgGroup.js.map +0 -1
- package/dist/zcan/trainControlGroup.js.map +0 -1
- package/dist/zcan/vehicleGroup.js +0 -145
- package/dist/zcan/vehicleGroup.js.map +0 -1
- package/dist/zcan/zimoProgrammableScriptGroup.js.map +0 -1
- package/src/@types/communication.ts +0 -220
- package/src/@types/models.ts +0 -390
- package/src/internal/speedUtils.ts +0 -36
- package/src/internal/utils.ts +0 -3
- package/src/util/enums.ts +0 -198
- package/src/util/extended-ascii.ts +0 -179
- package/src/zcan/dataGroup.ts +0 -412
- package/src/zcan/fileControlGroup.ts +0 -25
- package/src/zcan/fileTransferGroup.ts +0 -25
- package/src/zcan/index.ts +0 -39
- package/src/zcan/infoGroup.ts +0 -141
- package/src/zcan/lanDataGroup.ts +0 -443
- package/src/zcan/lanInfoGroup.ts +0 -86
- package/src/zcan/lanLocoStateGroup.ts +0 -77
- package/src/zcan/lanNetworkGroup.ts +0 -70
- package/src/zcan/lanZimoProgrammableScriptGroup.ts +0 -25
- package/src/zcan/networkGroup.ts +0 -93
- package/src/zcan/propertyConfigGroup.ts +0 -25
- package/src/zcan/railwayControlGroup.ts +0 -25
- package/src/zcan/systemControlGroup.ts +0 -62
- package/src/zcan/trackCfgGroup.ts +0 -224
- package/src/zcan/vehicleGroup.ts +0 -267
- package/src/zcan/zimoProgrammableScriptGroup.ts +0 -25
- package/tst +0 -0
- /package/dist/{internal → common}/bites.d.ts +0 -0
- /package/dist/{internal → common}/bites.js +0 -0
- /package/dist/{util/extended-ascii.d.ts → common/extendedAscii.d.ts} +0 -0
- /package/dist/{zcan → file}/fileControlGroup.d.ts +0 -0
- /package/dist/{zcan → file}/fileControlGroup.js +0 -0
- /package/dist/{zcan → file}/fileTransferGroup.d.ts +0 -0
- /package/dist/{zcan → file}/fileTransferGroup.js +0 -0
- /package/dist/{zcan → misc}/lanLocoStateGroup.js +0 -0
- /package/dist/{zcan → misc}/propertyConfigGroup.d.ts +0 -0
- /package/dist/{zcan → misc}/propertyConfigGroup.js +0 -0
- /package/dist/{zcan → misc}/railwayControlGroup.d.ts +0 -0
- /package/dist/{zcan → misc}/railwayControlGroup.js +0 -0
- /package/dist/{zcan → network}/lanNetworkGroup.d.ts +0 -0
- /package/dist/{zcan → network}/lanNetworkGroup.js +0 -0
- /package/dist/{zcan → network}/networkGroup.js +0 -0
- /package/dist/{zcan/lanZimoProgrammableScriptGroup.d.ts → script/lanScriptGroup.d.ts} +0 -0
- /package/dist/{zcan/zimoProgrammableScriptGroup.d.ts → script/scriptGroup.d.ts} +0 -0
- /package/dist/{zcan → system}/systemControlGroup.js +0 -0
- /package/dist/{zcan → train}/trainControlGroup.d.ts +0 -0
- /package/dist/{zcan → train}/trainControlGroup.js +0 -0
- /package/src/{internal → common}/bites.ts +0 -0
package/Makefile
ADDED
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
all:
|
|
2
|
+
@#@for f in $$(grep -lrw src/ --include "*.ts" -Pe "[ \t]+from[ \t]+['\"]src\/"); do
|
|
3
|
+
@for f in $$(find src -type f -name "*.ts"); do \
|
|
4
|
+
n=$$(grep -cP "[ \t]+from[ \t]+['\"]src\/" "$$f"); \
|
|
5
|
+
if [ $$n -eq 0 ]; then continue; fi; \
|
|
6
|
+
dir=''; \
|
|
7
|
+
for i in $$(seq 0 $$(echo "$$f" | tr -dc ',' | wc -c)); do \
|
|
8
|
+
dir="..\/$$dir"; \
|
|
9
|
+
done; \
|
|
10
|
+
if [ -z $$dir ]; then dir='.\/'; fi; \
|
|
11
|
+
echo -n "\nmaking import paths relative @ $$f ... "; \
|
|
12
|
+
sed -i -E "/\sfrom\s+['\"]/ s/([^\/])src\//\1$$dir/g" "$$f"; \
|
|
13
|
+
n=$$(grep -cP "[ \t]+from[ \t]+['\"]src\/" "$$f"); \
|
|
14
|
+
if [ $$n -eq 0 ]; then \
|
|
15
|
+
echo "done"; \
|
|
16
|
+
else \
|
|
17
|
+
echo "failed"; \
|
|
18
|
+
fi; \
|
|
19
|
+
done; \
|
|
20
|
+
npm run build
|
|
21
|
+
yalc push || true
|
package/README.md
CHANGED
|
@@ -1,8 +1,15 @@
|
|
|
1
|
-
# ZCAN
|
|
1
|
+
# ZIMO ZCAN NPM Module
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
Typescript library for the ZIMO ZCAN v2 protocol via UDP.
|
|
4
|
+
|
|
5
|
+
It is also available as a node module at npmjs.com.
|
|
5
6
|
|
|
6
7
|
## Getting Started
|
|
7
8
|
|
|
8
|
-
|
|
9
|
+
Simply add the library to your npm based project by running
|
|
10
|
+
|
|
11
|
+
`npm install @zimo-elektronik/zcan`
|
|
12
|
+
|
|
13
|
+
## Further Information
|
|
14
|
+
|
|
15
|
+
See the ZCAN v2 documentation at https://www.zimo.at/web2010/documents/Zimo_CAN-Protokoll_4.35.pdf
|
|
@@ -1,15 +1,8 @@
|
|
|
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/
|
|
5
|
-
import {
|
|
6
|
-
Direction,
|
|
7
|
-
DirectionDefault,
|
|
8
|
-
Manual,
|
|
9
|
-
OperatingMode,
|
|
10
|
-
ShuntingFunction,
|
|
11
|
-
SpecialFunctionMode,
|
|
12
|
-
} from '../src';
|
|
4
|
+
import {delay} from '../src/common/utils';
|
|
5
|
+
import {Direction, Manual, OperatingMode, ShuntingFunction, SpecialFunctionMode} from '../src';
|
|
13
6
|
|
|
14
7
|
describe('Vehicle group tests - 0x02', () => {
|
|
15
8
|
const mx10 = createMX10();
|
|
@@ -37,13 +30,11 @@ describe('Vehicle group tests - 0x02', () => {
|
|
|
37
30
|
});
|
|
38
31
|
|
|
39
32
|
it('0x01 - retrieve operating mode', async () => {
|
|
40
|
-
mx10.vehicle.
|
|
41
|
-
const
|
|
33
|
+
mx10.vehicle.getVehicleMode(3);
|
|
34
|
+
const msg = await firstValueFrom(mx10.vehicle.onVehicleMode);
|
|
42
35
|
|
|
43
|
-
expect(
|
|
44
|
-
|
|
45
|
-
expect(data.nid).toBe(3);
|
|
46
|
-
expect(data.operatingMode).toBe(OperatingMode.DCC);
|
|
36
|
+
expect(msg.trainNid()).toBe(3);
|
|
37
|
+
expect(msg.operatingMode()).toBe(OperatingMode.DCC);
|
|
47
38
|
});
|
|
48
39
|
|
|
49
40
|
test.each([
|
|
@@ -55,16 +46,14 @@ describe('Vehicle group tests - 0x02', () => {
|
|
|
55
46
|
'0x02 - change speed and directions',
|
|
56
47
|
async ({nid, speedStep, forward, eastWest}) => {
|
|
57
48
|
mx10.vehicle.changeSpeed(nid, speedStep, forward, eastWest);
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
expect(
|
|
61
|
-
expect(
|
|
62
|
-
expect(
|
|
63
|
-
|
|
64
|
-
expect(
|
|
65
|
-
expect(
|
|
66
|
-
expect(data.eastWest).toBe(eastWest);
|
|
67
|
-
expect(data.emergencyStop).toBe(false);
|
|
49
|
+
const msg = await firstValueFrom(mx10.vehicle.onVehicleSpeed);
|
|
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);
|
|
68
57
|
},
|
|
69
58
|
);
|
|
70
59
|
|
|
@@ -114,7 +103,7 @@ describe('Vehicle group tests - 0x02', () => {
|
|
|
114
103
|
{mode: SpecialFunctionMode.SHUNTING_FUNCTION, state: ShuntingFunction.AZBZ},
|
|
115
104
|
{
|
|
116
105
|
mode: SpecialFunctionMode.DIRECTION_DEFAULT,
|
|
117
|
-
state:
|
|
106
|
+
state: Direction.WEST,
|
|
118
107
|
},
|
|
119
108
|
])('0x05 - special function mode', async ({mode, state}) => {
|
|
120
109
|
mx10.vehicle.changeSpecialFunction(testNID, mode, state);
|
package/dist/MX10.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Subject } from 'rxjs';
|
|
2
|
-
import { Message } from '
|
|
3
|
-
import { AccessoryCommandGroup, DataGroup, FileControlGroup, FileTransferGroup, InfoGroup, LanDataGroup, LanInfoGroup, LanNetworkGroup, LanLocoStateGroup, LanZimoProgrammableScriptGroup, NetworkGroup, PropertyConfigGroup, RailwayControlGroup, SystemControlGroup, TrackCfgGroup, TrainControlGroup, VehicleGroup, ZimoProgrammableScriptGroup } from './
|
|
4
|
-
import { CreateSocketFunction, NIDGenerator, ZcanDataArray } from '
|
|
2
|
+
import { Message } from './common/communication';
|
|
3
|
+
import { AccessoryCommandGroup, DataGroup, FileControlGroup, FileTransferGroup, InfoGroup, LanDataGroup, LanInfoGroup, LanNetworkGroup, LanLocoStateGroup, LanZimoProgrammableScriptGroup, NetworkGroup, PropertyConfigGroup, RailwayControlGroup, SystemControlGroup, TrackCfgGroup, TrainControlGroup, VehicleGroup, ZimoProgrammableScriptGroup, MsgMode } from './';
|
|
4
|
+
import { CreateSocketFunction, NIDGenerator, ZcanDataArray } from './common/communication';
|
|
5
5
|
export default class MX10 {
|
|
6
6
|
myNID: number;
|
|
7
7
|
mx10NID: number;
|
|
@@ -27,6 +27,7 @@ export default class MX10 {
|
|
|
27
27
|
readonly lanZimoProgrammableScript: LanZimoProgrammableScriptGroup;
|
|
28
28
|
readonly errors: Subject<string>;
|
|
29
29
|
readonly log: Subject<string>;
|
|
30
|
+
readonly connectionTimeout: number;
|
|
30
31
|
private mx10Socket;
|
|
31
32
|
private incomingPort;
|
|
32
33
|
private outgoingPort;
|
|
@@ -35,13 +36,12 @@ export default class MX10 {
|
|
|
35
36
|
private readonly nidGeneratorFunction;
|
|
36
37
|
private readonly debugCommunication;
|
|
37
38
|
private readonly reconnectionTime;
|
|
38
|
-
readonly connectionTimeout: number;
|
|
39
39
|
constructor(nidGeneratorFunction: NIDGenerator, connectionTimeout?: number, debugCommunication?: boolean);
|
|
40
40
|
initSocket(createSocketFunction: CreateSocketFunction, ipAddress: string, incomingPort?: number, outgoingPort?: number): Promise<void>;
|
|
41
41
|
reconnectLogic(): void;
|
|
42
42
|
closeSocket(callMx10?: boolean): void;
|
|
43
43
|
sendMsg(msg: Message): void;
|
|
44
|
-
sendData(group: number, cmd: number, data?: ZcanDataArray, mode?:
|
|
44
|
+
sendData(group: number, cmd: number, data?: ZcanDataArray, mode?: MsgMode, nid?: number, force?: boolean): void;
|
|
45
45
|
private formatData;
|
|
46
46
|
private send;
|
|
47
47
|
private readRawData;
|
package/dist/MX10.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { Buffer } from 'buffer';
|
|
2
2
|
import { interval, Subject } from 'rxjs';
|
|
3
|
-
import { AccessoryCommandGroup, DataGroup, FileControlGroup, FileTransferGroup, InfoGroup, LanDataGroup, LanInfoGroup, LanNetworkGroup, LanLocoStateGroup, LanZimoProgrammableScriptGroup, NetworkGroup, PropertyConfigGroup, RailwayControlGroup, SystemControlGroup, TrackCfgGroup, TrainControlGroup, VehicleGroup, ZimoProgrammableScriptGroup, } from './
|
|
4
|
-
import { delay } from './
|
|
5
|
-
import ExtendedASCII from './
|
|
3
|
+
import { AccessoryCommandGroup, DataGroup, FileControlGroup, FileTransferGroup, InfoGroup, LanDataGroup, LanInfoGroup, LanNetworkGroup, LanLocoStateGroup, LanZimoProgrammableScriptGroup, NetworkGroup, PropertyConfigGroup, RailwayControlGroup, SystemControlGroup, TrackCfgGroup, TrainControlGroup, VehicleGroup, ZimoProgrammableScriptGroup, MsgMode, } from './';
|
|
4
|
+
import { delay } from './common/utils';
|
|
5
|
+
import ExtendedASCII from './common/extendedAscii';
|
|
6
6
|
export default class MX10 {
|
|
7
7
|
myNID = 0;
|
|
8
8
|
mx10NID = 0;
|
|
@@ -28,6 +28,7 @@ export default class MX10 {
|
|
|
28
28
|
lanZimoProgrammableScript = new LanZimoProgrammableScriptGroup(this);
|
|
29
29
|
errors = new Subject();
|
|
30
30
|
log = new Subject();
|
|
31
|
+
connectionTimeout;
|
|
31
32
|
mx10Socket = null;
|
|
32
33
|
incomingPort = 14521;
|
|
33
34
|
outgoingPort = 14520;
|
|
@@ -36,7 +37,6 @@ export default class MX10 {
|
|
|
36
37
|
nidGeneratorFunction;
|
|
37
38
|
debugCommunication;
|
|
38
39
|
reconnectionTime = 0;
|
|
39
|
-
connectionTimeout;
|
|
40
40
|
constructor(nidGeneratorFunction, connectionTimeout = 1000, debugCommunication = false) {
|
|
41
41
|
this.nidGeneratorFunction = nidGeneratorFunction;
|
|
42
42
|
this.connectionTimeout = connectionTimeout;
|
|
@@ -77,8 +77,7 @@ export default class MX10 {
|
|
|
77
77
|
}
|
|
78
78
|
reconnectLogic() {
|
|
79
79
|
const date = Date.now();
|
|
80
|
-
if (date - this.lastPing < this.reconnectionTime &&
|
|
81
|
-
this.interval !== undefined) {
|
|
80
|
+
if (date - this.lastPing < this.reconnectionTime && this.interval !== undefined) {
|
|
82
81
|
clearInterval(this.interval);
|
|
83
82
|
this.interval = undefined;
|
|
84
83
|
}
|
|
@@ -109,7 +108,7 @@ export default class MX10 {
|
|
|
109
108
|
this.log.next("mx10.sendMsg: " + JSON.stringify(buffer));
|
|
110
109
|
this.send(buffer, false);
|
|
111
110
|
}
|
|
112
|
-
sendData(group, cmd, data = [], mode =
|
|
111
|
+
sendData(group, cmd, data = [], mode = MsgMode.CMD, nid = this.myNID, force = false) {
|
|
113
112
|
const buffer = this.formatData(group, cmd, mode, nid, data);
|
|
114
113
|
this.send(buffer, force);
|
|
115
114
|
}
|
|
@@ -151,16 +150,14 @@ export default class MX10 {
|
|
|
151
150
|
return buffer;
|
|
152
151
|
}
|
|
153
152
|
send(message, force = false) {
|
|
154
|
-
if (this.connected
|
|
155
|
-
this.mx10Socket?.send(message, 0, message.length, this.outgoingPort, this.mx10IP, (err) => {
|
|
156
|
-
if (err && this.debugCommunication) {
|
|
157
|
-
console.log(err);
|
|
158
|
-
}
|
|
159
|
-
});
|
|
160
|
-
}
|
|
161
|
-
else {
|
|
153
|
+
if (!this.connected && !force) {
|
|
162
154
|
this.errors.next('mx10.connection.not_connected');
|
|
155
|
+
return;
|
|
163
156
|
}
|
|
157
|
+
this.mx10Socket?.send(message, 0, message.length, this.outgoingPort, this.mx10IP, (err) => {
|
|
158
|
+
if (err && this.debugCommunication)
|
|
159
|
+
this.log.next(err.message);
|
|
160
|
+
});
|
|
164
161
|
}
|
|
165
162
|
readRawData(message) {
|
|
166
163
|
const size = message.readUInt16LE(0);
|
|
@@ -236,7 +233,6 @@ export default class MX10 {
|
|
|
236
233
|
const f = (obj) => Number(obj).toString(16);
|
|
237
234
|
const arrow = '|' + (out ? '→' : '←');
|
|
238
235
|
const msg = `${arrow} g=${f(group)} c=${f(cmd)} m=${f(mode)} n=${f(nid)} l=${f(size)} : ${data}`;
|
|
239
|
-
console.debug(msg);
|
|
240
236
|
this.log.next(msg);
|
|
241
237
|
}
|
|
242
238
|
}
|
package/dist/MX10.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MX10.js","sourceRoot":"","sources":["../src/MX10.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,MAAM,EAAC,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAC,QAAQ,EAAE,OAAO,EAAC,MAAM,MAAM,CAAC;AAEvC,OAAO,
|
|
1
|
+
{"version":3,"file":"MX10.js","sourceRoot":"","sources":["../src/MX10.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Subject } from 'rxjs';
|
|
2
2
|
import MX10 from '../MX10';
|
|
3
|
-
import { AccessoryModeData, AccessoryPinData, AccessoryPortData } from '
|
|
3
|
+
import { AccessoryModeData, AccessoryPinData, AccessoryPortData } from '../common/models';
|
|
4
4
|
export default class AccessoryCommandGroup {
|
|
5
5
|
readonly onAccessoryMode: Subject<AccessoryModeData>;
|
|
6
6
|
readonly onAccessoryPort: Subject<AccessoryPortData>;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"accessoryCommandGroup.js","sourceRoot":"","sources":["../../src/accessory/accessoryCommandGroup.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { AccessoryPortState } from '../
|
|
1
|
+
import { AccessoryPortState } from '../common/enums';
|
|
2
2
|
export declare const parseAccessory4Byte: (accessoryState: number) => Map<number, AccessoryPortState>;
|
|
3
3
|
export declare const parseAccessory8byte: (accessoryState: number) => Map<number, AccessoryPortState>;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"accessoryUtils.js","sourceRoot":"","sources":["../../src/accessory/accessoryUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAC,MAAM,iBAAiB,CAAC;AAEnD,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,cAAsB,EAAE,EAAE;IAC5D,MAAM,UAAU,GAAG,IAAI,GAAG,EAA8B,CAAC;IAEzD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3B,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAC3B,MAAM,MAAM,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QAEhC,IAAI,cAAc,GAAG,KAAK,EAAE,CAAC;YAC3B,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAC/C,CAAC;aAAM,IAAI,cAAc,GAAG,MAAM,EAAE,CAAC;YACnC,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,kBAAkB,CAAC,GAAG,CAAC,CAAC;QAChD,CAAC;aAAM,CAAC;YACN,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC;QACpD,CAAC;IACH,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,cAAsB,EAAE,EAAE;IAC5D,MAAM,UAAU,GAAG,IAAI,GAAG,EAA8B,CAAC;IAEzD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3B,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,CAAC;QACrB,MAAM,MAAM,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAE5B,IAAI,cAAc,GAAG,KAAK,EAAE,CAAC;YAC3B,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAC/C,CAAC;aAAM,IAAI,cAAc,GAAG,MAAM,EAAE,CAAC;YACnC,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,kBAAkB,CAAC,GAAG,CAAC,CAAC;QAChD,CAAC;aAAM,CAAC;YACN,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC;QACpD,CAAC;IACH,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"bites.js","sourceRoot":"","sources":["../../src/common/bites.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,cAAc,GAAG,kBAAkB,CAAC;AACjD,MAAM,CAAC,MAAM,cAAc,GAAG,kBAAkB,CAAC;AACjD,MAAM,CAAC,MAAM,cAAc,GAAG,kBAAkB,CAAC;AACjD,MAAM,CAAC,MAAM,cAAc,GAAG,kBAAkB,CAAC;AACjD,MAAM,CAAC,MAAM,cAAc,GAAG,kBAAkB,CAAC;AAEjD,MAAM,CAAC,MAAM,cAAc,GAAG,UAAU,CAAC;AACzC,MAAM,CAAC,MAAM,cAAc,GAAG,UAAU,CAAC;AAEzC,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC;AACxC,MAAM,CAAC,MAAM,WAAW,GAAG,QAAQ,CAAC;AAGpC,MAAM,CAAC,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AACpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AACpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AACpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AACpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AACpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AACpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AACpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AACpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AACpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AACpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AACpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AACpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AACpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AACpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AACpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,kCAAkC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { BindOptions, RemoteInfo, SocketOptions } from 'dgram';
|
|
2
2
|
import { Buffer } from 'buffer';
|
|
3
|
-
import { MsgMode } from '
|
|
3
|
+
import { MsgMode } from './enums';
|
|
4
4
|
import { Subject, Subscription } from 'rxjs';
|
|
5
5
|
export type Header = {
|
|
6
6
|
group: number;
|
|
@@ -18,6 +18,7 @@ export declare class Message {
|
|
|
18
18
|
data: ZcanDataArray;
|
|
19
19
|
constructor(header: Header, data?: ZcanDataArray);
|
|
20
20
|
push(data: ZcanData): void;
|
|
21
|
+
rxDelay(millis: number): void;
|
|
21
22
|
udp(ownNid: number): Buffer;
|
|
22
23
|
}
|
|
23
24
|
export declare class Query<T extends Message> {
|
|
@@ -33,7 +34,7 @@ export declare class Query<T extends Message> {
|
|
|
33
34
|
lock(millis?: number): Promise<boolean>;
|
|
34
35
|
unlock(): void;
|
|
35
36
|
subscribe(): void;
|
|
36
|
-
run(retries?: number): Promise<T | undefined>;
|
|
37
|
+
run(rxDelay?: number, retries?: number): Promise<T | undefined>;
|
|
37
38
|
}
|
|
38
39
|
export type NIDGenerator = () => Promise<number>;
|
|
39
40
|
export interface Socket {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Buffer } from 'buffer';
|
|
2
|
-
import { MsgMode } from '
|
|
3
|
-
import { delay } from '
|
|
4
|
-
import ExtendedASCII from '
|
|
2
|
+
import { MsgMode } from './enums';
|
|
3
|
+
import { delay } from './utils';
|
|
4
|
+
import ExtendedASCII from './extendedAscii';
|
|
5
5
|
export class Message {
|
|
6
6
|
header;
|
|
7
7
|
data;
|
|
@@ -12,6 +12,7 @@ export class Message {
|
|
|
12
12
|
push(data) {
|
|
13
13
|
this.data.push(data);
|
|
14
14
|
}
|
|
15
|
+
rxDelay(millis) { }
|
|
15
16
|
udp(ownNid) {
|
|
16
17
|
const size = 2 + this.data.reduce((sum, obj) => sum + obj.length, 0);
|
|
17
18
|
const buffer = Buffer.alloc(size + 8);
|
|
@@ -88,15 +89,16 @@ export class Query {
|
|
|
88
89
|
this.rx?.unsubscribe();
|
|
89
90
|
});
|
|
90
91
|
}
|
|
91
|
-
async run(retries = 5) {
|
|
92
|
+
async run(rxDelay = 5, retries = 5) {
|
|
92
93
|
if (this.tx === undefined)
|
|
93
94
|
return undefined;
|
|
94
95
|
if (this.rx === undefined)
|
|
95
96
|
this.subscribe();
|
|
96
|
-
let
|
|
97
|
+
let tickFrom = 2 * Math.abs(retries);
|
|
98
|
+
let tick = tickFrom;
|
|
97
99
|
while (this.result === undefined) {
|
|
98
100
|
if (tick % 2)
|
|
99
|
-
await delay(
|
|
101
|
+
await delay(rxDelay);
|
|
100
102
|
else
|
|
101
103
|
this.tx(this.header);
|
|
102
104
|
if (!tick--) {
|
|
@@ -105,6 +107,7 @@ export class Query {
|
|
|
105
107
|
return undefined;
|
|
106
108
|
}
|
|
107
109
|
}
|
|
110
|
+
this.result.rxDelay(rxDelay * (tickFrom - tick));
|
|
108
111
|
return this.result;
|
|
109
112
|
}
|
|
110
113
|
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"communication.js","sourceRoot":"","sources":["../../src/common/communication.ts"],"names":[],"mappings":"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"}
|
|
@@ -108,11 +108,6 @@ export declare enum ShuntingFunction {
|
|
|
108
108
|
AZBZ = 1,
|
|
109
109
|
HALF = 2
|
|
110
110
|
}
|
|
111
|
-
export declare enum DirectionDefault {
|
|
112
|
-
NO_CHANGE = 0,
|
|
113
|
-
DIRECTION_EAST = 1,
|
|
114
|
-
DIRECTION_WEST = 2
|
|
115
|
-
}
|
|
116
111
|
export declare enum BidiType {
|
|
117
112
|
RAILCOM_STATISTICS = 0,
|
|
118
113
|
SPEED_REPORT = 256,
|
|
@@ -130,12 +130,6 @@ export var ShuntingFunction;
|
|
|
130
130
|
ShuntingFunction[ShuntingFunction["AZBZ"] = 1] = "AZBZ";
|
|
131
131
|
ShuntingFunction[ShuntingFunction["HALF"] = 2] = "HALF";
|
|
132
132
|
})(ShuntingFunction || (ShuntingFunction = {}));
|
|
133
|
-
export var DirectionDefault;
|
|
134
|
-
(function (DirectionDefault) {
|
|
135
|
-
DirectionDefault[DirectionDefault["NO_CHANGE"] = 0] = "NO_CHANGE";
|
|
136
|
-
DirectionDefault[DirectionDefault["DIRECTION_EAST"] = 1] = "DIRECTION_EAST";
|
|
137
|
-
DirectionDefault[DirectionDefault["DIRECTION_WEST"] = 2] = "DIRECTION_WEST";
|
|
138
|
-
})(DirectionDefault || (DirectionDefault = {}));
|
|
139
133
|
export var BidiType;
|
|
140
134
|
(function (BidiType) {
|
|
141
135
|
BidiType[BidiType["RAILCOM_STATISTICS"] = 0] = "RAILCOM_STATISTICS";
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"enums.js","sourceRoot":"","sources":["../../src/common/enums.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"
|
|
1
|
+
{"version":3,"file":"extendedAscii.js","sourceRoot":"","sources":["../../src/common/extendedAscii.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { NameType, Direction, ExternalController, FunctionMode, OperatingMode, SystemStateMode, TrackMode, ImageType, FxConfigType, SpecialFunctionMode, Manual,
|
|
2
|
-
import {
|
|
1
|
+
import { NameType, Direction, ExternalController, FunctionMode, OperatingMode, SystemStateMode, TrackMode, ImageType, FxConfigType, SpecialFunctionMode, Manual, ShuntingFunction, BidiType, ForwardOrReverse, AccessoryMode, FxModeType } from './enums';
|
|
2
|
+
import { ZcanDataArray } from './communication';
|
|
3
3
|
export interface Train {
|
|
4
4
|
nid: number;
|
|
5
5
|
subId: number;
|
|
@@ -99,27 +99,6 @@ export interface BidiInfoData {
|
|
|
99
99
|
type: BidiType;
|
|
100
100
|
data: BidiDirectionData | number;
|
|
101
101
|
}
|
|
102
|
-
export declare class MsgModInfo extends Message {
|
|
103
|
-
static header(mode: MsgMode, nid: number): Header;
|
|
104
|
-
constructor(header: Header, type: ModInfoType, data?: ZcanDataArray);
|
|
105
|
-
type(): ModInfoType | undefined;
|
|
106
|
-
info(): number | undefined;
|
|
107
|
-
}
|
|
108
|
-
export declare class MsgCvRead extends Message {
|
|
109
|
-
static header(mode: MsgMode, nid: number): Header;
|
|
110
|
-
constructor(header: Header, trainNid: number, cvNum: number, cvVal?: number | undefined);
|
|
111
|
-
cvVal(): number | undefined;
|
|
112
|
-
cvNum(): number;
|
|
113
|
-
trainNid(): number;
|
|
114
|
-
}
|
|
115
|
-
export declare class MsgCvWrite extends MsgCvRead {
|
|
116
|
-
static header(mode: MsgMode, nid: number): Header;
|
|
117
|
-
constructor(header: Header, trainNid: number, cvNum: number, cvVal: number);
|
|
118
|
-
}
|
|
119
|
-
export declare class MsgCvWrite16 extends MsgCvRead {
|
|
120
|
-
static header(mode: MsgMode, nid: number): Header;
|
|
121
|
-
constructor(header: Header, trainNid: number, cvNum: number, cvVal: number);
|
|
122
|
-
}
|
|
123
102
|
export interface BidiDirectionData {
|
|
124
103
|
direction?: Direction;
|
|
125
104
|
forwardOrReverse?: ForwardOrReverse;
|
|
@@ -154,7 +133,7 @@ export interface CallFunctionData {
|
|
|
154
133
|
export interface CallSpecialFunctionData {
|
|
155
134
|
nid: number;
|
|
156
135
|
specialFunctionMode: SpecialFunctionMode;
|
|
157
|
-
specialFunctionState: Manual | ShuntingFunction |
|
|
136
|
+
specialFunctionState: Manual | ShuntingFunction | Direction;
|
|
158
137
|
}
|
|
159
138
|
export interface SystemStateData {
|
|
160
139
|
nid: number;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../src/common/models.ts"],"names":[],"mappings":""}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Direction } from "../
|
|
1
|
+
import { Direction } from "../common/enums";
|
|
2
2
|
export declare const combineSpeedAndDirection: (speed: number, forward: boolean, eastWest?: Direction, emergencyStop?: boolean) => number;
|
|
3
3
|
export declare const parseSpeed: (speedAndDirection: number) => {
|
|
4
4
|
speedStep: number;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Direction } from "../
|
|
2
|
-
import { directACKBites, directionBites, eastWestBites_, emergencyStopB, speedBites____, speedStepBites } from "
|
|
1
|
+
import { Direction } from "../common/enums";
|
|
2
|
+
import { directACKBites, directionBites, eastWestBites_, emergencyStopB, speedBites____, speedStepBites } from "../common/bites";
|
|
3
3
|
export const combineSpeedAndDirection = (speed, forward, eastWest = Direction.UNDEFINED, emergencyStop = false) => {
|
|
4
4
|
const direction = Number(!forward);
|
|
5
5
|
const stop = Number(emergencyStop);
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"speedUtils.js","sourceRoot":"","sources":["../../src/common/speedUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAC,cAAc,EAAE,cAAc,EAAE,cAAc,EAAE,cAAc,EAAE,cAAc,EAAE,cAAc,EAAC,MAAM,iBAAiB,CAAC;AAE/H,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,KAAa,EAAE,OAAgB,EAAE,QAAQ,GAAG,SAAS,CAAC,SAAS,EAAE,aAAa,GAAG,KAAK,EAAE,EAAE;IAClI,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC;IACnC,MAAM,IAAI,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;IAEnC,OAAO,KAAK,GAAG,CAAC,SAAS,IAAI,EAAE,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;AACpE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,iBAAyB,EAAE,EAAE;IACvD,MAAM,SAAS,GAAG,iBAAiB,GAAG,cAAc,CAAC;IACrD,MAAM,SAAS,GAAG,CAAC,iBAAiB,GAAG,cAAc,CAAC,KAAK,cAAc,CAAC;IAC1E,MAAM,YAAY,GAAG,CAAC,iBAAiB,GAAG,cAAc,CAAC,KAAK,cAAc,CAAC;IAC7E,MAAM,QAAQ,GAAG,CAAC,iBAAiB,GAAG,cAAc,CAAC,IAAI,EAAE,CAAC;IAC5D,MAAM,aAAa,GAAG,CAAC,iBAAiB,GAAG,cAAc,CAAC,KAAK,cAAc,CAAC;IAE9E,MAAM,OAAO,GAAG,CAAC,SAAS,IAAI,CAAC,YAAY,CAAC;IAE5C,OAAO;QACN,SAAS;QACT,OAAO;QACP,QAAQ,EAAE,QAAQ;QAClB,aAAa;KACb,CAAC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,GAAW,EAAE,EAAE;IAC5C,MAAM,KAAK,GAAG,GAAG,GAAG,cAAc,CAAC;IAEnC,IAAI,KAAK,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;QAC9B,OAAO,SAAS,CAAC;IAClB,CAAC;IAED,OAAO,KAAK,CAAC;AACd,CAAC,CAAA"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
export declare const delay: (ms: number) => Promise<unknown>;
|
|
2
|
+
export declare const clamp: (num: number, min: number, max: number) => number;
|
|
3
|
+
export declare class Ranger {
|
|
4
|
+
private min;
|
|
5
|
+
private max;
|
|
6
|
+
private num;
|
|
7
|
+
constructor(that: {
|
|
8
|
+
min: number;
|
|
9
|
+
max: number;
|
|
10
|
+
now: number;
|
|
11
|
+
});
|
|
12
|
+
set(value: number): void;
|
|
13
|
+
now(): number;
|
|
14
|
+
}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
export const delay = (ms) => new Promise(resolve => setTimeout(resolve, ms));
|
|
2
|
+
export const clamp = (num, min, max) => Math.min(Math.max(num, min), max);
|
|
3
|
+
export class Ranger {
|
|
4
|
+
min = 0;
|
|
5
|
+
max = 0;
|
|
6
|
+
num = 0;
|
|
7
|
+
constructor(that) {
|
|
8
|
+
this.min = that.min;
|
|
9
|
+
this.max = that.max;
|
|
10
|
+
this.num = that.now;
|
|
11
|
+
}
|
|
12
|
+
set(value) { this.num = clamp(value, this.min, this.max); }
|
|
13
|
+
now() { return this.num; }
|
|
14
|
+
}
|
|
15
|
+
//# sourceMappingURL=utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAErF,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,GAAW,EAAE,GAAW,EAAE,GAAW,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;AAElG,MAAM,OAAO,MAAM;IAEV,GAAG,GAAW,CAAC,CAAC;IAChB,GAAG,GAAW,CAAC,CAAC;IAChB,GAAG,GAAW,CAAC,CAAC;IACxB,YAAY,IAA6C;QAExD,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACpB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACpB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;IACrB,CAAC;IACD,GAAG,CAAC,KAAa,IAAG,IAAI,CAAC,GAAG,GAAG,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAA,CAAA,CAAC;IAChE,GAAG,KAAI,OAAO,IAAI,CAAC,GAAG,CAAA,CAAA,CAAC;CACvB"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import MX10 from '../MX10';
|
|
2
2
|
import { Buffer } from 'buffer';
|
|
3
3
|
import { Subject } from 'rxjs';
|
|
4
|
-
import { RemoveLocomotiveData, DataNameExtended, GroupCountData, ItemFxMode, ItemFxConfig, ItemImageData, ItemListByIndexData, ItemListByNidData } from '
|
|
5
|
-
import { FxConfigType, ImageType } from '../
|
|
4
|
+
import { RemoveLocomotiveData, DataNameExtended, GroupCountData, ItemFxMode, ItemFxConfig, ItemImageData, ItemListByIndexData, ItemListByNidData } from '../common/models';
|
|
5
|
+
import { FxConfigType, ImageType } from '../common/enums';
|
|
6
6
|
export default class DataGroup {
|
|
7
7
|
readonly onGroupCount: Subject<GroupCountData>;
|
|
8
8
|
readonly onListItemsByIndex: Subject<ItemListByIndexData>;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Subject } from 'rxjs';
|
|
2
|
-
import { NameType } from '../
|
|
3
|
-
import ExtendedASCII from '../
|
|
2
|
+
import { NameType } from '../common/enums';
|
|
3
|
+
import ExtendedASCII from '../common/extendedAscii';
|
|
4
4
|
export default class DataGroup {
|
|
5
5
|
onGroupCount = new Subject();
|
|
6
6
|
onListItemsByIndex = new Subject();
|