@zimo-elektronik/zcan 1.0.57 → 1.0.59

package/dist/network/networkGroup.js

@@ -1,15 +1,42 @@
 import { Subject } from 'rxjs';
+import { Query } from '../docs_entrypoint';
+import { MsgPing } from './networkMsg';
+import { MsgMode } from '../common/enums';
 export default class NetworkGroup {
-    onPingResponse = new Subject();
+    onPing = new Subject();
     onPortClose = new Subject();
+    pingQ = undefined;
     portCloseQ = undefined;
     mx10;
-    pingTimeout = null;
     constructor(mx10) {
         this.mx10 = mx10;
     }
-    ping(mode = 0b10) {
-        this.mx10.sendData(0x0a, 0x00, [{ value: this.mx10.mx10NID, length: 2 }], mode);
+    async ping(nid = 0xc000) {
+        if (this.pingQ !== undefined && !await this.pingQ.lock()) {
+            this.mx10.logInfo.next("mx10.ping: failed to acquire lock");
+            return undefined;
+        }
+        this.pingQ = new Query(MsgPing.header(MsgMode.CMD, nid), this.onPing);
+        this.pingQ.log = ((msg) => {
+            this.mx10.logInfo.next(msg);
+        });
+        this.pingQ.tx = ((header) => {
+            const msg = new MsgPing(header, nid);
+            this.mx10.logInfo.next('ping query tx: ' + JSON.stringify(msg));
+            this.mx10.sendMsg(msg, true);
+        });
+        this.pingQ.match = ((msg) => {
+            this.mx10.logInfo.next('ping query rx: ' + JSON.stringify(msg));
+            if (nid & 0xff)
+                return msg.header.nid === nid;
+            return ((msg.header.nid || 0) & 0xff00) === (nid & 0xff00);
+        });
+        this.pingQ.subscribe(false);
+        const rv = await this.pingQ.run(100);
+        this.mx10.logInfo.next("mx10.ping.rv: " + JSON.stringify(rv));
+        this.pingQ.unlock();
+        this.pingQ = undefined;
+        return rv;
     }
     async portClose() {
         this.mx10.sendData(0x0a, 0x07, [{ value: this.mx10.myNID, length: 2 }], 0b01);
@@ -18,33 +45,24 @@ export default class NetworkGroup {
     parse(size, command, mode, nid, buffer) {
         switch (command) {
             case 0x00:
-                this.pingResponse(size, mode, nid, buffer);
+                this.parsePing(size, mode, nid, buffer);
                 break;
         }
     }
-    pingResponse(size, mode, nid, _buffer) {
-        if (!this.onPingResponse.observed)
+    parsePing(size, mode, nid, buffer) {
+        if (!this.onPing.observed)
             return;
-        if (size === 8) {
-            if (!this.mx10.mx10NID) {
-                this.mx10.mx10NID = nid;
-            }
-            this.mx10.connected = true;
-            if (this.pingTimeout)
-                clearTimeout(this.pingTimeout);
-            this.pingTimeout = setTimeout(() => {
-                this.mx10.connected = false;
-                this.onPingResponse.next({
-                    connected: this.mx10.connected,
-                });
-                this.mx10.logInfo.next('No ping for 2 seconds, disconnected');
-            }, 2000);
+        this.mx10.logInfo.next('parsePing from 0x' + nid.toString(16) + ': ' + JSON.stringify(buffer));
+        if (mode < MsgMode.EVT) {
+            const nid = buffer.readUInt16LE(0);
+            this.onPing.next(new MsgPing(MsgPing.header(mode, nid)));
         }
         else {
-            throw new Error('LENGTH ERROR: readCmdGrp_0x0A-0x0A, read length as: ' +
-                size.toString());
+            const masterUid = buffer.readUInt32LE(0);
+            const type = buffer.readUInt16LE(4);
+            const session = buffer.readUInt16LE(6);
+            this.onPing.next(new MsgPing(MsgPing.header(mode, nid), masterUid, type, session));
         }
-        this.onPingResponse.next({ connected: this.mx10.connected });
     }
 }
 //# sourceMappingURL=networkGroup.js.map

package/dist/network/networkGroup.js.map

@@ -1 +1 @@
-{"version":3,"file":"networkGroup.js","sourceRoot":"","sources":["../../src/network/networkGroup.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAC,MAAM,MAAM,CAAC;AAY7B,MAAM,CAAC,OAAO,OAAO,YAAY;IAEhB,cAAc,GAAG,IAAI,OAAO,EAAwB,CAAC;IACrD,WAAW,GAAG,IAAI,OAAO,EAAgB,CAAC;IAElD,UAAU,GAAoC,SAAS,CAAC;IAExD,IAAI,CAAO;IACnB,WAAW,GAA0B,IAAI,CAAC;IAE1C,YAAY,IAAU;QAErB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IAClB,CAAC;IAED,IAAI,CAAC,IAAI,GAAG,IAAI;QAEf,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,EAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,EAAC,CAAC,EAAE,IAAI,CAAC,CAAC;IAC/E,CAAC;IAED,KAAK,CAAC,SAAS;QAyBd,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,EAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,EAAC,CAAC,EAAE,IAAI,CAAC,CAAC;QAC5E,IAAI,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,IAAY,EAAE,OAAe,EAAE,IAAY,EAAE,GAAW,EAAE,MAAc;QAE7E,QAAQ,OAAO,EAAE,CAAC;YACjB,KAAK,IAAI;gBACR,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;gBAC3C,MAAM;QACR,CAAC;IACF,CAAC;IAGD,YAAY,CAAC,IAAY,EAAE,IAAY,EAAE,GAAW,EAAE,OAAe;QAEpE,IAAG,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ;YAC/B,OAAO;QAER,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;YAGhB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACxB,IAAI,CAAC,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC;YACzB,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;YAO3B,IAAI,IAAI,CAAC,WAAW;gBACnB,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAEhC,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC,GAAG,EAAE;gBAClC,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;gBAC5B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;oBACxB,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS;iBAC9B,CAAC,CAAC;gBACH,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;YAC/D,CAAC,EAAE,IAAI,CAAC,CAAC;QACV,CAAC;aAAM,CAAC;YACP,MAAM,IAAI,KAAK,CACd,sDAAsD;gBACrD,IAAI,CAAC,QAAQ,EAAE,CAChB,CAAC;QACH,CAAC;QAED,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAC,CAAC,CAAC;IAC5D,CAAC;CACD"}
+{"version":3,"file":"networkGroup.js","sourceRoot":"","sources":["../../src/network/networkGroup.ts"],"names":[],"mappings":"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"}

package/dist/network/networkMsg.d.ts

@@ -11,3 +11,11 @@ export declare class MsgPortClose extends Message {
     static header(mode: MsgMode, nid: number): Header;
     constructor(header: Header, myNid: number);
 }
+export declare class MsgPing extends Message {
+    static header(mode: MsgMode, nid: number): Header;
+    constructor(header: Header, masterUid?: number, type?: number, session?: number);
+    nid(): number;
+    masterUid(): number;
+    type(): number;
+    session(): number;
+}

package/dist/network/networkMsg.js

@@ -1,4 +1,5 @@
 import { Message } from "../common/communication";
+import { MsgMode } from "../common/enums";
 export class MsgPortOpen extends Message {
     static header(mode, nid) { return { group: 0x1a, cmd: 0x6, mode: mode, nid: nid }; }
     constructor(header, clientId, comFlags = 0xffffffff, clientName) {
@@ -19,4 +20,19 @@ export class MsgPortClose extends Message {
         super.push({ value: myNid, length: 2 });
     }
 }
+export class MsgPing extends Message {
+    static header(mode, nid) { return { group: 0xa, cmd: 0x0, mode: mode, nid: nid }; }
+    constructor(header, masterUid, type, session) {
+        super(header);
+        if (header.mode < MsgMode.EVT)
+            return;
+        super.push({ value: masterUid || 0, length: 4 });
+        super.push({ value: type || 0, length: 2 });
+        super.push({ value: session || 0, length: 2 });
+    }
+    nid() { return this.header.nid; }
+    masterUid() { return this.data[0].value; }
+    type() { return this.data[0].value; }
+    session() { return this.data[0].value; }
+}
 //# sourceMappingURL=networkMsg.js.map

package/dist/network/networkMsg.js.map

@@ -1 +1 @@
-{"version":3,"file":"networkMsg.js","sourceRoot":"","sources":["../../src/network/networkMsg.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAI1D,MAAM,OAAO,WAAY,SAAQ,OAAO;IAEhC,MAAM,CAAC,MAAM,CAAC,IAAa,EAAE,GAAW,IAC9C,OAAO,EAAC,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAC,CAAA,CAAA,CAAC;IAEtD,YAAY,MAAc,EAAE,QAAgB,EAAE,WAAmB,UAAU,EAAE,UAAmB;QAE/F,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,KAAK,CAAC,IAAI,CAAC,EAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAC,CAAC,CAAC;QACzC,KAAK,CAAC,IAAI,CAAC,EAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAC,CAAC,CAAC;QACzC,IAAG,UAAU;YACZ,KAAK,CAAC,IAAI,CAAC,EAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,EAAC,CAAC,CAAC;IAC9C,CAAC;IAED,QAAQ,KAAI,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAe,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA,CAAC;IAChF,QAAQ,KAAI,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA,CAAC;IAC5E,UAAU,KAAI,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA,CAAC;CAC9E;AAED,MAAM,OAAO,YAAa,SAAQ,OAAO;IAEjC,MAAM,CAAC,MAAM,CAAC,IAAa,EAAE,GAAW,IAC9C,OAAO,EAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAC,CAAA,CAAA,CAAC;IAErD,YAAY,MAAc,EAAE,KAAa;QAExC,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,KAAK,CAAC,IAAI,CAAC,EAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,EAAC,CAAC,CAAC;IACvC,CAAC;CACD"}
+{"version":3,"file":"networkMsg.js","sourceRoot":"","sources":["../../src/network/networkMsg.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -5,7 +5,7 @@
   "types": "dist/index.d.ts",
   "license": "MIT",
   "repository": "https://github.com/ZIMO-Elektronik/zcan",
-  "version": "1.0.57",
+  "version": "1.0.59",
   "scripts": {
     "start": "node dist/main.js",
     "start:dev": "nodemon --ext js,ts,json,env --exec \"node --experimental-specifier-resolution=node --loader ts-node/esm\" src/main.ts",

package/src/MX10.ts

@@ -3,27 +3,10 @@
 import {Buffer} from 'buffer';
 import {interval, Subject} from 'rxjs';
 import {Message} from './common/communication';
-import {
-	AccessoryCommandGroup,
-	DataGroup,
-	FileControlGroup,
-	FileTransferGroup,
-	InfoGroup,
-	LanDataGroup,
-	LanInfoGroup,
-	LanNetworkGroup,
-	LanLocoStateGroup,
-	LanZimoProgrammableScriptGroup,
-	NetworkGroup,
-	PropertyConfigGroup,
-	RailwayControlGroup,
-	SystemControlGroup,
-	TrackCfgGroup,
-	TrainControlGroup,
-	VehicleGroup,
-	ZimoProgrammableScriptGroup,
-	MsgMode,
-} from './';
+import {AccessoryCommandGroup, DataGroup, FileControlGroup, FileTransferGroup, InfoGroup, LanDataGroup, LanInfoGroup,
+	LanNetworkGroup, LanLocoStateGroup, LanZimoProgrammableScriptGroup, NetworkGroup, PropertyConfigGroup,
+	RailwayControlGroup, SystemControlGroup, TrackCfgGroup, TrainControlGroup, VehicleGroup,
+	ZimoProgrammableScriptGroup, MsgMode} from './';
 import {CreateSocketFunction, NIDGenerator, Socket, ZcanDataArray} from './common/communication';
 import {delay} from './common/utils';
 import ExtendedASCII from './common/extendedAscii';
@@ -61,7 +44,6 @@ export default class MX10
 	readonly logError = new Subject<string>();
 	readonly logWarning = new Subject<string>();
 	readonly logInfo = new Subject<string>();
-	readonly connectionTimeout: number;
 
 	private mx10Socket: Socket | null = null;
 	private incomingPort = 14521;
@@ -76,24 +58,26 @@ export default class MX10
 	private readonly reconnectionTime: number = 0;
 
 
-	constructor(nidGeneratorFunction: NIDGenerator, clientName: string, clientId: number,
-		connectionTimeout = 1000, debugCommunication = false)
+	constructor(nidGeneratorFunction: NIDGenerator, clientName: string, clientId: number, debugCommunication = false)
 	{
 		this.nidGeneratorFunction = nidGeneratorFunction;
-		this.connectionTimeout = connectionTimeout;
 		this.debugCommunication = debugCommunication;
-		this.reconnectionTime = connectionTimeout * 4;
+		this.reconnectionTime = 2000;
 		this.clientName = clientName;
 		this.clientId = clientId;
 
-		const pingIntervalMs = 1000;
-
-		if (this.connected) {
-			this.network.ping();
-		}
-		interval(pingIntervalMs).subscribe(() => {
-			if (this.connected) {
-				this.network.ping();
+		interval(1000).subscribe(async () => {
+			if(this.connected) {
+				this.logInfo.next('ping, weil connected');
+				const msg = await this.network.ping(this.mx10NID);
+				if(msg)
+					this.lastPing = Date.now();
+				else if(Date.now() - this.lastPing > 2000) {
+					this.logInfo.next('No ping for 2 seconds, disconnected');
+					this.connected = false;
+					this.closeSocket();
+					this.logError.next('.mx10.connection.not_connected');
+				}
 			}
 		});
 	}
@@ -101,11 +85,12 @@ export default class MX10
 	async initSocket(createSocketFunction: CreateSocketFunction, ipAddress: string,
 		incomingPort = 14521, outgoingPort = 14520)
 	{
-		this.mx10IP = ipAddress;
 		this.incomingPort = incomingPort;
 		this.outgoingPort = outgoingPort;
+		this.mx10IP = ipAddress;
+		// this.mx10NID = 0xc000 | Number.parseInt(ipAddress.split('.')[3]);
 
-		if (this.mx10Socket == null)
+		if(this.mx10Socket == null)
 		{
 			const socket = (this.mx10Socket = createSocketFunction({type: 'udp4'}) as Socket);
 
@@ -117,18 +102,23 @@ export default class MX10
 
 			this.mx10Socket.on('message', this.readRawData.bind(this));
 			this.myNID = await this.nidGeneratorFunction();
-			const ack = await this.lanNetwork.portOpen(this.clientName, this.clientId);
-			if(ack) {
-				this.mx10NID = ack.header.nid || 0;
+			const ping = await this.network.ping();
+			if(ping) {
 				this.connected = true;
+			} else {
+				const ack = await this.lanNetwork.portOpen(this.clientName, this.clientId);
+				if(ack) {
+					this.mx10NID = ack.header.nid || 0;
+					this.connected = true;
+				}
 			}
-			this.connected = true;	// since subsequent portOpen cmd don't seem to be answered..
-			await delay(this.connectionTimeout);
+			// this.connected = true;	// since subsequent portOpen cmd don't seem to be answered..
+			// await delay(this.connectionTimeout);
 
-			if (!this.connected) {
+			if(!this.connected) {
 				await this.closeSocket();
 				// throw new Error('mx10.connection.timeout');
-				throw new Error('mx10.connection.not_connected');
+				// throw new Error('mx10.connection.not_connected');
 			}
 		}
 	}
@@ -148,7 +138,7 @@ export default class MX10
 					this.connected = false;
 					this.mx10NID = 0;
 					this.lanNetwork.portOpen(this.clientName, this.clientId);
-					this.network.ping(0b00);
+					this.network.ping();
 				}
 			}, this.reconnectionTime);
 		}
@@ -171,6 +161,7 @@ export default class MX10
 
 	sendMsg(msg: Message, force = false)
 	{
+		// Message.log = (msg) => this.logInfo.next(msg);
 		const buffer = msg.udp(this.myNID);
 		this.logInfo.next("mx10.sendMsg: " + JSON.stringify(buffer));
 		this.send(buffer, force);
@@ -231,7 +222,7 @@ export default class MX10
 	private send(message: Buffer, force = false)
 	{
 		if(!this.connected && !force) {
-			this.logError.next('.mx10.connection.not_connected');
+			// this.logError.next('.mx10.connection.not_connected');
 			this.logInfo.next('unable to send ' + JSON.stringify(message));
 			return;
 		}

package/src/accessory/accessoryCommandGroup.ts

@@ -1,133 +1,119 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import {Subject} from 'rxjs';
 import MX10 from '../MX10';
-import {
-  AccessoryModeData,
-  AccessoryPinData,
-  AccessoryPortData,
-} from '../common/models';
+import {AccessoryModeData, AccessoryPin4Data, AccessoryPin6Data, AccessoryPortData} from '../common/models';
 import {AccessoryMode} from '../common/enums';
 
 /**
  *
  * @category Groups
  */
-export default class AccessoryCommandGroup {
-  public readonly onAccessoryMode = new Subject<AccessoryModeData>();
-  public readonly onAccessoryPort = new Subject<AccessoryPortData>();
-  public readonly onAccessoryPin = new Subject<AccessoryPinData>();
+export default class AccessoryCommandGroup
+{
+	public readonly onAccessoryMode = new Subject<AccessoryModeData>();
+	public readonly onAccessoryPort = new Subject<AccessoryPortData>();
+	public readonly onAccessoryPin4 = new Subject<AccessoryPin4Data>();
+	public readonly onAccessoryPin6 = new Subject<AccessoryPin6Data>();
 
-  private mx10: MX10;
+	private mx10: MX10;
 
-  constructor(mx10: MX10) {
-    this.mx10 = mx10;
-  }
+	constructor(mx10: MX10)
+	{
+		this.mx10 = mx10;
+	}
 
-  accessoryModeByNid(nid: number) {
-    this.mx10.sendData(0x01, 0x01, [{value: nid, length: 2}], 0b00);
-  }
+	accessoryModeByNid(nid: number)
+	{
+		this.mx10.sendData(0x01, 0x01, [{value: nid, length: 2}], 0b00);
+	}
 
-  accessoryPortByNid(nid: number) {
-    this.mx10.sendData(
-      0x01,
-      0x02,
-      [
-        {value: nid, length: 2},
-        {value: 0, length: 2},
-      ],
-      0b00,
-    );
-  }
-  accessoryPortByPin(nid: number, pin: number, state: number) {
-    this.mx10.sendData(
-      0x01,
-      0x04,
-      [
-        {value: nid, length: 2},
-        {value: pin, length: 1},
-        {value: state, length: 1},
-      ],
-      0b01,
-    );
-  }
+	accessoryPortByNid(nid: number)
+	{
+		this.mx10.sendData(0x01, 0x02, [{value: nid, length: 2}, {value: 0, length: 2}], 0b00);
+	}
 
-  parse(
-    size: number,
-    command: number,
-    mode: number,
-    nid: number,
-    buffer: Buffer,
-  ) {
-    switch (command) {
-      case 0x01:
-        this.parseAccessoryMode(size, mode, nid, buffer);
-        break;
-      case 0x02:
-        this.parseAccessoryPort(size, mode, nid, buffer);
-        break;
-      case 0x04:
-        this.parseAccessoryPin(size, mode, nid, buffer);
-        break;
-      default:
-        this.mx10.logInfo.next('accessoryCommandGroup command ' + command + ' not parsed: ' + JSON.stringify(buffer));
-    }
-  }
+	accessoryPortByPin(nid: number, pin: number, state: number)
+	{
+		this.mx10.sendData(0x01, 0x04,
+			[{value: nid, length: 2}, {value: pin, length: 1}, {value: state, length: 1}], 0b01);
+	}
 
-  parseAccessoryMode(size: number, mode: number, nid: number, buffer: Buffer) {
-    if (this.onAccessoryMode.observed) {
-      const deviceNID = buffer.readUInt16LE(0);
-      const mode = buffer.readUInt16LE(2);
+	parse(size: number, command: number, mode: number, nid: number, buffer: Buffer)
+	{
+		switch (command) {
+			case 0x01:
+				this.parseAccessoryMode(size, mode, nid, buffer);
+				break;
+			case 0x02:
+				this.parseAccessoryPort(size, mode, nid, buffer);
+				break;
+			case 0x04:
+				this.parseAccessoryPin4(size, mode, nid, buffer);
+				break;
+			case 0x06:
+				this.parseAccessoryPin6(size, mode, nid, buffer);
+				break;
+			default:
+				this.mx10.logInfo.next('accessoryCommandGroup command ' + command + ' not parsed: ' + JSON.stringify(buffer));
+		}
+	}
 
-      let parsedMode: AccessoryMode;
-      switch (mode) {
-        case 1:
-          parsedMode = AccessoryMode.PAIRED;
-          break;
-        case 2:
-          parsedMode = AccessoryMode.SINGLE;
-          break;
-        default:
-          parsedMode = AccessoryMode.UNKNOWN;
-      }
+	parseAccessoryMode(size: number, mode: number, nid: number, buffer: Buffer)
+	{
+		if (this.onAccessoryMode.observed) {
+			const deviceNID = buffer.readUInt16LE(0);
+			const mode = buffer.readUInt16LE(2);
+			let parsedMode: AccessoryMode;
+			switch (mode) {
+				case 1:
+					parsedMode = AccessoryMode.PAIRED;
+					break;
+				case 2:
+					parsedMode = AccessoryMode.SINGLE;
+					break;
+				default:
+					parsedMode = AccessoryMode.UNKNOWN;
+			}
+			if (deviceNID) {
+				this.onAccessoryMode.next({nid: deviceNID, mode: parsedMode});
+			}
+		}
+	}
 
-      if (deviceNID) {
-        this.onAccessoryMode.next({
-          nid: deviceNID,
-          mode: parsedMode,
-        });
-      }
-    }
-  }
+	parseAccessoryPort(size: number, mode: number, nid: number, buffer: Buffer)
+	{
+		if (this.onAccessoryPort.observed) {
+			const deviceNID = buffer.readUInt16LE(0);
+			const type = buffer.readUInt16LE(2);
+			const port = buffer.readUInt8(4); // only 1.st byte represents state of pins
+			if (deviceNID) {
+				this.onAccessoryPort.next({nid: deviceNID, type, port});
+			}
+		}
+	}
 
-  parseAccessoryPort(size: number, mode: number, nid: number, buffer: Buffer) {
-    if (this.onAccessoryPort.observed) {
-      const deviceNID = buffer.readUInt16LE(0);
-      const type = buffer.readUInt16LE(2);
-      const port = buffer.readUInt8(4); // only 1.st byte represents state of pins
+	parseAccessoryPin4(size: number, mode: number, nid: number, buffer: Buffer)
+	{
+		if (this.onAccessoryPin4.observed) {
+			const deviceNID = buffer.readUInt16LE(0);
+			const pin = buffer.readUInt8(2);
+			const state = buffer.readUInt8(3);
+			if (deviceNID) {
+				this.onAccessoryPin4.next({nid: deviceNID, pin, state});
+			}
+		}
+	}
 
-      if (deviceNID) {
-        this.onAccessoryPort.next({
-          nid: deviceNID,
-          type,
-          port,
-        });
-      }
-    }
-  }
-
-  parseAccessoryPin(size: number, mode: number, nid: number, buffer: Buffer) {
-    if (this.onAccessoryPin.observed) {
-      const deviceNID = buffer.readUInt16LE(0);
-      const pin = buffer.readUInt8(2);
-      const state = buffer.readUInt8(3);
-
-      if (deviceNID) {
-        this.onAccessoryPin.next({
-          nid: deviceNID,
-          pin,
-          state,
-        });
-      }
-    }
-  }
+	parseAccessoryPin6(size: number, mode: number, nid: number, buffer: Buffer)
+	{
+		if (this.onAccessoryPin6.observed) {
+			const deviceNID = buffer.readUInt16LE(0);
+			const pin = buffer.readUInt8(2);
+			const type = buffer.readUInt8(3);
+			const state = buffer.readUInt16LE(4);
+			if (deviceNID) {
+				this.onAccessoryPin6.next({nid: deviceNID, pin, type, state});
+			}
+		}
+	}
 }

package/src/common/communication.ts

@@ -21,6 +21,8 @@ export type ZcanDataArray = ZcanData[];
 
 export class Message
 {
+	public static log: (msg: string) => void = () => {};
+
 	header: Header;
 	data: ZcanDataArray;
 
@@ -55,6 +57,7 @@ export class Message
 		}
 
 		this.data.forEach((element) => {
+			// Message.log('offset = ' + offset + ', element: ' + JSON.stringify(element) + ', buffer: ' + JSON.stringify(buffer));
 			if (typeof element.value === 'string') {
 				ExtendedASCII.str2byte(element.value, buffer, offset, element.length);
 				offset += element.length;

package/src/common/models.ts

@@ -268,8 +268,14 @@ export interface AccessoryPortData {
 	type: number;
 	port: number;
 }
-export interface AccessoryPinData {
+export interface AccessoryPin4Data {
 	nid: number;
 	pin: number;
 	state: number;
 }
+export interface AccessoryPin6Data {
+	nid: number;
+	pin: number;
+	type: number;
+	state: number;
+}

package/src/loco/vehicleGroup.ts

@@ -192,14 +192,14 @@ export default class VehicleGroup
 		]);
 	}
 
-	// callFunction(vehicleAddress: number, functionId: number, functionStatus: boolean)
-	// {
-	// 	this.mx10.sendData(0x02, 0x04, [
-	// 		{value: vehicleAddress, length: 2},
-	// 		{value: functionId, length: 2},
-	// 		{value: Number(functionStatus), length: 2},
-	// 	]);
-	// }
+	callFunction(vehicleAddress: number, functionId: number, functionStatus: boolean)
+	{
+		this.mx10.sendData(0x02, 0x04, [
+			{value: vehicleAddress, length: 2},
+			{value: functionId, length: 2},
+			{value: Number(functionStatus), length: 2},
+		]);
+	}
 
 	async getFx(nid: number, fxNr: number)
 	{

package/src/loco/vehicleMsg.ts

@@ -9,7 +9,6 @@ export class MsgVehicleMode extends Message
 {
 	public static header = (mode: MsgMode, nid: number) => {return {group: 0x2, cmd: 0x1, mode, nid}}
 	public static rxDelay = () => {return this.rxTiming.now()}
-	public static log: (msg: string) => void = () => {};
 
 	private static rxTiming = new Ranger({min: 5, max: 20, now: 5});