@zimo-elektronik/zcan 1.0.50 → 1.0.52

package/dist/info/infoMsg.js.map

@@ -1 +1 @@
-{"version":3,"file":"infoMsg.js","sourceRoot":"","sources":["../../src/info/infoMsg.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,OAAO,EAAiB,MAAM,yBAAyB,CAAC;AAKzE,MAAM,OAAO,UAAW,SAAQ,OAAO;IAE/B,MAAM,CAAC,MAAM,CAAC,IAAa,EAAE,GAAW,IAC9C,OAAO,EAAC,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAC,CAAA,CAAA,CAAC;IAElD,YAAY,MAAc,EAAE,IAAiB,EAAE,OAAsB,EAAE;QAEtE,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,KAAK,CAAC,IAAI,CAAC,EAAC,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAC,CAAC,CAAC;QACrC,IAAG,IAAI,CAAC,MAAM;YACb,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IACD,IAAI,KAA6B,OAAS,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAiC,CAAA,CAAA,CAAC;IACzF,IAAI,KAAwB,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAe,CAAC,CAAC,CAAC,SAAS,CAAA,CAAA,CAAC;CACnG"}
+{"version":3,"file":"infoMsg.js","sourceRoot":"","sources":["../../src/info/infoMsg.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.50",
+  "version": "1.0.52",
   "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/common/models.ts

@@ -110,18 +110,18 @@ export interface ModulePowerInfoData {
 	temperature: number;
 }
 
-export interface BidiInfoData {
-	nid: number;
-	type: BidiType;
-	data: BidiDirectionData | number;
-}
+// export interface BidiInfoData {
+// 	nid: number;
+// 	type: BidiType;
+// 	data: BidiDirectionData | number;
+// }
 
-export interface BidiDirectionData {
-	direction?: Direction;
-	forwardOrReverse?: ForwardOrReverse;
-	directionChange?: boolean;
-	directionConfirm?: boolean;
-}
+// export interface BidiDirectionData {
+// 	direction?: Direction;
+// 	forwardOrReverse?: ForwardOrReverse;
+// 	directionChange?: boolean;
+// 	directionConfirm?: boolean;
+// }
 
 export interface VehicleStateData {
 	nid: number;

package/src/info/infoGroup.ts

@@ -2,9 +2,8 @@ import {Buffer} from 'buffer';
 import MX10 from '../MX10';
 import {Subject} from 'rxjs';
 import {Query} from '../common/communication';
-import {BidiInfoData, BidiDirectionData} from '../common/models';
-import {BidiType, Direction, ForwardOrReverse, ModInfoType, MsgMode} from '../common/enums';
-import { MsgModInfo } from './infoMsg';
+import {ModInfoType, MsgMode} from '../common/enums';
+import {MsgBidiInfo, MsgModInfo} from './infoMsg';
 
 /**
  *
@@ -14,10 +13,11 @@ export default class InfoGroup
 {
 	private mx10: MX10;
 
-	public readonly onBidiInfoChange = new Subject<BidiInfoData>();
+	public readonly onBidiInfoChange = new Subject<MsgBidiInfo>();
 	public readonly onModuleInfoChange = new Subject<MsgModInfo>();
 
 	private modInfoQ: Query<MsgModInfo> | undefined = undefined;
+	private bidiQ: Query<MsgBidiInfo> | undefined = undefined;
 
 	constructor(mx10: MX10)
 	{
@@ -30,7 +30,6 @@ export default class InfoGroup
 			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.logInfo.next(msg);
@@ -52,6 +51,30 @@ export default class InfoGroup
 		return rv;
 	}
 
+	async getBidiInfo(locoNid: number, type: number): Promise<MsgBidiInfo | undefined>
+	{
+		if(this.bidiQ !== undefined && !await this.bidiQ.lock()) {
+			this.mx10.logInfo.next("mx10.getBidiInfo: failed to acquire lock");
+			return undefined;
+		}
+		this.bidiQ = new Query(MsgBidiInfo.header(MsgMode.REQ, locoNid), this.onBidiInfoChange);
+		this.bidiQ.tx = ((header) => {
+			const msg = new MsgBidiInfo(header, type, locoNid);
+			this.mx10.logInfo.next('bidi query tx: ' + JSON.stringify(msg));
+			this.mx10.sendMsg(msg);
+		});
+		this.bidiQ.match = ((msg) => {
+			this.mx10.logInfo.next('bidi query rx: ' + JSON.stringify(msg));
+			return (msg.type() === type);
+		})
+		this.bidiQ.subscribe(false);
+		const rv = await this.bidiQ.run();
+		this.mx10.logInfo.next("mx10.getBidiInfo.rv: " + JSON.stringify(rv));
+		this.bidiQ.unlock();
+		this.bidiQ = undefined;
+		return rv;
+	}
+
 	parse(size: number, command: number, mode: number, nid: number, buffer: Buffer)
 	{
 		switch (command) {
@@ -87,41 +110,30 @@ export default class InfoGroup
 		const type = buffer.readUInt16LE(2);
 		const info = buffer.readUInt32LE(4);
 
-		let data: BidiDirectionData | number = {};
-		switch (type) {
-			case BidiType.DIRECTION:
-				data.direction = this.parseEastWest(info);
-				data.directionChange = this.parseDirChange(info);
-				data.directionConfirm = this.parseDirectionConfirm(info);
-				data.forwardOrReverse = this.parseFwdRev(info);
-				break;
-			default:
-				data = info;
-		}
-
-		this.onBidiInfoChange.next({nid: NID, type, data,});
+		const msg = new MsgBidiInfo(MsgBidiInfo.header(mode, NID), type, undefined, info);
+		this.onBidiInfoChange.next(msg);
 	}
 
-	private parseEastWest(data: number)
-	{
-		if ((data & 0x02) == 0x02)
-			return Direction.EAST;
-		return Direction.WEST;
-	}
+	// private parseEastWest(data: number)
+	// {
+	// 	if ((data & 0x02) == 0x02)
+	// 		return Direction.EAST;
+	// 	return Direction.WEST;
+	// }
 
-	private parseDirChange(data: number)
-	{
-		return (data & 0x04) == 0x04;
-	}
+	// private parseDirChange(data: number)
+	// {
+	// 	return (data & 0x04) == 0x04;
+	// }
 
-	private parseFwdRev(data: number)
-	{
-		if ((data & 0x01) == 0)
-			return ForwardOrReverse.REVERSE;
-		return ForwardOrReverse.FORWARD;
-	}
-	private parseDirectionConfirm(data: number)
-	{
-		return (data & 0x08) == 0x08;
-	}
+	// private parseFwdRev(data: number)
+	// {
+	// 	if ((data & 0x01) == 0)
+	// 		return ForwardOrReverse.REVERSE;
+	// 	return ForwardOrReverse.FORWARD;
+	// }
+	// private parseDirectionConfirm(data: number)
+	// {
+	// 	return (data & 0x08) == 0x08;
+	// }
 }

package/src/info/infoMsg.ts

@@ -18,4 +18,46 @@ export class MsgModInfo extends Message
 	}
 	type(): ModInfoType | undefined {return ((this.data[0].value as unknown) as ModInfoType)}
 	info(): number | undefined {return this.data.length > 1 ? this.data[1].value as number : undefined}
+}
+
+export class MsgBidiInfo extends Message
+{
+	public static header(mode: MsgMode, nid: number): Header
+	{return {group: 0x08, cmd: 0x05, mode: mode, nid}}
+	
+	constructor(header: Header, type: number, nid?: number, info?: number)
+	{
+		super(header);
+		
+		if(header.mode === MsgMode.REQ) {
+			super.push({value: nid || 0, length: 2});
+			super.push({value: type, length: 2});
+		} else {
+			super.push({value: type, length: 2});
+			super.push({value: info || 0, length: 4});
+		}
+	}
+	nid(): number {return this.header.mode === MsgMode.REQ ? this.data[0].value as number : this.header.nid || 0}
+	type(): number {return this.data[this.header.mode === MsgMode.REQ ? 1 : 0].value as number}
+	info(): number | undefined {return this.data.length > 1 ? this.data[1].value as number : undefined}
+
+	public static dirEast(info: number)
+	{
+		return ((info & 0x02) == 0x02)
+	}
+
+	public static dirChanging(info: number)
+	{
+		return ((info & 0x04) == 0x04)
+	}
+
+	public static dirForward(info: number)
+	{
+		return ((info & 0x01) == 0x01)
+	}
+
+	public static dirConfirm(info: number)
+	{
+		return ((info & 0x08) == 0x08)
+	}
 }