@zimo-elektronik/zcan 1.0.36 → 1.0.37
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.
- package/dist/common/enums.d.ts +4 -3
- package/dist/common/enums.js +3 -2
- package/dist/common/enums.js.map +1 -1
- package/dist/data/dataGroup.d.ts +2 -2
- package/dist/data/dataGroup.js +101 -143
- package/dist/data/dataGroup.js.map +1 -1
- package/dist/data/lanDataGroup.d.ts +2 -0
- package/dist/data/lanDataGroup.js +109 -141
- package/dist/data/lanDataGroup.js.map +1 -1
- package/package.json +1 -1
- package/src/common/enums.ts +4 -4
- package/src/data/dataGroup.ts +173 -269
- package/src/data/lanDataGroup.ts +238 -318
package/dist/common/enums.d.ts
CHANGED
|
@@ -32,8 +32,8 @@ export declare enum ExternalController {
|
|
|
32
32
|
FS2 = "FS(2)"
|
|
33
33
|
}
|
|
34
34
|
export declare enum FunctionMode {
|
|
35
|
-
|
|
36
|
-
|
|
35
|
+
switch = 0,
|
|
36
|
+
moment = 16384
|
|
37
37
|
}
|
|
38
38
|
export declare enum SystemStateMode {
|
|
39
39
|
NORMAL = 1,
|
|
@@ -92,7 +92,8 @@ export declare enum FxConfigType {
|
|
|
92
92
|
TIME_VALUE_1 = 4,
|
|
93
93
|
TIME_VALUE_2 = 5,
|
|
94
94
|
ICON = 16,
|
|
95
|
-
SOUND = 17
|
|
95
|
+
SOUND = 17,
|
|
96
|
+
ANY = 32
|
|
96
97
|
}
|
|
97
98
|
export declare enum SpecialFunctionMode {
|
|
98
99
|
MANUAL = 1,
|
package/dist/common/enums.js
CHANGED
|
@@ -44,8 +44,8 @@ export var ExternalController;
|
|
|
44
44
|
})(ExternalController || (ExternalController = {}));
|
|
45
45
|
export var FunctionMode;
|
|
46
46
|
(function (FunctionMode) {
|
|
47
|
-
FunctionMode[FunctionMode["
|
|
48
|
-
FunctionMode[FunctionMode["
|
|
47
|
+
FunctionMode[FunctionMode["switch"] = 0] = "switch";
|
|
48
|
+
FunctionMode[FunctionMode["moment"] = 16384] = "moment";
|
|
49
49
|
})(FunctionMode || (FunctionMode = {}));
|
|
50
50
|
export var SystemStateMode;
|
|
51
51
|
(function (SystemStateMode) {
|
|
@@ -112,6 +112,7 @@ export var FxConfigType;
|
|
|
112
112
|
FxConfigType[FxConfigType["TIME_VALUE_2"] = 5] = "TIME_VALUE_2";
|
|
113
113
|
FxConfigType[FxConfigType["ICON"] = 16] = "ICON";
|
|
114
114
|
FxConfigType[FxConfigType["SOUND"] = 17] = "SOUND";
|
|
115
|
+
FxConfigType[FxConfigType["ANY"] = 32] = "ANY";
|
|
115
116
|
})(FxConfigType || (FxConfigType = {}));
|
|
116
117
|
export var SpecialFunctionMode;
|
|
117
118
|
(function (SpecialFunctionMode) {
|
package/dist/common/enums.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enums.js","sourceRoot":"","sources":["../../src/common/enums.ts"],"names":[],"mappings":"AACA,MAAM,CAAN,IAAY,OAKX;AALD,WAAY,OAAO;IAClB,mCAAU,CAAA;IACV,mCAAU,CAAA;IACV,mCAAU,CAAA;IACV,mCAAU,CAAA;AACX,CAAC,EALW,OAAO,KAAP,OAAO,QAKlB;AAED,MAAM,CAAN,IAAY,aASX;AATD,WAAY,aAAa;IACxB,6BAAY,CAAA;IACZ,4BAAW,CAAA;IACX,4BAAW,CAAA;IACX,4BAAW,CAAA;IACX,0BAAS,CAAA;IACT,4BAAW,CAAA;IACX,oCAAmB,CAAA;IACnB,+BAAc,CAAA;AACf,CAAC,EATW,aAAa,KAAb,aAAa,QASxB;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,GAAW,EAAE,EAAE;IAE/C,MAAM,IAAI,GAAG,GAAG,IAAI,CAAC,CAAC;IACtB,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAC3C,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,EAAE,CAAC;QAC5B,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC;IACD,OAAO,aAAa,CAAC,OAAO,CAAC;AAC9B,CAAC,CAAC;AAEF,MAAM,CAAN,IAAY,aAOX;AAPD,WAAY,aAAa;IACxB,uDAAO,CAAA;IACP,mDAAK,CAAA;IACL,mDAAK,CAAA;IACL,mDAAK,CAAA;IACL,qDAAM,CAAA;IACN,uDAAO,CAAA;AACR,CAAC,EAPW,aAAa,KAAb,aAAa,QAOxB;AAED,MAAM,CAAN,IAAY,kBAWX;AAXD,WAAY,kBAAkB;IAE7B,+BAAS,CAAA;IAET,+BAAS,CAAA;IACT,+BAAS,CAAA;IACT,+BAAS,CAAA;IAET,mCAAa,CAAA;IAEb,mCAAa,CAAA;AACd,CAAC,EAXW,kBAAkB,KAAlB,kBAAkB,QAW7B;AAKD,MAAM,CAAN,IAAY,
|
|
1
|
+
{"version":3,"file":"enums.js","sourceRoot":"","sources":["../../src/common/enums.ts"],"names":[],"mappings":"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"}
|
package/dist/data/dataGroup.d.ts
CHANGED
|
@@ -19,8 +19,8 @@ export default class DataGroup {
|
|
|
19
19
|
listItemsByNID(searchAfterValue: number): void;
|
|
20
20
|
removeLocomotive(toRemove: number, removeFrom?: number): void;
|
|
21
21
|
itemImageConfig(nid: number, type: ImageType, imageId: number): void;
|
|
22
|
-
|
|
23
|
-
itemFxConfig(nid: number, fx: number,
|
|
22
|
+
itemFxModes(nid: number, group: number, mode: number[]): void;
|
|
23
|
+
itemFxConfig(nid: number, fx: number, type: FxConfigType, data: number): void;
|
|
24
24
|
dataNameExtended(NID: number, subID: number, name: string): void;
|
|
25
25
|
parse(size: number, command: number, mode: number, nid: number, buffer: Buffer): void;
|
|
26
26
|
private parseGroupCount;
|
package/dist/data/dataGroup.js
CHANGED
|
@@ -46,7 +46,7 @@ export default class DataGroup {
|
|
|
46
46
|
{ value: imageId, length: 2 },
|
|
47
47
|
]);
|
|
48
48
|
}
|
|
49
|
-
|
|
49
|
+
itemFxModes(nid, group, mode) {
|
|
50
50
|
this.mx10.sendData(0x07, 0x14, [
|
|
51
51
|
{ value: nid, length: 2 },
|
|
52
52
|
{ value: group, length: 1 },
|
|
@@ -57,11 +57,11 @@ export default class DataGroup {
|
|
|
57
57
|
{ value: mode[12] | (mode[13] << 2) | (mode[14] << 4) | (mode[15] << 6), length: 1 },
|
|
58
58
|
]);
|
|
59
59
|
}
|
|
60
|
-
itemFxConfig(nid, fx,
|
|
60
|
+
itemFxConfig(nid, fx, type, data) {
|
|
61
61
|
this.mx10.sendData(0x07, 0x15, [
|
|
62
62
|
{ value: nid, length: 2 },
|
|
63
63
|
{ value: fx, length: 2 },
|
|
64
|
-
{ value:
|
|
64
|
+
{ value: type, length: 2 },
|
|
65
65
|
{ value: data, length: 2 },
|
|
66
66
|
]);
|
|
67
67
|
}
|
|
@@ -102,166 +102,124 @@ export default class DataGroup {
|
|
|
102
102
|
this.parseDataNameExtended(size, mode, nid, buffer);
|
|
103
103
|
break;
|
|
104
104
|
default:
|
|
105
|
-
|
|
105
|
+
this.mx10.log.next('command not parsed: ' + command.toString());
|
|
106
106
|
}
|
|
107
107
|
}
|
|
108
108
|
parseGroupCount(size, mode, nid, buffer) {
|
|
109
|
-
if (this.onGroupCount.observed)
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
number,
|
|
115
|
-
});
|
|
116
|
-
}
|
|
109
|
+
if (!this.onGroupCount.observed)
|
|
110
|
+
return;
|
|
111
|
+
const objectType = buffer.readUInt16LE(0);
|
|
112
|
+
const number = buffer.readUInt16LE(2);
|
|
113
|
+
this.onGroupCount.next({ objectType, number });
|
|
117
114
|
}
|
|
118
115
|
parseItemListByIndex(size, mode, nid, buffer) {
|
|
119
|
-
if (this.onListItemsByIndex.observed)
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
nid: deviceNID,
|
|
127
|
-
msSinceLastCommunication,
|
|
128
|
-
});
|
|
129
|
-
}
|
|
130
|
-
}
|
|
116
|
+
if (!this.onListItemsByIndex.observed)
|
|
117
|
+
return;
|
|
118
|
+
const index = buffer.readUInt16LE(0);
|
|
119
|
+
const deviceNID = buffer.readUInt16LE(2);
|
|
120
|
+
const msSinceLastCommunication = buffer.readUInt16LE(4);
|
|
121
|
+
if (deviceNID)
|
|
122
|
+
this.onListItemsByIndex.next({ index, nid: deviceNID, msSinceLastCommunication });
|
|
131
123
|
}
|
|
132
124
|
parseItemListByNid(size, mode, nid, buffer) {
|
|
133
|
-
if (this.onListItemsByNID.observed)
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
index,
|
|
141
|
-
itemState,
|
|
142
|
-
lastTick,
|
|
143
|
-
});
|
|
144
|
-
}
|
|
125
|
+
if (!this.onListItemsByNID.observed)
|
|
126
|
+
return;
|
|
127
|
+
const NID = buffer.readUInt16LE(0);
|
|
128
|
+
const index = buffer.readUInt16LE(2);
|
|
129
|
+
const itemState = buffer.readUInt16LE(4);
|
|
130
|
+
const lastTick = buffer.readUInt16LE(6);
|
|
131
|
+
this.onListItemsByNID.next({ nid: NID, index, itemState, lastTick });
|
|
145
132
|
}
|
|
146
133
|
parseDataClear(size, mode, nid, buffer) {
|
|
147
|
-
if (this.onRemoveLocomotive.observed)
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
state: state,
|
|
153
|
-
});
|
|
154
|
-
}
|
|
134
|
+
if (!this.onRemoveLocomotive.observed)
|
|
135
|
+
return;
|
|
136
|
+
const NID = buffer.readUInt16LE(0);
|
|
137
|
+
const state = buffer.readUInt16LE(2);
|
|
138
|
+
this.onRemoveLocomotive.next({ nid: NID, state: state });
|
|
155
139
|
}
|
|
156
140
|
parseItemImageConfig(size, mode, nid, buffer) {
|
|
157
|
-
if (this.onItemImageConfig.observed)
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
type,
|
|
164
|
-
imageId,
|
|
165
|
-
});
|
|
166
|
-
}
|
|
141
|
+
if (!this.onItemImageConfig.observed)
|
|
142
|
+
return;
|
|
143
|
+
const NID = buffer.readUInt16LE(0);
|
|
144
|
+
const type = buffer.readUInt16LE(2);
|
|
145
|
+
const imageId = buffer.readUInt16LE(4);
|
|
146
|
+
this.onItemImageConfig.next({ nid: NID, type, imageId });
|
|
167
147
|
}
|
|
168
148
|
parseItemFxMode(size, mode, nid, buffer) {
|
|
169
|
-
if (this.onItemFxMode.observed)
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
mode,
|
|
181
|
-
};
|
|
182
|
-
this.mx10.log.next('parseItemFxMode: ' + JSON.stringify(msg));
|
|
183
|
-
this.onItemFxMode.next(msg);
|
|
184
|
-
}
|
|
149
|
+
if (!this.onItemFxMode.observed)
|
|
150
|
+
return;
|
|
151
|
+
const NID = buffer.readUInt16LE(0);
|
|
152
|
+
const group = buffer.readUInt8(2);
|
|
153
|
+
const fxModes = buffer.readUInt32LE(4);
|
|
154
|
+
const fxMode = [];
|
|
155
|
+
for (let i = 0; i < 32; i += 2)
|
|
156
|
+
fxMode.push((fxModes >> i) & 0b11);
|
|
157
|
+
const msg = { nid: NID, group, mode: fxMode };
|
|
158
|
+
this.mx10.log.next('parseItemFxMode: ' + JSON.stringify(msg));
|
|
159
|
+
this.onItemFxMode.next(msg);
|
|
185
160
|
}
|
|
186
161
|
parseItemFxConfig(size, mode, nid, buffer) {
|
|
187
|
-
if (this.onItemFxConfig.observed)
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
data,
|
|
197
|
-
};
|
|
198
|
-
this.mx10.log.next('parseItemFxMode: ' + JSON.stringify(msg));
|
|
199
|
-
this.onItemFxConfig.next(msg);
|
|
200
|
-
}
|
|
162
|
+
if (!this.onItemFxConfig.observed)
|
|
163
|
+
return;
|
|
164
|
+
const NID = buffer.readUInt16LE(0);
|
|
165
|
+
const fx = buffer.readUInt16LE(2);
|
|
166
|
+
const item = buffer.readUInt16LE(4);
|
|
167
|
+
const data = buffer.readUInt16LE(6);
|
|
168
|
+
const msg = { nid: NID, function: fx, item, data };
|
|
169
|
+
this.mx10.log.next('parseItemFxConfig: ' + JSON.stringify(msg));
|
|
170
|
+
this.onItemFxConfig.next(msg);
|
|
201
171
|
}
|
|
202
172
|
parseDataNameExtended(size, mode, nid, buffer) {
|
|
203
|
-
if (this.onDataNameExtended.observed)
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
173
|
+
if (!this.onDataNameExtended.observed)
|
|
174
|
+
return;
|
|
175
|
+
const NID = buffer.readUInt16LE(0);
|
|
176
|
+
const subID = buffer.readUInt16LE(2);
|
|
177
|
+
const name = ExtendedASCII.byte2str(buffer.subarray(12, 203));
|
|
178
|
+
let value1;
|
|
179
|
+
const value2 = buffer.readUInt32LE(8);
|
|
180
|
+
let type;
|
|
181
|
+
switch (NID) {
|
|
182
|
+
case 0x7f00:
|
|
183
|
+
type = NameType.MANUFACTURER;
|
|
184
|
+
break;
|
|
185
|
+
case 0x7f02:
|
|
186
|
+
type = NameType.DECODER;
|
|
187
|
+
break;
|
|
188
|
+
case 0x7f04:
|
|
189
|
+
type = NameType.DESIGNATION;
|
|
190
|
+
value1 = { type: buffer.subarray(4).toString('ascii').trim(),
|
|
191
|
+
cfgNum: parseInt(buffer.subarray(5, 7).toString('ascii')) };
|
|
192
|
+
break;
|
|
193
|
+
case 0x7f06:
|
|
194
|
+
type = NameType.CFGDB;
|
|
195
|
+
break;
|
|
196
|
+
case 0x7f10:
|
|
197
|
+
type = NameType.ICON;
|
|
198
|
+
break;
|
|
199
|
+
case 0x7f11:
|
|
200
|
+
type = NameType.ICON;
|
|
201
|
+
break;
|
|
202
|
+
case 0x7f18:
|
|
203
|
+
type = NameType.ZIMO_PARTNER;
|
|
204
|
+
break;
|
|
205
|
+
case 0x7f20:
|
|
206
|
+
type = NameType.LAND;
|
|
207
|
+
break;
|
|
208
|
+
case 0x7f21:
|
|
209
|
+
type = NameType.COMPANY_CV;
|
|
210
|
+
break;
|
|
211
|
+
case 0xc2:
|
|
212
|
+
type = NameType.CONNECTION;
|
|
213
|
+
break;
|
|
214
|
+
default:
|
|
215
|
+
if (subID == 1)
|
|
240
216
|
type = NameType.COMPANY_CV;
|
|
241
|
-
|
|
242
|
-
|
|
217
|
+
else if (subID == 0)
|
|
218
|
+
type = NameType.VEHICLE;
|
|
219
|
+
else
|
|
243
220
|
type = NameType.CONNECTION;
|
|
244
|
-
break;
|
|
245
|
-
default:
|
|
246
|
-
if (subID == 1) {
|
|
247
|
-
type = NameType.COMPANY_CV;
|
|
248
|
-
}
|
|
249
|
-
else if (subID == 0) {
|
|
250
|
-
type = NameType.VEHICLE;
|
|
251
|
-
}
|
|
252
|
-
else {
|
|
253
|
-
type = NameType.CONNECTION;
|
|
254
|
-
}
|
|
255
|
-
}
|
|
256
|
-
this.onDataNameExtended.next({
|
|
257
|
-
nid: NID,
|
|
258
|
-
type,
|
|
259
|
-
subID,
|
|
260
|
-
value1,
|
|
261
|
-
value2,
|
|
262
|
-
name,
|
|
263
|
-
});
|
|
264
221
|
}
|
|
222
|
+
this.onDataNameExtended.next({ nid: NID, type, subID, value1, value2, name });
|
|
265
223
|
}
|
|
266
224
|
}
|
|
267
225
|
//# sourceMappingURL=dataGroup.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dataGroup.js","sourceRoot":"","sources":["../../src/data/dataGroup.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,OAAO,EAAC,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"dataGroup.js","sourceRoot":"","sources":["../../src/data/dataGroup.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import MX10 from '../MX10';
|
|
2
|
+
import { FxConfigType } from '../common/enums';
|
|
2
3
|
import { DataNameExtendedData, DataValueExtendedData, LocoGuiMXExtended, LocoSpeedTabExtended, Train } from '../common/models';
|
|
3
4
|
import { Subject } from 'rxjs';
|
|
4
5
|
import { ZcanDataArray } from '../common/communication';
|
|
@@ -13,6 +14,7 @@ export default class LanDataGroup {
|
|
|
13
14
|
dataValueExtended(NID: number): void;
|
|
14
15
|
dataNameExtended(NID: number): void;
|
|
15
16
|
renameDataExtended(NID: number, type: number, val1: number, val2: number, val3: number, name: string): void;
|
|
17
|
+
itemFxConfig(nid: number, fx: number, type: FxConfigType, addr: number, mode: number, icon: number): void;
|
|
16
18
|
locoGuiExtended(NID: number): void;
|
|
17
19
|
locoGuiMXExtended(NID: number): void;
|
|
18
20
|
locoSpeedTapExtended(NID: number): void;
|