@zimo-elektronik/zcan 1.0.40 → 1.0.42

package/src/data/lanDataMsg.ts

@@ -0,0 +1,71 @@
+import { FunctionMode, MsgMode } from "../common/enums";
+import { Header, Message } from "../common/communication";
+import { TrainFunction } from "../docs_entrypoint";
+
+
+export class MsgLocoGuiReq 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 MsgLocoGuiRsp 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;
+	}
+}

package/src/file/fileControlGroup.ts

@@ -20,6 +20,6 @@ export default class FileControlGroup {
 		nid: number,
 		buffer: Buffer,
 	) {
-		// console.log('parse file control group');
+		// this.mx10.logInfo.next('parse file control group');
 	}
 }

package/src/file/fileTransferGroup.ts

@@ -20,6 +20,6 @@ parse(
 	nid: number,
 	buffer: Buffer,
 ) {
-	// console.log('parse file transfer group');
+	// this.mx10.logInfo.next('parse file transfer group');
 }
 }

package/src/info/infoGroup.ts

@@ -27,26 +27,26 @@ export default class InfoGroup
 	async getModuleInfo(nid: number, type: ModInfoType | number): Promise<MsgModInfo | undefined>
 	{
 		if(this.modInfoQ !== undefined && !await this.modInfoQ.lock()) {
-			this.mx10.log.next("mx10.getModuleInfo: failed to acquire lock");
+			this.mx10.logInfo.next("mx10.getModuleInfo: failed to acquire lock");
 			return undefined;
 		}
 
 		this.modInfoQ = new Query(MsgModInfo.header(MsgMode.REQ, nid), this.onModuleInfoChange);
 		this.modInfoQ.log = ((msg) => {
-			this.mx10.log.next(msg);
+			this.mx10.logInfo.next(msg);
 		});
 		this.modInfoQ.tx = ((header) => {
 			const msg = new MsgModInfo(header, type);
-			this.mx10.log.next('mx10 query tx: ' + JSON.stringify(msg));
+			this.mx10.logInfo.next('mx10 query tx: ' + JSON.stringify(msg));
 			this.mx10.sendMsg(msg);
 		});
 		this.modInfoQ.match = ((msg) => {
-			this.mx10.log.next('mx10 query rx: ' + JSON.stringify(msg));
+			this.mx10.logInfo.next('mx10 query rx: ' + JSON.stringify(msg));
 			return (msg.type() === type);
 		})
 		// this.modInfoQ.subscribe();
 		const rv = await this.modInfoQ.run();
-		this.mx10.log.next("mx10.getModuleInfo.rv: " + JSON.stringify(rv));
+		this.mx10.logInfo.next("mx10.getModuleInfo.rv: " + JSON.stringify(rv));
 		this.modInfoQ.unlock();
 		this.modInfoQ = undefined;
 		return rv;
@@ -62,8 +62,7 @@ export default class InfoGroup
 				this.parseModuleInfo(size, mode, nid, buffer);
 				break;
 			default:
-				// eslint-disable-next-line no-console
-				console.log('command not parsed: ' + command.toString());
+				this.mx10.logInfo.next('command not parsed: ' + command.toString());
 		}
 	}
 
@@ -74,7 +73,7 @@ export default class InfoGroup
 			const type = buffer.readUInt16LE(2);
 			const info = buffer.readUInt32LE(4);
 			const msg = new MsgModInfo(MsgModInfo.header(mode, NID), type, [{value: info, length: 4}]);
-			// this.mx10.log.next('onModuleInfoChange <- ' + JSON.stringify(msg));
+			// this.mx10.logInfo.next('onModuleInfoChange <- ' + JSON.stringify(msg));
 			this.onModuleInfoChange.next(msg);
 		}
 	}

package/src/loco/vehicleGroup.ts

@@ -30,22 +30,22 @@ export default class VehicleGroup
 	async getVehicleMode(trainNid: number)
 	{
 		if(this.modeQ !== undefined && !await this.modeQ.lock()) {
-			this.mx10.log.next("mx10.getVehicleMode: failed to acquire lock");
+			this.mx10.logInfo.next("mx10.getVehicleMode: failed to acquire lock");
 			return undefined;
 		}
 		this.modeQ = new Query(MsgVehicleMode.header(MsgMode.REQ, trainNid), this.onVehicleMode);
-		this.modeQ.log = ((msg) => {this.mx10.log.next(msg)});
+		this.modeQ.log = ((msg) => {this.mx10.logInfo.next(msg)});
 		this.modeQ.tx = ((header) => {
 			const msg = new MsgVehicleMode(header);
-			// this.mx10.log.next('mode query tx: ' + JSON.stringify(msg));
+			// this.mx10.logInfo.next('mode query tx: ' + JSON.stringify(msg));
 			this.mx10.sendMsg(msg);
 		});
 		this.modeQ.match = ((msg) => {
-			// this.mx10.log.next('mode query rx: ' + JSON.stringify(msg));
+			// this.mx10.logInfo.next('mode query rx: ' + JSON.stringify(msg));
 			return (msg.trainNid() === trainNid);
 		})
 		const rv = await this.modeQ.run();
-		this.mx10.log.next("mx10.getVehicleMode.rv: " + JSON.stringify(rv));
+		this.mx10.logInfo.next("mx10.getVehicleMode.rv: " + JSON.stringify(rv));
 		this.modeQ.unlock();
 		this.modeQ = undefined;
 		return rv;
@@ -53,24 +53,24 @@ export default class VehicleGroup
 
 	async setVehicleMode(trainNid: number, opMode: OperatingMode, speedSteps: MaxSpeedSteps)
 	{
-		MsgVehicleMode.log = (msg) => {this.mx10.log.next(msg)};
+		MsgVehicleMode.log = (msg) => {this.mx10.logInfo.next(msg)};
 		if(this.modeQ !== undefined && !await this.modeQ.lock()) {
-			this.mx10.log.next("mx10.setVehicleMode: failed to acquire lock");
+			this.mx10.logInfo.next("mx10.setVehicleMode: failed to acquire lock");
 			return undefined;
 		}
 		this.modeQ = new Query(MsgVehicleMode.header(MsgMode.CMD, trainNid), this.onVehicleMode);
-		this.modeQ.log = (msg) => {this.mx10.log.next(msg)};
+		this.modeQ.log = (msg) => {this.mx10.logInfo.next(msg)};
 		this.modeQ.tx = ((header) => {
 			const msg = new MsgVehicleMode(header, {opMode, speedSteps});
-			this.mx10.log.next('mode query tx: ' + JSON.stringify(msg));
+			this.mx10.logInfo.next('mode query tx: ' + JSON.stringify(msg));
 			this.mx10.sendMsg(msg);
 		});
 		this.modeQ.match = ((msg) => {
-			this.mx10.log.next('mode query rx: ' + JSON.stringify(msg));
+			this.mx10.logInfo.next('mode query rx: ' + JSON.stringify(msg));
 			return (msg.trainNid() === trainNid);
 		})
 		const rv = await this.modeQ.run(MsgVehicleMode.rxDelay());
-		this.mx10.log.next("mx10.setVehicleMode.rv: " + JSON.stringify(rv));
+		this.mx10.logInfo.next("mx10.setVehicleMode.rv: " + JSON.stringify(rv));
 		this.modeQ.unlock();
 		this.modeQ = undefined;
 		return rv;
@@ -79,22 +79,22 @@ export default class VehicleGroup
 	async getVehicleSpeed(trainNid: number)
 	{
 		if(this.speedQ !== undefined && !await this.speedQ.lock()) {
-			this.mx10.log.next("mx10.getVehicleSpeed: failed to acquire lock");
+			this.mx10.logInfo.next("mx10.getVehicleSpeed: failed to acquire lock");
 			return undefined;
 		}
 		this.speedQ = new Query(MsgVehicleSpeed.header(MsgMode.REQ, trainNid), this.onVehicleSpeed);
-		this.speedQ.log = ((msg) => {this.mx10.log.next(msg)});
+		this.speedQ.log = ((msg) => {this.mx10.logInfo.next(msg)});
 		this.speedQ.tx = ((header) => {
 			const msg = new MsgVehicleSpeed(header);
-			// this.mx10.log.next('speed query tx: ' + JSON.stringify(msg));
+			// this.mx10.logInfo.next('speed query tx: ' + JSON.stringify(msg));
 			this.mx10.sendMsg(msg);
 		});
 		this.speedQ.match = ((msg) => {
-			// this.mx10.log.next('speed query rx: ' + JSON.stringify(msg));
+			// this.mx10.logInfo.next('speed query rx: ' + JSON.stringify(msg));
 			return (msg.trainNid() === trainNid);
 		})
 		const rv = await this.speedQ.run();
-		this.mx10.log.next("mx10.getVehicleSpeed.rv: " + JSON.stringify(rv));
+		this.mx10.logInfo.next("mx10.getVehicleSpeed.rv: " + JSON.stringify(rv));
 		this.speedQ.unlock();
 		this.speedQ = undefined;
 		return rv;
@@ -103,25 +103,25 @@ export default class VehicleGroup
 	async setVehicleSpeed(trainNid: number, speedStep: number, divisor: number = 0, forward: boolean = true,
 		emergencyStop: boolean = false, eastWest: Direction = Direction.UNDEFINED)
 	{
-		MsgVehicleSpeed.log = (msg) => {this.mx10.log.next(msg)};
+		MsgVehicleSpeed.log = (msg) => {this.mx10.logInfo.next(msg)};
 		if(this.speedQ !== undefined && !await this.speedQ.lock()) {
-			this.mx10.log.next("mx10.setVehicleSpeed: failed to acquire lock");
+			this.mx10.logInfo.next("mx10.setVehicleSpeed: failed to acquire lock");
 			return undefined;
 		}
 		this.speedQ = new Query(MsgVehicleSpeed.header(MsgMode.CMD, trainNid), this.onVehicleSpeed);
-		this.speedQ.log = (msg) => {this.mx10.log.next(msg)};
+		this.speedQ.log = (msg) => {this.mx10.logInfo.next(msg)};
 		this.speedQ.tx = ((header) => {
 			const speedAndDir= MsgVehicleSpeed.speedAndDir(speedStep, forward, emergencyStop, eastWest);
 			const msg = new MsgVehicleSpeed(header, speedAndDir, divisor);
-			this.mx10.log.next('speed query tx: ' + JSON.stringify(msg));
+			this.mx10.logInfo.next('speed query tx: ' + JSON.stringify(msg));
 			this.mx10.sendMsg(msg);
 		});
 		this.speedQ.match = ((msg) => {
-			this.mx10.log.next('speed query rx: ' + JSON.stringify(msg));
+			this.mx10.logInfo.next('speed query rx: ' + JSON.stringify(msg));
 			return (msg.trainNid() === trainNid);
 		})
 		const rv = await this.speedQ.run(MsgVehicleSpeed.rxDelay());
-		this.mx10.log.next("mx10.setVehicleSpeed.rv: " + JSON.stringify(rv));
+		this.mx10.logInfo.next("mx10.setVehicleSpeed.rv: " + JSON.stringify(rv));
 		this.speedQ.unlock();
 		this.speedQ = undefined;
 		return rv;
@@ -177,7 +177,7 @@ export default class VehicleGroup
 
 	parse(size: number, command: number, mode: number, nid: number, buffer: Buffer)
 	{
-		this.mx10.log.next("mx10.vehicleGroup.parse: " + command + "," + nid + "," + JSON.stringify(buffer));
+		this.mx10.logInfo.next("mx10.vehicleGroup.parse: " + command + "," + nid + "," + JSON.stringify(buffer));
 		switch (command) {
 			case 0x00: this.parseVehicleState(size, mode, nid, buffer); break;
 			case 0x01: this.parseVehicleMode(size, mode, nid, buffer); break;
@@ -210,7 +210,7 @@ export default class VehicleGroup
 		if (this.onVehicleMode.observed) {
 			const NID = buffer.readUInt16LE(0);
 			const vMode = [buffer.readUInt8(2), buffer.readUInt8(3), buffer.readUInt8(4)];
-			this.mx10.log.next("parseVehicleMode: " + NID + " = " + JSON.stringify(vMode));
+			this.mx10.logInfo.next("parseVehicleMode: " + NID + " = " + JSON.stringify(vMode));
 			this.onVehicleMode.next(new MsgVehicleMode(MsgVehicleMode.header(mode, NID), vMode));
 		}
 	}
@@ -222,7 +222,7 @@ export default class VehicleGroup
 			return;
 
 		const msg = MsgVehicleSpeed.fromBuffer(mode, buffer);
-		this.mx10.log.next('parseVehicleSpeed: ' + JSON.stringify(msg));
+		this.mx10.logInfo.next('parseVehicleSpeed: ' + JSON.stringify(msg));
 		this.onVehicleSpeed.next(msg);
 
 

package/src/misc/propertyConfigGroup.ts

@@ -20,6 +20,6 @@ export default class PropertyConfigGroup {
 		nid: number,
 		buffer: Buffer,
 	) {
-		// console.log('parse property config group');
+		// this.mx10.logInfo.next('parse property config group');
 	}
 }

package/src/misc/railwayControlGroup.ts

@@ -20,6 +20,6 @@ export default class RailwayControlGroup {
 		nid: number,
 		buffer: Buffer,
 	) {
-		// console.log('parse railway control group');
+		// this.mx10.logInfo.next('parse railway control group');
 	}
 }

package/src/network/lanNetworkGroup.ts

@@ -37,20 +37,20 @@ export default class LanNetworkGroup
 	async portOpen(clientName: string, clientId: number, comFlags = 0xffffffff): Promise<MsgPortOpen | undefined>
 	{
 		if(this.portOpenQ !== undefined && !await this.portOpenQ.lock()) {
-			this.mx10.log.next("mx10.portOpen: failed to acquire lock");
+			this.mx10.logInfo.next("mx10.portOpen: failed to acquire lock");
 			return undefined;
 		}
 		this.portOpenQ = new Query(MsgPortOpen.header(MsgMode.CMD, this.mx10.myNID), this.onPortOpen);
 		this.portOpenQ.log = ((msg) => {
-			this.mx10.log.next(msg);
+			this.mx10.logInfo.next(msg);
 		});
 		this.portOpenQ.tx = ((header) => {
 			const msg = new MsgPortOpen(header, clientId, comFlags, clientName);
-			this.mx10.log.next('portOpen query tx: ' + JSON.stringify(msg));
+			this.mx10.logInfo.next('portOpen query tx: ' + JSON.stringify(msg));
 			this.mx10.sendMsg(msg, true);
 		});
 		this.portOpenQ.match = ((msg) => {
-			this.mx10.log.next('portOpen query rx: ' + JSON.stringify(msg));
+			this.mx10.logInfo.next('portOpen query rx: ' + JSON.stringify(msg));
 			return (msg.clientId() === clientId);
 		});
 		this.portOpenQ.subscribe(false);
@@ -59,7 +59,7 @@ export default class LanNetworkGroup
 		// 	this.mx10.mx10NID = this.portOpenQ.header.nid || 0;
 		// 	this.mx10.connected = true;
 		// }
-		this.mx10.log.next("mx10.portOpen.rv: " + JSON.stringify(rv));
+		this.mx10.logInfo.next("mx10.portOpen.rv: " + JSON.stringify(rv));
 		this.portOpenQ.unlock();
 		this.portOpenQ = undefined;
 		return rv;
@@ -70,7 +70,7 @@ export default class LanNetworkGroup
 	{
 		switch (command) {
 			case 0x06:
-				this.mx10.log.next('parsePortOpen, nid = ' + nid + ', buf = ' + JSON.stringify(buffer))
+				this.mx10.logInfo.next('parsePortOpen, nid = ' + nid + ', buf = ' + JSON.stringify(buffer))
 				this.parsePortOpen(size, mode, nid, buffer);
 				break;
 			case 0x0e:

package/src/network/networkGroup.ts

@@ -34,25 +34,25 @@ export default class NetworkGroup
 	async portClose()
 	{
 		// if(this.portCloseQ !== undefined && !await this.portCloseQ.lock()) {
-		// 	this.mx10.log.next("mx10.portClose: failed to acquire lock");
+		// 	this.mx10.logInfo.next("mx10.portClose: failed to acquire lock");
 		// 	return undefined;
 		// }
 		// this.portCloseQ = new Query(MsgPortClose.header(MsgMode.CMD, this.mx10.mx10NID), this.onPortClose);
 		// this.portCloseQ.log = ((msg) => {
-		// 	this.mx10.log.next(msg);
+		// 	this.mx10.logInfo.next(msg);
 		// });
 		// this.portCloseQ.tx = ((header) => {
 		// 	const msg = new MsgPortClose(header, this.mx10.myNID);
-		// 	this.mx10.log.next('portClose query tx: ' + JSON.stringify(msg));
+		// 	this.mx10.logInfo.next('portClose query tx: ' + JSON.stringify(msg));
 		// 	this.mx10.sendMsg(msg, true);
 		// });
 		// this.portCloseQ.match = ((msg) => {
-		// 	this.mx10.log.next('portClose query rx: ' + JSON.stringify(msg));
+		// 	this.mx10.logInfo.next('portClose query rx: ' + JSON.stringify(msg));
 		// 	return true;
 		// });
 		// this.portCloseQ.subscribe(false);
 		// const rv = await this.portCloseQ.run();
-		// this.mx10.log.next("mx10.portClose.rv: " + JSON.stringify(rv));
+		// this.mx10.logInfo.next("mx10.portClose.rv: " + JSON.stringify(rv));
 		// this.portCloseQ.unlock();
 		// this.portCloseQ = undefined;
 		// return rv;
@@ -96,8 +96,7 @@ export default class NetworkGroup
 				this.onPingResponse.next({
 					connected: this.mx10.connected,
 				});
-				// eslint-disable-next-line no-console
-				console.log('No ping for 2 seconds, disconnected');
+				this.mx10.logInfo.next('No ping for 2 seconds, disconnected');
 			}, 2000);
 		} else {
 			throw new Error(

package/src/script/lanScriptGroup.ts

@@ -22,6 +22,6 @@ export default class LanZimoProgrammableScriptGroup
 		nid: number,
 		buffer: Buffer,
 	) {
-		// console.log('parse data group');
+		// this.mx10.logInfo.next('parse data group');
 	}
 }

package/src/script/scriptGroup.ts

@@ -21,6 +21,6 @@ export default class ZimoProgrammableScriptGroup
 		nid: number,
 		buffer: Buffer,
 	) {
-		// console.log('parse zcs group');
+		// this.mx10.logInfo.next('parse zcs group');
 	}
 }

package/src/track/trackGroup.ts

@@ -24,7 +24,7 @@ export default class TrackCfgGroup
 
 	parse(size: number, command: number, mode: number, nid: number, buffer: Buffer)
 	{
-		// this.mx10.log.next("parseTse: " + command + "." + mode + ":" + nid + " ... " + JSON.stringify(buffer));
+		// this.mx10.logInfo.next("parseTse: " + command + "." + mode + ":" + nid + " ... " + JSON.stringify(buffer));
 		switch (command) {
 			case 0x02: this.parseTseInfo(size, mode, nid, buffer); break;
 			case 0x08: this.parseTseProgRead(size, mode, nid, buffer); break;
@@ -62,7 +62,7 @@ export default class TrackCfgGroup
 		const NID = buffer.readUInt16LE(2);
 		const cfgNum = buffer.readUInt32LE(4);
 		const cvValue = buffer.readUInt16LE(8);
-		// this.mx10.log.next("parseTseProgRead: " + JSON.stringify(buffer));
+		// this.mx10.logInfo.next("parseTseProgRead: " + JSON.stringify(buffer));
 
 		this.onTseProgReadExtended.next(new MsgCvRead(MsgCvRead.header(mode, nid), NID, cfgNum, cvValue));
 	}
@@ -76,7 +76,7 @@ export default class TrackCfgGroup
 		const NID = buffer.readUInt16LE(0);
 		const cfgNum = buffer.readUInt32LE(2);
 		const cvValue = buffer.readUint8(6);
-		// this.mx10.log.next("parseTseProgWrite: " + JSON.stringify(buffer));
+		// this.mx10.logInfo.next("parseTseProgWrite: " + JSON.stringify(buffer));
 
 		this.onTseProgWriteExtended.next(new MsgCvWrite(MsgCvWrite.header(mode, nid), NID, cfgNum, cvValue));
 	}
@@ -126,13 +126,13 @@ export default class TrackCfgGroup
 	async getCv(trainNid: number, cvNum: number): Promise<MsgCvRead | undefined>
 	{
 		if(this.getCvQ !== undefined && !await this.getCvQ.lock()) {
-			this.mx10.log.next("mx10.getCv: failed to acquire lock");
+			this.mx10.logInfo.next("mx10.getCv: failed to acquire lock");
 			return undefined;
 		}
 
 		this.getCvQ = new Query(MsgCvRead.header(MsgMode.CMD, this.mx10.mx10NID), this.onTseProgReadExtended);
 		this.getCvQ.log = ((msg) => {
-			this.mx10.log.next(msg);
+			this.mx10.logInfo.next(msg);
 		});
 		this.getCvQ.tx = ((header) => {
 			const msg = new MsgCvRead(header, trainNid, cvNum);
@@ -144,7 +144,7 @@ export default class TrackCfgGroup
 			return (msg.trainNid() === trainNid && msg.cvNum() === cvNum);
 		})
 		const rv = await this.getCvQ.run();
-		this.mx10.log.next("mx10.getCv.rv: " + JSON.stringify(rv));
+		this.mx10.logInfo.next("mx10.getCv.rv: " + JSON.stringify(rv));
 		this.getCvQ.unlock();
 		this.getCvQ = undefined;
 		return rv;
@@ -153,25 +153,25 @@ export default class TrackCfgGroup
 	async setCv(trainNid: number, cvNum: number, cvVal: number): Promise<MsgCvWrite | undefined>
 	{
 		if(this.setCvQ !== undefined && !await this.setCvQ.lock()) {
-			this.mx10.log.next("mx10.setCv: failed to acquire lock");
+			this.mx10.logInfo.next("mx10.setCv: failed to acquire lock");
 			return undefined;
 		}
 
 		this.setCvQ = new Query(MsgCvWrite.header(MsgMode.CMD, this.mx10.mx10NID), this.onTseProgWriteExtended);
 		this.setCvQ.log = ((msg) => {
-			this.mx10.log.next(msg);
+			this.mx10.logInfo.next(msg);
 		});
 		this.setCvQ.tx = ((header) => {
 			const msg = new MsgCvWrite(header, trainNid, cvNum, cvVal);
-			// this.mx10.log.next('cv write query tx: ' + JSON.stringify(msg));
+			// this.mx10.logInfo.next('cv write query tx: ' + JSON.stringify(msg));
 			this.mx10.sendMsg(msg);
 		});
 		this.setCvQ.match = ((msg) => {
-			// this.mx10.log.next('cv write query rx: ' + JSON.stringify(msg));
+			// this.mx10.logInfo.next('cv write query rx: ' + JSON.stringify(msg));
 			return (msg.trainNid() === trainNid && msg.cvNum() === cvNum && msg.cvVal() === cvVal);
 		})
 		const rv = await this.setCvQ.run();
-		this.mx10.log.next("mx10.setCv.rv: " + JSON.stringify(rv));
+		this.mx10.logInfo.next("mx10.setCv.rv: " + JSON.stringify(rv));
 		this.setCvQ.unlock();
 		this.setCvQ = undefined;
 		return rv;
@@ -180,13 +180,13 @@ export default class TrackCfgGroup
 	async setCv16(trainNid: number, cvNum: number, cvVal: number): Promise<MsgCvWrite16 | undefined>
 	{
 		if(this.setCvQ !== undefined && !await this.setCvQ.lock()) {
-			this.mx10.log.next("mx10.setCv: failed to acquire lock");
+			this.mx10.logInfo.next("mx10.setCv: failed to acquire lock");
 			return undefined;
 		}
 
 		this.setCvQ = new Query(MsgCvWrite16.header(MsgMode.CMD, this.mx10.mx10NID), this.onTseProgWrite16Extended);
 		this.setCvQ.log = ((msg) => {
-			this.mx10.log.next(msg);
+			this.mx10.logInfo.next(msg);
 		});
 		this.setCvQ.tx = ((header) => {
 			const msg = new MsgCvWrite16(header, trainNid, cvNum, cvVal);
@@ -198,7 +198,7 @@ export default class TrackCfgGroup
 			return (msg.trainNid() === trainNid && msg.cvNum() === cvNum && msg.cvVal() === cvVal);
 		})
 		const rv = await this.setCvQ.run();
-		this.mx10.log.next("mx10.setCv.rv: " + JSON.stringify(rv));
+		this.mx10.logInfo.next("mx10.setCv.rv: " + JSON.stringify(rv));
 		this.setCvQ.unlock();
 		this.setCvQ = undefined;
 		return rv;