@zimo-elektronik/zcan 1.0.45 → 1.0.47

package/src/MX10.ts

@@ -172,7 +172,7 @@ export default class MX10
 	sendMsg(msg: Message, force = false)
 	{
 		const buffer = msg.udp(this.myNID);
-		this.logInfo.next("mx10.sendMsg: " + JSON.stringify(buffer));
+		// this.logInfo.next("mx10.sendMsg: " + JSON.stringify(buffer));
 		this.send(buffer, force);
 	}
 
@@ -270,65 +270,72 @@ export default class MX10
 		// this.logInfo.next(JSON.stringify(message));
 		this.printReadout(group, command, mode, nid, size, buffer, false);
 
-		switch (group) {
-			case 0x00:
-				this.systemControl.parse(size, command, mode, nid, buffer);
-				break;
-			case 0x01:
-				this.accessoryCommand.parse(size, command, mode, nid, buffer);
-				break;
-			case 0x02:
-				this.vehicle.parse(size, command, mode, nid, buffer);
-				break;
-			case 0x05:
-				this.trainControl.parse(size, command, mode, nid, buffer);
-				break;
-			case 0x06:
-			case 0x16:
-				this.trackCfg.parse(size, command, mode, nid, buffer);
-				break;
-			case 0x07:
-				this.data.parse(size, command, mode, nid, buffer);
-				break;
-			case 0x08:
-				this.info.parse(size, command, mode, nid, buffer);
-				break;
-			case 0x09:
-				this.propertyConfig.parse(size, command, mode, nid, buffer);
-				break;
-			case 0x0a:
-				this.network.parse(size, command, mode, nid, buffer);
-				break;
-			case 0x0b:
-				this.railwayControl.parse(size, command, mode, nid, buffer);
-				break;
-			case 0x0c:
-				this.zimoProgrammableScript.parse(size, command, mode, nid, buffer);
-				break;
-			case 0x0e:
-				this.fileControl.parse(size, command, mode, nid, buffer);
-				break;
-			case 0x0f:
-				this.fileTransfer.parse(size, command, mode, nid, buffer);
-				break;
-			case 0x12:
-				this.lanLocoState.parse(size, command, mode, nid, buffer);
-				break;
-			case 0x17:
-				this.lanData.parse(size, command, mode, nid, buffer);
-				break;
-			case 0x18:
-				this.lanInfo.parse(size, command, mode, nid, buffer);
-				break;
-			case 0x1a:
-				this.lanNetwork.parse(size, command, mode, nid, buffer);
-				break;
-			case 0x1c:
-				this.lanZimoProgrammableScript.parse(size, command, mode, nid, buffer);
-				break;
-			default:
-				// eslint-disable-next-line no-console
-				// console.warn('Unknown group: ' + Number(group).toString(16));
+		try {
+			switch (group) {
+				case 0x00:
+					this.systemControl.parse(size, command, mode, nid, buffer);
+					break;
+				case 0x01:
+					this.accessoryCommand.parse(size, command, mode, nid, buffer);
+					break;
+				case 0x02:
+					this.vehicle.parse(size, command, mode, nid, buffer);
+					break;
+				case 0x05:
+					this.trainControl.parse(size, command, mode, nid, buffer);
+					break;
+				case 0x06:
+				case 0x16:
+					this.trackCfg.parse(size, command, mode, nid, buffer);
+					break;
+				case 0x07:
+					this.data.parse(size, command, mode, nid, buffer);
+					break;
+				case 0x08:
+					this.info.parse(size, command, mode, nid, buffer);
+					break;
+				case 0x09:
+					this.propertyConfig.parse(size, command, mode, nid, buffer);
+					break;
+				case 0x0a:
+					this.network.parse(size, command, mode, nid, buffer);
+					break;
+				case 0x0b:
+					this.railwayControl.parse(size, command, mode, nid, buffer);
+					break;
+				case 0x0c:
+					this.zimoProgrammableScript.parse(size, command, mode, nid, buffer);
+					break;
+				case 0x0e:
+					this.fileControl.parse(size, command, mode, nid, buffer);
+					break;
+				case 0x0f:
+					this.fileTransfer.parse(size, command, mode, nid, buffer);
+					break;
+				case 0x12:
+					this.lanLocoState.parse(size, command, mode, nid, buffer);
+					break;
+				case 0x17:
+					this.lanData.parse(size, command, mode, nid, buffer);
+					break;
+				case 0x18:
+					this.lanInfo.parse(size, command, mode, nid, buffer);
+					break;
+				case 0x1a:
+					this.lanNetwork.parse(size, command, mode, nid, buffer);
+					break;
+				case 0x1c:
+					this.lanZimoProgrammableScript.parse(size, command, mode, nid, buffer);
+					break;
+				case 0x2f:
+					break;
+				default:
+					this.logInfo.next('Zcan group ' + group + ' not parsed: ' + JSON.stringify(message));
+			}
+		} catch(err: any) {
+			this.logError.next('failed to parse zcan message: ' + JSON.stringify(message));
+			if(err.message)
+				this.logError.next(err.message);
 		}
 	}
 

package/src/accessory/accessoryCommandGroup.ts

@@ -69,8 +69,7 @@ export default class AccessoryCommandGroup {
         this.parseAccessoryPin(size, mode, nid, buffer);
         break;
       default:
-        // eslint-disable-next-line no-console
-        console.warn('command not parsed: ' + command.toString());
+        this.mx10.logInfo.next('accessoryCommandGroup command ' + command + ' not parsed: ' + JSON.stringify(buffer));
     }
   }
 

package/src/data/dataGroup.ts

@@ -46,15 +46,15 @@ export default class DataGroup
 		});
 		this.groupCountQ.tx = ((header) => {
 			const msg = new MsgGroupCount(header, groupNid);
-			this.mx10.logInfo.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.logInfo.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.logInfo.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;
@@ -72,12 +72,12 @@ export default class DataGroup
 		});
 		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.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());
+			// 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:
@@ -231,11 +231,11 @@ export default class DataGroup
 		switch (command)
 		{
 			case 0x00:
-				this.mx10.logInfo.next('parseGroupCount: ' + JSON.stringify(buffer));
+				// this.mx10.logInfo.next('parseGroupCount: ' + JSON.stringify(buffer));
 				this.parseGroupCount(size, mode, nid, buffer);
 				break;
 			case 0x01:
-				this.mx10.logInfo.next('parseItemListByIndex: ' + JSON.stringify(buffer));
+				// this.mx10.logInfo.next('parseItemListByIndex: ' + JSON.stringify(buffer));
 				this.parseItemListByIndex(size, mode, nid, buffer);
 				break;
 			case 0x02:
@@ -258,7 +258,7 @@ export default class DataGroup
 				this.parseDataNameExtended(size, mode, nid, buffer);
 				break;
 			default:
-				this.mx10.logInfo.next('command not parsed: ' + command.toString());
+				this.mx10.logInfo.next('dataGroup command ' + command + ' not parsed: ' + JSON.stringify(buffer));
 		}
 	}
 

package/src/data/lanDataGroup.ts

@@ -17,12 +17,13 @@ import { MsgLocoGuiReq, MsgLocoGuiRsp } from './lanDataMsg';
 export default class LanDataGroup
 {
 	public readonly onLocoGuiExtended = new Subject<MsgLocoGuiRsp>();
-	public readonly onLocoGuiMXExtended = new Subject<LocoGuiMXExtended>();
+	// public readonly onOldLocoGuiExtended = new Subject<MsgOldLocoGuiRsp>();
 	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 oldLocoGuiQ: Query<MsgOldLocoGuiRsp> | undefined = undefined;
 
 	private mx10: MX10;
 
@@ -82,7 +83,7 @@ export default class LanDataGroup
 		]);
 	}
 
-	async locoGuiExtended(nid: number): Promise<MsgLocoGuiRsp | undefined>
+	async getLocoGuiExtended(nid: number): Promise<MsgLocoGuiRsp | undefined>
 	{
 		if(this.locoGuiQ !== undefined && !await this.locoGuiQ.lock()) {
 			this.mx10.logInfo.next("mx10.locoGuiExtended: failed to acquire lock");
@@ -94,20 +95,77 @@ export default class LanDataGroup
 		});
 		this.locoGuiQ.tx = ((header) => {
 			const msg = new MsgLocoGuiReq(header, nid, 0);
-			this.mx10.logInfo.next('locoGuiExtended query tx: ' + JSON.stringify(msg));
+			// 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));
+			// 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.mx10.logInfo.next("mx10.locoGuiExtended.rv: " + JSON.stringify(rv));
 		this.locoGuiQ.unlock();
 		this.locoGuiQ = undefined;
 		return rv;
 	}
 
+	async setLocoGuiExtended(loco: Train): Promise<MsgLocoGuiRsp | undefined>
+	{
+		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.CMD, this.mx10.myNID), this.onLocoGuiExtended);
+		this.locoGuiQ.log = ((msg) => {
+			this.mx10.logInfo.next(msg);
+		});
+		this.locoGuiQ.tx = ((header) => {
+			const msg = new MsgLocoGuiRsp(header, loco.nid, loco.subId, 0, 0, loco.group, loco.name,
+				loco.image ? parseInt(loco.image) : 0, 0, parseInt(loco.tacho), 0, loco.speedFwd, loco.speedRev,
+				loco.speedRange, loco.driveType, parseInt(loco.era), loco.countryCode,
+				loco.functions.map(fun => fun.icon ? parseInt(fun.icon) : 0), loco.functions.map(fun => fun.mode)
+			);
+			// 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() === loco.nid);
+		})
+		this.locoGuiQ.subscribe(false);
+		const rv = await this.locoGuiQ.run(40);
+		// this.mx10.logInfo.next("mx10.locoGuiExtended.rv: " + JSON.stringify(rv));
+		this.locoGuiQ.unlock();
+		this.locoGuiQ = undefined;
+		return rv;
+	}
+
+	// async oldLocoGuiExtended(nid: number): Promise<MsgOldLocoGuiRsp | undefined>
+	// {
+	// 	if(this.oldLocoGuiQ !== undefined && !await this.oldLocoGuiQ.lock()) {
+	// 		this.mx10.logInfo.next("mx10.locoGuiExtended: failed to acquire lock");
+	// 		return undefined;
+	// 	}
+	// 	this.oldLocoGuiQ = new Query(MsgOldLocoGuiReq.header(MsgMode.REQ, this.mx10.mx10NID), this.onOldLocoGuiExtended);
+	// 	this.oldLocoGuiQ.log = ((msg) => {
+	// 		this.mx10.logInfo.next(msg);
+	// 	});
+	// 	this.oldLocoGuiQ.tx = ((header) => {
+	// 		const msg = new MsgOldLocoGuiReq(header, nid, 0);
+	// 		this.mx10.logInfo.next('locoGuiExtended query tx: ' + JSON.stringify(msg));
+	// 		this.mx10.sendMsg(msg);
+	// 	});
+	// 	this.oldLocoGuiQ.match = ((msg) => {
+	// 		this.mx10.logInfo.next('locoGuiExtended query rx: ' + JSON.stringify(msg));
+	// 		return (msg.locoNid() === nid);
+	// 	})
+	// 	const rv = await this.oldLocoGuiQ.run();
+	// 	this.mx10.logInfo.next("mx10.locoGuiExtended.rv: " + JSON.stringify(rv));
+	// 	this.oldLocoGuiQ.unlock();
+	// 	this.oldLocoGuiQ = undefined;
+	// 	return rv;
+	// }
+
 	// locoGuiExtended(NID: number)
 	// {
 	// 	this.mx10.sendData(0x17, 0x27, [
@@ -117,14 +175,14 @@ export default class LanDataGroup
 	// 	], 0b00);
 	// }
 
-	locoGuiMXExtended(NID: number)
-	{
-		this.mx10.sendData(0x17,0x28, [
-			{value: this.mx10.mx10NID, length: 2},
-			{value: NID, length: 2},
-			{value: 0, length: 2},
-		], 0b00);
-	}
+	// locoGuiMXExtended(NID: number)
+	// {
+	// 	this.mx10.sendData(0x17,0x28, [
+	// 		{value: this.mx10.mx10NID, length: 2},
+	// 		{value: NID, length: 2},
+	// 		{value: 0, length: 2},
+	// 	], 0b00);
+	// }
 
 	locoSpeedTapExtended(NID: number)
 	{
@@ -136,10 +194,10 @@ export default class LanDataGroup
 		], 0b00);
 	}
 
-	mxUpdateFnIcons(destructuredBuffer: ZcanDataArray)
-	{
-		this.mx10.sendData(0x17, 0x28, destructuredBuffer, 0b01);
-	}
+	// mxUpdateFnIcons(destructuredBuffer: ZcanDataArray)
+	// {
+	// 	this.mx10.sendData(0x17, 0x28, destructuredBuffer, 0b01);
+	// }
 
 	parse(size: number, command: number, mode: number, nid: number, buffer: Buffer)
 	{
@@ -151,15 +209,17 @@ export default class LanDataGroup
 			case 0x10:
 				this.parseDataNameExtended(size, mode, nid, buffer);
 				break;
-			case 0x27:
-				this.parseLocoGuiExtended(size, mode, nid, buffer);
-				break;
+			// case 0x27:
+			// 	this.parseOldLocoGuiExtended(size, mode, nid, buffer);
+			// 	break;
 			case 0x28:
-				this.parseLocoGuiMXExtended(size, mode, nid, buffer);
+				this.parseLocoGuiExtended(size, mode, nid, buffer);
 				break;
 			case 0x19:
 				this.parseLocoSpeedTabExtended(size, mode, nid, buffer);
 				break;
+			default:
+				this.mx10.logInfo.next('lanDataGroup command ' + command + ' not parsed: ' + JSON.stringify(buffer));
 		}
 	}
 
@@ -212,92 +272,46 @@ export default class LanDataGroup
 		this.onDataNameExtended.next({nid: NID, name});
 	}
 
-	// 0x17.0x27
+	// 0x17.0x28
 	private parseLocoGuiExtended(size: number, mode: number, nid: number, buffer: Buffer)
 	{
 		if(!this.onLocoGuiExtended.observed)
 			return;
 
-		const NID = buffer.readUInt16LE(0);
-		const SubID = buffer.readUInt16LE(2);
-		const vehicleGroup = buffer.readUInt16LE(4);
-		const name = ExtendedASCII.byte2str(buffer.subarray(6, 32));
-		const imageId = buffer.readUInt16LE(38);
-		const tacho = buffer.readUInt16LE(40);
-		const speedFwd = buffer.readUInt16LE(42);
-		const speedRev = buffer.readUInt16LE(44);
-		const speedRange = buffer.readUInt16LE(46);
-		const driveType = buffer.readUInt16LE(48);
-		const era = buffer.readUInt16LE(50);
-		const countryCode = buffer.readUInt16LE(52);
-		const functions: number[] = [];
-		for (let i = 0; i < 32; i++) {
-			const fun = buffer.readUInt16LE(54 + 2*i);
-			functions.push(fun);
-		}
-
-		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
-	private parseLocoGuiMXExtended(size: number, mode: number, nid: number, buffer: Buffer)
-	{
-		if(!this.onLocoGuiMXExtended.observed)
-			return;
+		// this.mx10.logInfo.next('parseLocoGuiExtended: ' + JSON.stringify(buffer));
 
 		const NID = buffer.readUInt16LE(0);
-		const name = ExtendedASCII.byte2str(buffer.subarray(12, 38));
+		const SubID = buffer.readUInt16LE(2);
+		const version = buffer.readUInt32LE(4);
+		const flags = buffer.readUInt16LE(8);
+		const group = buffer.readUInt16LE(10);
+		const name = ExtendedASCII.byte2str(buffer.subarray(12, 32));
 		const imageId = buffer.readUInt16LE(44);
-
-		// TODO: after documentation
-		// const SubID = buffer.readUInt16LE(2);
-		// const vehicleGroup = buffer.readUInt16LE(4);
-
-		// const name = ExtendedASCII.byte2str(buffer.subarray(6, 32));
-		// const imageId = buffer.readUInt16LE(38);
-		// const tacho = buffer.readUInt16LE(40);
-		// const speedFwd = buffer.readUInt16LE(42);
-		// const speedRev = buffer.readUInt16LE(44);
-		// const speedRange = buffer.readUInt16LE(46);
-		// 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 imageCrc = buffer.readUInt32LE(46);
+		const tachoId = buffer.readUInt16LE(50);
+		const tachoCrc = buffer.readUInt32LE(52);
+		const speedFwd = buffer.readUInt16LE(56);
+		const speedRev = buffer.readUInt16LE(58);
+		const speedRank = buffer.readUInt16LE(60);
+		const driveType = buffer.readUInt16LE(62);
+		const era = buffer.readUInt16LE(64);
+		const countryCode = buffer.readUInt16LE(66);
+		const funImg: number[] = [];
 		for (let i = 0; i < 64; i++) {
-			const icon = buffer.readUInt16LE(68 + i * 2);
-			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'),
-			});
+			const fun = buffer.readUInt16LE(68 + 2*i);
+			funImg.push(fun);
+		}
+		const funMode: number[] = [];
+		for (let i = 0; i < 64; i++) {
+			const fun = buffer.readUInt16LE(132 + 2*i);
+			funMode.push(fun);
 		}
 
-		//TODO: implement rest
-		this.onLocoGuiMXExtended.next({nid: NID, name: name, image: imageId == 0 ? undefined : imageId.toString(),
-			destructuredBuffer: this.destructureBuffer(buffer), functions});
+		const msg = new MsgLocoGuiRsp(MsgLocoGuiRsp.header(mode, nid), NID, SubID, version, flags, group, name,
+			imageId, imageCrc, tachoId, tachoCrc, speedFwd, speedRev, speedRank, driveType, era, countryCode,
+			funImg, funMode);
+		
+		this.onLocoGuiExtended.next(msg);
 	}
 
 	// 0x17.0x19

package/src/data/lanDataMsg.ts

@@ -3,10 +3,77 @@ import { Header, Message } from "../common/communication";
 import { TrainFunction } from "../docs_entrypoint";
 
 
+// export class MsgOldLocoGuiReq extends Message
+// {
+// 	public static header(mode: MsgMode, nid: number): Header
+// 	{return {group: 0x17, cmd: 0x27, mode: mode, nid: nid}}
+
+// 	constructor(header: Header, locoNid: number, subNid: number)
+// 	{
+// 		super(header);
+// 		super.push({value: locoNid, length: 2});
+// 		super.push({value: subNid, length: 2});
+// 	}
+// 	locoNid(): number {return (this.data[0].value as number)}
+// 	subNid(): number {return (this.data[1].value as number)}
+// }
+
+// export class MsgOldLocoGuiRsp extends Message
+// {
+// 	public static header(mode: MsgMode, nid: number): Header
+// 	{return {group: 0x17, cmd: 0x27, mode: mode, nid: nid}}
+
+// 	constructor(header: Header, locoNid: number, subNid: number, group: number, name: string, imageId: number,
+// 		tacho: number, speedFwd: number, speedRev: number, speedRange: number, driveType: number, era: number,
+// 		country: number, functions: number[])
+// 	{
+// 		super(header);
+// 		super.push({value: locoNid, length: 2});
+// 		super.push({value: subNid, length: 2});
+// 		super.push({value: group, length: 2});
+// 		super.push({value: name, length: 32});
+// 		super.push({value: imageId, length: 2});
+// 		super.push({value: tacho, length: 2});
+// 		super.push({value: speedFwd, length: 2});
+// 		super.push({value: speedRev, length: 2});
+// 		super.push({value: speedRange, length: 2});
+// 		super.push({value: driveType, length: 2});
+// 		super.push({value: era, length: 2});
+// 		super.push({value: country, length: 2});
+// 		functions.forEach(funk => {
+// 			super.push({value: funk, length: 2});
+// 		});
+// 	}
+// 	locoNid(): number {return (this.data[0].value as number)}
+// 	subNid(): number {return (this.data[1].value as number)}
+// 	group(): number {return (this.data[2].value as number)}
+// 	name(): string {return (this.data[3].value as string)}
+// 	imageId(): number {return (this.data[4].value as number)}
+// 	tacho(): number {return (this.data[5].value as number)}
+// 	speedFwd(): number {return (this.data[6].value as number)}
+// 	speedRev(): number {return (this.data[7].value as number)}
+// 	speedRange(): number {return (this.data[8].value as number)}
+// 	driveType(): number {return (this.data[9].value as number)}
+// 	era(): number {return (this.data[10].value as number)}
+// 	country(): number {return (this.data[11].value as number)}
+// 	functions(): Array<TrainFunction>
+// 	{
+// 		const rv = Array<TrainFunction>();
+// 		for (let i = 12; i < this.data.length; i++) {
+// 			const icon = (this.data[i].value as number);
+// 			const iconString = icon === 0 ? String(i).padStart(2, '0') : String(icon);
+// 			rv.push({mode: FunctionMode.switch, active: false,
+// 				icon: iconString.padStart(4, icon === 0 ? '07' : '0'),
+// 			});
+// 		}
+// 		return rv;
+// 	}
+// }
+
 export class MsgLocoGuiReq extends Message
 {
 	public static header(mode: MsgMode, nid: number): Header
-	{return {group: 0x17, cmd: 0x27, mode: mode, nid: nid}}
+	{return {group: 0x17, cmd: 0x28, mode: mode, nid: nid}}
 
 	constructor(header: Header, locoNid: number, subNid: number)
 	{
@@ -21,51 +88,74 @@ export class MsgLocoGuiReq extends Message
 export class MsgLocoGuiRsp extends Message
 {
 	public static header(mode: MsgMode, nid: number): Header
-	{return {group: 0x17, cmd: 0x27, mode: mode, nid: nid}}
+	{return {group: 0x17, cmd: 0x28, mode: mode, nid: nid}}
 
-	constructor(header: Header, locoNid: number, subNid: number, group: number, name: string, imageId: number,
-		tacho: number, speedFwd: number, speedRev: number, speedRange: number, driveType: number, era: number,
-		country: number, functions: number[])
+	constructor(header: Header, locoNid: number, subNid: number, version: number, flags: number, group: number,
+		name: string, imageId: number, imageCrc: number,  tachoId: number, tachoCrc: number,
+		speedFwd: number, speedRev: number, speedRnk: number, driveType: number, era: number,
+		country: number, funImgs: number[], funModes: number[])
 	{
 		super(header);
 		super.push({value: locoNid, length: 2});
 		super.push({value: subNid, length: 2});
+		super.push({value: version, length: 4});
+		super.push({value: flags, length: 2});
 		super.push({value: group, length: 2});
 		super.push({value: name, length: 32});
 		super.push({value: imageId, length: 2});
-		super.push({value: tacho, length: 2});
+		super.push({value: imageCrc, length: 4});
+		super.push({value: tachoId, length: 2});
+		super.push({value: tachoCrc, length: 4});
 		super.push({value: speedFwd, length: 2});
 		super.push({value: speedRev, length: 2});
-		super.push({value: speedRange, length: 2});
+		super.push({value: speedRnk, length: 2});
 		super.push({value: driveType, length: 2});
 		super.push({value: era, length: 2});
 		super.push({value: country, length: 2});
-		functions.forEach(funk => {
+		funImgs.forEach(funk => {
+			super.push({value: funk, length: 2});
+		});
+		funModes.forEach(funk => {
 			super.push({value: funk, length: 2});
 		});
 	}
 	locoNid(): number {return (this.data[0].value as number)}
 	subNid(): number {return (this.data[1].value as number)}
-	group(): number {return (this.data[2].value as number)}
-	name(): string {return (this.data[3].value as string)}
-	imageId(): number {return (this.data[4].value as number)}
-	tacho(): number {return (this.data[5].value as number)}
-	speedFwd(): number {return (this.data[6].value as number)}
-	speedRev(): number {return (this.data[7].value as number)}
-	speedRange(): number {return (this.data[8].value as number)}
-	driveType(): number {return (this.data[9].value as number)}
-	era(): number {return (this.data[10].value as number)}
-	country(): number {return (this.data[11].value as number)}
+	group(): number {return (this.data[4].value as number)}
+	name(): string {return (this.data[5].value as string)}
+	imageId(): number {return (this.data[6].value as number)}
+	tacho(): number {return (this.data[8].value as number)}
+	speedFwd(): number {return (this.data[10].value as number)}
+	speedRev(): number {return (this.data[11].value as number)}
+	speedRnk(): number {return (this.data[12].value as number)}
+	driveType(): number {return (this.data[13].value as number)}
+	era(): number {return (this.data[14].value as number)}
+	country(): number {return (this.data[15].value as number)}
 	functions(): Array<TrainFunction>
 	{
 		const rv = Array<TrainFunction>();
-		for (let i = 12; i < this.data.length; i++) {
+		for (let i = 16; i < 80; i++) {
 			const icon = (this.data[i].value as number);
 			const iconString = icon === 0 ? String(i).padStart(2, '0') : String(icon);
 			rv.push({mode: FunctionMode.switch, active: false,
 				icon: iconString.padStart(4, icon === 0 ? '07' : '0'),
 			});
 		}
+		for (let i = 80; i < 144; i++) {
+			rv[i-80].mode = this.data[i].value as number;
+		}
 		return rv;
 	}
+	// funModes(): Array<TrainFunction>
+	// {
+	// 	const rv = Array<TrainFunction>();
+	// 	for (let i = 12; i < this.data.length; i++) {
+	// 		const icon = (this.data[i].value as number);
+	// 		const iconString = icon === 0 ? String(i).padStart(2, '0') : String(icon);
+	// 		rv.push({mode: FunctionMode.switch, active: false,
+	// 			icon: iconString.padStart(4, icon === 0 ? '07' : '0'),
+	// 		});
+	// 	}
+	// 	return rv;
+	// }
 }