@zimo-elektronik/zcan 1.0.40 → 1.0.42

package/src/MX10.ts

@@ -58,8 +58,9 @@ export default class MX10
 	readonly lanNetwork = new LanNetworkGroup(this);
 	readonly lanZimoProgrammableScript = new LanZimoProgrammableScriptGroup(this);
 
-	readonly errors = new Subject<string>();
-	readonly log = new Subject<string>();
+	readonly logError = new Subject<string>();
+	readonly logWarning = new Subject<string>();
+	readonly logInfo = new Subject<string>();
 	readonly connectionTimeout: number;
 
 	private mx10Socket: Socket | null = null;
@@ -141,8 +142,7 @@ export default class MX10
 		if (this.interval === undefined) {
 			this.interval = setInterval(() => {
 				if (!this.connected) {
-					// eslint-disable-next-line no-console
-					console.log('Reconnecting...');
+					this.logInfo.next('Reconnecting...');
 					this.network.portClose();
 					this.connected = false;
 					this.mx10NID = 0;
@@ -171,14 +171,14 @@ export default class MX10
 	sendMsg(msg: Message, force = false)
 	{
 		const buffer = msg.udp(this.myNID);
-		this.log.next("mx10.sendMsg: " + JSON.stringify(buffer));
+		this.logInfo.next("mx10.sendMsg: " + JSON.stringify(buffer));
 		this.send(buffer, force);
 	}
 
 	sendData(group: number, cmd: number, data: ZcanDataArray = [], mode = MsgMode.CMD, nid = this.myNID, force = false)
 	{
 		const buffer = this.formatData(group, cmd, mode, nid, data);
-		//this.log.next("mx10.sendData: " + JSON.stringify(buffer));
+		//this.logInfo.next("mx10.sendData: " + JSON.stringify(buffer));
 		this.send(buffer, force);
 	}
 
@@ -230,12 +230,12 @@ export default class MX10
 	private send(message: Buffer, force = false)
 	{
 		if(!this.connected && !force) {
-			this.errors.next('mx10.connection.not_connected');
+			this.logError.next('mx10.connection.not_connected');
 			return;
 		}
 		this.mx10Socket?.send(message, 0, message.length, this.outgoingPort, this.mx10IP, (err) => {
 			if (err && this.debugCommunication)
-				this.log.next(err.message);
+				this.logInfo.next(err.message);
 		});
 	}
 
@@ -249,23 +249,23 @@ export default class MX10
 		const command = commandAndMode >> 2;
 		const mode = commandAndMode & 0x03;
 		const nid = message.readUInt16LE(6);
-		// this.log.next('rx: ' + JSON.stringify(message));
+		// this.logInfo.next('rx: ' + JSON.stringify(message));
 		if(!this.mx10NID && (group !== 0x1a || command !== 0x06 || mode !== MsgMode.ACK))
 			return;
 		if(this.mx10NID && nid !== this.mx10NID) {
 			if((nid >> 8 !== 0xc0)) {
 				if(!(group === 0xa && command === 0 && mode === MsgMode.EVT))
-					this.log.next('Not from MX10: ' + JSON.stringify(message));
+					this.logInfo.next('Not from MX10: ' + JSON.stringify(message));
 			}
 			// else
-			// 	this.log.next('This packet is not from our MX10: ' + JSON.stringify(message));
+			// 	this.logInfo.next('This packet is not from our MX10: ' + JSON.stringify(message));
 			return;
 		}
 		// this.log.next('MX10 >> ' + JSON.stringify(message));
 		
 		const buffer = message.slice(8); //Remove first 8 bytes; left only with data
 
-		// this.log.next(JSON.stringify(message));
+		// this.logInfo.next(JSON.stringify(message));
 		this.printReadout(group, command, mode, nid, size, buffer, false);
 
 		switch (group) {
@@ -338,7 +338,7 @@ export default class MX10
 			const f = (obj: unknown) => Number(obj).toString(16);
 			const arrow = '|' + (out ? '→' : '←');
 			const msg = `${arrow} g=${f(group)} c=${f(cmd)} m=${f(mode)} n=${f(nid)} l=${f(size,)} : ${data}`;
-			this.log.next(msg);
+			this.logInfo.next(msg);
 		}
 	}
 }

package/src/data/dataGroup.ts

@@ -6,7 +6,7 @@ import {RemoveLocomotiveData, DataNameExtended, DataNameValue1,
 	ItemFxMode, ItemFxConfig, ItemImageData, ItemListByIndexData, ItemListByNidData} from '../common/models';
 import {FxConfigType, FxModeType, ImageType, MsgMode, NameType} from '../common/enums';
 import ExtendedASCII from '../common/extendedAscii';
-import { MsgGroupCount } from './dataMsg';
+import { MsgGroupCount, MsgItemsByIndexReq, MsgItemsByIndexRsp } from './dataMsg';
 import { Query } from '../docs_entrypoint';
 
 /**
@@ -16,7 +16,7 @@ import { Query } from '../docs_entrypoint';
 export default class DataGroup
 {
 	public readonly onGroupCount = new Subject<MsgGroupCount>();
-	public readonly onListItemsByIndex = new Subject<ItemListByIndexData>();
+	public readonly onListItemsByIndex = new Subject<MsgItemsByIndexRsp>();
 	public readonly onListItemsByNID = new Subject<ItemListByNidData>();
 	public readonly onRemoveLocomotive = new Subject<RemoveLocomotiveData>();
 	public readonly onItemImageConfig = new Subject<ItemImageData>();
@@ -25,6 +25,7 @@ export default class DataGroup
 	public readonly onDataNameExtended = new Subject<DataNameExtended>();
 
 	private groupCountQ: Query<MsgGroupCount> | undefined = undefined;
+	private byIndexQ: Query<MsgItemsByIndexRsp> | undefined = undefined;
 
 	private mx10: MX10;
 
@@ -36,38 +37,128 @@ export default class DataGroup
 	async groupCount(groupNid = 0): Promise<MsgGroupCount | undefined>
 	{
 		if(this.groupCountQ !== undefined && !await this.groupCountQ.lock()) {
-			this.mx10.log.next("mx10.groupCount: failed to acquire lock");
+			this.mx10.logInfo.next("mx10.groupCount: failed to acquire lock");
 			return undefined;
 		}
 		this.groupCountQ = new Query(MsgGroupCount.header(MsgMode.REQ, this.mx10.mx10NID), this.onGroupCount);
 		this.groupCountQ.log = ((msg) => {
-			this.mx10.log.next(msg);
+			this.mx10.logInfo.next(msg);
 		});
 		this.groupCountQ.tx = ((header) => {
 			const msg = new MsgGroupCount(header, groupNid);
-			this.mx10.log.next('groupCount query tx: ' + JSON.stringify(msg));
+			this.mx10.logInfo.next('groupCount query tx: ' + JSON.stringify(msg));
 			this.mx10.sendMsg(msg);
 		});
 		this.groupCountQ.match = ((msg) => {
-			this.mx10.log.next('groupCount query rx: ' + JSON.stringify(msg));
+			this.mx10.logInfo.next('groupCount query rx: ' + JSON.stringify(msg));
 			return (msg.group() === groupNid);
 		})
 		const rv = await this.groupCountQ.run();
-		this.mx10.log.next("mx10.groupCount.rv: " + JSON.stringify(rv));
+		this.mx10.logInfo.next("mx10.groupCount.rv: " + JSON.stringify(rv));
 		this.groupCountQ.unlock();
 		this.groupCountQ = undefined;
 		return rv;
 	}
 
-	listItemsByIndex(groupNID: number, index: number)
+	async listItemsByIndex(groupNid: number, index: number): Promise<MsgItemsByIndexRsp | undefined>
 	{
-		this.mx10.sendData(0x07, 0x01, [
-			{value: this.mx10.mx10NID, length: 2},
-			{value: groupNID, length: 2},
-			{value: index, length: 2},
-		], 0b00);
+		if(this.byIndexQ !== undefined && !await this.byIndexQ.lock()) {
+			this.mx10.logInfo.next("mx10.listItemsByIndex: failed to acquire lock");
+			return undefined;
+		}
+		this.byIndexQ = new Query(MsgItemsByIndexReq.header(MsgMode.REQ, this.mx10.mx10NID), this.onListItemsByIndex);
+		this.byIndexQ.log = ((msg) => {
+			this.mx10.logInfo.next(msg);
+		});
+		this.byIndexQ.tx = ((header) => {
+			const msg = new MsgItemsByIndexReq(header, this.mx10.myNID, groupNid, index);
+			this.mx10.logInfo.next('listItemsByIndex query tx: ' + JSON.stringify(msg));
+			this.mx10.sendMsg(msg);
+		});
+		this.byIndexQ.match = ((msg) => {
+			this.mx10.logInfo.next('listItemsByIndex query rx: ' + JSON.stringify(msg));
+			this.mx10.logInfo.next('listItemsByIndex query rx: ' + msg.itemNid());
+			const nid = msg.itemNid();
+			switch(groupNid) {
+				case 0:
+					return nid < 0x2800;
+				case 0x2800:
+					return nid < 0x28ff;
+				case 0x2f00:
+					return nid < 0x3000;
+				case 0x3000:
+					return nid < 0x3200;
+				case 0x3200:
+					return nid < 0x3a00;
+				case 0x3a00:
+					return nid < 0x3e00;
+				case 0x4000:
+					return nid < 0x4400;
+				case 0x4400:
+					return nid < 0x4600;
+				case 0x4600:
+					return nid < 0x4800;
+				case 0x5000:
+					return nid < 0x5040;
+				case 0x5040:
+					return nid < 0x5080;
+				case 0x5080:
+					return nid < 0x50c0;
+				case 0x50c0:
+					return nid < 0x50d0;
+				case 0x50d0:
+					return nid < 0x50e0;
+				case 0x5100:
+					return nid < 0x5140;
+				case 0x5140:
+					return nid < 0x5180;
+				case 0x5800:
+					return nid < 0x5880;
+				case 0x5a00:
+					return nid < 0x5b00;
+				case 0x6000:
+					return nid < 0x6100;
+				case 0x6100:
+					return nid < 0x6400;
+				case 0x6600:
+					return nid < 0x6700;
+				case 0x8000:
+					return nid < 0xc000;
+				case 0xc000:
+					return nid < 0xc100;
+				case 0xc100:
+					return nid < 0xc200;
+				case 0xc200:
+					return nid < 0xc300;
+				case 0xc300:
+					return nid < 0xc400;
+				case 0xc400:
+					return nid < 0xc500;
+				case 0xd000:
+					return nid < 0xe000;
+				case 0xe000:
+					return nid < 0xf000;
+				case 0xf000:
+					return nid <= 0xffff;
+			}
+			return false;
+		})
+		const rv = await this.byIndexQ.run();
+		this.mx10.logInfo.next("mx10.listItemsByIndex.rv: " + JSON.stringify(rv));
+		this.byIndexQ.unlock();
+		this.byIndexQ = undefined;
+		return rv;
 	}
 
+	// listItemsByIndex(groupNID: number, index: number)
+	// {
+	// 	this.mx10.sendData(0x07, 0x01, [
+	// 		{value: this.mx10.mx10NID, length: 2},
+	// 		{value: groupNID, length: 2},
+	// 		{value: index, length: 2},
+	// 	], 0b00);
+	// }
+
 	listItemsByNID(searchAfterValue: number)
 	{
 		this.mx10.sendData(0x07, 0x02, [
@@ -140,15 +231,15 @@ export default class DataGroup
 		switch (command)
 		{
 			case 0x00:
-				this.mx10.log.next('parseGroupCount: ' + JSON.stringify(buffer));
+				this.mx10.logInfo.next('parseGroupCount: ' + JSON.stringify(buffer));
 				this.parseGroupCount(size, mode, nid, buffer);
 				break;
 			case 0x01:
-				this.mx10.log.next('parseItemListByIndex: ' + JSON.stringify(buffer));
+				this.mx10.logInfo.next('parseItemListByIndex: ' + JSON.stringify(buffer));
 				this.parseItemListByIndex(size, mode, nid, buffer);
 				break;
 			case 0x02:
-				this.mx10.log.next('parseItemListByNid: ' + JSON.stringify(buffer));
+				this.mx10.logInfo.next('parseItemListByNid: ' + JSON.stringify(buffer));
 				this.parseItemListByNid(size, mode, nid, buffer);
 				break;
 			case 0x12:
@@ -167,7 +258,7 @@ export default class DataGroup
 				this.parseDataNameExtended(size, mode, nid, buffer);
 				break;
 			default:
-				this.mx10.log.next('command not parsed: ' + command.toString());
+				this.mx10.logInfo.next('command not parsed: ' + command.toString());
 		}
 	}
 
@@ -189,8 +280,10 @@ export default class DataGroup
 		const index = buffer.readUInt16LE(0);
 		const deviceNID = buffer.readUInt16LE(2);
 		const msSinceLastCommunication = buffer.readUInt16LE(4);
-		if(deviceNID)
-			this.onListItemsByIndex.next({index, nid: deviceNID, msSinceLastCommunication});
+		if(!deviceNID)
+			return;
+		this.onListItemsByIndex.next(new MsgItemsByIndexRsp(MsgItemsByIndexRsp.header(mode, nid),
+			index, deviceNID, msSinceLastCommunication));
 	}
 
 	// 0x07.0x02
@@ -238,7 +331,7 @@ export default class DataGroup
 		for(let i=0; i<32; i+=2)
 			fxMode.push((fxModes>>i)&0b11);
 		const msg: ItemFxMode = {nid: NID, group, mode: fxMode};
-		this.mx10.log.next('parseItemFxMode: ' + JSON.stringify(msg));
+		this.mx10.logInfo.next('parseItemFxMode: ' + JSON.stringify(msg));
 		this.onItemFxMode.next(msg);
 	}
 
@@ -275,7 +368,7 @@ export default class DataGroup
 		const item = buffer.readUInt16LE(4);
 		const data = buffer.readUInt16LE(6);
 		const msg: ItemFxConfig = {nid: NID, function: fx, item, data};
-		this.mx10.log.next('parseItemFxConfig: ' + JSON.stringify(msg));
+		this.mx10.logInfo.next('parseItemFxConfig: ' + JSON.stringify(msg));
 		this.onItemFxConfig.next(msg);
 	}
 

package/src/data/dataMsg.ts

@@ -5,87 +5,86 @@ import { MsgMode } from "../common/enums";
 
 export class MsgGroupCount extends Message
 {
-    public static header(mode: MsgMode, nid: number): Header
-    {return {group: 0x7, cmd: 0x0, mode: mode, nid: nid}}
+	public static header(mode: MsgMode, nid: number): Header
+	{return {group: 0x7, cmd: 0x0, mode: mode, nid: nid}}
 
-    constructor(header: Header, group?: number, count?: number)
-    {
-        super(header);
-        if(group !== undefined)
-            super.push({value: group, length: 2});
-        // super.push({value: groupNid, length: 2});
-        if(count !== undefined)
-            super.push({value: count, length: 2});
-    }
+	constructor(header: Header, group?: number, count?: number)
+	{
+		super(header);
+		if(group !== undefined)
+			super.push({value: group, length: 2});
+		// super.push({value: groupNid, length: 2});
+		if(count !== undefined)
+			super.push({value: count, length: 2});
+	}
 
-    group() {return this.data.length ? this.data[0].value as number : this.header.nid;}
-    count() {return this.data.length > 1 ? this.data[1].value as number : 0;}
+	group() {return this.data.length ? this.data[0].value as number : this.header.nid;}
+	count() {return this.data.length > 1 ? this.data[1].value as number : 0;}
 }
 
 
 export class MsgItemsByIndexReq extends Message
 {
-    public static header(mode: MsgMode, nid: number): Header
-    {return {group: 0x7, cmd: 0x1, mode: mode, nid: nid}}
+	public static header(mode: MsgMode, nid: number): Header
+	{return {group: 0x7, cmd: 0x1, mode: mode, nid: nid}}
 
-    constructor(header: Header, mx10Nid: number, groupNid: number, index: number)
-    {
-        super(header);
-        super.push({value: mx10Nid, length: 2});
-        super.push({value: groupNid, length: 2});
-        super.push({value: index, length: 2});
-    }
+	constructor(header: Header, mx10Nid: number, groupNid: number, index: number)
+	{
+		super(header);
+		// super.push({value: mx10Nid, length: 2});
+		super.push({value: groupNid, length: 2});
+		super.push({value: index, length: 2});
+	}
 }
 
 export class MsgItemsByIndexRsp extends Message
 {
-    public static header(mode: MsgMode, nid: number): Header
-    {return {group: 0x7, cmd: 0x1, mode: mode, nid: nid}}
+	public static header(mode: MsgMode, nid: number): Header
+	{return {group: 0x7, cmd: 0x1, mode: mode, nid: nid}}
 
-    constructor(header: Header, index: number, itemNid: number, itemState: number, lastTick: number | undefined)
-    {
-        super(header);
-        super.push({value: index, length: 2});
-        super.push({value: itemNid, length: 2});
-        super.push({value: itemState, length: 2});
-        if(lastTick !== undefined)
-            super.push({value: lastTick, length: 2});
-    }
-    index(): number {return (this.data[1].value as number)}
-    itemNid(): number {return (this.data[2].value as number)}
-    itemState(): number {return (this.data[3].value as number)}
-    lastTick(): number {return (this.data[4].value as number)}
+	constructor(header: Header, index: number, itemNid: number, lastTick: number)
+	{
+		super(header);
+		super.push({value: index, length: 2});
+		super.push({value: itemNid, length: 2});
+		if(lastTick !== undefined)
+			super.push({value: lastTick, length: 2});
+	}
+	index(): number {return (this.data[0].value as number)}
+	itemNid(): number {return (this.data[1].value as number)}
+	lastTick(): number {return (this.data[2].value as number)}
+	// lastTick(): number {return this.data.length > 4 ? (this.data[4].value as number) : 0}
 }
 
 export class MsgItemsByNidReq extends Message
 {
-    public static header(mode: MsgMode, nid: number): Header
-    {return {group: 0x7, cmd: 0x2, mode: mode, nid: nid}}
+	public static header(mode: MsgMode, nid: number): Header
+	{return {group: 0x7, cmd: 0x2, mode: mode, nid: nid}}
 
-    constructor(header: Header, mx10Nid: number, precedingNid: number)
-    {
-        super(header);
-        super.push({value: mx10Nid, length: 2});
-        super.push({value: precedingNid, length: 2});
-    }
+	constructor(header: Header, mx10Nid: number, precedingNid: number)
+	{
+		super(header);
+		super.push({value: mx10Nid, length: 2});
+		super.push({value: precedingNid, length: 2});
+	}
 }
 
 export class MsgItemsByNidRsp extends Message
 {
-    public static header(mode: MsgMode, nid: number): Header
-    {return {group: 0x7, cmd: 0x2, mode: mode, nid: nid}}
+	public static header(mode: MsgMode, nid: number): Header
+	{return {group: 0x7, cmd: 0x2, mode: mode, nid: nid}}
 
-    constructor(header: Header, itemNid: number, index: number, itemState: number, lastTick: number | undefined)
-    {
-        super(header);
-        super.push({value: itemNid, length: 2});
-        super.push({value: index, length: 2});
-        super.push({value: itemState, length: 2});
-        if(lastTick !== undefined)
-            super.push({value: lastTick, length: 2});
-    }
-    itemNid(): number {return (this.data[1].value as number)}
-    index(): number {return (this.data[2].value as number)}
-    itemState(): number {return (this.data[3].value as number)}
-    lastTick(): number {return (this.data[4].value as number)}
+	constructor(header: Header, itemNid: number, index: number, itemState: number, lastTick: number | undefined)
+	{
+		super(header);
+		super.push({value: itemNid, length: 2});
+		super.push({value: index, length: 2});
+		super.push({value: itemState, length: 2});
+		if(lastTick !== undefined)
+			super.push({value: lastTick, length: 2});
+	}
+	itemNid(): number {return (this.data[1].value as number)}
+	index(): number {return (this.data[2].value as number)}
+	itemState(): number {return (this.data[3].value as number)}
+	lastTick(): number {return (this.data[4].value as number)}
 }

package/src/data/lanDataGroup.ts

@@ -1,13 +1,14 @@
 // 0x17
 import MX10 from '../MX10';
-import {FunctionMode, FxConfigType, getOperatingMode, OperatingMode} from '../common/enums';
+import {FunctionMode, FxConfigType, getOperatingMode, MsgMode, OperatingMode} from '../common/enums';
 import {DataNameExtendedData, DataValueExtendedData, LocoGuiMXExtended, LocoSpeedTabExtended, SpeedTabData,
 	Train, TrainFlags, TrainFunction} from '../common/models';
 import {Subject} from 'rxjs';
 import {parseSpeed} from '../common/speedUtils';
 import ExtendedASCII from '../common/extendedAscii';
 import {manualModeB, shuntingFunctionB} from '../common/bites';
-import {ZcanDataArray} from '../common/communication';
+import {Query, ZcanDataArray} from '../common/communication';
+import { MsgLocoGuiReq, MsgLocoGuiRsp } from './lanDataMsg';
 
 /**
  *
@@ -15,12 +16,14 @@ import {ZcanDataArray} from '../common/communication';
  */
 export default class LanDataGroup
 {
-	public readonly onLocoGuiExtended = new Subject<Train>();
+	public readonly onLocoGuiExtended = new Subject<MsgLocoGuiRsp>();
 	public readonly onLocoGuiMXExtended = new Subject<LocoGuiMXExtended>();
 	public readonly onDataValueExtended = new Subject<DataValueExtendedData>();
 	public readonly onDataNameExtended = new Subject<DataNameExtendedData>();
 	public readonly onLocoSpeedTabExtended = new Subject<LocoSpeedTabExtended>();
 
+	private locoGuiQ: Query<MsgLocoGuiRsp> | undefined = undefined;
+
 	private mx10: MX10;
 
 	constructor(mx10: MX10)
@@ -79,15 +82,41 @@ export default class LanDataGroup
 		]);
 	}
 
-	locoGuiExtended(NID: number)
+	async locoGuiExtended(nid: number): Promise<MsgLocoGuiRsp | undefined>
 	{
-		this.mx10.sendData(0x17, 0x27, [
-			{value: this.mx10.mx10NID, length: 2},
-			{value: NID, length: 2},
-			{value: 0, length: 2},
-		], 0b00);
+		if(this.locoGuiQ !== undefined && !await this.locoGuiQ.lock()) {
+			this.mx10.logInfo.next("mx10.locoGuiExtended: failed to acquire lock");
+			return undefined;
+		}
+		this.locoGuiQ = new Query(MsgLocoGuiReq.header(MsgMode.REQ, this.mx10.mx10NID), this.onLocoGuiExtended);
+		this.locoGuiQ.log = ((msg) => {
+			this.mx10.logInfo.next(msg);
+		});
+		this.locoGuiQ.tx = ((header) => {
+			const msg = new MsgLocoGuiReq(header, nid, 0);
+			this.mx10.logInfo.next('locoGuiExtended query tx: ' + JSON.stringify(msg));
+			this.mx10.sendMsg(msg);
+		});
+		this.locoGuiQ.match = ((msg) => {
+			this.mx10.logInfo.next('locoGuiExtended query rx: ' + JSON.stringify(msg));
+			return (msg.locoNid() === nid);
+		})
+		const rv = await this.locoGuiQ.run();
+		this.mx10.logInfo.next("mx10.locoGuiExtended.rv: " + JSON.stringify(rv));
+		this.locoGuiQ.unlock();
+		this.locoGuiQ = undefined;
+		return rv;
 	}
 
+	// locoGuiExtended(NID: number)
+	// {
+	// 	this.mx10.sendData(0x17, 0x27, [
+	// 		{value: this.mx10.mx10NID, length: 2},
+	// 		{value: NID, length: 2},
+	// 		{value: 0, length: 2},
+	// 	], 0b00);
+	// }
+
 	locoGuiMXExtended(NID: number)
 	{
 		this.mx10.sendData(0x17,0x28, [
@@ -201,25 +230,35 @@ export default class LanDataGroup
 		const driveType = buffer.readUInt16LE(48);
 		const era = buffer.readUInt16LE(50);
 		const countryCode = buffer.readUInt16LE(52);
-
-		// reading 64 bytes of functions
-		const functions = Array<TrainFunction>();
+		const functions: number[] = [];
 		for (let i = 0; i < 32; i++) {
-			const icon = buffer.readUInt16LE(54 + i * 2);
-			const iconString =
-				icon === 0 ? String(i).padStart(2, '0') : String(icon);
-			functions.push({
-				mode: FunctionMode.switch,
-				active: false,
-				icon: iconString.padStart(4, icon === 0 ? '07' : '0'),
-			});
+			const fun = buffer.readUInt16LE(54 + 2*i);
+			functions.push(fun);
 		}
-		this.onLocoGuiExtended.next({nid: NID, subId: SubID, name: name, group: vehicleGroup,
-			image: imageId == 0 ? undefined : imageId.toString(), tacho: tacho.toString(),
-			speedFwd: speedFwd, speedRev: speedRev, speedRange: speedRange,
-			operatingMode: OperatingMode.UNKNOWN, driveType: driveType, era: this.parseEra(era),
-			countryCode: countryCode, functions,
-		});
+
+		const msg = new MsgLocoGuiRsp(MsgLocoGuiRsp.header(mode, nid), NID, SubID, vehicleGroup, name, imageId, tacho, speedFwd, speedRev, speedRange,
+			driveType, era, countryCode, functions);
+		
+		this.onLocoGuiExtended.next(msg);
+
+		// // reading 64 bytes of functions
+		// const functions = Array<TrainFunction>();
+		// for (let i = 0; i < 32; i++) {
+		// 	const icon = buffer.readUInt16LE(54 + i * 2);
+		// 	const iconString =
+		// 		icon === 0 ? String(i).padStart(2, '0') : String(icon);
+		// 	functions.push({
+		// 		mode: FunctionMode.switch,
+		// 		active: false,
+		// 		icon: iconString.padStart(4, icon === 0 ? '07' : '0'),
+		// 	});
+		// }
+		// this.onLocoGuiExtended.next({nid: NID, subId: SubID, name: name, group: vehicleGroup,
+		// 	image: imageId == 0 ? undefined : imageId.toString(), tacho: tacho.toString(),
+		// 	speedFwd: speedFwd, speedRev: speedRev, speedRange: speedRange,
+		// 	operatingMode: OperatingMode.UNKNOWN, driveType: driveType, era: this.parseEra(era),
+		// 	countryCode: countryCode, functions,
+		// });
 	}
 
 	// 0x17.0x28
@@ -248,14 +287,11 @@ export default class LanDataGroup
 
 		// reading 64 bytes of functions
 		const functions = Array<TrainFunction>();
-		for (let i = 0; i < 32; i++) {
+		for (let i = 0; i < 64; i++) {
 			const icon = buffer.readUInt16LE(68 + i * 2);
-			const iconString =
-				icon === 0 ? String(i).padStart(2, '0') : String(icon);
-			functions.push({
-				mode: FunctionMode.switch,
-				active: false,
-				icon: iconString.padStart(4, icon === 0 ? '07' : '0'),
+			const fxMode = buffer.readUInt16LE(196 + i * 2) as FunctionMode;
+			const iconString = icon === 0 ? String(i).padStart(2, '0') : String(icon);
+			functions.push({mode: fxMode, active: false, icon: iconString.padStart(4, icon === 0 ? '07' : '0'),
 			});
 		}