@zimo-elektronik/zcan 1.0.37 → 1.0.39

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (27) hide show
  1. package/dist/MX10.js +11 -0
  2. package/dist/MX10.js.map +1 -1
  3. package/dist/common/communication.d.ts +1 -1
  4. package/dist/common/communication.js +2 -2
  5. package/dist/common/communication.js.map +1 -1
  6. package/dist/data/dataGroup.d.ts +5 -3
  7. package/dist/data/dataGroup.js +33 -9
  8. package/dist/data/dataGroup.js.map +1 -1
  9. package/dist/data/dataMsg.d.ts +6 -0
  10. package/dist/data/dataMsg.js +12 -0
  11. package/dist/data/dataMsg.js.map +1 -1
  12. package/dist/data/lanDataGroup.js.map +1 -1
  13. package/dist/info/infoGroup.js +20 -30
  14. package/dist/info/infoGroup.js.map +1 -1
  15. package/dist/network/lanNetworkGroup.js +5 -5
  16. package/dist/network/lanNetworkGroup.js.map +1 -1
  17. package/dist/network/networkGroup.js +22 -30
  18. package/dist/network/networkGroup.js.map +1 -1
  19. package/package.json +1 -1
  20. package/src/MX10.ts +17 -0
  21. package/src/common/communication.ts +11 -11
  22. package/src/data/dataGroup.ts +36 -12
  23. package/src/data/dataMsg.ts +20 -0
  24. package/src/data/lanDataGroup.ts +2 -10
  25. package/src/info/infoGroup.ts +37 -52
  26. package/src/network/lanNetworkGroup.ts +16 -27
  27. package/src/network/networkGroup.ts +40 -53
package/dist/MX10.js CHANGED
@@ -160,12 +160,23 @@ export default class MX10 {
160
160
  });
161
161
  }
162
162
  readRawData(message) {
163
+ if (message.byteLength < 8)
164
+ return;
163
165
  const size = message.readUInt16LE(0);
164
166
  const group = message.readUInt8(4);
165
167
  const commandAndMode = message.readUInt8(5);
166
168
  const command = commandAndMode >> 2;
167
169
  const mode = commandAndMode & 0x03;
168
170
  const nid = message.readUInt16LE(6);
171
+ if (!this.mx10NID && (group !== 0x1a || command !== 0x06 || mode !== MsgMode.ACK))
172
+ return;
173
+ if (this.mx10NID && nid !== this.mx10NID) {
174
+ if ((nid >> 8 !== 0xc0)) {
175
+ if (!(group === 0xa && command === 0 && mode === MsgMode.EVT))
176
+ this.log.next('Not from MX10: ' + JSON.stringify(message));
177
+ }
178
+ return;
179
+ }
169
180
  const buffer = message.slice(8);
170
181
  this.printReadout(group, command, mode, nid, size, buffer, false);
171
182
  switch (group) {
package/dist/MX10.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"MX10.js","sourceRoot":"","sources":["../src/MX10.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"MX10.js","sourceRoot":"","sources":["../src/MX10.ts"],"names":[],"mappings":"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"}
package/dist/common/communication.d.ts CHANGED
@@ -33,7 +33,7 @@ export declare class Query<T extends Message> {
33
33
  constructor(header: Header, subject: Subject<T>, match?: (msg: T) => boolean);
34
34
  lock(millis?: number): Promise<boolean>;
35
35
  unlock(): void;
36
- subscribe(): void;
36
+ subscribe(matchNid?: boolean): void;
37
37
  run(rxDelay?: number, retries?: number): Promise<T | undefined>;
38
38
  }
39
39
  export type NIDGenerator = () => Promise<number>;
package/dist/common/communication.js CHANGED
@@ -77,11 +77,11 @@ export class Query {
77
77
  unlock() {
78
78
  this.mutex = false;
79
79
  }
80
- subscribe() {
80
+ subscribe(matchNid = true) {
81
81
  this.rx = this.subject.subscribe((msg) => {
82
82
  if (msg.header.mode < MsgMode.EVT)
83
83
  return;
84
- if (msg.header.nid !== this.header.nid)
84
+ if (matchNid && msg.header.nid !== this.header.nid)
85
85
  return;
86
86
  if (!this.match(msg))
87
87
  return;
package/dist/common/communication.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"communication.js","sourceRoot":"","sources":["../../src/common/communication.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"communication.js","sourceRoot":"","sources":["../../src/common/communication.ts"],"names":[],"mappings":"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"}
package/dist/data/dataGroup.d.ts CHANGED
@@ -1,10 +1,11 @@
1
1
  import MX10 from '../MX10';
2
2
  import { Buffer } from 'buffer';
3
3
  import { Subject } from 'rxjs';
4
- import { RemoveLocomotiveData, DataNameExtended, GroupCountData, ItemFxMode, ItemFxConfig, ItemImageData, ItemListByIndexData, ItemListByNidData } from '../common/models';
4
+ import { RemoveLocomotiveData, DataNameExtended, ItemFxMode, ItemFxConfig, ItemImageData, ItemListByIndexData, ItemListByNidData } from '../common/models';
5
5
  import { FxConfigType, ImageType } from '../common/enums';
6
+ import { MsgGroupCount } from './dataMsg';
6
7
  export default class DataGroup {
7
- readonly onGroupCount: Subject<GroupCountData>;
8
+ readonly onGroupCount: Subject<MsgGroupCount>;
8
9
  readonly onListItemsByIndex: Subject<ItemListByIndexData>;
9
10
  readonly onListItemsByNID: Subject<ItemListByNidData>;
10
11
  readonly onRemoveLocomotive: Subject<RemoveLocomotiveData>;
@@ -12,9 +13,10 @@ export default class DataGroup {
12
13
  readonly onItemFxMode: Subject<ItemFxMode>;
13
14
  readonly onItemFxConfig: Subject<ItemFxConfig>;
14
15
  readonly onDataNameExtended: Subject<DataNameExtended>;
16
+ private groupCountQ;
15
17
  private mx10;
16
18
  constructor(mx10: MX10);
17
- groupCount(objType?: number): void;
19
+ groupCount(groupNid?: number): Promise<MsgGroupCount | undefined>;
18
20
  listItemsByIndex(groupNID: number, index: number): void;
19
21
  listItemsByNID(searchAfterValue: number): void;
20
22
  removeLocomotive(toRemove: number, removeFrom?: number): void;
package/dist/data/dataGroup.js CHANGED
@@ -1,6 +1,8 @@
1
1
  import { Subject } from 'rxjs';
2
- import { NameType } from '../common/enums';
2
+ import { MsgMode, NameType } from '../common/enums';
3
3
  import ExtendedASCII from '../common/extendedAscii';
4
+ import { MsgGroupCount } from './dataMsg';
5
+ import { Query } from '../docs_entrypoint';
4
6
  export default class DataGroup {
5
7
  onGroupCount = new Subject();
6
8
  onListItemsByIndex = new Subject();
@@ -10,15 +12,34 @@ export default class DataGroup {
10
12
  onItemFxMode = new Subject();
11
13
  onItemFxConfig = new Subject();
12
14
  onDataNameExtended = new Subject();
15
+ groupCountQ = undefined;
13
16
  mx10;
14
17
  constructor(mx10) {
15
18
  this.mx10 = mx10;
16
19
  }
17
- groupCount(objType = 0x0000) {
18
- this.mx10.sendData(0x07, 0x00, [
19
- { value: this.mx10.mx10NID, length: 2 },
20
- { value: objType, length: 2 },
21
- ], 0b00);
20
+ async groupCount(groupNid = 0) {
21
+ if (this.groupCountQ !== undefined && !await this.groupCountQ.lock()) {
22
+ this.mx10.log.next("mx10.groupCount: failed to acquire lock");
23
+ return undefined;
24
+ }
25
+ this.groupCountQ = new Query(MsgGroupCount.header(MsgMode.REQ, this.mx10.mx10NID), this.onGroupCount);
26
+ this.groupCountQ.log = ((msg) => {
27
+ this.mx10.log.next(msg);
28
+ });
29
+ this.groupCountQ.tx = ((header) => {
30
+ const msg = new MsgGroupCount(header, groupNid);
31
+ this.mx10.log.next('groupCount query tx: ' + JSON.stringify(msg));
32
+ this.mx10.sendMsg(msg);
33
+ });
34
+ this.groupCountQ.match = ((msg) => {
35
+ this.mx10.log.next('groupCount query rx: ' + JSON.stringify(msg));
36
+ return (msg.group() === groupNid);
37
+ });
38
+ const rv = await this.groupCountQ.run();
39
+ this.mx10.log.next("mx10.groupCount.rv: " + JSON.stringify(rv));
40
+ this.groupCountQ.unlock();
41
+ this.groupCountQ = undefined;
42
+ return rv;
22
43
  }
23
44
  listItemsByIndex(groupNID, index) {
24
45
  this.mx10.sendData(0x07, 0x01, [
@@ -78,12 +99,15 @@ export default class DataGroup {
78
99
  parse(size, command, mode, nid, buffer) {
79
100
  switch (command) {
80
101
  case 0x00:
102
+ this.mx10.log.next('parseGroupCount: ' + JSON.stringify(buffer));
81
103
  this.parseGroupCount(size, mode, nid, buffer);
82
104
  break;
83
105
  case 0x01:
106
+ this.mx10.log.next('parseItemListByIndex: ' + JSON.stringify(buffer));
84
107
  this.parseItemListByIndex(size, mode, nid, buffer);
85
108
  break;
86
109
  case 0x02:
110
+ this.mx10.log.next('parseItemListByNid: ' + JSON.stringify(buffer));
87
111
  this.parseItemListByNid(size, mode, nid, buffer);
88
112
  break;
89
113
  case 0x12:
@@ -108,9 +132,9 @@ export default class DataGroup {
108
132
  parseGroupCount(size, mode, nid, buffer) {
109
133
  if (!this.onGroupCount.observed)
110
134
  return;
111
- const objectType = buffer.readUInt16LE(0);
112
- const number = buffer.readUInt16LE(2);
113
- this.onGroupCount.next({ objectType, number });
135
+ const group = buffer.readUInt16LE(0);
136
+ const count = buffer.readUInt16LE(2);
137
+ this.onGroupCount.next(new MsgGroupCount(MsgGroupCount.header(mode, nid), group, count));
114
138
  }
115
139
  parseItemListByIndex(size, mode, nid, buffer) {
116
140
  if (!this.onListItemsByIndex.observed)
package/dist/data/dataGroup.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"dataGroup.js","sourceRoot":"","sources":["../../src/data/dataGroup.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dataGroup.js","sourceRoot":"","sources":["../../src/data/dataGroup.ts"],"names":[],"mappings":"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"}
package/dist/data/dataMsg.d.ts CHANGED
@@ -1,5 +1,11 @@
1
1
  import { Header, Message } from "../common/communication";
2
2
  import { MsgMode } from "../common/enums";
3
+ export declare class MsgGroupCount extends Message {
4
+ static header(mode: MsgMode, nid: number): Header;
5
+ constructor(header: Header, group?: number, count?: number);
6
+ group(): number;
7
+ count(): number;
8
+ }
3
9
  export declare class MsgItemsByIndexReq extends Message {
4
10
  static header(mode: MsgMode, nid: number): Header;
5
11
  constructor(header: Header, mx10Nid: number, groupNid: number, index: number);
package/dist/data/dataMsg.js CHANGED
@@ -1,4 +1,16 @@
1
1
  import { Message } from "../common/communication";
2
+ export class MsgGroupCount extends Message {
3
+ static header(mode, nid) { return { group: 0x7, cmd: 0x0, mode: mode, nid: nid }; }
4
+ constructor(header, group, count) {
5
+ super(header);
6
+ if (group !== undefined)
7
+ super.push({ value: group, length: 2 });
8
+ if (count !== undefined)
9
+ super.push({ value: count, length: 2 });
10
+ }
11
+ group() { return this.data.length ? this.data[0].value : this.header.nid; }
12
+ count() { return this.data.length > 1 ? this.data[1].value : 0; }
13
+ }
2
14
  export class MsgItemsByIndexReq extends Message {
3
15
  static header(mode, nid) { return { group: 0x7, cmd: 0x1, mode: mode, nid: nid }; }
4
16
  constructor(header, mx10Nid, groupNid, index) {
package/dist/data/dataMsg.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"dataMsg.js","sourceRoot":"","sources":["../../src/data/dataMsg.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dataMsg.js","sourceRoot":"","sources":["../../src/data/dataMsg.ts"],"names":[],"mappings":"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"}
package/dist/data/lanDataGroup.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"lanDataGroup.js","sourceRoot":"","sources":["../../src/data/lanDataGroup.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"lanDataGroup.js","sourceRoot":"","sources":["../../src/data/lanDataGroup.ts"],"names":[],"mappings":"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"}
package/dist/info/infoGroup.js CHANGED
@@ -56,46 +56,36 @@ export default class InfoGroup {
56
56
  }
57
57
  }
58
58
  parseBidiInfo(size, mode, nid, buffer) {
59
- if (this.onBidiInfoChange.observed) {
60
- const NID = buffer.readUInt16LE(0);
61
- const type = buffer.readUInt16LE(2);
62
- const info = buffer.readUInt32LE(4);
63
- let data = {};
64
- switch (type) {
65
- case BidiType.DIRECTION:
66
- data.direction = this.parseEastWest(info);
67
- data.directionChange = this.parseDirChange(info);
68
- data.directionConfirm = this.parseDirectionConfirm(info);
69
- data.forwardOrReverse = this.parseFwdRev(info);
70
- break;
71
- default:
72
- data = info;
73
- }
74
- this.onBidiInfoChange.next({
75
- nid: NID,
76
- type,
77
- data,
78
- });
59
+ if (!this.onBidiInfoChange.observed)
60
+ return;
61
+ const NID = buffer.readUInt16LE(0);
62
+ const type = buffer.readUInt16LE(2);
63
+ const info = buffer.readUInt32LE(4);
64
+ let data = {};
65
+ switch (type) {
66
+ case BidiType.DIRECTION:
67
+ data.direction = this.parseEastWest(info);
68
+ data.directionChange = this.parseDirChange(info);
69
+ data.directionConfirm = this.parseDirectionConfirm(info);
70
+ data.forwardOrReverse = this.parseFwdRev(info);
71
+ break;
72
+ default:
73
+ data = info;
79
74
  }
75
+ this.onBidiInfoChange.next({ nid: NID, type, data, });
80
76
  }
81
77
  parseEastWest(data) {
82
- if ((data & 0x02) == 0x02) {
78
+ if ((data & 0x02) == 0x02)
83
79
  return Direction.EAST;
84
- }
85
- else {
86
- return Direction.WEST;
87
- }
80
+ return Direction.WEST;
88
81
  }
89
82
  parseDirChange(data) {
90
83
  return (data & 0x04) == 0x04;
91
84
  }
92
85
  parseFwdRev(data) {
93
- if ((data & 0x01) == 0) {
86
+ if ((data & 0x01) == 0)
94
87
  return ForwardOrReverse.REVERSE;
95
- }
96
- else {
97
- return ForwardOrReverse.FORWARD;
98
- }
88
+ return ForwardOrReverse.FORWARD;
99
89
  }
100
90
  parseDirectionConfirm(data) {
101
91
  return (data & 0x08) == 0x08;
package/dist/info/infoGroup.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"infoGroup.js","sourceRoot":"","sources":["../../src/info/infoGroup.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"infoGroup.js","sourceRoot":"","sources":["../../src/info/infoGroup.ts"],"names":[],"mappings":"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"}
package/dist/network/lanNetworkGroup.js CHANGED
@@ -25,11 +25,11 @@ export default class LanNetworkGroup {
25
25
  }
26
26
  }
27
27
  parsePortOpen(size, mode, nid, buffer) {
28
- if (this.onPortOpen.observed) {
29
- this.mx10.mx10NID = nid;
30
- this.mx10.connected = true;
31
- this.onPortOpen.next(true);
32
- }
28
+ if (!this.onPortOpen.observed)
29
+ return;
30
+ this.mx10.mx10NID = nid;
31
+ this.mx10.connected = true;
32
+ this.onPortOpen.next(true);
33
33
  }
34
34
  parseUnknownCommand(size, mode, nid, buffer) {
35
35
  }
package/dist/network/lanNetworkGroup.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"lanNetworkGroup.js","sourceRoot":"","sources":["../../src/network/lanNetworkGroup.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,OAAO,EAAC,MAAM,MAAM,CAAC;AAM7B,MAAM,CAAC,OAAO,OAAO,eAAe;IAE3B,IAAI,CAAO;IAEH,UAAU,GAAG,IAAI,OAAO,EAAW,CAAC;IAEpD,YAAY,IAAU;QAErB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IAClB,CAAC;IAED,QAAQ;QAEP,IAAI,CAAC,IAAI,CAAC,QAAQ,CACjB,IAAI,EACJ,IAAI,EACJ;YACC,EAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,EAAC;YAC9B,EAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,EAAC;YAC9B,EAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,EAAC;SAC/B,EACD,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,KAAK,EACf,IAAI,CACJ,CAAC;IACH,CAAC;IAGD,KAAK,CACJ,IAAY,EACZ,OAAe,EACf,IAAY,EACZ,GAAW,EACX,MAAc;QAEd,QAAQ,OAAO,EAAE,CAAC;YACjB,KAAK,IAAI;gBACR,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;gBAC5C,MAAM;YACP,KAAK,IAAI;gBACR,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;gBAClD,MAAM;YACP;gBAEC,OAAO,CAAC,IAAI,CAAC,sBAAsB,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC5D,CAAC;IACF,CAAC;IAED,aAAa,CAAC,IAAY,EAAE,IAAY,EAAE,GAAW,EAAE,MAAc;QACpE,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;YAC9B,IAAI,CAAC,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC;YACxB,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;YAE3B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC;IACF,CAAC;IAGD,mBAAmB,CAAC,IAAY,EAAE,IAAY,EAAE,GAAW,EAAE,MAAc;IAG3E,CAAC;CACD"}
1
+ {"version":3,"file":"lanNetworkGroup.js","sourceRoot":"","sources":["../../src/network/lanNetworkGroup.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,OAAO,EAAC,MAAM,MAAM,CAAC;AAM7B,MAAM,CAAC,OAAO,OAAO,eAAe;IAE3B,IAAI,CAAO;IAEH,UAAU,GAAG,IAAI,OAAO,EAAW,CAAC;IAEpD,YAAY,IAAU;QAErB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IAClB,CAAC;IAED,QAAQ;QAEP,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE;YAC9B,EAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,EAAC;YAC9B,EAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,EAAC;YAC9B,EAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,EAAC;SAC/B,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACjC,CAAC;IAGD,KAAK,CAAC,IAAY,EAAE,OAAe,EAAE,IAAY,EAAE,GAAW,EAAE,MAAc;QAE7E,QAAQ,OAAO,EAAE,CAAC;YACjB,KAAK,IAAI;gBACR,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;gBAC5C,MAAM;YACP,KAAK,IAAI;gBACR,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;gBAClD,MAAM;YACP;gBAEC,OAAO,CAAC,IAAI,CAAC,sBAAsB,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC5D,CAAC;IACF,CAAC;IAED,aAAa,CAAC,IAAY,EAAE,IAAY,EAAE,GAAW,EAAE,MAAc;QAEpE,IAAG,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ;YAC3B,OAAO;QACR,IAAI,CAAC,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC;QACxB,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IAGD,mBAAmB,CAAC,IAAY,EAAE,IAAY,EAAE,GAAW,EAAE,MAAc;IAI3E,CAAC;CACD"}
package/dist/network/networkGroup.js CHANGED
@@ -7,12 +7,7 @@ export default class NetworkGroup {
7
7
  this.mx10 = mx10;
8
8
  }
9
9
  ping(mode = 0b10) {
10
- this.mx10.sendData(0x0a, 0x00, [
11
- {
12
- value: this.mx10.mx10NID,
13
- length: 2,
14
- },
15
- ], mode);
10
+ this.mx10.sendData(0x0a, 0x00, [{ value: this.mx10.mx10NID, length: 2 }], mode);
16
11
  }
17
12
  portClose() {
18
13
  this.mx10.sendData(0x0a, 0x07, [{ value: this.mx10.myNID, length: 2 }], 0b01);
@@ -25,32 +20,29 @@ export default class NetworkGroup {
25
20
  }
26
21
  }
27
22
  pingResponse(size, mode, nid, _buffer) {
28
- if (this.onPingResponse.observed) {
29
- if (size === 8) {
30
- if (!this.mx10.mx10NID) {
31
- this.mx10.mx10NID = nid;
32
- }
33
- this.mx10.connected = true;
34
- this.mx10.reconnectLogic();
35
- if (this.pingTimeout) {
36
- clearTimeout(this.pingTimeout);
37
- }
38
- this.pingTimeout = setTimeout(() => {
39
- this.mx10.connected = false;
40
- this.onPingResponse.next({
41
- connected: this.mx10.connected,
42
- });
43
- console.log('No ping for 2 seconds, disconnected');
44
- }, 2000);
23
+ if (!this.onPingResponse.observed)
24
+ return;
25
+ if (size === 8) {
26
+ if (!this.mx10.mx10NID) {
27
+ this.mx10.mx10NID = nid;
45
28
  }
46
- else {
47
- throw new Error('LENGTH ERROR: readCmdGrp_0x0A-0x0A, read length as: ' +
48
- size.toString());
49
- }
50
- this.onPingResponse.next({
51
- connected: this.mx10.connected,
52
- });
29
+ this.mx10.connected = true;
30
+ this.mx10.reconnectLogic();
31
+ if (this.pingTimeout)
32
+ clearTimeout(this.pingTimeout);
33
+ this.pingTimeout = setTimeout(() => {
34
+ this.mx10.connected = false;
35
+ this.onPingResponse.next({
36
+ connected: this.mx10.connected,
37
+ });
38
+ console.log('No ping for 2 seconds, disconnected');
39
+ }, 2000);
40
+ }
41
+ else {
42
+ throw new Error('LENGTH ERROR: readCmdGrp_0x0A-0x0A, read length as: ' +
43
+ size.toString());
53
44
  }
45
+ this.onPingResponse.next({ connected: this.mx10.connected });
54
46
  }
55
47
  }
56
48
  //# sourceMappingURL=networkGroup.js.map
package/dist/network/networkGroup.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"networkGroup.js","sourceRoot":"","sources":["../../src/network/networkGroup.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAC,MAAM,MAAM,CAAC;AAS7B,MAAM,CAAC,OAAO,OAAO,YAAY;IAEhB,cAAc,GAAG,IAAI,OAAO,EAAwB,CAAC;IAE7D,IAAI,CAAO;IACnB,WAAW,GAA0B,IAAI,CAAC;IAE1C,YAAY,IAAU;QACrB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IAClB,CAAC;IAED,IAAI,CAAC,IAAI,GAAG,IAAI;QACf,IAAI,CAAC,IAAI,CAAC,QAAQ,CACjB,IAAI,EACJ,IAAI,EACJ;YACC;gBACC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO;gBACxB,MAAM,EAAE,CAAC;aACT;SACD,EACD,IAAI,CACJ,CAAC;IACH,CAAC;IAED,SAAS;QACR,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;IAC7E,CAAC;IAED,KAAK,CACJ,IAAY,EACZ,OAAe,EACf,IAAY,EACZ,GAAW,EACX,MAAc;QAEd,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;QACpE,IAAI,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;YAClC,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;gBAGhB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;oBACxB,IAAI,CAAC,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC;gBACzB,CAAC;gBACD,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;gBAK3B,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;gBAE3B,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;oBACtB,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBAChC,CAAC;gBAED,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC,GAAG,EAAE;oBAClC,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;oBAC5B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;wBACxB,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS;qBAC9B,CAAC,CAAC;oBAEH,OAAO,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;gBACpD,CAAC,EAAE,IAAI,CAAC,CAAC;YACV,CAAC;iBAAM,CAAC;gBACP,MAAM,IAAI,KAAK,CACd,sDAAsD;oBACrD,IAAI,CAAC,QAAQ,EAAE,CAChB,CAAC;YACH,CAAC;YAED,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;gBACxB,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS;aAC9B,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;CACD"}
1
+ {"version":3,"file":"networkGroup.js","sourceRoot":"","sources":["../../src/network/networkGroup.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAC,MAAM,MAAM,CAAC;AAS7B,MAAM,CAAC,OAAO,OAAO,YAAY;IAEhB,cAAc,GAAG,IAAI,OAAO,EAAwB,CAAC;IAE7D,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,SAAS;QAER,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;IAC7E,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;YAK3B,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YAE3B,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;gBAEH,OAAO,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;YACpD,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"}
package/package.json CHANGED
@@ -5,7 +5,7 @@
5
5
  "types": "dist/index.d.ts",
6
6
  "license": "MIT",
7
7
  "repository": "https://github.com/ZIMO-Elektronik/zcan",
8
- "version": "1.0.37",
8
+ "version": "1.0.39",
9
9
  "scripts": {
10
10
  "start": "node dist/main.js",
11
11
  "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 CHANGED
@@ -229,14 +229,31 @@ export default class MX10
229
229
 
230
230
  private readRawData(message: Buffer)
231
231
  {
232
+ if(message.byteLength < 8)
233
+ return;
232
234
  const size = message.readUInt16LE(0);
233
235
  const group = message.readUInt8(4);
234
236
  const commandAndMode = message.readUInt8(5);
235
237
  const command = commandAndMode >> 2;
236
238
  const mode = commandAndMode & 0x03;
237
239
  const nid = message.readUInt16LE(6);
240
+ // this.log.next('rx: ' + JSON.stringify(message));
241
+ if(!this.mx10NID && (group !== 0x1a || command !== 0x06 || mode !== MsgMode.ACK))
242
+ return;
243
+ if(this.mx10NID && nid !== this.mx10NID) {
244
+ if((nid >> 8 !== 0xc0)) {
245
+ if(!(group === 0xa && command === 0 && mode === MsgMode.EVT))
246
+ this.log.next('Not from MX10: ' + JSON.stringify(message));
247
+ }
248
+ // else
249
+ // this.log.next('This packet is not from our MX10: ' + JSON.stringify(message));
250
+ return;
251
+ }
252
+ // this.log.next('MX10 >> ' + JSON.stringify(message));
253
+
238
254
  const buffer = message.slice(8); //Remove first 8 bytes; left only with data
239
255
 
256
+ // this.log.next(JSON.stringify(message));
240
257
  this.printReadout(group, command, mode, nid, size, buffer, false);
241
258
 
242
259
  switch (group) {
package/src/common/communication.ts CHANGED
@@ -98,15 +98,15 @@ export class Query<T extends Message>
98
98
 
99
99
  async lock(millis: number = 500): Promise<boolean>
100
100
  {
101
- let centis = Math.abs(millis) / 10;
102
- while(this.mutex && centis)
103
- {
104
- await delay(10);
105
- if(!centis--)
106
- return false;
107
- }
108
- this.mutex = true;
109
- return true;
101
+ let centis = Math.abs(millis) / 10;
102
+ while(this.mutex && centis)
103
+ {
104
+ await delay(10);
105
+ if(!centis--)
106
+ return false;
107
+ }
108
+ this.mutex = true;
109
+ return true;
110
110
  }
111
111
 
112
112
  unlock()
@@ -114,13 +114,13 @@ export class Query<T extends Message>
114
114
  this.mutex = false;
115
115
  }
116
116
 
117
- subscribe()
117
+ subscribe(matchNid: boolean = true)
118
118
  {
119
119
  this.rx = this.subject.subscribe((msg: T) =>
120
120
  {
121
121
  if(msg.header.mode < MsgMode.EVT)
122
122
  return;
123
- if(msg.header.nid !== this.header.nid)
123
+ if(matchNid && msg.header.nid !== this.header.nid)
124
124
  return;
125
125
  //this.log('query.run.rx: ' + JSON.stringify(msg));
126
126
  if(!this.match(msg))
package/src/data/dataGroup.ts CHANGED
@@ -2,10 +2,12 @@
2
2
  import MX10 from '../MX10';
3
3
  import {Buffer} from 'buffer';
4
4
  import {Subject} from 'rxjs';
5
- import {RemoveLocomotiveData, DataNameExtended, DataNameValue1, GroupCountData,
5
+ import {RemoveLocomotiveData, DataNameExtended, DataNameValue1,
6
6
  ItemFxMode, ItemFxConfig, ItemImageData, ItemListByIndexData, ItemListByNidData} from '../common/models';
7
- import {FxConfigType, FxModeType, ImageType, NameType} from '../common/enums';
7
+ import {FxConfigType, FxModeType, ImageType, MsgMode, NameType} from '../common/enums';
8
8
  import ExtendedASCII from '../common/extendedAscii';
9
+ import { MsgGroupCount } from './dataMsg';
10
+ import { Query } from '../docs_entrypoint';
9
11
 
10
12
  /**
11
13
  *
@@ -13,7 +15,7 @@ import ExtendedASCII from '../common/extendedAscii';
13
15
  */
14
16
  export default class DataGroup
15
17
  {
16
- public readonly onGroupCount = new Subject<GroupCountData>();
18
+ public readonly onGroupCount = new Subject<MsgGroupCount>();
17
19
  public readonly onListItemsByIndex = new Subject<ItemListByIndexData>();
18
20
  public readonly onListItemsByNID = new Subject<ItemListByNidData>();
19
21
  public readonly onRemoveLocomotive = new Subject<RemoveLocomotiveData>();
@@ -22,20 +24,39 @@ export default class DataGroup
22
24
  public readonly onItemFxConfig = new Subject<ItemFxConfig>();
23
25
  public readonly onDataNameExtended = new Subject<DataNameExtended>();
24
26
 
27
+ private groupCountQ: Query<MsgGroupCount> | undefined = undefined;
28
+
25
29
  private mx10: MX10;
26
- // private fxModeRequest: Query<ItemFxMode> | undefined = undefined;
27
30
 
28
31
  constructor(mx10: MX10)
29
32
  {
30
33
  this.mx10 = mx10;
31
34
  }
32
35
 
33
- groupCount(objType = 0x0000)
36
+ async groupCount(groupNid = 0): Promise<MsgGroupCount | undefined>
34
37
  {
35
- this.mx10.sendData(0x07, 0x00, [
36
- {value: this.mx10.mx10NID, length: 2},
37
- {value: objType, length: 2},
38
- ], 0b00);
38
+ if(this.groupCountQ !== undefined && !await this.groupCountQ.lock()) {
39
+ this.mx10.log.next("mx10.groupCount: failed to acquire lock");
40
+ return undefined;
41
+ }
42
+ this.groupCountQ = new Query(MsgGroupCount.header(MsgMode.REQ, this.mx10.mx10NID), this.onGroupCount);
43
+ this.groupCountQ.log = ((msg) => {
44
+ this.mx10.log.next(msg);
45
+ });
46
+ this.groupCountQ.tx = ((header) => {
47
+ const msg = new MsgGroupCount(header, groupNid);
48
+ this.mx10.log.next('groupCount query tx: ' + JSON.stringify(msg));
49
+ this.mx10.sendMsg(msg);
50
+ });
51
+ this.groupCountQ.match = ((msg) => {
52
+ this.mx10.log.next('groupCount query rx: ' + JSON.stringify(msg));
53
+ return (msg.group() === groupNid);
54
+ })
55
+ const rv = await this.groupCountQ.run();
56
+ this.mx10.log.next("mx10.groupCount.rv: " + JSON.stringify(rv));
57
+ this.groupCountQ.unlock();
58
+ this.groupCountQ = undefined;
59
+ return rv;
39
60
  }
40
61
 
41
62
  listItemsByIndex(groupNID: number, index: number)
@@ -119,12 +140,15 @@ export default class DataGroup
119
140
  switch (command)
120
141
  {
121
142
  case 0x00:
143
+ this.mx10.log.next('parseGroupCount: ' + JSON.stringify(buffer));
122
144
  this.parseGroupCount(size, mode, nid, buffer);
123
145
  break;
124
146
  case 0x01:
147
+ this.mx10.log.next('parseItemListByIndex: ' + JSON.stringify(buffer));
125
148
  this.parseItemListByIndex(size, mode, nid, buffer);
126
149
  break;
127
150
  case 0x02:
151
+ this.mx10.log.next('parseItemListByNid: ' + JSON.stringify(buffer));
128
152
  this.parseItemListByNid(size, mode, nid, buffer);
129
153
  break;
130
154
  case 0x12:
@@ -152,9 +176,9 @@ export default class DataGroup
152
176
  {
153
177
  if(!this.onGroupCount.observed)
154
178
  return;
155
- const objectType = buffer.readUInt16LE(0);
156
- const number = buffer.readUInt16LE(2);
157
- this.onGroupCount.next({objectType, number});
179
+ const group = buffer.readUInt16LE(0);
180
+ const count = buffer.readUInt16LE(2);
181
+ this.onGroupCount.next(new MsgGroupCount(MsgGroupCount.header(mode, nid), group, count));
158
182
  }
159
183
 
160
184
  // 0x07.0x01
package/src/data/dataMsg.ts CHANGED
@@ -3,6 +3,26 @@ import { Header, Message } from "../common/communication";
3
3
  import { MsgMode } from "../common/enums";
4
4
 
5
5
 
6
+ export class MsgGroupCount extends Message
7
+ {
8
+ public static header(mode: MsgMode, nid: number): Header
9
+ {return {group: 0x7, cmd: 0x0, mode: mode, nid: nid}}
10
+
11
+ constructor(header: Header, group?: number, count?: number)
12
+ {
13
+ super(header);
14
+ if(group !== undefined)
15
+ super.push({value: group, length: 2});
16
+ // super.push({value: groupNid, length: 2});
17
+ if(count !== undefined)
18
+ super.push({value: count, length: 2});
19
+ }
20
+
21
+ group() {return this.data.length ? this.data[0].value as number : this.header.nid;}
22
+ count() {return this.data.length > 1 ? this.data[1].value as number : 0;}
23
+ }
24
+
25
+
6
26
  export class MsgItemsByIndexReq extends Message
7
27
  {
8
28
  public static header(mode: MsgMode, nid: number): Header
package/src/data/lanDataGroup.ts CHANGED
@@ -1,16 +1,8 @@
1
1
  // 0x17
2
2
  import MX10 from '../MX10';
3
3
  import {FunctionMode, FxConfigType, getOperatingMode, OperatingMode} from '../common/enums';
4
- import {
5
- DataNameExtendedData,
6
- DataValueExtendedData,
7
- LocoGuiMXExtended,
8
- LocoSpeedTabExtended,
9
- SpeedTabData,
10
- Train,
11
- TrainFlags,
12
- TrainFunction,
13
- } from '../common/models';
4
+ import {DataNameExtendedData, DataValueExtendedData, LocoGuiMXExtended, LocoSpeedTabExtended, SpeedTabData,
5
+ Train, TrainFlags, TrainFunction} from '../common/models';
14
6
  import {Subject} from 'rxjs';
15
7
  import {parseSpeed} from '../common/speedUtils';
16
8
  import ExtendedASCII from '../common/extendedAscii';
package/src/info/infoGroup.ts CHANGED
@@ -19,7 +19,8 @@ export default class InfoGroup
19
19
 
20
20
  private modInfoQ: Query<MsgModInfo> | undefined = undefined;
21
21
 
22
- constructor(mx10: MX10) {
22
+ constructor(mx10: MX10)
23
+ {
23
24
  this.mx10 = mx10;
24
25
  }
25
26
 
@@ -51,13 +52,8 @@ export default class InfoGroup
51
52
  return rv;
52
53
  }
53
54
 
54
- parse(
55
- size: number,
56
- command: number,
57
- mode: number,
58
- nid: number,
59
- buffer: Buffer,
60
- ) {
55
+ parse(size: number, command: number, mode: number, nid: number, buffer: Buffer)
56
+ {
61
57
  switch (command) {
62
58
  case 0x05:
63
59
  this.parseBidiInfo(size, mode, nid, buffer);
@@ -71,12 +67,8 @@ export default class InfoGroup
71
67
  }
72
68
  }
73
69
 
74
- private parseModuleInfo(
75
- size: number,
76
- mode: number,
77
- nid: number,
78
- buffer: Buffer,
79
- ) {
70
+ private parseModuleInfo(size: number, mode: number, nid: number, buffer: Buffer)
71
+ {
80
72
  if (this.onModuleInfoChange.observed) {
81
73
  const NID = buffer.readUInt16LE(0);
82
74
  const type = buffer.readUInt16LE(2);
@@ -87,57 +79,50 @@ export default class InfoGroup
87
79
  }
88
80
  }
89
81
 
90
- private parseBidiInfo(
91
- size: number,
92
- mode: number,
93
- nid: number,
94
- buffer: Buffer,
95
- ) {
96
- if (this.onBidiInfoChange.observed) {
97
- const NID = buffer.readUInt16LE(0);
98
- const type = buffer.readUInt16LE(2);
99
- const info = buffer.readUInt32LE(4);
82
+ private parseBidiInfo(size: number, mode: number, nid: number, buffer: Buffer)
83
+ {
84
+ if(!this.onBidiInfoChange.observed)
85
+ return;
100
86
 
101
- let data: BidiDirectionData | number = {};
102
- switch (type) {
103
- case BidiType.DIRECTION:
104
- data.direction = this.parseEastWest(info);
105
- data.directionChange = this.parseDirChange(info);
106
- data.directionConfirm = this.parseDirectionConfirm(info);
107
- data.forwardOrReverse = this.parseFwdRev(info);
108
- break;
109
- default:
110
- data = info;
111
- }
87
+ const NID = buffer.readUInt16LE(0);
88
+ const type = buffer.readUInt16LE(2);
89
+ const info = buffer.readUInt32LE(4);
112
90
 
113
- this.onBidiInfoChange.next({
114
- nid: NID,
115
- type,
116
- data,
117
- });
91
+ let data: BidiDirectionData | number = {};
92
+ switch (type) {
93
+ case BidiType.DIRECTION:
94
+ data.direction = this.parseEastWest(info);
95
+ data.directionChange = this.parseDirChange(info);
96
+ data.directionConfirm = this.parseDirectionConfirm(info);
97
+ data.forwardOrReverse = this.parseFwdRev(info);
98
+ break;
99
+ default:
100
+ data = info;
118
101
  }
102
+
103
+ this.onBidiInfoChange.next({nid: NID, type, data,});
119
104
  }
120
105
 
121
- private parseEastWest(data: number) {
122
- if ((data & 0x02) == 0x02) {
106
+ private parseEastWest(data: number)
107
+ {
108
+ if ((data & 0x02) == 0x02)
123
109
  return Direction.EAST;
124
- } else {
125
- return Direction.WEST;
126
- }
110
+ return Direction.WEST;
127
111
  }
128
112
 
129
- private parseDirChange(data: number) {
113
+ private parseDirChange(data: number)
114
+ {
130
115
  return (data & 0x04) == 0x04;
131
116
  }
132
117
 
133
- private parseFwdRev(data: number) {
134
- if ((data & 0x01) == 0) {
118
+ private parseFwdRev(data: number)
119
+ {
120
+ if ((data & 0x01) == 0)
135
121
  return ForwardOrReverse.REVERSE;
136
- } else {
137
- return ForwardOrReverse.FORWARD;
138
- }
122
+ return ForwardOrReverse.FORWARD;
139
123
  }
140
- private parseDirectionConfirm(data: number) {
124
+ private parseDirectionConfirm(data: number)
125
+ {
141
126
  return (data & 0x08) == 0x08;
142
127
  }
143
128
  }
package/src/network/lanNetworkGroup.ts CHANGED
@@ -21,28 +21,16 @@ export default class LanNetworkGroup
21
21
 
22
22
  portOpen()
23
23
  {
24
- this.mx10.sendData(
25
- 0x1a,
26
- 0x06,
27
- [
28
- {value: 4294967295, length: 4},
29
- {value: 1514238064, length: 4},
30
- {value: 'ZIMO APP', length: 20},
31
- ],
32
- 0b01,
33
- this.mx10.myNID,
34
- true,
35
- );
24
+ this.mx10.sendData(0x1a, 0x06, [
25
+ {value: 4294967295, length: 4},
26
+ {value: 1514238064, length: 4},
27
+ {value: 'ZIMO APP', length: 20},
28
+ ], 0b01, this.mx10.myNID, true);
36
29
  }
37
30
 
38
31
  // Responses
39
- parse(
40
- size: number,
41
- command: number,
42
- mode: number,
43
- nid: number,
44
- buffer: Buffer,
45
- ) {
32
+ parse(size: number, command: number, mode: number, nid: number, buffer: Buffer)
33
+ {
46
34
  switch (command) {
47
35
  case 0x06:
48
36
  this.parsePortOpen(size, mode, nid, buffer);
@@ -56,17 +44,18 @@ export default class LanNetworkGroup
56
44
  }
57
45
  }
58
46
 
59
- parsePortOpen(size: number, mode: number, nid: number, buffer: Buffer) {
60
- if (this.onPortOpen.observed) {
61
- this.mx10.mx10NID = nid;
62
- this.mx10.connected = true;
63
-
64
- this.onPortOpen.next(true);
65
- }
47
+ parsePortOpen(size: number, mode: number, nid: number, buffer: Buffer)
48
+ {
49
+ if(!this.onPortOpen.observed)
50
+ return;
51
+ this.mx10.mx10NID = nid;
52
+ this.mx10.connected = true;
53
+ this.onPortOpen.next(true);
66
54
  }
67
55
 
68
56
  // 0x1A.0x0e
69
- parseUnknownCommand(size: number, mode: number, nid: number, buffer: Buffer) {
57
+ parseUnknownCommand(size: number, mode: number, nid: number, buffer: Buffer)
58
+ {
70
59
  // TODO implement once documented
71
60
  // console.debug('IMPLEMENT 0x1A.0x0e', size, mode, nid, buffer);
72
61
  }
package/src/network/networkGroup.ts CHANGED
@@ -15,35 +15,23 @@ export default class NetworkGroup
15
15
  private mx10: MX10;
16
16
  pingTimeout: NodeJS.Timeout | null = null;
17
17
 
18
- constructor(mx10: MX10) {
18
+ constructor(mx10: MX10)
19
+ {
19
20
  this.mx10 = mx10;
20
21
  }
21
22
 
22
- ping(mode = 0b10) {
23
- this.mx10.sendData(
24
- 0x0a,
25
- 0x00,
26
- [
27
- {
28
- value: this.mx10.mx10NID,
29
- length: 2,
30
- },
31
- ],
32
- mode,
33
- );
23
+ ping(mode = 0b10)
24
+ {
25
+ this.mx10.sendData(0x0a, 0x00, [{value: this.mx10.mx10NID, length: 2}], mode);
34
26
  }
35
27
 
36
- portClose() {
28
+ portClose()
29
+ {
37
30
  this.mx10.sendData(0x0a, 0x07, [{value: this.mx10.myNID, length: 2}], 0b01);
38
31
  }
39
32
 
40
- parse(
41
- size: number,
42
- command: number,
43
- mode: number,
44
- nid: number,
45
- buffer: Buffer,
46
- ) {
33
+ parse(size: number, command: number, mode: number, nid: number, buffer: Buffer)
34
+ {
47
35
  switch (command) {
48
36
  case 0x00:
49
37
  this.pingResponse(size, mode, nid, buffer);
@@ -52,43 +40,42 @@ export default class NetworkGroup
52
40
  }
53
41
 
54
42
  // 0x0A.0x00
55
- pingResponse(size: number, mode: number, nid: number, _buffer: Buffer) {
56
- if (this.onPingResponse.observed) {
57
- if (size === 8) {
58
- // TODO IMPLEMENT DETAIL READOUT
43
+ pingResponse(size: number, mode: number, nid: number, _buffer: Buffer)
44
+ {
45
+ if(!this.onPingResponse.observed)
46
+ return;
47
+
48
+ if (size === 8) {
49
+ // TODO IMPLEMENT DETAIL READOUT
59
50
 
60
- if (!this.mx10.mx10NID) {
61
- this.mx10.mx10NID = nid;
62
- }
63
- this.mx10.connected = true;
64
-
65
- // TODO reconnect when uuid has changed
66
- // const uuid = buffer.readUInt32LE(0);
51
+ if (!this.mx10.mx10NID) {
52
+ this.mx10.mx10NID = nid;
53
+ }
54
+ this.mx10.connected = true;
67
55
 
68
- this.mx10.reconnectLogic();
56
+ // TODO reconnect when uuid has changed
57
+ // const uuid = buffer.readUInt32LE(0);
69
58
 
70
- if (this.pingTimeout) {
71
- clearTimeout(this.pingTimeout);
72
- }
59
+ this.mx10.reconnectLogic();
73
60
 
74
- this.pingTimeout = setTimeout(() => {
75
- this.mx10.connected = false;
76
- this.onPingResponse.next({
77
- connected: this.mx10.connected,
78
- });
79
- // eslint-disable-next-line no-console
80
- console.log('No ping for 2 seconds, disconnected');
81
- }, 2000);
82
- } else {
83
- throw new Error(
84
- 'LENGTH ERROR: readCmdGrp_0x0A-0x0A, read length as: ' +
85
- size.toString(),
86
- );
87
- }
61
+ if (this.pingTimeout)
62
+ clearTimeout(this.pingTimeout);
88
63
 
89
- this.onPingResponse.next({
90
- connected: this.mx10.connected,
91
- });
64
+ this.pingTimeout = setTimeout(() => {
65
+ this.mx10.connected = false;
66
+ this.onPingResponse.next({
67
+ connected: this.mx10.connected,
68
+ });
69
+ // eslint-disable-next-line no-console
70
+ console.log('No ping for 2 seconds, disconnected');
71
+ }, 2000);
72
+ } else {
73
+ throw new Error(
74
+ 'LENGTH ERROR: readCmdGrp_0x0A-0x0A, read length as: ' +
75
+ size.toString(),
76
+ );
92
77
  }
78
+
79
+ this.onPingResponse.next({connected: this.mx10.connected});
93
80
  }
94
81
  }