@zimo-elektronik/zcan 1.0.50 → 1.0.52

package/__tests__/lanLocoStateGroup.test.ts

@@ -1,27 +1,27 @@
 import {createMX10, initConnection} from './util';
 import {afterAll, beforeAll, expect, it} from '@jest/globals';
 import {firstValueFrom} from 'rxjs';
-import {delay} from '../src/internal/utils';
+import { delay } from '../src/common/utils';
 
 describe('LocoState group tests - 0x12', () => {
-  const mx10 = createMX10();
-  const testNID = 3;
+	const mx10 = createMX10();
+	const testNID = 3;
 
-  beforeAll(async () => {
-    await initConnection(mx10);
-  });
+	beforeAll(async () => {
+		await initConnection(mx10);
+	});
 
-  afterAll(() => {
-    delay(1000).then(() => {
-      mx10.closeSocket();
-    });
-  });
+	afterAll(() => {
+		delay(1000).then(() => {
+			mx10.closeSocket();
+		});
+	});
 
-  it('0x00 - retrieve loco state', async () => {
-    const data = await firstValueFrom(mx10.lanLocoState.onLocoStateExtended);
+	it('0x00 - retrieve loco state', async () => {
+		const data = await firstValueFrom(mx10.lanLocoState.onLocoStateExtended);
 
-    expect(data.nid).toBe(testNID);
-    // testing on device ZimoApp
-    expect(data.ownerNid).toBe(mx10.myNID);
-  });
+		expect(data.nid).toBe(testNID);
+		// testing on device ZimoApp
+		expect(data.ownerNid).toBe(mx10.myNID);
+	});
 });

package/__tests__/systemControlGroup.test.ts

@@ -1,42 +1,42 @@
 import {afterAll, beforeAll, describe, expect, jest} from '@jest/globals';
 import {createMX10, initConnection} from './util';
 import {SystemStateData, SystemStateMode} from '../src';
-import {delay} from '../src/internal/utils';
+import { delay } from '../src/common/utils';
 
 describe('System Control Group group tests - 0x00', () => {
-  const mx10 = createMX10();
-
-  beforeAll(async () => {
-    await initConnection(mx10);
-  });
-
-  afterAll(() => {
-    mx10.systemControl.systemState(SystemStateMode.NORMAL);
-
-    delay(1000).then(() => {
-      mx10.closeSocket();
-    });
-  });
-
-  test.each<{mode: number}>([
-    {mode: SystemStateMode.SSPe},
-    {mode: SystemStateMode.OFF},
-    {mode: SystemStateMode.SSP0},
-  ])('0x00 - System state test', ({mode}, done) => {
-    mx10.systemControl.systemState(mode);
-
-    const callback = jest.fn((data: SystemStateData) => {
-      if (data.nid === mx10.mx10NID) {
-        expect(data.port).toBeDefined();
-        expect(data.mode).toBe(mode);
-
-        if (callback.mock.calls.length === 3) {
-          sub.unsubscribe();
-          done();
-        }
-      }
-    });
-
-    const sub = mx10.systemControl.onSystemStateChange.subscribe(callback);
-  });
+	const mx10 = createMX10();
+
+	beforeAll(async () => {
+		await initConnection(mx10);
+	});
+
+	afterAll(() => {
+		mx10.systemControl.systemState(SystemStateMode.NORMAL);
+
+		delay(1000).then(() => {
+			mx10.closeSocket();
+		});
+	});
+
+	test.each<{mode: number}>([
+		{mode: SystemStateMode.SSPe},
+		{mode: SystemStateMode.OFF},
+		{mode: SystemStateMode.SSP0},
+	])('0x00 - System state test', ({mode}, done) => {
+		mx10.systemControl.systemState(mode);
+
+		const callback = jest.fn((data: SystemStateData) => {
+			if (data.nid === mx10.mx10NID) {
+				expect(data.port).toBeDefined();
+				expect(data.mode).toBe(mode);
+
+				if (callback.mock.calls.length === 3) {
+					sub.unsubscribe();
+					done();
+				}
+			}
+		});
+
+		const sub = mx10.systemControl.onSystemStateChange.subscribe(callback);
+	});
 });

package/__tests__/trackCfgGroup.test.ts

@@ -2,42 +2,42 @@ import {createMX10, initConnection} from './util';
 import {afterAll, beforeAll, describe, it, expect} from '@jest/globals';
 
 describe('LAN Data group tests - 0x16', () => {
-  const mx10 = createMX10();
-
-  beforeAll(async () => {
-    await initConnection(mx10);
-  });
-
-  afterAll(() => {
-    mx10.closeSocket();
-  });
-
-  it('0x08 - Tse Prog Read Extended', (done) => {
-    mx10.trackCfg.tseProgRead(211, 8);
-
-    const prog = mx10.trackCfg.onTseProgReadExtended.subscribe((data) => {
-      expect(data.cfgNum).toBeDefined();
-      expect(data.cfgNum).toBe(8);
-      expect(data.cvValue).toBeDefined();
-      expect(data.cvValue).toBe(145);
-
-      prog.unsubscribe();
-      done();
-    });
-  });
-
-  it('0x09 - Tse Prog Write Extended', (done) => {
-    // Please be sure if you want to CV write HU value on test
-    // mx10.trackCfg.tseProgWrite(211, 51, 20);
-
-    const prog = mx10.trackCfg.onTseProgWriteExtended.subscribe((data) => {
-      expect(data.cfgNum).toBeDefined();
-      expect(data.cfgNum).toBe(51);
-      expect(data.cvValue).toBeDefined();
-      expect(data.cvValue).toBe(20);
-
-      prog.unsubscribe();
-      done();
-    });
-  });
+	const mx10 = createMX10();
+
+	beforeAll(async () => {
+		await initConnection(mx10);
+	});
+
+	afterAll(() => {
+		mx10.closeSocket();
+	});
+
+	it('0x08 - Tse Prog Read Extended', (done) => {
+		mx10.trackCfg.tseProgRead(211, 8);
+
+		const prog = mx10.trackCfg.onTseProgReadExtended.subscribe((msg) => {
+			expect(msg.cvNum()).toBeDefined();
+			expect(msg.cvNum()).toBe(8);
+			expect(msg.cvVal()).toBeDefined();
+			expect(msg.cvVal()).toBe(145);
+
+			prog.unsubscribe();
+			done();
+		});
+	});
+
+	it('0x09 - Tse Prog Write Extended', (done) => {
+		// Please be sure if you want to CV write HU value on test
+		// mx10.trackCfg.tseProgWrite(211, 51, 20);
+
+		const prog = mx10.trackCfg.onTseProgWriteExtended.subscribe((msg) => {
+			expect(msg.cvNum()).toBeDefined();
+			expect(msg.cvNum()).toBe(51);
+			expect(msg.cvVal()).toBeDefined();
+			expect(msg.cvVal()).toBe(20);
+
+			prog.unsubscribe();
+			done();
+		});
+	});
 });

package/__tests__/vehicleGroup.test.ts

@@ -4,114 +4,113 @@ import {firstValueFrom} from 'rxjs';
 import {delay} from '../src/common/utils';
 import {Direction, Manual, OperatingMode, ShuntingFunction, SpecialFunctionMode} from '../src';
 
-describe('Vehicle group tests - 0x02', () => {
-  const mx10 = createMX10();
-  const testNID = 211;
-
-  beforeAll(async () => {
-    await initConnection(mx10);
-  });
-
-  afterAll(() => {
-    mx10.vehicle.changeSpeed(testNID, 0, true);
-
-    delay(1000).then(() => {
-      mx10.closeSocket();
-    });
-  });
-
-  it('0x00 - retrieve operating state', async () => {
-    const data = await firstValueFrom(mx10.vehicle.onVehicleState);
-
-    expect(data.nid).toBe(211);
-    // testing on device ZimoApp
-    mx10.vehicle.changeSpeed(testNID, 15, true);
-    expect(data.ctrlDevice).toBe(mx10.myNID);
-  });
-
-  it('0x01 - retrieve operating mode', async () => {
-    mx10.vehicle.getVehicleMode(3);
-    const msg = await firstValueFrom(mx10.vehicle.onVehicleMode);
-
-    expect(msg.trainNid()).toBe(3);
-    expect(msg.operatingMode()).toBe(OperatingMode.DCC);
-  });
-
-  test.each([
-    {nid: testNID, speedStep: 10, forward: true, eastWest: Direction.UNDEFINED},
-    {nid: testNID, speedStep: 30, forward: false, eastWest: Direction.EAST},
-    {nid: testNID, speedStep: 40, forward: false, eastWest: Direction.WEST},
-    {nid: testNID, speedStep: 35, forward: true, eastWest: Direction.WEST},
-  ])(
-    '0x02 - change speed and directions',
-    async ({nid, speedStep, forward, eastWest}) => {
-      mx10.vehicle.changeSpeed(nid, speedStep, forward, eastWest);
-      const msg = await firstValueFrom(mx10.vehicle.onVehicleSpeed);
-      expect(msg).toBeDefined();
-      expect(msg.trainNid()).toBe(nid);
-      expect(msg.divisor).toBe(0);
-      expect(msg.speedStep).toBe(speedStep);
-      expect(msg.forward).toBe(forward);
-      expect(msg.eastWest).toBe(eastWest);
-      expect(msg.emergencyStop).toBe(false);
-    },
-  );
-
-  it('0x02 - change speed with bidi feedback', (done) => {
-    const speedStep = 500,
-      forward = true;
-
-    const sub = mx10.info.onBidiInfoChange.subscribe((data) => {
-      if (data.type === 0x0100) {
-        expect(data).toBeDefined();
-        expect(data.type).toBe(0x0100);
-        expect(data.data).toBeGreaterThan(10);
-
-        sub.unsubscribe();
-        done();
-      }
-    });
-
-    mx10.vehicle.changeSpeed(testNID, speedStep, forward);
-  });
-
-  it('0x04 - call function', async () => {
-    const nid = testNID,
-      buttonId = 1;
-
-    mx10.vehicle.callFunction(nid, buttonId, true);
-    const data = await firstValueFrom(mx10.vehicle.onCallFunction);
-
-    expect(data).toBeDefined();
-    expect(data.nid).toBe(nid);
-    expect(data.functionNumber).toBe(buttonId);
-    expect(data.functionState).toBe(true);
-
-    await delay(500);
-
-    mx10.vehicle.callFunction(nid, buttonId, false);
-    const data2 = await firstValueFrom(mx10.vehicle.onCallFunction);
-
-    expect(data2).toBeDefined();
-    expect(data2.nid).toBe(nid);
-    expect(data2.functionNumber).toBe(buttonId);
-    expect(data2.functionState).toBe(false);
-  });
-
-  test.each([
-    {mode: SpecialFunctionMode.MANUAL, state: Manual.OFF},
-    {mode: SpecialFunctionMode.SHUNTING_FUNCTION, state: ShuntingFunction.AZBZ},
-    {
-      mode: SpecialFunctionMode.DIRECTION_DEFAULT,
-      state: Direction.WEST,
-    },
-  ])('0x05 - special function mode', async ({mode, state}) => {
-    mx10.vehicle.changeSpecialFunction(testNID, mode, state);
-    const data = await firstValueFrom(mx10.vehicle.onCallSpecialFunction);
-
-    expect(data).toBeDefined();
-    expect(data.nid).toBe(testNID);
-    expect(data.specialFunctionMode).toBe(mode);
-    expect(data.specialFunctionState).toBe(state);
-  });
+describe('Vehicle group tests - 0x02', () =>
+{
+	const mx10 = createMX10();
+	const testNID = 211;
+
+	beforeAll(async () => {
+		await initConnection(mx10);
+	});
+
+	afterAll(() => {
+		mx10.vehicle.changeSpeed(testNID, 0, true);
+
+		delay(1000).then(() => {
+			mx10.closeSocket();
+		});
+	});
+
+	it('0x00 - retrieve operating state', async () => {
+		const msg = await firstValueFrom(mx10.vehicle.onVehicleState);
+
+		expect(msg.trainNid()).toBe(211);
+		// testing on device ZimoApp
+		mx10.vehicle.changeSpeed(testNID, 15, true);
+		expect(msg.lastCtlNid()).toBe(mx10.myNID);
+	});
+
+	it('0x01 - retrieve operating mode', async () => {
+		const msg = await mx10.vehicle.getMode(3);
+
+		expect(msg?.trainNid()).toBe(3);
+		expect(msg?.mode()).toBe(OperatingMode.DCC);
+	});
+
+	test.each([
+		{nid: testNID, speedStep: 10, forward: true, eastWest: Direction.UNDEFINED},
+		{nid: testNID, speedStep: 30, forward: false, eastWest: Direction.EAST},
+		{nid: testNID, speedStep: 40, forward: false, eastWest: Direction.WEST},
+		{nid: testNID, speedStep: 35, forward: true, eastWest: Direction.WEST},
+	])(
+		'0x02 - change speed and directions',
+		async ({nid, speedStep, forward, eastWest}) => {
+			
+			const msg = await mx10.vehicle.setSpeed(nid, speedStep, 0, forward, false, eastWest);
+			expect(msg).toBeDefined();
+			expect(msg?.trainNid()).toBe(nid);
+			expect(msg?.divisor()).toBe(0);
+			expect(msg?.speedStep()).toBe(speedStep);
+			expect(msg?.forward()).toBe(forward);
+			expect(msg?.eastWest()).toBe(eastWest);
+			expect(msg?.emergencyStop()).toBe(false);
+		},
+	);
+
+	it('0x02 - change speed with bidi feedback', (done) => {
+		const speedStep = 500,
+			forward = true;
+
+		const sub = mx10.info.onBidiInfoChange.subscribe((msg) => {
+			if (msg.type() === 0x0100) {
+				expect(msg).toBeDefined();
+				expect(msg.type()).toBe(0x0100);
+				expect(msg.info()).toBeGreaterThan(10);
+				sub.unsubscribe();
+				done();
+			}
+		});
+
+		mx10.vehicle.changeSpeed(testNID, speedStep, forward);
+	});
+
+	it('0x04 - call function', async () => {
+		const nid = testNID,
+			buttonId = 1;
+
+		mx10.vehicle.callFunction(nid, buttonId, true);
+		const data = await firstValueFrom(mx10.vehicle.onCallFunction);
+
+		expect(data).toBeDefined();
+		expect(data.nid).toBe(nid);
+		expect(data.functionNumber).toBe(buttonId);
+		expect(data.functionState).toBe(true);
+
+		await delay(500);
+
+		mx10.vehicle.callFunction(nid, buttonId, false);
+		const data2 = await firstValueFrom(mx10.vehicle.onCallFunction);
+
+		expect(data2).toBeDefined();
+		expect(data2.nid).toBe(nid);
+		expect(data2.functionNumber).toBe(buttonId);
+		expect(data2.functionState).toBe(false);
+	});
+
+	test.each([
+		{mode: SpecialFunctionMode.MANUAL, state: Manual.OFF},
+		{mode: SpecialFunctionMode.SHUNTING_FUNCTION, state: ShuntingFunction.AZBZ},
+		{
+			mode: SpecialFunctionMode.DIRECTION_DEFAULT,
+			state: Direction.WEST,
+		},
+	])('0x05 - special function mode', async ({mode, state}) => {
+		mx10.vehicle.changeSpecialFunction(testNID, mode, state);
+		const data = await firstValueFrom(mx10.vehicle.onCallSpecialFunction);
+
+		expect(data).toBeDefined();
+		expect(data.nid).toBe(testNID);
+		expect(data.specialFunctionMode).toBe(mode);
+		expect(data.specialFunctionState).toBe(state);
+	});
 });

package/dist/common/models.d.ts

@@ -1,4 +1,4 @@
-import { NameType, Direction, ExternalController, FunctionMode, OperatingMode, SystemStateMode, TrackMode, ImageType, FxConfigType, SpecialFunctionMode, Manual, ShuntingFunction, BidiType, ForwardOrReverse, AccessoryMode, FxModeType } from './enums';
+import { NameType, Direction, ExternalController, FunctionMode, OperatingMode, SystemStateMode, TrackMode, ImageType, FxConfigType, SpecialFunctionMode, Manual, ShuntingFunction, AccessoryMode, FxModeType } from './enums';
 import { ZcanDataArray } from './communication';
 export interface Train {
     nid: number;
@@ -94,17 +94,6 @@ export interface ModulePowerInfoData {
     voltageTotal: number;
     temperature: number;
 }
-export interface BidiInfoData {
-    nid: number;
-    type: BidiType;
-    data: BidiDirectionData | number;
-}
-export interface BidiDirectionData {
-    direction?: Direction;
-    forwardOrReverse?: ForwardOrReverse;
-    directionChange?: boolean;
-    directionConfirm?: boolean;
-}
 export interface VehicleStateData {
     nid: number;
     ctrlTick: number;

package/dist/info/infoGroup.d.ts

@@ -1,21 +1,18 @@
 import { Buffer } from 'buffer';
 import MX10 from '../MX10';
 import { Subject } from 'rxjs';
-import { BidiInfoData } from '../common/models';
 import { ModInfoType } from '../common/enums';
-import { MsgModInfo } from './infoMsg';
+import { MsgBidiInfo, MsgModInfo } from './infoMsg';
 export default class InfoGroup {
     private mx10;
-    readonly onBidiInfoChange: Subject<BidiInfoData>;
+    readonly onBidiInfoChange: Subject<MsgBidiInfo>;
     readonly onModuleInfoChange: Subject<MsgModInfo>;
     private modInfoQ;
+    private bidiQ;
     constructor(mx10: MX10);
     getModuleInfo(nid: number, type: ModInfoType | number): Promise<MsgModInfo | undefined>;
+    getBidiInfo(locoNid: number, type: number): Promise<MsgBidiInfo | undefined>;
     parse(size: number, command: number, mode: number, nid: number, buffer: Buffer): void;
     private parseModuleInfo;
     private parseBidiInfo;
-    private parseEastWest;
-    private parseDirChange;
-    private parseFwdRev;
-    private parseDirectionConfirm;
 }

package/dist/info/infoGroup.js

@@ -1,12 +1,13 @@
 import { Subject } from 'rxjs';
 import { Query } from '../common/communication';
-import { BidiType, Direction, ForwardOrReverse, MsgMode } from '../common/enums';
-import { MsgModInfo } from './infoMsg';
+import { MsgMode } from '../common/enums';
+import { MsgBidiInfo, MsgModInfo } from './infoMsg';
 export default class InfoGroup {
     mx10;
     onBidiInfoChange = new Subject();
     onModuleInfoChange = new Subject();
     modInfoQ = undefined;
+    bidiQ = undefined;
     constructor(mx10) {
         this.mx10 = mx10;
     }
@@ -34,6 +35,28 @@ export default class InfoGroup {
         this.modInfoQ = undefined;
         return rv;
     }
+    async getBidiInfo(locoNid, type) {
+        if (this.bidiQ !== undefined && !await this.bidiQ.lock()) {
+            this.mx10.logInfo.next("mx10.getBidiInfo: failed to acquire lock");
+            return undefined;
+        }
+        this.bidiQ = new Query(MsgBidiInfo.header(MsgMode.REQ, locoNid), this.onBidiInfoChange);
+        this.bidiQ.tx = ((header) => {
+            const msg = new MsgBidiInfo(header, type, locoNid);
+            this.mx10.logInfo.next('bidi query tx: ' + JSON.stringify(msg));
+            this.mx10.sendMsg(msg);
+        });
+        this.bidiQ.match = ((msg) => {
+            this.mx10.logInfo.next('bidi query rx: ' + JSON.stringify(msg));
+            return (msg.type() === type);
+        });
+        this.bidiQ.subscribe(false);
+        const rv = await this.bidiQ.run();
+        this.mx10.logInfo.next("mx10.getBidiInfo.rv: " + JSON.stringify(rv));
+        this.bidiQ.unlock();
+        this.bidiQ = undefined;
+        return rv;
+    }
     parse(size, command, mode, nid, buffer) {
         switch (command) {
             case 0x05:
@@ -61,34 +84,8 @@ export default class InfoGroup {
         const NID = buffer.readUInt16LE(0);
         const type = buffer.readUInt16LE(2);
         const info = buffer.readUInt32LE(4);
-        let data = {};
-        switch (type) {
-            case BidiType.DIRECTION:
-                data.direction = this.parseEastWest(info);
-                data.directionChange = this.parseDirChange(info);
-                data.directionConfirm = this.parseDirectionConfirm(info);
-                data.forwardOrReverse = this.parseFwdRev(info);
-                break;
-            default:
-                data = info;
-        }
-        this.onBidiInfoChange.next({ nid: NID, type, data, });
-    }
-    parseEastWest(data) {
-        if ((data & 0x02) == 0x02)
-            return Direction.EAST;
-        return Direction.WEST;
-    }
-    parseDirChange(data) {
-        return (data & 0x04) == 0x04;
-    }
-    parseFwdRev(data) {
-        if ((data & 0x01) == 0)
-            return ForwardOrReverse.REVERSE;
-        return ForwardOrReverse.FORWARD;
-    }
-    parseDirectionConfirm(data) {
-        return (data & 0x08) == 0x08;
+        const msg = new MsgBidiInfo(MsgBidiInfo.header(mode, NID), type, undefined, info);
+        this.onBidiInfoChange.next(msg);
     }
 }
 //# sourceMappingURL=infoGroup.js.map

package/dist/info/infoGroup.js.map

@@ -1 +1 @@
-{"version":3,"file":"infoGroup.js","sourceRoot":"","sources":["../../src/info/infoGroup.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"infoGroup.js","sourceRoot":"","sources":["../../src/info/infoGroup.ts"],"names":[],"mappings":"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"}

package/dist/info/infoMsg.d.ts

@@ -6,3 +6,14 @@ export declare class MsgModInfo extends Message {
     type(): ModInfoType | undefined;
     info(): number | undefined;
 }
+export declare class MsgBidiInfo extends Message {
+    static header(mode: MsgMode, nid: number): Header;
+    constructor(header: Header, type: number, nid?: number, info?: number);
+    nid(): number;
+    type(): number;
+    info(): number | undefined;
+    static dirEast(info: number): boolean;
+    static dirChanging(info: number): boolean;
+    static dirForward(info: number): boolean;
+    static dirConfirm(info: number): boolean;
+}

package/dist/info/infoMsg.js

@@ -1,4 +1,5 @@
 import { Message } from "../common/communication";
+import { MsgMode } from "../common/enums";
 export class MsgModInfo extends Message {
     static header(mode, nid) { return { group: 0x08, cmd: 0x08, mode: mode, nid }; }
     constructor(header, type, data = []) {
@@ -10,4 +11,33 @@ export class MsgModInfo extends Message {
     type() { return this.data[0].value; }
     info() { return this.data.length > 1 ? this.data[1].value : undefined; }
 }
+export class MsgBidiInfo extends Message {
+    static header(mode, nid) { return { group: 0x08, cmd: 0x05, mode: mode, nid }; }
+    constructor(header, type, nid, info) {
+        super(header);
+        if (header.mode === MsgMode.REQ) {
+            super.push({ value: nid || 0, length: 2 });
+            super.push({ value: type, length: 2 });
+        }
+        else {
+            super.push({ value: type, length: 2 });
+            super.push({ value: info || 0, length: 4 });
+        }
+    }
+    nid() { return this.header.mode === MsgMode.REQ ? this.data[0].value : this.header.nid || 0; }
+    type() { return this.data[this.header.mode === MsgMode.REQ ? 1 : 0].value; }
+    info() { return this.data.length > 1 ? this.data[1].value : undefined; }
+    static dirEast(info) {
+        return ((info & 0x02) == 0x02);
+    }
+    static dirChanging(info) {
+        return ((info & 0x04) == 0x04);
+    }
+    static dirForward(info) {
+        return ((info & 0x01) == 0x01);
+    }
+    static dirConfirm(info) {
+        return ((info & 0x08) == 0x08);
+    }
+}
 //# sourceMappingURL=infoMsg.js.map