@zwave-js/nvmedit 12.5.0-beta.0 → 12.5.0

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.
@@ -1,5 +1,5 @@
1
1
  /// <reference types="node" />
2
- import { type CommandClasses, type NodeProtocolInfo, RFRegion } from "@zwave-js/core/safe";
2
+ import { type CommandClasses, NodeIDType, type NodeProtocolInfo, RFRegion } from "@zwave-js/core/safe";
3
3
  import semver from "semver";
4
4
  import { type Route, type SUCUpdateEntry } from "./files";
5
5
  import { type NVM3Objects, type NVMMeta } from "./nvm3/nvm";
@@ -42,6 +42,7 @@ export interface NVMJSONController {
42
42
  includedSecurelySecureCCs: CommandClasses[];
43
43
  };
44
44
  applicationData?: string | null;
45
+ applicationName?: string | null;
45
46
  }
46
47
  export interface NVMJSONControllerRFConfig {
47
48
  rfRegion: RFRegion;
@@ -49,6 +50,7 @@ export interface NVMJSONControllerRFConfig {
49
50
  measured0dBm: number;
50
51
  enablePTI: number | null;
51
52
  maxTXPower: number | null;
53
+ nodeIdType: NodeIDType | null;
52
54
  }
53
55
  export interface NVMJSONNodeWithInfo extends Omit<NodeProtocolInfo, "hasSpecificDeviceClass"> {
54
56
  isVirtual: boolean;
@@ -69,7 +71,7 @@ export interface NVMJSONVirtualNode {
69
71
  export type NVMJSONNode = NVMJSONNodeWithInfo | NVMJSONVirtualNode;
70
72
  export declare function nodeHasInfo(node: NVMJSONNode): node is NVMJSONNodeWithInfo;
71
73
  /** Converts a compressed set of NVM objects to a JSON representation */
72
- export declare function nvmObjectsToJSON(applicationObjects: ReadonlyMap<number, NVM3Object>, protocolObjects: ReadonlyMap<number, NVM3Object>): NVMJSON;
74
+ export declare function nvmObjectsToJSON(objects: ReadonlyMap<number, NVM3Object>): NVMJSON;
73
75
  export declare function jsonToNVMObjects_v7_0_0(json: NVMJSON, targetSDKVersion: semver.SemVer): NVM3Objects;
74
76
  export declare function jsonToNVMObjects_v7_11_0(json: NVMJSON, targetSDKVersion: semver.SemVer): NVM3Objects;
75
77
  /** Reads an NVM buffer and returns its JSON representation */
@@ -1 +1 @@
1
- {"version":3,"file":"convert.d.ts","sourceRoot":"","sources":["../src/convert.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"convert.d.ts","sourceRoot":"","sources":["../src/convert.ts"],"names":[],"mappings":"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"}
package/build/convert.js CHANGED
@@ -10,6 +10,7 @@ const typeguards_1 = require("alcalzone-shared/typeguards");
10
10
  const semver_1 = __importDefault(require("semver"));
11
11
  const consts_1 = require("./consts");
12
12
  const files_1 = require("./files");
13
+ const ApplicationNameFile_1 = require("./files/ApplicationNameFile");
13
14
  const nvm_1 = require("./nvm3/nvm");
14
15
  const utils_1 = require("./nvm3/utils");
15
16
  const NVMParser_1 = require("./nvm500/NVMParser");
@@ -42,7 +43,7 @@ function createEmptyPhysicalNode() {
42
43
  };
43
44
  }
44
45
  /** Converts a compressed set of NVM objects to a JSON representation */
45
- function nvmObjectsToJSON(applicationObjects, protocolObjects) {
46
+ function nvmObjectsToJSON(objects) {
46
47
  const nodes = new Map();
47
48
  const getNode = (id) => {
48
49
  if (!nodes.has(id))
@@ -51,14 +52,10 @@ function nvmObjectsToJSON(applicationObjects, protocolObjects) {
51
52
  };
52
53
  const getObject = (id) => {
53
54
  if (typeof id === "number") {
54
- return protocolObjects.get(id) ?? applicationObjects.get(id);
55
+ return objects.get(id);
55
56
  }
56
57
  else {
57
- for (const [key, obj] of protocolObjects) {
58
- if (id(key))
59
- return obj;
60
- }
61
- for (const [key, obj] of applicationObjects) {
58
+ for (const [key, obj] of objects) {
62
59
  if (id(key))
63
60
  return obj;
64
61
  }
@@ -68,7 +65,7 @@ function nvmObjectsToJSON(applicationObjects, protocolObjects) {
68
65
  const ret = getObject(id);
69
66
  if (ret)
70
67
  return ret;
71
- throw new safe_1.ZWaveError(`Object${typeof id === "number" ? ` ${id}` : ""} not found!`, safe_1.ZWaveErrorCodes.NVM_ObjectNotFound);
68
+ throw new safe_1.ZWaveError(`Object${typeof id === "number" ? ` ${(0, safe_2.num2hex)(id)} (${id})` : ""} not found!`, safe_1.ZWaveErrorCodes.NVM_ObjectNotFound);
72
69
  };
73
70
  const getFileOrThrow = (id, fileVersion) => {
74
71
  const obj = getObjectOrThrow(id);
@@ -171,12 +168,19 @@ function nvmObjectsToJSON(applicationObjects, protocolObjects) {
171
168
  }
172
169
  }
173
170
  // === Application NVM files ===
174
- const applicationVersionFile = getFileOrThrow(files_1.ApplicationVersionFileID, "7.0.0");
171
+ const applicationVersionFile700 = getFile(files_1.ApplicationVersionFileID, "7.0.0");
172
+ const applicationVersionFile800 = getFile(files_1.ApplicationVersionFile800ID, "7.0.0");
173
+ const applicationVersionFile = applicationVersionFile700
174
+ ?? applicationVersionFile800;
175
+ if (!applicationVersionFile) {
176
+ throw new safe_1.ZWaveError("ApplicationVersionFile not found!", safe_1.ZWaveErrorCodes.NVM_ObjectNotFound);
177
+ }
175
178
  const applicationVersion = `${applicationVersionFile.major}.${applicationVersionFile.minor}.${applicationVersionFile.patch}`;
176
179
  const rfConfigFile = getFile(files_1.ApplicationRFConfigFileID, applicationVersion);
177
180
  const applicationCCsFile = getFileOrThrow(files_1.ApplicationCCsFileID, applicationVersion);
178
181
  const applicationDataFile = getFile(files_1.ApplicationDataFileID, applicationVersion);
179
182
  const applicationTypeFile = getFileOrThrow(files_1.ApplicationTypeFileID, applicationVersion);
183
+ const applicationNameFile = getFile(ApplicationNameFile_1.ApplicationNameFileID, applicationVersion);
180
184
  const preferredRepeaters = getFile(files_1.ProtocolPreferredRepeatersFileID, applicationVersion)?.nodeIds;
181
185
  const controllerProps = [
182
186
  "nodeId",
@@ -195,8 +199,8 @@ function nvmObjectsToJSON(applicationObjects, protocolObjects) {
195
199
  "dcdcConfig",
196
200
  ];
197
201
  const controller = {
198
- protocolVersion: `${protocolVersionFile.major}.${protocolVersionFile.minor}.${protocolVersionFile.patch}`,
199
- applicationVersion: `${applicationVersionFile.major}.${applicationVersionFile.minor}.${applicationVersionFile.patch}`,
202
+ protocolVersion,
203
+ applicationVersion,
200
204
  homeId: `0x${controllerInfoFile.homeId.toString("hex")}`,
201
205
  ...(0, safe_2.pick)(controllerInfoFile, controllerProps),
202
206
  ...(0, safe_2.pick)(applicationTypeFile, [
@@ -219,11 +223,13 @@ function nvmObjectsToJSON(applicationObjects, protocolObjects) {
219
223
  measured0dBm: rfConfigFile.measured0dBm,
220
224
  enablePTI: rfConfigFile.enablePTI ?? null,
221
225
  maxTXPower: rfConfigFile.maxTXPower ?? null,
226
+ nodeIdType: rfConfigFile.nodeIdType ?? null,
222
227
  },
223
228
  }
224
229
  : {}),
225
230
  sucUpdateEntries,
226
231
  applicationData: applicationDataFile?.data.toString("hex") ?? null,
232
+ applicationName: applicationNameFile?.name ?? null,
227
233
  };
228
234
  // Make sure all props are defined
229
235
  const optionalControllerProps = [
@@ -328,6 +334,7 @@ function serializeCommonApplicationObjects(nvm) {
328
334
  ]),
329
335
  enablePTI: nvm.controller.rfConfig.enablePTI ?? undefined,
330
336
  maxTXPower: nvm.controller.rfConfig.maxTXPower ?? undefined,
337
+ nodeIdType: nvm.controller.rfConfig.nodeIdType ?? undefined,
331
338
  fileVersion: nvm.controller.applicationVersion,
332
339
  });
333
340
  ret.push(applRFConfigFile.serialize());
@@ -340,6 +347,14 @@ function serializeCommonApplicationObjects(nvm) {
340
347
  });
341
348
  ret.push(applDataFile.serialize());
342
349
  }
350
+ if (nvm.controller.applicationName && nvm.meta?.sharedFileSystem) {
351
+ // The application name only seems to be used with the shared file system
352
+ const applNameFile = new ApplicationNameFile_1.ApplicationNameFile({
353
+ name: nvm.controller.applicationName,
354
+ fileVersion: nvm.controller.applicationVersion,
355
+ });
356
+ ret.push(applNameFile.serialize());
357
+ }
343
358
  return ret;
344
359
  }
345
360
  function serializeCommonProtocolObjects(nvm) {
@@ -510,13 +525,14 @@ function jsonToNVMObjects_v7_11_0(json, targetSDKVersion) {
510
525
  let targetApplicationVersion;
511
526
  let targetProtocolVersion;
512
527
  let targetProtocolFormat;
513
- // We currently support application version migrations up to 7.19.1
528
+ // We currently support application version migrations up to:
529
+ const HIGHEST_SUPPORTED_SDK_VERSION = "7.21.0";
514
530
  // For all higher ones, set the highest version we support and let the controller handle the migration itself
515
- if (semver_1.default.lte(targetSDKVersion, "7.19.1")) {
531
+ if (semver_1.default.lte(targetSDKVersion, HIGHEST_SUPPORTED_SDK_VERSION)) {
516
532
  targetApplicationVersion = semver_1.default.parse(targetSDKVersion);
517
533
  }
518
534
  else {
519
- targetApplicationVersion = semver_1.default.parse("7.19.1");
535
+ targetApplicationVersion = semver_1.default.parse(HIGHEST_SUPPORTED_SDK_VERSION);
520
536
  }
521
537
  // The protocol version file only seems to be updated when the format of the protocol file system changes
522
538
  // Once again, we simply set the highest version we support here and let the controller handle any potential migration
@@ -557,7 +573,10 @@ function jsonToNVMObjects_v7_11_0(json, targetSDKVersion) {
557
573
  }
558
574
  };
559
575
  // Application files
560
- const applVersionFile = new files_1.ApplicationVersionFile({
576
+ const ApplicationVersionConstructor = json.meta?.sharedFileSystem
577
+ ? files_1.ApplicationVersionFile800
578
+ : files_1.ApplicationVersionFile;
579
+ const applVersionFile = new ApplicationVersionConstructor({
561
580
  // The SDK compares 4-byte values where the format is set to 0 to determine whether a migration is needed
562
581
  format: 0,
563
582
  major: targetApplicationVersion.major,
@@ -574,6 +593,7 @@ function jsonToNVMObjects_v7_11_0(json, targetSDKVersion) {
574
593
  measured0dBm: +3.3,
575
594
  enablePTI: null,
576
595
  maxTXPower: null,
596
+ nodeIdType: null,
577
597
  };
578
598
  // Make sure the RF config format matches the application version.
579
599
  // Otherwise, the controller will ignore the file and not accept any changes to the RF config
@@ -581,6 +601,9 @@ function jsonToNVMObjects_v7_11_0(json, targetSDKVersion) {
581
601
  target.controller.rfConfig.enablePTI ??= 0;
582
602
  target.controller.rfConfig.maxTXPower ??= 14.0;
583
603
  }
604
+ if (semver_1.default.gte(targetSDKVersion, "7.21.0")) {
605
+ target.controller.rfConfig.nodeIdType ??= safe_1.NodeIDType.Short;
606
+ }
584
607
  addApplicationObjects(...serializeCommonApplicationObjects(target));
585
608
  // Protocol files
586
609
  const protocolVersionFile = new files_1.ProtocolVersionFile({
@@ -661,8 +684,18 @@ exports.jsonToNVMObjects_v7_11_0 = jsonToNVMObjects_v7_11_0;
661
684
  /** Reads an NVM buffer and returns its JSON representation */
662
685
  function nvmToJSON(buffer, debugLogs = false) {
663
686
  const nvm = (0, nvm_1.parseNVM)(buffer, debugLogs);
664
- const ret = nvmObjectsToJSON(nvm.applicationObjects, nvm.protocolObjects);
665
- ret.meta = (0, nvm_1.getNVMMeta)(nvm.protocolPages[0]);
687
+ const objects = new Map([
688
+ ...nvm.applicationObjects,
689
+ ...nvm.protocolObjects,
690
+ ]);
691
+ // 800 series doesn't distinguish between the storage for application and protocol objects
692
+ const sharedFileSystem = nvm.applicationObjects.size > 0
693
+ && nvm.protocolObjects.size === 0;
694
+ const ret = nvmObjectsToJSON(objects);
695
+ const firstPage = sharedFileSystem
696
+ ? nvm.applicationPages[0]
697
+ : nvm.protocolPages[0];
698
+ ret.meta = (0, nvm_1.getNVMMeta)(firstPage, sharedFileSystem);
666
699
  return ret;
667
700
  }
668
701
  exports.nvmToJSON = nvmToJSON;
@@ -940,13 +973,19 @@ function migrateNVM(sourceNVM, targetNVM) {
940
973
  && targetProtocolFileFormat
941
974
  && targetProtocolFileFormat > consts_1.MAX_PROTOCOL_FILE_FORMAT
942
975
  && sourceProtocolFileFormat
943
- && sourceProtocolFileFormat <= targetProtocolFileFormat) {
976
+ && sourceProtocolFileFormat <= targetProtocolFileFormat
977
+ && sourceNVM.length === targetNVM.length) {
944
978
  // ...both the source and the target are 700 series, but at least the target uses an unsupported protocol version.
945
- // We can be sure hwoever that the target can upgrade any 700 series NVM to its protocol version, as long as the
979
+ // We can be sure however that the target can upgrade any 700 series NVM to its protocol version, as long as the
946
980
  // source protocol version is not higher than the target's
947
981
  return sourceNVM;
948
982
  }
949
- else if (source.type === 700 && target.type === 700) {
983
+ else if (source.type === 700
984
+ && target.type === 700
985
+ // ...the source and target NVMs have the same size and structure
986
+ && sourceNVM.length === targetNVM.length
987
+ && source.json.meta.sharedFileSystem
988
+ === target.json.meta.sharedFileSystem) {
950
989
  // ... the source and target protocol versions are compatible without conversion
951
990
  const sourceProtocolVersion = source.json.controller.protocolVersion;
952
991
  const targetProtocolVersion = target.json.controller.protocolVersion;
@@ -1 +1 @@
1
- {"version":3,"file":"convert.js","sourceRoot":"","sources":["../src/convert.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"convert.js","sourceRoot":"","sources":["../src/convert.ts"],"names":[],"mappings":";;;;;;AAAA,8CAW6B;AAC7B,gDAAiE;AACjE,4DAAuD;AACvD,oDAA4B;AAC5B,qCAAqE;AACrE,mCAqDiB;AACjB,qEAGqC;AACrC,oCAMoB;AAEpB,wCAA2C;AAC3C,kDAK4B;AA8F5B,SAAgB,WAAW,CAAC,IAAiB;IAC5C,OAAO,CAAC,IAAI,CAAC,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;AACxD,CAAC;AAFD,kCAEC;AAED,SAAS,uBAAuB;IAC/B,OAAO;QACN,SAAS,EAAE,KAAK;QAChB,WAAW,EAAE,KAAK;QAClB,mBAAmB,EAAE,KAAK;QAC1B,SAAS,EAAE,KAAK;QAChB,kBAAkB,EAAE,EAAE;QACtB,eAAe,EAAE,CAAC;QAClB,qBAAqB,EAAE,KAAK;QAC5B,QAAQ,EAAE,eAAQ,CAAC,UAAU,CAAC;QAC9B,gBAAgB,EAAE,KAAK;QACvB,eAAe,EAAE,KAAK;QACtB,kBAAkB,EAAE,CAAC;QACrB,mBAAmB,EAAE,IAAI;QACzB,SAAS,EAAE,EAAE;QACb,cAAc,EAAE,CAAC;QACjB,YAAY,EAAE,KAAK;QACnB,aAAa,EAAE,KAAK;QACpB,gBAAgB,EAAE,KAAK;QACvB,gBAAgB,EAAE,KAAK;QACvB,GAAG,EAAE,IAAI;QACT,IAAI,EAAE,IAAI;KACV,CAAC;AACH,CAAC;AAED,wEAAwE;AACxE,SAAgB,gBAAgB,CAC/B,OAAwC;IAExC,MAAM,KAAK,GAAG,IAAI,GAAG,EAAuB,CAAC;IAC7C,MAAM,OAAO,GAAG,CAAC,EAAU,EAAe,EAAE;QAC3C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;YAAE,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,uBAAuB,EAAE,CAAC,CAAC;QAC7D,OAAO,KAAK,CAAC,GAAG,CAAC,EAAE,CAAE,CAAC;IACvB,CAAC,CAAC;IAEF,MAAM,SAAS,GAAG,CACjB,EAAsC,EACb,EAAE;QAC3B,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE;YAC3B,OAAO,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;SACvB;aAAM;YACN,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,OAAO,EAAE;gBACjC,IAAI,EAAE,CAAC,GAAG,CAAC;oBAAE,OAAO,GAAG,CAAC;aACxB;SACD;IACF,CAAC,CAAC;IAEF,MAAM,gBAAgB,GAAG,CACxB,EAAsC,EACzB,EAAE;QACf,MAAM,GAAG,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC;QAC1B,IAAI,GAAG;YAAE,OAAO,GAAG,CAAC;QACpB,MAAM,IAAI,iBAAU,CACnB,SACC,OAAO,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAA,cAAO,EAAC,EAAE,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,EACtD,aAAa,EACb,sBAAe,CAAC,kBAAkB,CAClC,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,cAAc,GAAG,CACtB,EAAsC,EACtC,WAAmB,EACf,EAAE;QACN,MAAM,GAAG,GAAG,gBAAgB,CAAC,EAAE,CAAC,CAAC;QACjC,OAAO,eAAO,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,CAAM,CAAC;IAC5C,CAAC,CAAC;IAEF,MAAM,OAAO,GAAG,CACf,EAAsC,EACtC,WAAmB,EACH,EAAE;QAClB,MAAM,GAAG,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC;QAC1B,IAAI,CAAC,GAAG;YAAE,OAAO,SAAS,CAAC;QAC3B,OAAO,eAAO,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,CAAM,CAAC;IAC5C,CAAC,CAAC;IAEF,6BAA6B;IAE7B,+CAA+C;IAC/C,MAAM,mBAAmB,GAAG,cAAc,CACzC,6BAAqB,EACrB,OAAO,CACP,CAAC;IACF,MAAM,kBAAkB,GAAG,mBAAmB,CAAC,MAAM,CAAC;IACtD,MAAM,eAAe,GACpB,GAAG,mBAAmB,CAAC,KAAK,IAAI,mBAAmB,CAAC,KAAK,IAAI,mBAAmB,CAAC,KAAK,EAAE,CAAC;IAE1F,iFAAiF;IACjF,IAAI,kBAAkB,GAAG,iCAAwB,EAAE;QAClD,MAAM,IAAI,iBAAU,CACnB,qCAAqC,kBAAkB,EAAE,EACzD,sBAAe,CAAC,gBAAgB,EAChC,EAAE,kBAAkB,EAAE,CACtB,CAAC;KACF;IAED,+BAA+B;IAC/B,MAAM,OAAO,GAAG,cAAc,CAC7B,8BAAsB,EACtB,eAAe,CACf,CAAC,OAAO,CAAC;IAEV,+BAA+B;IAC/B,MAAM,YAAY,GAAG,IAAI,GAAG,CAC3B,cAAc,CACb,0CAAkC,EAClC,eAAe,CACf,CAAC,OAAO,CACT,CAAC;IACF,MAAM,aAAa,GAAG,IAAI,GAAG,CAC5B,cAAc,CACb,2CAAmC,EACnC,eAAe,CACf,CAAC,OAAO,CACT,CAAC;IACF,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAC/B,cAAc,CACb,8CAAsC,EACtC,eAAe,CACf,CAAC,OAAO,CACT,CAAC;IACF,MAAM,SAAS,GAAG,IAAI,GAAG,CACxB,cAAc,CACb,qCAA6B,EAC7B,eAAe,CACf,CAAC,OAAO,CACT,CAAC;IACF,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAC/B,cAAc,CACb,8CAAsC,EACtC,eAAe,CACf,CAAC,OAAO,CACT,CAAC;IACF,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAC/B,cAAc,CACb,8CAAsC,EACtC,eAAe,CACf,CAAC,OAAO,CACT,CAAC;IAEF,qDAAqD;IACrD,KAAK,MAAM,EAAE,IAAI,OAAO,EAAE;QACzB,MAAM,IAAI,GAAG,OAAO,CAAC,EAAE,CAAwB,CAAC;QAEhD,MAAM,mBAAmB,GAAG,GAAG,EAAE;YAChC,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE;gBACb,SAAS,EAAE,IAAI;aACf,CAAC,CAAC;QACJ,CAAC,CAAC;QAEF,iBAAiB;QACjB,IAAI,QAAkB,CAAC;QACvB,IAAI;YACH,IAAI,kBAAkB,KAAK,CAAC,EAAE;gBAC7B,MAAM,MAAM,GAAG,IAAA,gCAAwB,EAAC,EAAE,CAAC,CAAC;gBAC5C,MAAM,IAAI,GAAG,cAAc,CAC1B,MAAM,EACN,eAAe,CACf,CAAC;gBACF,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;aACzB;iBAAM;gBACN,MAAM,MAAM,GAAG,IAAA,gCAAwB,EAAC,EAAE,CAAC,CAAC;gBAC5C,MAAM,IAAI,GAAG,cAAc,CAC1B,MAAM,EACN,eAAe,CACf,CAAC;gBACF,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,EAAE,CAAE,CAAC;aACxD;SACD;QAAC,OAAO,CAAM,EAAE;YAChB,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE;gBAC3C,mBAAmB,EAAE,CAAC;gBACtB,SAAS;aACT;YACD,MAAM,CAAC,CAAC;SACR;QAED,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAE9B,iBAAiB;QACjB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACnC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACzC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC3C,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACjD,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACjD,IAAI,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YAC7B,IAAI,UAAkC,CAAC;YACvC,IAAI,kBAAkB,KAAK,CAAC,EAAE;gBAC7B,MAAM,MAAM,GAAG,IAAA,kCAA0B,EAAC,EAAE,CAAC,CAAC;gBAC9C,MAAM,IAAI,GAAG,OAAO,CAAmB,MAAM,EAAE,eAAe,CAAC,CAAC;gBAChE,UAAU,GAAG,IAAI,EAAE,UAAU,CAAC;aAC9B;iBAAM;gBACN,MAAM,MAAM,GAAG,IAAA,kCAA0B,EAAC,EAAE,CAAC,CAAC;gBAC9C,MAAM,IAAI,GAAG,OAAO,CAAmB,MAAM,EAAE,eAAe,CAAC,CAAC;gBAChE,UAAU,GAAG,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,EAAE,CAAC,CAAC;aAC5D;YACD,IAAI,UAAU,EAAE;gBACf,IAAI,CAAC,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC;gBAC1B,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;aAC5B;SACD;QAED,sEAAsE;QACtE,OAAO,IAAI,CAAC,MAAM,CAAC;KACnB;IAED,qCAAqC;IACrC,MAAM,kBAAkB,GAAG,cAAc,CACxC,4BAAoB,EACpB,eAAe,CACf,CAAC;IAEF,IAAI,gBAAkC,CAAC;IACvC,IAAI,kBAAkB,GAAG,CAAC,EAAE;QAC3B,gBAAgB,GAAG,cAAc,CAChC,gCAAwB,EACxB,eAAe,CACf,CAAC,aAAa,CAAC;KAChB;SAAM;QACN,+CAA+C;QAC/C,gBAAgB,GAAG,EAAE,CAAC;QACtB,KACC,IAAI,KAAK,GAAG,CAAC,EACb,KAAK,GAAG,wBAAe,EACvB,KAAK,IAAI,+BAAuB,EAC/B;YACD,MAAM,IAAI,GAAG,OAAO,CACnB,IAAA,gDAAwC,EAAC,KAAK,CAAC,EAC/C,eAAe,CACf,CAAC;YACF,IAAI,CAAC,IAAI;gBAAE,MAAM;YACjB,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC;SAC7C;KACD;IAED,gCAAgC;IAEhC,MAAM,yBAAyB,GAAG,OAAO,CACxC,gCAAwB,EACxB,OAAO,CACP,CAAC;IACF,MAAM,yBAAyB,GAAG,OAAO,CACxC,mCAA2B,EAC3B,OAAO,CACP,CAAC;IACF,MAAM,sBAAsB,GAAG,yBAAyB;WACpD,yBAAyB,CAAC;IAC9B,IAAI,CAAC,sBAAsB,EAAE;QAC5B,MAAM,IAAI,iBAAU,CACnB,mCAAmC,EACnC,sBAAe,CAAC,kBAAkB,CAClC,CAAC;KACF;IACD,MAAM,kBAAkB,GACvB,GAAG,sBAAsB,CAAC,KAAK,IAAI,sBAAsB,CAAC,KAAK,IAAI,sBAAsB,CAAC,KAAK,EAAE,CAAC;IAEnG,MAAM,YAAY,GAAG,OAAO,CAC3B,iCAAyB,EACzB,kBAAkB,CAClB,CAAC;IACF,MAAM,kBAAkB,GAAG,cAAc,CACxC,4BAAoB,EACpB,kBAAkB,CAClB,CAAC;IACF,MAAM,mBAAmB,GAAG,OAAO,CAClC,6BAAqB,EACrB,kBAAkB,CAClB,CAAC;IACF,MAAM,mBAAmB,GAAG,cAAc,CACzC,6BAAqB,EACrB,kBAAkB,CAClB,CAAC;IACF,MAAM,mBAAmB,GAAG,OAAO,CAClC,2CAAqB,EACrB,kBAAkB,CAClB,CAAC;IAEF,MAAM,kBAAkB,GAAG,OAAO,CACjC,wCAAgC,EAChC,kBAAkB,CAClB,EAAE,OAAO,CAAC;IAEX,MAAM,eAAe,GAAG;QACvB,QAAQ;QACR,YAAY;QACZ,wBAAwB;QACxB,cAAc;QACd,yBAAyB;QACzB,wBAAwB;QACxB,WAAW;QACX,YAAY;QACZ,aAAa;QACb,cAAc;QACd,aAAa;QACb,cAAc;QACd,2BAA2B;QAC3B,YAAY;KACH,CAAC;IACX,MAAM,UAAU,GAAsB;QACrC,eAAe;QACf,kBAAkB;QAClB,MAAM,EAAE,KAAK,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;QACxD,GAAG,IAAA,WAAI,EAAC,kBAAkB,EAAE,eAAe,CAAC;QAC5C,GAAG,IAAA,WAAI,EAAC,mBAAmB,EAAE;YAC5B,aAAa;YACb,uBAAuB;YACvB,oBAAoB;YACpB,qBAAqB;SACrB,CAAC;QACF,cAAc,EAAE,IAAA,WAAI,EAAC,kBAAkB,EAAE;YACxC,oBAAoB;YACpB,6BAA6B;YAC7B,2BAA2B;SAC3B,CAAC;QACF,kBAAkB;QAClB,GAAG,CAAC,YAAY;YACf,CAAC,CAAC;gBACD,QAAQ,EAAE;oBACT,QAAQ,EAAE,YAAY,CAAC,QAAQ;oBAC/B,OAAO,EAAE,YAAY,CAAC,OAAO;oBAC7B,YAAY,EAAE,YAAY,CAAC,YAAY;oBACvC,SAAS,EAAE,YAAY,CAAC,SAAS,IAAI,IAAI;oBACzC,UAAU,EAAE,YAAY,CAAC,UAAU,IAAI,IAAI;oBAC3C,UAAU,EAAE,YAAY,CAAC,UAAU,IAAI,IAAI;iBAC3C;aACD;YACD,CAAC,CAAC,EAAE,CAAC;QACN,gBAAgB;QAChB,eAAe,EAAE,mBAAmB,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,IAAI;QAClE,eAAe,EAAE,mBAAmB,EAAE,IAAI,IAAI,IAAI;KAClD,CAAC;IAEF,kCAAkC;IAClC,MAAM,uBAAuB,GAAG;QAC/B,wBAAwB;QACxB,cAAc;QACd,aAAa;QACb,cAAc;QACd,2BAA2B;QAC3B,YAAY;QACZ,UAAU;QACV,oBAAoB;QACpB,iBAAiB;KACR,CAAC;IACX,KAAK,MAAM,IAAI,IAAI,uBAAuB,EAAE;QAC3C,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,SAAS;YAAE,UAAU,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;KAC5D;IAED,MAAM,GAAG,GAAY;QACpB,MAAM,EAAE,kBAAkB;QAC1B,UAAU;QACV,KAAK,EAAE,IAAA,mBAAW,EAAC,KAAK,CAAC;KACzB,CAAC;IAEF,OAAO,GAAG,CAAC;AACZ,CAAC;AAzUD,4CAyUC;AAED,SAAS,qBAAqB,CAC7B,MAAc,EACd,IAAyB;IAEzB,OAAO;QACN,MAAM;QACN,GAAG,IAAA,WAAI,EAAC,IAAI,EAAE;YACb,aAAa;YACb,qBAAqB;YACrB,WAAW;YACX,oBAAoB;YACpB,iBAAiB;YACjB,uBAAuB;YACvB,UAAU;YACV,kBAAkB;YAClB,iBAAiB;YACjB,oBAAoB;YACpB,qBAAqB;YACrB,WAAW;YACX,gBAAgB;SAChB,CAAC;KACF,CAAC;AACH,CAAC;AAED,SAAS,8BAA8B,CACtC,KAAwB;IAExB,MAAM,GAAG,GAAG;QACX,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC;QAC3D,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,sBAAsB,EAAE,KAAK,CAAC,sBAAsB;QACpD,YAAY,EAAE,KAAK,CAAC,YAAY;QAChC,uBAAuB,EAAE,KAAK,CAAC,uBAAuB;QACtD,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,WAAW,EAAE,KAAK,CAAC,WAAW;KACD,CAAC;IAC/B,IAAI,KAAK,CAAC,sBAAsB,IAAI,SAAS,EAAE;QAC9C,gEAAgE;QAChE,wBAAwB;QACxB,GAAG,CAAC,sBAAsB,GAAG,KAAK,CAAC,sBAAsB,CAAC;KAC1D;SAAM;QACN,MAAM,CAAC,MAAM,CACZ,GAAG,EACH,IAAA,qBAAc,EACb,IAAA,WAAI,EAAC,KAAK,EAAE;YACX,wBAAwB;YACxB,cAAc;YACd,aAAa;YACb,cAAc;YACd,2BAA2B;YAC3B,YAAY;SACZ,CAAC,CACF,CACD,CAAC;KACF;IACD,OAAO,GAAG,CAAC;AACZ,CAAC;AAED,SAAS,iCAAiC,CAAC,GAAY;IACtD,MAAM,GAAG,GAAiB,EAAE,CAAC;IAC7B,MAAM,YAAY,GAAG,IAAI,2BAAmB,CAAC;QAC5C,GAAG,IAAA,WAAI,EAAC,GAAG,CAAC,UAAU,EAAE;YACvB,aAAa;YACb,uBAAuB;YACvB,oBAAoB;YACpB,qBAAqB;SACrB,CAAC;QACF,WAAW,EAAE,GAAG,CAAC,UAAU,CAAC,kBAAkB;KAC9C,CAAC,CAAC;IACH,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,CAAC;IAEnC,MAAM,WAAW,GAAG,IAAI,0BAAkB,CAAC;QAC1C,GAAG,IAAA,WAAI,EAAC,GAAG,CAAC,UAAU,CAAC,cAAc,EAAE;YACtC,oBAAoB;YACpB,6BAA6B;YAC7B,2BAA2B;SAC3B,CAAC;QACF,WAAW,EAAE,GAAG,CAAC,UAAU,CAAC,kBAAkB;KAC9C,CAAC,CAAC;IACH,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC,CAAC;IAElC,IAAI,GAAG,CAAC,UAAU,CAAC,QAAQ,EAAE;QAC5B,MAAM,gBAAgB,GAAG,IAAI,+BAAuB,CAAC;YACpD,GAAG,IAAA,WAAI,EAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,EAAE;gBAChC,UAAU;gBACV,SAAS;gBACT,cAAc;aACd,CAAC;YACF,SAAS,EAAE,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,SAAS,IAAI,SAAS;YACzD,UAAU,EAAE,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,UAAU,IAAI,SAAS;YAC3D,UAAU,EAAE,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,UAAU,IAAI,SAAS;YAC3D,WAAW,EAAE,GAAG,CAAC,UAAU,CAAC,kBAAkB;SAC9C,CAAC,CAAC;QACH,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,CAAC;KACvC;IAED,IAAI,GAAG,CAAC,UAAU,CAAC,eAAe,EAAE;QACnC,sCAAsC;QACtC,MAAM,YAAY,GAAG,IAAI,2BAAmB,CAAC;YAC5C,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,eAAe,EAAE,KAAK,CAAC;YACxD,WAAW,EAAE,GAAG,CAAC,UAAU,CAAC,kBAAkB;SAC9C,CAAC,CAAC;QACH,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,CAAC;KACnC;IAED,IAAI,GAAG,CAAC,UAAU,CAAC,eAAe,IAAI,GAAG,CAAC,IAAI,EAAE,gBAAgB,EAAE;QACjE,yEAAyE;QACzE,MAAM,YAAY,GAAG,IAAI,yCAAmB,CAAC;YAC5C,IAAI,EAAE,GAAG,CAAC,UAAU,CAAC,eAAe;YACpC,WAAW,EAAE,GAAG,CAAC,UAAU,CAAC,kBAAkB;SAC9C,CAAC,CAAC;QACH,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,CAAC;KACnC;IAED,OAAO,GAAG,CAAC;AACZ,CAAC;AAED,SAAS,8BAA8B,CAAC,GAAY;IACnD,MAAM,GAAG,GAAiB,EAAE,CAAC;IAE7B,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;IACvC,MAAM,aAAa,GAAG,IAAI,GAAG,EAAU,CAAC;IACxC,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;IAC3C,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IACpC,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;IAE3C,KAAK,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;QACnD,MAAM,MAAM,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;QAC5B,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;YACvB,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACtB,SAAS;SACT;aAAM;YACN,IAAI,IAAI,CAAC,SAAS;gBAAE,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAC1C,IAAI,IAAI,CAAC,YAAY;gBAAE,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAChD,IAAI,IAAI,CAAC,aAAa;gBAAE,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAClD,IAAI,IAAI,CAAC,gBAAgB;gBAAE,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACxD,IAAI,IAAI,CAAC,gBAAgB;gBAAE,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;SACxD;KACD;IAED,GAAG,CAAC,IAAI,CACP,IAAI,0BAAkB,CACrB,8BAA8B,CAAC,GAAG,CAAC,UAAU,CAAC,CAC9C,CAAC,SAAS,EAAE,CACb,CAAC;IAEF,GAAG,CAAC,IAAI,CACP,IAAI,wCAAgC,CAAC;QACpC,OAAO,EAAE,CAAC,GAAG,YAAY,CAAC;QAC1B,WAAW,EAAE,GAAG,CAAC,UAAU,CAAC,eAAe;KAC3C,CAAC,CAAC,SAAS,EAAE,CACd,CAAC;IACF,GAAG,CAAC,IAAI,CACP,IAAI,yCAAiC,CAAC;QACrC,OAAO,EAAE,CAAC,GAAG,aAAa,CAAC;QAC3B,WAAW,EAAE,GAAG,CAAC,UAAU,CAAC,eAAe;KAC3C,CAAC,CAAC,SAAS,EAAE,CACd,CAAC;IACF,GAAG,CAAC,IAAI,CACP,IAAI,4CAAoC,CAAC;QACxC,OAAO,EAAE,CAAC,GAAG,gBAAgB,CAAC;QAC9B,WAAW,EAAE,GAAG,CAAC,UAAU,CAAC,eAAe;KAC3C,CAAC,CAAC,SAAS,EAAE,CACd,CAAC;IACF,GAAG,CAAC,IAAI,CACP,IAAI,mCAA2B,CAAC;QAC/B,OAAO,EAAE,CAAC,GAAG,SAAS,CAAC;QACvB,WAAW,EAAE,GAAG,CAAC,UAAU,CAAC,eAAe;KAC3C,CAAC,CAAC,SAAS,EAAE,CACd,CAAC;IACF,GAAG,CAAC,IAAI,CACP,IAAI,4CAAoC,CAAC;QACxC,OAAO,EAAE,CAAC,GAAG,gBAAgB,CAAC;QAC9B,WAAW,EAAE,GAAG,CAAC,UAAU,CAAC,eAAe;KAC3C,CAAC,CAAC,SAAS,EAAE,CACd,CAAC;IAEF,4HAA4H;IAE5H,IAAI,GAAG,CAAC,UAAU,CAAC,kBAAkB,EAAE,MAAM,EAAE;QAC9C,GAAG,CAAC,IAAI,CACP,IAAI,sCAA8B,CAAC;YAClC,OAAO,EAAE,GAAG,CAAC,UAAU,CAAC,kBAAkB;YAC1C,WAAW,EAAE,GAAG,CAAC,UAAU,CAAC,eAAe;SAC3C,CAAC,CAAC,SAAS,EAAE,CACd,CAAC;KACF;IAED,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;QACnB,GAAG,CAAC,IAAI,CACP,IAAI,8BAAsB,CAAC;YAC1B,aAAa,EAAE,GAAG,CAAC,UAAU,CAAC,gBAAgB;YAC9C,WAAW,EAAE,GAAG,CAAC,UAAU,CAAC,eAAe;SAC3C,CAAC,CAAC,SAAS,EAAE,CACd,CAAC;KACF;SAAM;QACN,0DAA0D;QAC1D,KACC,IAAI,KAAK,GAAG,CAAC,EACb,KAAK,GAAG,wBAAe,EACvB,KAAK,IAAI,+BAAuB,EAC/B;YACD,MAAM,KAAK,GAAG,GAAG,CAAC,UAAU,CAAC,gBAAgB,CAAC,KAAK,CAClD,KAAK,EACL,KAAK,GAAG,+BAAuB,CAC/B,CAAC;YACF,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;gBAAE,MAAM;YAC9B,MAAM,IAAI,GAAG,IAAI,8BAAsB,CAAC;gBACvC,aAAa,EAAE,KAAK;gBACpB,WAAW,EAAE,GAAG,CAAC,UAAU,CAAC,eAAe;aAC3C,CAAC,CAAC;YACH,IAAI,CAAC,MAAM,GAAG,IAAA,gDAAwC,EAAC,KAAK,CAAC,CAAC;YAC9D,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;SAC3B;KACD;IAED,OAAO,GAAG,CAAC;AACZ,CAAC;AAED,SAAgB,uBAAuB,CACtC,IAAa,EACb,gBAA+B;IAE/B,MAAM,MAAM,GAAG,IAAA,gBAAS,EAAC,IAAI,CAAC,CAAC;IAE/B,MAAM,CAAC,UAAU,CAAC,eAAe,GAAG,OAAO,CAAC;IAC5C,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;IAClB,MAAM,CAAC,UAAU,CAAC,kBAAkB,GAAG,gBAAgB,CAAC,MAAM,EAAE,CAAC;IAEjE,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAsB,CAAC;IACzD,MAAM,eAAe,GAAG,IAAI,GAAG,EAAsB,CAAC;IAEtD,MAAM,qBAAqB,GAAG,CAAC,GAAG,OAAqB,EAAE,EAAE;QAC1D,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE;YACxB,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;SACjC;IACF,CAAC,CAAC;IACF,MAAM,kBAAkB,GAAG,CAAC,GAAG,OAAqB,EAAE,EAAE;QACvD,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE;YACxB,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;SAC9B;IACF,CAAC,CAAC;IAEF,oBAAoB;IACpB,MAAM,eAAe,GAAG,IAAI,8BAAsB,CAAC;QAClD,yGAAyG;QACzG,MAAM,EAAE,CAAC;QACT,KAAK,EAAE,gBAAgB,CAAC,KAAK;QAC7B,KAAK,EAAE,gBAAgB,CAAC,KAAK;QAC7B,KAAK,EAAE,gBAAgB,CAAC,KAAK;QAC7B,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,kBAAkB,EAAE,gCAAgC;KACnF,CAAC,CAAC;IACH,qBAAqB,CAAC,eAAe,CAAC,SAAS,EAAE,CAAC,CAAC;IAEnD,qBAAqB,CAAC,GAAG,iCAAiC,CAAC,MAAM,CAAC,CAAC,CAAC;IAEpE,iBAAiB;IAEjB,MAAM,mBAAmB,GAAG,IAAI,2BAAmB,CAAC;QACnD,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,KAAK,EAAE,CAAC;QACR,KAAK,EAAE,CAAC;QACR,KAAK,EAAE,CAAC;QACR,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,eAAe,EAAE,gCAAgC;KAChF,CAAC,CAAC;IACH,kBAAkB,CAAC,mBAAmB,CAAC,SAAS,EAAE,CAAC,CAAC;IAEpD,MAAM,aAAa,GAAG,IAAI,GAAG,EAA0B,CAAC;IACxD,MAAM,eAAe,GAAG,IAAI,GAAG,EAA4B,CAAC;IAC5D,MAAM,cAAc,GAAG,IAAI,GAAG,EAAU,CAAC;IACzC,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;IAE3C,KAAK,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;QACtD,MAAM,MAAM,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;QAC5B,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;YAAE,SAAS;QAEjC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAE3B,+BAA+B;QAC/B,MAAM,iBAAiB,GAAG,IAAA,gCAAwB,EAAC,MAAM,CAAC,CAAC;QAC3D,aAAa,CAAC,GAAG,CAChB,iBAAiB,EACjB,IAAI,sBAAc,CAAC;YAClB,QAAQ,EAAE,qBAAqB,CAAC,MAAM,EAAE,IAAI,CAAC;YAC7C,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,eAAe;SAC9C,CAAC,CACF,CAAC;QAEF,uDAAuD;QACvD,IAAI,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE;YAC1B,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAE7B,MAAM,mBAAmB,GAAG,IAAA,kCAA0B,EAAC,MAAM,CAAC,CAAC;YAC/D,eAAe,CAAC,GAAG,CAClB,mBAAmB,EACnB,IAAI,wBAAgB,CAAC;gBACpB,UAAU,EAAE;oBACX,MAAM;oBACN,GAAG,EAAE,IAAI,CAAC,GAAG,IAAI,IAAA,qBAAa,GAAE;oBAChC,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,IAAA,qBAAa,GAAE;iBAClC;gBACD,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,eAAe;aAC9C,CAAC,CACF,CAAC;SACF;KACD;IAED,kBAAkB,CAAC,GAAG,8BAA8B,CAAC,MAAM,CAAC,CAAC,CAAC;IAE9D,kBAAkB,CACjB,IAAI,4BAAoB,CAAC;QACxB,OAAO,EAAE,CAAC,GAAG,cAAc,CAAC;QAC5B,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,eAAe;KAC9C,CAAC,CAAC,SAAS,EAAE,CACd,CAAC;IACF,kBAAkB,CACjB,IAAI,4CAAoC,CAAC;QACxC,OAAO,EAAE,CAAC,GAAG,gBAAgB,CAAC;QAC9B,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,eAAe;KAC9C,CAAC,CAAC,SAAS,EAAE,CACd,CAAC;IAEF,IAAI,aAAa,CAAC,IAAI,GAAG,CAAC,EAAE;QAC3B,kBAAkB,CACjB,GAAG,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CACxD,CAAC;KACF;IACD,IAAI,eAAe,CAAC,IAAI,GAAG,CAAC,EAAE;QAC7B,kBAAkB,CACjB,GAAG,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAC1D,CAAC;KACF;IAED,OAAO;QACN,kBAAkB;QAClB,eAAe;KACf,CAAC;AACH,CAAC;AAtHD,0DAsHC;AAED,SAAgB,wBAAwB,CACvC,IAAa,EACb,gBAA+B;IAE/B,MAAM,MAAM,GAAG,IAAA,gBAAS,EAAC,IAAI,CAAC,CAAC;IAE/B,IAAI,wBAAuC,CAAC;IAC5C,IAAI,qBAAoC,CAAC;IACzC,IAAI,oBAA4B,CAAC;IAEjC,6DAA6D;IAC7D,MAAM,6BAA6B,GAAG,QAAQ,CAAC;IAC/C,6GAA6G;IAC7G,IAAI,gBAAM,CAAC,GAAG,CAAC,gBAAgB,EAAE,6BAA6B,CAAC,EAAE;QAChE,wBAAwB,GAAG,gBAAM,CAAC,KAAK,CAAC,gBAAgB,CAAE,CAAC;KAC3D;SAAM;QACN,wBAAwB,GAAG,gBAAM,CAAC,KAAK,CAAC,6BAA6B,CAAE,CAAC;KACxE;IAED,yGAAyG;IACzG,sHAAsH;IACtH,IAAI,gBAAM,CAAC,GAAG,CAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE;QAC3C,qBAAqB,GAAG,gBAAM,CAAC,KAAK,CAAC,QAAQ,CAAE,CAAC;QAChD,oBAAoB,GAAG,CAAC,CAAC;KACzB;SAAM,IAAI,gBAAM,CAAC,GAAG,CAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE;QAClD,qBAAqB,GAAG,gBAAM,CAAC,KAAK,CAAC,QAAQ,CAAE,CAAC;QAChD,oBAAoB,GAAG,CAAC,CAAC;KACzB;SAAM,IAAI,gBAAM,CAAC,GAAG,CAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE;QAClD,qBAAqB,GAAG,gBAAM,CAAC,KAAK,CAAC,QAAQ,CAAE,CAAC;QAChD,oBAAoB,GAAG,CAAC,CAAC;KACzB;SAAM,IAAI,gBAAM,CAAC,GAAG,CAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE;QAClD,qBAAqB,GAAG,gBAAM,CAAC,KAAK,CAAC,QAAQ,CAAE,CAAC;QAChD,oBAAoB,GAAG,CAAC,CAAC;KACzB;SAAM;QACN,8DAA8D;QAC9D,qBAAqB,GAAG,gBAAM,CAAC,KAAK,CAAC,QAAQ,CAAE,CAAC;QAChD,oBAAoB,GAAG,CAAC,CAAC;KACzB;IAED,MAAM,CAAC,MAAM,GAAG,oBAAoB,CAAC;IACrC,MAAM,CAAC,UAAU,CAAC,kBAAkB,GAAG,wBAAwB,CAAC,MAAM,EAAE,CAAC;IACzE,MAAM,CAAC,UAAU,CAAC,eAAe,GAAG,qBAAqB,CAAC,MAAM,EAAE,CAAC;IAEnE,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAsB,CAAC;IACzD,MAAM,eAAe,GAAG,IAAI,GAAG,EAAsB,CAAC;IAEtD,MAAM,qBAAqB,GAAG,CAAC,GAAG,OAAqB,EAAE,EAAE;QAC1D,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE;YACxB,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;SACjC;IACF,CAAC,CAAC;IACF,MAAM,kBAAkB,GAAG,CAAC,GAAG,OAAqB,EAAE,EAAE;QACvD,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE;YACxB,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;SAC9B;IACF,CAAC,CAAC;IAEF,oBAAoB;IACpB,MAAM,6BAA6B,GAAG,IAAI,CAAC,IAAI,EAAE,gBAAgB;QAChE,CAAC,CAAC,iCAAyB;QAC3B,CAAC,CAAC,8BAAsB,CAAC;IAC1B,MAAM,eAAe,GAAG,IAAI,6BAA6B,CAAC;QACzD,yGAAyG;QACzG,MAAM,EAAE,CAAC;QACT,KAAK,EAAE,wBAAwB,CAAC,KAAK;QACrC,KAAK,EAAE,wBAAwB,CAAC,KAAK;QACrC,KAAK,EAAE,wBAAwB,CAAC,KAAK;QACrC,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,kBAAkB,EAAE,gCAAgC;KACnF,CAAC,CAAC;IACH,qBAAqB,CAAC,eAAe,CAAC,SAAS,EAAE,CAAC,CAAC;IAEnD,uEAAuE;IACvE,+CAA+C;IAC/C,MAAM,CAAC,UAAU,CAAC,QAAQ,KAAK;QAC9B,QAAQ,EAAE,eAAQ,CAAC,cAAc,CAAC;QAClC,OAAO,EAAE,GAAG;QACZ,YAAY,EAAE,CAAC,GAAG;QAClB,SAAS,EAAE,IAAI;QACf,UAAU,EAAE,IAAI;QAChB,UAAU,EAAE,IAAI;KAChB,CAAC;IAEF,kEAAkE;IAClE,6FAA6F;IAC7F,IAAI,gBAAM,CAAC,GAAG,CAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE;QAC3C,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,SAAS,KAAK,CAAC,CAAC;QAC3C,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,UAAU,KAAK,IAAI,CAAC;KAC/C;IACD,IAAI,gBAAM,CAAC,GAAG,CAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE;QAC3C,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,UAAU,KAAK,iBAAU,CAAC,KAAK,CAAC;KAC3D;IAED,qBAAqB,CAAC,GAAG,iCAAiC,CAAC,MAAM,CAAC,CAAC,CAAC;IAEpE,iBAAiB;IAEjB,MAAM,mBAAmB,GAAG,IAAI,2BAAmB,CAAC;QACnD,MAAM,EAAE,oBAAoB;QAC5B,KAAK,EAAE,qBAAqB,CAAC,KAAK;QAClC,KAAK,EAAE,qBAAqB,CAAC,KAAK;QAClC,KAAK,EAAE,qBAAqB,CAAC,KAAK;QAClC,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,eAAe,EAAE,gCAAgC;KAChF,CAAC,CAAC;IACH,kBAAkB,CAAC,mBAAmB,CAAC,SAAS,EAAE,CAAC,CAAC;IAEpD,MAAM,aAAa,GAAG,IAAI,GAAG,EAA0B,CAAC;IACxD,MAAM,eAAe,GAAG,IAAI,GAAG,EAA4B,CAAC;IAC5D,MAAM,cAAc,GAAG,IAAI,GAAG,EAAU,CAAC;IACzC,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;IAE3C,KAAK,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;QACtD,MAAM,MAAM,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;QAC5B,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;YAAE,SAAS;QAEjC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAE3B,+BAA+B;QAC/B,MAAM,iBAAiB,GAAG,IAAA,gCAAwB,EAAC,MAAM,CAAC,CAAC;QAC3D,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE;YAC1C,aAAa,CAAC,GAAG,CAChB,iBAAiB,EACjB,IAAI,sBAAc,CAAC;gBAClB,SAAS,EAAE,EAAE;gBACb,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,eAAe;aAC9C,CAAC,CACF,CAAC;SACF;QACD,MAAM,YAAY,GAAG,aAAa,CAAC,GAAG,CAAC,iBAAiB,CAAE,CAAC;QAE3D,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;QAEjE,uDAAuD;QACvD,IAAI,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE;YAC1B,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAC7B,MAAM,mBAAmB,GAAG,IAAA,kCAA0B,EAAC,MAAM,CAAC,CAAC;YAC/D,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,mBAAmB,CAAC,EAAE;gBAC9C,eAAe,CAAC,GAAG,CAClB,mBAAmB,EACnB,IAAI,wBAAgB,CAAC;oBACpB,WAAW,EAAE,EAAE;oBACf,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,eAAe;iBAC9C,CAAC,CACF,CAAC;aACF;YACD,MAAM,cAAc,GAAG,eAAe,CAAC,GAAG,CAAC,mBAAmB,CAAE,CAAC;YACjE,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC;gBAC/B,MAAM;gBACN,GAAG,EAAE,IAAI,CAAC,GAAG,IAAI,IAAA,qBAAa,GAAE;gBAChC,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,IAAA,qBAAa,GAAE;aAClC,CAAC,CAAC;SACH;KACD;IAED,gFAAgF;IAChF,gEAAgE;IAChE,IAAI,oBAAoB,IAAI,CAAC,EAAE;QAC9B,MAAM,CAAC,UAAU,CAAC,YAAY,KAAK,GAAG,CAAC;QACvC,MAAM,CAAC,UAAU,CAAC,WAAW,KAAK,CAAC,CAAC;QACpC,MAAM,CAAC,UAAU,CAAC,YAAY,KAAK,CAAC,CAAC;QACrC,MAAM,CAAC,UAAU,CAAC,yBAAyB,KAAK,CAAC,CAAC;QAClD,MAAM,CAAC,UAAU,CAAC,UAAU,KAAK,GAAG,CAAC;KACrC;IAED,kBAAkB,CAAC,GAAG,8BAA8B,CAAC,MAAM,CAAC,CAAC,CAAC;IAE9D,kBAAkB,CACjB,IAAI,4BAAoB,CAAC;QACxB,OAAO,EAAE,CAAC,GAAG,cAAc,CAAC;QAC5B,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,eAAe;KAC9C,CAAC,CAAC,SAAS,EAAE,CACd,CAAC;IACF,kBAAkB,CACjB,IAAI,4CAAoC,CAAC;QACxC,OAAO,EAAE,CAAC,GAAG,gBAAgB,CAAC;QAC9B,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,eAAe;KAC9C,CAAC,CAAC,SAAS,EAAE,CACd,CAAC;IAEF,IAAI,aAAa,CAAC,IAAI,GAAG,CAAC,EAAE;QAC3B,kBAAkB,CACjB,GAAG,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CACxD,CAAC;KACF;IACD,IAAI,eAAe,CAAC,IAAI,GAAG,CAAC,EAAE;QAC7B,kBAAkB,CACjB,GAAG,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAC1D,CAAC;KACF;IAED,OAAO;QACN,kBAAkB;QAClB,eAAe;KACf,CAAC;AACH,CAAC;AAjMD,4DAiMC;AAED,8DAA8D;AAC9D,SAAgB,SAAS,CACxB,MAAc,EACd,YAAqB,KAAK;IAE1B,MAAM,GAAG,GAAG,IAAA,cAAQ,EAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACxC,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC;QACvB,GAAG,GAAG,CAAC,kBAAkB;QACzB,GAAG,GAAG,CAAC,eAAe;KACtB,CAAC,CAAC;IACH,0FAA0F;IAC1F,MAAM,gBAAgB,GAAG,GAAG,CAAC,kBAAkB,CAAC,IAAI,GAAG,CAAC;WACpD,GAAG,CAAC,eAAe,CAAC,IAAI,KAAK,CAAC,CAAC;IACnC,MAAM,GAAG,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACtC,MAAM,SAAS,GAAG,gBAAgB;QACjC,CAAC,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC;QACzB,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IACxB,GAAG,CAAC,IAAI,GAAG,IAAA,gBAAU,EAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;IACnD,OAAO,GAAwB,CAAC;AACjC,CAAC;AAlBD,8BAkBC;AAED,oFAAoF;AACpF,SAAgB,YAAY,CAAC,MAAc;IAC1C,MAAM,MAAM,GAAG,IAAA,wBAAkB,EAAC,MAAM,CAAC,CAAC;IAC1C,IAAI,CAAC,MAAM,EAAE;QACZ,MAAM,IAAI,iBAAU,CACnB,4IAA4I,EAC5I,sBAAe,CAAC,gBAAgB,CAChC,CAAC;KACF;IACD,OAAO,MAAM,CAAC,MAAM,EAAE,CAAC;AACxB,CAAC;AATD,oCASC;AAED,6DAA6D;AAC7D,SAAgB,SAAS,CACxB,IAAuB,EACvB,gBAAwB;IAExB,MAAM,aAAa,GAAG,gBAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACrD,IAAI,CAAC,aAAa,EAAE;QACnB,MAAM,IAAI,iBAAU,CACnB,wBAAwB,gBAAgB,EAAE,EAC1C,sBAAe,CAAC,gBAAgB,CAChC,CAAC;KACF;IAED,IAAI,OAAoB,CAAC;IACzB,IAAI,gBAAM,CAAC,GAAG,CAAC,aAAa,EAAE,QAAQ,CAAC,EAAE;QACxC,OAAO,GAAG,wBAAwB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;KACxD;SAAM,IAAI,gBAAM,CAAC,GAAG,CAAC,aAAa,EAAE,OAAO,CAAC,EAAE;QAC9C,OAAO,GAAG,uBAAuB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;KACvD;SAAM;QACN,MAAM,IAAI,iBAAU,CACnB,8EAA8E,EAC9E,sBAAe,CAAC,gBAAgB,CAChC,CAAC;KACF;IAED,OAAO,IAAA,eAAS,EACf,OAAO,CAAC,kBAAkB,EAC1B,OAAO,CAAC,eAAe,EACvB,IAAI,CAAC,IAAI,CACT,CAAC;AACH,CAAC;AA7BD,8BA6BC;AAED,wEAAwE;AACxE,SAAgB,YAAY,CAC3B,IAA0B,EAC1B,eAAuB;IAEvB,wCAAwC;IACxC,MAAM,IAAI,GAAG,yBAAa,CAAC,IAAI,CAC9B,CAAC,CAAC,EAAE,EAAE,CACL,CAAC,CAAC,gBAAgB,CAAC,QAAQ,CAAC,eAAe,CAAC;WACzC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CACtD,CAAC;IAEF,IAAI,CAAC,IAAI,EAAE;QACV,MAAM,IAAI,iBAAU,CACnB,+DAA+D,eAAe,gBAAgB,IAAI,CAAC,IAAI,CAAC,OAAO,kHAAkH,EACjO,sBAAe,CAAC,gBAAgB,CAChC,CAAC;KACF;IAED,MAAM,UAAU,GAAG,IAAI,yBAAa,CAAC,IAAI,CAAC,CAAC;IAC3C,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IAC5C,OAAO,UAAU,CAAC,SAAS,EAAE,CAAC;AAC/B,CAAC;AArBD,oCAqBC;AAED,SAAgB,YAAY,CAC3B,IAAgB,EAChB,uBAAiC;IAEjC,MAAM,MAAM,GAAG,IAAA,gBAAS,EAAC,IAAI,CAAC,CAAC;IAE/B,2FAA2F;IAC3F,0BAA0B;IAC1B,IAAI,cAAc,GAAG,MAAM,CAAC,KAAK,CAChC,MAAM,CAAC,UAAU,CAAC,MAAM,IAAI,CAAC,CACN,CAAC,CAAC,oEAAoE;IAC9F,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,EAAE;QACjC,kDAAkD;QAClD,cAAc,GAAG;YAChB,WAAW,EAAE,IAAI;YACjB,qBAAqB,EAAE,KAAK;YAC5B,uBAAuB;YACvB,kBAAkB,EAAE,IAAI;YACxB,mBAAmB,EAAE,IAAI;SAClB,CAAC;KACT;IAED,IAAI,eAAe,GAAkB,IAAI,CAAC;IAC1C,IAAI,MAAM,CAAC,UAAU,CAAC,eAAe,EAAE;QACtC,IAAI,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;QAChE,iEAAiE;QACjE,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,OAAO,KAAK,GAAG,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;YAC9C,KAAK,EAAE,CAAC;SACR;QACD,IAAI,GAAG,GAAG,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC;QACzB,OAAO,GAAG,GAAG,KAAK,IAAI,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;YACrC,GAAG,EAAE,CAAC;SACN;QACD,GAAG,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC;QACnC,IAAI,GAAG,CAAC,MAAM,GAAG,GAAG,EAAE;YACrB,IAAI,CAAC,uBAAuB,EAAE;gBAC7B,MAAM,IAAI,iBAAU,CACnB,2GAA2G,EAC3G,sBAAe,CAAC,eAAe,CAC/B,CAAC;aACF;YACD,GAAG,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;SAC3B;QACD,eAAe,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;KACtC;IAED,wDAAwD;IACxD,kEAAkE;IAClE,IAAI,uBAAuB,GAAG,MAAM,CAAC,UAAU,CAAC,uBAAuB,CAAC;IACxE,IAAI,MAAM,CAAC,UAAU,CAAC,uBAAuB,KAAK,IAAI,EAAE;QACvD,yBAAyB;QACzB,uBAAuB,GAAG,gCAAyB,CAAC,UAAU;cAC3D,gCAAyB,CAAC,cAAc;cACxC,gCAAyB,CAAC,GAAG,CAAC;KACjC;IAED,IAAI,MAAc,CAAC;IACnB,IACC,CAAC,CAAC,CACD,uBAAuB,GAAG,gCAAyB,CAAC,cAAc,CAClE;WACE,MAAM,CAAC,UAAU,CAAC,aAAa;WAC/B,MAAM,CAAC,UAAU,CAAC,MAAM,EAC1B;QACD,sGAAsG;QACtG,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC;KACzC;SAAM;QACN,8CAA8C;QAC9C,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC;QACrC,uBAAuB,IAAI,CAAC,gCAAyB,CAAC,cAAc,CAAC;QACrE,iEAAiE;QACjE,IAAI,uBAAuB,GAAG,gCAAyB,CAAC,GAAG,EAAE;YAC5D,MAAM,CAAC,UAAU,CAAC,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,sBAAsB;mBAC/D,CAAC,CAAC;SACN;aAAM;YACN,MAAM,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;SAC7B;KACD;IAED,wDAAwD;IACxD,wDAAwD;IACxD,IAAI,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC;IAC5C,IAAI,SAAS,KAAK,IAAI;QAAE,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC;IACjE,IAAI,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC;IAC9C,IAAI,UAAU,KAAK,IAAI;QAAE,UAAU,GAAG,CAAC,CAAC;IAExC,MAAM,GAAG,GAAY;QACpB,wGAAwG;QACxG,MAAM,EAAE,CAAC;QACT,UAAU,EAAE;YACX,iGAAiG;YACjG,eAAe,EAAE,MAAM,CAAC,UAAU,CAAC,eAAe;YAClD,kBAAkB,EAAE,MAAM,CAAC,UAAU,CAAC,kBAAkB;YACxD,MAAM;YACN,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,MAAM;YAChC,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,UAAU;YACxC,sBAAsB,EAAE,MAAM,CAAC,UAAU,CAAC,sBAAsB;YAChE,YAAY,EAAE,MAAM,CAAC,UAAU,CAAC,YAAY;YAC5C,uBAAuB;YACvB,gBAAgB,EAAE,MAAM,CAAC,UAAU,CAAC,gBAAgB;YACpD,SAAS;YACT,UAAU;YACV,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,WAAW;YAC1C,kBAAkB,EAAE,MAAM,CAAC,UAAU,CAAC,kBAAkB;YAExD,uDAAuD;YAEvD,WAAW,EAAE,cAAc,CAAC,WAAW;YACvC,qBAAqB,EAAE,cAAc,CAAC,qBAAqB;YAC3D,kBAAkB,EAAE,cAAc,CAAC,kBAAkB;YACrD,mBAAmB,EAAE,cAAc,CAAC,mBAAmB,IAAI,CAAC;YAE5D,cAAc,EAAE;gBACf,kBAAkB,EAAE,MAAM,CAAC,UAAU,CAAC,cAAc;gBACpD,2BAA2B,EAAE,EAAE;gBAC/B,yBAAyB,EAAE,EAAE;aAC7B;YAED,eAAe;SACf;QACD,yEAAyE;QACzE,2CAA2C;QAC3C,KAAK,EAAE,MAAM,CAAC,KAAK;KACnB,CAAC;IACF,OAAO,GAAG,CAAC;AACZ,CAAC;AA9HD,oCA8HC;AAED,SAAgB,YAAY,CAAC,IAAa;IACzC,MAAM,MAAM,GAAG,IAAA,gBAAS,EAAC,IAAI,CAAC,CAAC;IAE/B,IAAI,SAAiB,CAAC;IACtB,IAAI,aAAa,GAAkB,IAAI,CAAC;IACxC,IAAI,MAAc,CAAC;IACnB,IACC,MAAM,CAAC,UAAU,CAAC,uBAAuB;UACvC,gCAAyB,CAAC,cAAc,EACzC;QACD,kDAAkD;QAClD,SAAS,GAAG,aAAa,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC;QACrD,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC;KAClC;SAAM;QACN,8CAA8C;QAC9C,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC;QACrC,8EAA8E;QAC9E,MAAM,GAAG,CAAC,CAAC;KACX;IAED,MAAM,GAAG,GAAe;QACvB,MAAM,EAAE,GAAG;QACX,UAAU,EAAE;YACX,iGAAiG;YACjG,eAAe,EAAE,MAAM,CAAC,UAAU,CAAC,eAAe;YAClD,kBAAkB,EAAE,MAAM,CAAC,UAAU,CAAC,kBAAkB;YACxD,6EAA6E;YAC7E,8DAA8D;YAC9D,SAAS;YACT,aAAa;YACb,MAAM;YACN,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,UAAU;YACxC,sBAAsB,EAAE,MAAM,CAAC,UAAU,CAAC,sBAAsB;YAChE,YAAY,EAAE,MAAM,CAAC,UAAU,CAAC,YAAY;YAC5C,uBAAuB,EAAE,MAAM,CAAC,UAAU,CAAC,uBAAuB;YAClE,gBAAgB,EAAE,MAAM,CAAC,UAAU,CAAC,gBAAgB;YACpD,SAAS,EAAE,MAAM,CAAC,UAAU,CAAC,SAAS;YACtC,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,UAAU;YACxC,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,WAAW;YAC1C,eAAe,EAAE,CAAC;YAClB,kBAAkB,EAAE,IAAI,CAAC,UAAU,CAAC,kBAAkB,IAAI,EAAE;YAE5D,4EAA4E;YAC5E,mDAAmD;YACnD,QAAQ,EAAE;gBACT,gBAAgB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;gBACjC,aAAa,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;gBAC9B,SAAS,EAAE,GAAG;gBACd,qBAAqB,EAAE,GAAG;gBAC1B,mBAAmB,EAAE,UAAU;aAC/B;YAED,cAAc,EAAE,MAAM,CAAC,UAAU,CAAC,cAAc,CAAC,kBAAkB;YAEnE,eAAe,EAAE,MAAM,CAAC,UAAU,CAAC,eAAe;SAClD;QACD,yEAAyE;QACzE,4CAA4C;QAC5C,KAAK,EAAE,MAAM,CAAC,KAAK;KACnB,CAAC;IACF,OAAO,GAAG,CAAC;AACZ,CAAC;AA7DD,oCA6DC;AAED,+FAA+F;AAC/F,SAAgB,UAAU,CAAC,SAAiB,EAAE,SAAiB;IAC9D,IAAI,MAAiB,CAAC;IACtB,IAAI,MAAiB,CAAC;IACtB,IAAI,wBAA4C,CAAC;IACjD,IAAI,wBAA4C,CAAC;IAEjD,IAAI;QACH,MAAM,GAAG;YACR,IAAI,EAAE,GAAG;YACT,IAAI,EAAE,SAAS,CAAC,SAAS,CAAC;SAC1B,CAAC;QACF,wBAAwB,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;KAC9C;IAAC,OAAO,CAAC,EAAE;QACX,IAAI,IAAA,mBAAY,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,sBAAe,CAAC,iBAAiB,EAAE;YACpE,8DAA8D;YAC9D,MAAM,GAAG;gBACR,IAAI,EAAE,GAAG;gBACT,IAAI,EAAE,YAAY,CAAC,SAAS,CAAC;aAC7B,CAAC;SACF;aAAM,IACN,IAAA,mBAAY,EAAC,CAAC,CAAC;eACZ,CAAC,CAAC,IAAI,KAAK,sBAAe,CAAC,gBAAgB;eAC3C,IAAA,qBAAQ,EAAC,CAAC,CAAC,OAAO,CAAC;eACnB,OAAO,CAAC,CAAC,OAAO,CAAC,kBAAkB,KAAK,QAAQ,EAClD;YACD,4EAA4E;YAC5E,MAAM,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;YAC7B,wBAAwB,GAAG,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC;SACxD;aAAM;YACN,MAAM,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;SAC7B;KACD;IAED,IAAI;QACH,MAAM,GAAG;YACR,IAAI,EAAE,GAAG;YACT,IAAI,EAAE,SAAS,CAAC,SAAS,CAAC;SAC1B,CAAC;QACF,wBAAwB,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;KAC9C;IAAC,OAAO,CAAC,EAAE;QACX,IAAI,IAAA,mBAAY,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,sBAAe,CAAC,iBAAiB,EAAE;YACpE,8DAA8D;YAC9D,MAAM,GAAG;gBACR,IAAI,EAAE,GAAG;gBACT,IAAI,EAAE,YAAY,CAAC,SAAS,CAAC;aAC7B,CAAC;SACF;aAAM,IACN,IAAA,mBAAY,EAAC,CAAC,CAAC;eACZ,CAAC,CAAC,IAAI,KAAK,sBAAe,CAAC,gBAAgB;eAC3C,MAAM,CAAC,IAAI,KAAK,GAAG;eACnB,IAAA,qBAAQ,EAAC,CAAC,CAAC,OAAO,CAAC;eACnB,OAAO,CAAC,CAAC,OAAO,CAAC,kBAAkB,KAAK,QAAQ,EAClD;YACD,4EAA4E;YAC5E,MAAM,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;YAC7B,wBAAwB,GAAG,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC;SACxD;aAAM;YACN,MAAM,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;SAC7B;KACD;IAED,sBAAsB;IACtB,IACC,MAAM,CAAC,IAAI,KAAK,SAAS;WACtB,wBAAwB;WACxB,wBAAwB,GAAG,iCAAwB;WACnD,wBAAwB;WACxB,wBAAwB,IAAI,wBAAwB;WACpD,SAAS,CAAC,MAAM,KAAK,SAAS,CAAC,MAAM,EACvC;QACD,kHAAkH;QAClH,gHAAgH;QAChH,0DAA0D;QAC1D,OAAO,SAAS,CAAC;KACjB;SAAM,IACN,MAAM,CAAC,IAAI,KAAK,GAAG;WAChB,MAAM,CAAC,IAAI,KAAK,GAAG;QACtB,iEAAiE;WAC9D,SAAS,CAAC,MAAM,KAAK,SAAS,CAAC,MAAM;WACrC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB;gBAC/B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EACrC;QACD,gFAAgF;QAChF,MAAM,qBAAqB,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC;QACrE,MAAM,qBAAqB,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC;QACrE,iGAAiG;QACjG,MAAM,wBAAwB,GAC7B,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC;QAC3C,MAAM,wBAAwB,GAC7B,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC;QAE3C,6FAA6F;QAC7F,iHAAiH;QACjH,IACC,gBAAM,CAAC,GAAG,CAAC,qBAAqB,EAAE,QAAQ,CAAC;eACxC,gBAAM,CAAC,GAAG,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;YAC3D,oGAAoG;YACpG,oEAAoE;eACjE,gBAAM,CAAC,GAAG,CAAC,wBAAwB,EAAE,qBAAqB,CAAC;eAC3D,gBAAM,CAAC,GAAG,CAAC,wBAAwB,EAAE,qBAAqB,CAAC;YAC9D,0EAA0E;eACvE,gBAAM,CAAC,EAAE,CAAC,wBAAwB,EAAE,SAAS,CAAC;eAC9C,gBAAM,CAAC,EAAE,CAAC,wBAAwB,EAAE,SAAS,CAAC,EAChD;YACD,OAAO,SAAS,CAAC;SACjB;KACD;SAAM,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE;QAClE,gFAAgF;QAChF,MAAM,IAAI,iBAAU,CACnB,2EAA2E,MAAM,CAAC,IAAI,cAAc,EACpG,sBAAe,CAAC,gBAAgB,CAChC,CAAC;KACF;SAAM,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE;QAClE,gFAAgF;QAChF,MAAM,IAAI,iBAAU,CACnB,4DAA4D,MAAM,CAAC,IAAI,sBAAsB,EAC7F,sBAAe,CAAC,gBAAgB,CAChC,CAAC;KACF;SAAM,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE;QAClE,mFAAmF;QACnF,OAAO,SAAS,CAAC;KACjB;IAED,gEAAgE;IAChE,MAAM,GAAG,MAAiD,CAAC;IAC3D,MAAM,GAAG,MAAiD,CAAC;IAE3D,iFAAiF;IACjF,IACC,MAAM,CAAC,IAAI,KAAK,GAAG;WAChB,gBAAM,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,SAAS,CAAC,EAClE;QACD,yCAAyC;QACzC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,kBAAkB;YACxC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC;KACxC;IAED,oEAAoE;IACpE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,kBAAkB;QACxC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC;IAE3C,IAAI,MAAM,CAAC,IAAI,KAAK,GAAG,IAAI,MAAM,CAAC,IAAI,KAAK,GAAG,EAAE;QAC/C,2EAA2E;QAC3E,MAAM,IAAI,GAAyB;YAClC,GAAG,MAAM,CAAC,IAAI;YACd,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI;SACtB,CAAC;QACF,8DAA8D;QAC9D,IAAI,CAAC,UAAU,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;QAC3D,OAAO,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;KAClE;SAAM,IAAI,MAAM,CAAC,IAAI,KAAK,GAAG,IAAI,MAAM,CAAC,IAAI,KAAK,GAAG,EAAE;QACtD,8CAA8C;QAC9C,MAAM,IAAI,GAAsB;YAC/B,GAAG,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC;YAClC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI;SACtB,CAAC;QACF,sFAAsF;QACtF,IAAI,CAAC,UAAU,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;QAC3D,qEAAqE;QACrE,OAAO,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC;KAClE;SAAM,IAAI,MAAM,CAAC,IAAI,KAAK,GAAG,IAAI,MAAM,CAAC,IAAI,KAAK,GAAG,EAAE;QACtD,gDAAgD;QAChD,MAAM,IAAI,GAAyB;YAClC,GAAG,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC;YAC5B,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI;SACtB,CAAC;QACF,sFAAsF;QACtF,IAAI,CAAC,UAAU,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;QAC3D,OAAO,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;KAClE;SAAM;QACN,2EAA2E;QAC3E,MAAM,IAAI,GAAsB;YAC/B,GAAI,MAAM,CAAC,IAA0B;YACrC,IAAI,EAAG,MAAM,CAAC,IAA0B,CAAC,IAAI;SAC7C,CAAC;QACF,qEAAqE;QACrE,OAAO,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC;KAClE;AACF,CAAC;AAlLD,gCAkLC"}
@@ -0,0 +1,12 @@
1
+ import { type NVMObject } from "..";
2
+ import { NVMFile, type NVMFileCreationOptions, type NVMFileDeserializationOptions } from "./NVMFile";
3
+ export interface ApplicationNameFileOptions extends NVMFileCreationOptions {
4
+ name: string;
5
+ }
6
+ export declare class ApplicationNameFile extends NVMFile {
7
+ constructor(options: NVMFileDeserializationOptions | ApplicationNameFileOptions);
8
+ name: string;
9
+ serialize(): NVMObject;
10
+ }
11
+ export declare const ApplicationNameFileID: number | ((id: number) => boolean);
12
+ //# sourceMappingURL=ApplicationNameFile.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ApplicationNameFile.d.ts","sourceRoot":"","sources":["../../src/files/ApplicationNameFile.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,IAAI,CAAC;AACpC,OAAO,EACN,OAAO,EACP,KAAK,sBAAsB,EAC3B,KAAK,6BAA6B,EAIlC,MAAM,WAAW,CAAC;AAEnB,MAAM,WAAW,0BAA2B,SAAQ,sBAAsB;IACzE,IAAI,EAAE,MAAM,CAAC;CACb;AAED,qBACa,mBAAoB,SAAQ,OAAO;gBAE9C,OAAO,EAAE,6BAA6B,GAAG,0BAA0B;IAU7D,IAAI,EAAE,MAAM,CAAC;IAEb,SAAS,IAAI,SAAS;CAO7B;AACD,eAAO,MAAM,qBAAqB,oCAA0C,CAAC"}
@@ -0,0 +1,36 @@
1
+ "use strict";
2
+ var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
3
+ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
4
+ if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
5
+ else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
6
+ return c > 3 && r && Object.defineProperty(target, key, r), r;
7
+ };
8
+ Object.defineProperty(exports, "__esModule", { value: true });
9
+ exports.ApplicationNameFileID = exports.ApplicationNameFile = void 0;
10
+ const shared_1 = require("@zwave-js/shared");
11
+ const NVMFile_1 = require("./NVMFile");
12
+ let ApplicationNameFile = class ApplicationNameFile extends NVMFile_1.NVMFile {
13
+ constructor(options) {
14
+ super(options);
15
+ if ((0, NVMFile_1.gotDeserializationOptions)(options)) {
16
+ this.name = (0, shared_1.cpp2js)(this.payload.toString("utf8"));
17
+ }
18
+ else {
19
+ this.name = options.name;
20
+ }
21
+ }
22
+ name;
23
+ serialize() {
24
+ // Return a zero-terminated string with a fixed length of 30 bytes
25
+ const nameAsString = Buffer.from(this.name, "utf8");
26
+ this.payload = Buffer.alloc(30, 0);
27
+ nameAsString.subarray(0, this.payload.length - 1).copy(this.payload);
28
+ return super.serialize();
29
+ }
30
+ };
31
+ exports.ApplicationNameFile = ApplicationNameFile;
32
+ exports.ApplicationNameFile = ApplicationNameFile = __decorate([
33
+ (0, NVMFile_1.nvmFileID)(0x4100c)
34
+ ], ApplicationNameFile);
35
+ exports.ApplicationNameFileID = (0, NVMFile_1.getNVMFileIDStatic)(ApplicationNameFile);
36
+ //# sourceMappingURL=ApplicationNameFile.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ApplicationNameFile.js","sourceRoot":"","sources":["../../src/files/ApplicationNameFile.ts"],"names":[],"mappings":";;;;;;;;;AAAA,6CAA0C;AAE1C,uCAOmB;AAOZ,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,iBAAO;IAC/C,YACC,OAAmE;QAEnE,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,IAAA,mCAAyB,EAAC,OAAO,CAAC,EAAE;YACvC,IAAI,CAAC,IAAI,GAAG,IAAA,eAAM,EAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;SAClD;aAAM;YACN,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;SACzB;IACF,CAAC;IAEM,IAAI,CAAS;IAEb,SAAS;QACf,kEAAkE;QAClE,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACpD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QACnC,YAAY,CAAC,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACrE,OAAO,KAAK,CAAC,SAAS,EAAE,CAAC;IAC1B,CAAC;CACD,CAAA;AArBY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAS,EAAC,OAAO,CAAC;GACN,mBAAmB,CAqB/B;AACY,QAAA,qBAAqB,GAAG,IAAA,4BAAkB,EAAC,mBAAmB,CAAC,CAAC"}
@@ -1,4 +1,4 @@
1
- import { RFRegion } from "@zwave-js/core/safe";
1
+ import { NodeIDType, RFRegion } from "@zwave-js/core/safe";
2
2
  import { type AllOrNone } from "@zwave-js/shared/safe";
3
3
  import type { NVM3Object } from "../nvm3/object";
4
4
  import { NVMFile, type NVMFileCreationOptions, type NVMFileDeserializationOptions } from "./NVMFile";
@@ -9,7 +9,9 @@ export type ApplicationRFConfigFileOptions = NVMFileCreationOptions & {
9
9
  } & AllOrNone<{
10
10
  enablePTI?: number;
11
11
  maxTXPower?: number;
12
- }>;
12
+ }> & {
13
+ nodeIdType?: number;
14
+ };
13
15
  export declare class ApplicationRFConfigFile extends NVMFile {
14
16
  constructor(options: NVMFileDeserializationOptions | ApplicationRFConfigFileOptions);
15
17
  rfRegion: RFRegion;
@@ -17,6 +19,7 @@ export declare class ApplicationRFConfigFile extends NVMFile {
17
19
  measured0dBm: number;
18
20
  enablePTI?: number;
19
21
  maxTXPower?: number;
22
+ nodeIdType?: NodeIDType;
20
23
  serialize(): NVM3Object;
21
24
  toJSON(): Record<string, any>;
22
25
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ApplicationRFConfigFile.d.ts","sourceRoot":"","sources":["../../src/files/ApplicationRFConfigFile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAA+B,MAAM,qBAAqB,CAAC;AAC5E,OAAO,EAAE,KAAK,SAAS,EAAqB,MAAM,uBAAuB,CAAC;AAE1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EACN,OAAO,EACP,KAAK,sBAAsB,EAC3B,KAAK,6BAA6B,EAIlC,MAAM,WAAW,CAAC;AAEnB,MAAM,MAAM,8BAA8B,GACvC,sBAAsB,GACtB;IACD,QAAQ,EAAE,QAAQ,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;CACrB,GACC,SAAS,CAAC;IACX,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC,CAAC;AAEJ,qBACa,uBAAwB,SAAQ,OAAO;gBAElD,OAAO,EAAE,6BAA6B,GAAG,8BAA8B;IAiCjE,QAAQ,EAAE,QAAQ,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,SAAS,IAAI,UAAU;IAyBvB,MAAM;CAeb;AACD,eAAO,MAAM,yBAAyB,oCAErC,CAAC"}
1
+ {"version":3,"file":"ApplicationRFConfigFile.d.ts","sourceRoot":"","sources":["../../src/files/ApplicationRFConfigFile.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,UAAU,EACV,QAAQ,EAGR,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,SAAS,EAAqB,MAAM,uBAAuB,CAAC;AAE1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EACN,OAAO,EACP,KAAK,sBAAsB,EAC3B,KAAK,6BAA6B,EAIlC,MAAM,WAAW,CAAC;AAEnB,MAAM,MAAM,8BAA8B,GACvC,sBAAsB,GACtB;IACD,QAAQ,EAAE,QAAQ,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;CACrB,GACC,SAAS,CAAC;IACX,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC,GACA;IACD,UAAU,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEH,qBACa,uBAAwB,SAAQ,OAAO;gBAElD,OAAO,EAAE,6BAA6B,GAAG,8BAA8B;IAyCjE,QAAQ,EAAE,QAAQ,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,UAAU,CAAC;IAExB,SAAS,IAAI,UAAU;IAiCvB,MAAM;CAqBb;AACD,eAAO,MAAM,yBAAyB,oCAErC,CAAC"}
@@ -34,6 +34,14 @@ let ApplicationRFConfigFile = class ApplicationRFConfigFile extends NVMFile_1.NV
34
34
  this.enablePTI = this.payload[5];
35
35
  this.maxTXPower = this.payload.readInt16LE(6) / 10;
36
36
  }
37
+ else if (this.payload.length === 9) {
38
+ this.rfRegion = this.payload[0];
39
+ this.txPower = this.payload.readInt16LE(1) / 10;
40
+ this.measured0dBm = this.payload.readInt16LE(3) / 10;
41
+ this.enablePTI = this.payload[5];
42
+ this.maxTXPower = this.payload.readInt16LE(6) / 10;
43
+ this.nodeIdType = this.payload[8];
44
+ }
37
45
  else {
38
46
  throw new safe_1.ZWaveError(`ApplicationRFConfigFile has unsupported length ${this.payload.length}`, safe_1.ZWaveErrorCodes.NVM_NotSupported);
39
47
  }
@@ -44,6 +52,7 @@ let ApplicationRFConfigFile = class ApplicationRFConfigFile extends NVMFile_1.NV
44
52
  this.measured0dBm = options.measured0dBm;
45
53
  this.enablePTI = options.enablePTI;
46
54
  this.maxTXPower = options.maxTXPower;
55
+ this.nodeIdType = options.nodeIdType;
47
56
  }
48
57
  }
49
58
  rfRegion;
@@ -51,6 +60,7 @@ let ApplicationRFConfigFile = class ApplicationRFConfigFile extends NVMFile_1.NV
51
60
  measured0dBm;
52
61
  enablePTI;
53
62
  maxTXPower;
63
+ nodeIdType;
54
64
  serialize() {
55
65
  if (semver_1.default.lt(this.fileVersion, "7.18.1")) {
56
66
  this.payload = Buffer.alloc(semver_1.default.gte(this.fileVersion, "7.15.3") ? 6 : 3, 0);
@@ -62,7 +72,7 @@ let ApplicationRFConfigFile = class ApplicationRFConfigFile extends NVMFile_1.NV
62
72
  this.payload.writeInt16LE((this.maxTXPower ?? 0) * 10, 4);
63
73
  }
64
74
  }
65
- else {
75
+ else if (semver_1.default.lt(this.fileVersion, "7.21.0")) {
66
76
  this.payload = Buffer.alloc(8, 0);
67
77
  this.payload[0] = this.rfRegion;
68
78
  this.payload.writeInt16LE(this.txPower * 10, 1);
@@ -70,6 +80,15 @@ let ApplicationRFConfigFile = class ApplicationRFConfigFile extends NVMFile_1.NV
70
80
  this.payload[5] = this.enablePTI ?? 0;
71
81
  this.payload.writeInt16LE((this.maxTXPower ?? 0) * 10, 6);
72
82
  }
83
+ else {
84
+ this.payload = Buffer.alloc(9, 0);
85
+ this.payload[0] = this.rfRegion;
86
+ this.payload.writeInt16LE(this.txPower * 10, 1);
87
+ this.payload.writeInt16LE(this.measured0dBm * 10, 3);
88
+ this.payload[5] = this.enablePTI ?? 0;
89
+ this.payload.writeInt16LE((this.maxTXPower ?? 0) * 10, 6);
90
+ this.payload[8] = this.nodeIdType ?? safe_1.NodeIDType.Short;
91
+ }
73
92
  return super.serialize();
74
93
  }
75
94
  // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
@@ -86,6 +105,9 @@ let ApplicationRFConfigFile = class ApplicationRFConfigFile extends NVMFile_1.NV
86
105
  if (this.maxTXPower != undefined) {
87
106
  ret["max TX power"] = `${this.maxTXPower.toFixed(1)} dBm`;
88
107
  }
108
+ if (this.nodeIdType != undefined) {
109
+ ret["node ID type"] = (0, safe_2.getEnumMemberName)(safe_1.NodeIDType, this.nodeIdType);
110
+ }
89
111
  return ret;
90
112
  }
91
113
  };
@@ -1 +1 @@
1
- {"version":3,"file":"ApplicationRFConfigFile.js","sourceRoot":"","sources":["../../src/files/ApplicationRFConfigFile.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ApplicationRFConfigFile.js","sourceRoot":"","sources":["../../src/files/ApplicationRFConfigFile.ts"],"names":[],"mappings":"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"}
@@ -21,6 +21,9 @@ export declare class VersionFile extends NVMFile {
21
21
  export declare class ApplicationVersionFile extends VersionFile {
22
22
  }
23
23
  export declare const ApplicationVersionFileID: number | ((id: number) => boolean);
24
+ export declare class ApplicationVersionFile800 extends VersionFile {
25
+ }
26
+ export declare const ApplicationVersionFile800ID: number | ((id: number) => boolean);
24
27
  export declare class ProtocolVersionFile extends VersionFile {
25
28
  }
26
29
  export declare const ProtocolVersionFileID: number | ((id: number) => boolean);
@@ -1 +1 @@
1
- {"version":3,"file":"VersionFiles.d.ts","sourceRoot":"","sources":["../../src/files/VersionFiles.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EACN,OAAO,EACP,KAAK,sBAAsB,EAC3B,KAAK,6BAA6B,EAIlC,MAAM,WAAW,CAAC;AAEnB,MAAM,WAAW,kBAAmB,SAAQ,sBAAsB;IACjE,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACd;AAED,qBAAa,WAAY,SAAQ,OAAO;gBAEtC,OAAO,EAAE,6BAA6B,GAAG,kBAAkB;IAgBrD,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IAEd,SAAS,IAAI,UAAU;IAWvB,MAAM;;;;CAOb;AAED,qBACa,sBAAuB,SAAQ,WAAW;CAAG;AAC1D,eAAO,MAAM,wBAAwB,oCAEpC,CAAC;AAEF,qBACa,mBAAoB,SAAQ,WAAW;CAAG;AACvD,eAAO,MAAM,qBAAqB,oCAA0C,CAAC"}
1
+ {"version":3,"file":"VersionFiles.d.ts","sourceRoot":"","sources":["../../src/files/VersionFiles.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EACN,OAAO,EACP,KAAK,sBAAsB,EAC3B,KAAK,6BAA6B,EAIlC,MAAM,WAAW,CAAC;AAEnB,MAAM,WAAW,kBAAmB,SAAQ,sBAAsB;IACjE,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACd;AAED,qBAAa,WAAY,SAAQ,OAAO;gBAEtC,OAAO,EAAE,6BAA6B,GAAG,kBAAkB;IAgBrD,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IAEd,SAAS,IAAI,UAAU;IAWvB,MAAM;;;;CAOb;AAED,qBACa,sBAAuB,SAAQ,WAAW;CAAG;AAC1D,eAAO,MAAM,wBAAwB,oCAEpC,CAAC;AAIF,qBACa,yBAA0B,SAAQ,WAAW;CAAG;AAC7D,eAAO,MAAM,2BAA2B,oCAEvC,CAAC;AAEF,qBACa,mBAAoB,SAAQ,WAAW;CAAG;AACvD,eAAO,MAAM,qBAAqB,oCAA0C,CAAC"}
@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
6
6
  return c > 3 && r && Object.defineProperty(target, key, r), r;
7
7
  };
8
8
  Object.defineProperty(exports, "__esModule", { value: true });
9
- exports.ProtocolVersionFileID = exports.ProtocolVersionFile = exports.ApplicationVersionFileID = exports.ApplicationVersionFile = exports.VersionFile = void 0;
9
+ exports.ProtocolVersionFileID = exports.ProtocolVersionFile = exports.ApplicationVersionFile800ID = exports.ApplicationVersionFile800 = exports.ApplicationVersionFileID = exports.ApplicationVersionFile = exports.VersionFile = void 0;
10
10
  const NVMFile_1 = require("./NVMFile");
11
11
  class VersionFile extends NVMFile_1.NVMFile {
12
12
  constructor(options) {
@@ -54,6 +54,15 @@ exports.ApplicationVersionFile = ApplicationVersionFile = __decorate([
54
54
  (0, NVMFile_1.nvmFileID)(0x51000)
55
55
  ], ApplicationVersionFile);
56
56
  exports.ApplicationVersionFileID = (0, NVMFile_1.getNVMFileIDStatic)(ApplicationVersionFile);
57
+ // The 800 series has a shared application/protocol file system
58
+ // and uses a different ID for the application version file
59
+ let ApplicationVersionFile800 = class ApplicationVersionFile800 extends VersionFile {
60
+ };
61
+ exports.ApplicationVersionFile800 = ApplicationVersionFile800;
62
+ exports.ApplicationVersionFile800 = ApplicationVersionFile800 = __decorate([
63
+ (0, NVMFile_1.nvmFileID)(0x41000)
64
+ ], ApplicationVersionFile800);
65
+ exports.ApplicationVersionFile800ID = (0, NVMFile_1.getNVMFileIDStatic)(ApplicationVersionFile800);
57
66
  let ProtocolVersionFile = class ProtocolVersionFile extends VersionFile {
58
67
  };
59
68
  exports.ProtocolVersionFile = ProtocolVersionFile;
@@ -1 +1 @@
1
- {"version":3,"file":"VersionFiles.js","sourceRoot":"","sources":["../../src/files/VersionFiles.ts"],"names":[],"mappings":";;;;;;;;;AACA,uCAOmB;AASnB,MAAa,WAAY,SAAQ,iBAAO;IACvC,YACC,OAA2D;QAE3D,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,IAAA,mCAAyB,EAAC,OAAO,CAAC,EAAE;YACvC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAC9B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAC7B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAC7B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;SAC7B;aAAM;YACN,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YAC7B,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;YAC3B,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;YAC3B,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;SAC3B;IACF,CAAC;IAEM,MAAM,CAAS;IACf,KAAK,CAAS;IACd,KAAK,CAAS;IACd,KAAK,CAAS;IAEd,SAAS;QACf,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC;YAC1B,IAAI,CAAC,KAAK;YACV,IAAI,CAAC,KAAK;YACV,IAAI,CAAC,KAAK;YACV,IAAI,CAAC,MAAM;SACX,CAAC,CAAC;QACH,OAAO,KAAK,CAAC,SAAS,EAAE,CAAC;IAC1B,CAAC;IAED,6EAA6E;IACtE,MAAM;QACZ,OAAO;YACN,GAAG,KAAK,CAAC,MAAM,EAAE;YACjB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,EAAE;SACpD,CAAC;IACH,CAAC;CACD;AAzCD,kCAyCC;AAGM,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,WAAW;CAAG,CAAA;AAA7C,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,mBAAS,EAAC,OAAO,CAAC;GACN,sBAAsB,CAAuB;AAC7C,QAAA,wBAAwB,GAAG,IAAA,4BAAkB,EACzD,sBAAsB,CACtB,CAAC;AAGK,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,WAAW;CAAG,CAAA;AAA1C,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAS,EAAC,OAAO,CAAC;GACN,mBAAmB,CAAuB;AAC1C,QAAA,qBAAqB,GAAG,IAAA,4BAAkB,EAAC,mBAAmB,CAAC,CAAC"}
1
+ {"version":3,"file":"VersionFiles.js","sourceRoot":"","sources":["../../src/files/VersionFiles.ts"],"names":[],"mappings":";;;;;;;;;AACA,uCAOmB;AASnB,MAAa,WAAY,SAAQ,iBAAO;IACvC,YACC,OAA2D;QAE3D,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,IAAA,mCAAyB,EAAC,OAAO,CAAC,EAAE;YACvC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAC9B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAC7B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAC7B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;SAC7B;aAAM;YACN,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YAC7B,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;YAC3B,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;YAC3B,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;SAC3B;IACF,CAAC;IAEM,MAAM,CAAS;IACf,KAAK,CAAS;IACd,KAAK,CAAS;IACd,KAAK,CAAS;IAEd,SAAS;QACf,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC;YAC1B,IAAI,CAAC,KAAK;YACV,IAAI,CAAC,KAAK;YACV,IAAI,CAAC,KAAK;YACV,IAAI,CAAC,MAAM;SACX,CAAC,CAAC;QACH,OAAO,KAAK,CAAC,SAAS,EAAE,CAAC;IAC1B,CAAC;IAED,6EAA6E;IACtE,MAAM;QACZ,OAAO;YACN,GAAG,KAAK,CAAC,MAAM,EAAE;YACjB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,EAAE;SACpD,CAAC;IACH,CAAC;CACD;AAzCD,kCAyCC;AAGM,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,WAAW;CAAG,CAAA;AAA7C,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,mBAAS,EAAC,OAAO,CAAC;GACN,sBAAsB,CAAuB;AAC7C,QAAA,wBAAwB,GAAG,IAAA,4BAAkB,EACzD,sBAAsB,CACtB,CAAC;AAEF,+DAA+D;AAC/D,2DAA2D;AAEpD,IAAM,yBAAyB,GAA/B,MAAM,yBAA0B,SAAQ,WAAW;CAAG,CAAA;AAAhD,8DAAyB;oCAAzB,yBAAyB;IADrC,IAAA,mBAAS,EAAC,OAAO,CAAC;GACN,yBAAyB,CAAuB;AAChD,QAAA,2BAA2B,GAAG,IAAA,4BAAkB,EAC5D,yBAAyB,CACzB,CAAC;AAGK,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,WAAW;CAAG,CAAA;AAA1C,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAS,EAAC,OAAO,CAAC;GACN,mBAAmB,CAAuB;AAC1C,QAAA,qBAAqB,GAAG,IAAA,4BAAkB,EAAC,mBAAmB,CAAC,CAAC"}
@@ -1,12 +1,14 @@
1
1
  export declare const ZWAVE_APPLICATION_NVM_SIZE = 12288;
2
2
  export declare const ZWAVE_PROTOCOL_NVM_SIZE: number;
3
+ export declare const ZWAVE_SHARED_NVM_SIZE = 40960;
3
4
  export declare const NVM3_WORD_SIZE = 4;
4
5
  export declare const NVM3_MIN_PAGE_SIZE = 512;
5
6
  export declare const NVM3_PAGE_HEADER_SIZE = 20;
6
7
  export declare const NVM3_PAGE_COUNTER_SIZE = 27;
7
8
  export declare const NVM3_PAGE_COUNTER_MASK: number;
8
9
  export declare const NVM3_PAGE_MAGIC = 45722;
9
- export declare const FLASH_MAX_PAGE_SIZE = 2048;
10
+ export declare const FLASH_MAX_PAGE_SIZE_700 = 2048;
11
+ export declare const FLASH_MAX_PAGE_SIZE_800 = 8192;
10
12
  export declare enum PageStatus {
11
13
  OK = 4294967295,
12
14
  OK_ErasePending = 4294944165,
@@ -1 +1 @@
1
- {"version":3,"file":"consts.d.ts","sourceRoot":"","sources":["../../src/nvm3/consts.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,0BAA0B,QAAS,CAAC;AACjD,eAAO,MAAM,uBAAuB,QAAsC,CAAC;AAG3E,eAAO,MAAM,cAAc,IAAI,CAAC;AAGhC,eAAO,MAAM,kBAAkB,MAAM,CAAC;AACtC,eAAO,MAAM,qBAAqB,KAAK,CAAC;AACxC,eAAO,MAAM,sBAAsB,KAAK,CAAC;AACzC,eAAO,MAAM,sBAAsB,QAAoC,CAAC;AACxE,eAAO,MAAM,eAAe,QAAS,CAAC;AACtC,eAAO,MAAM,mBAAmB,OAAO,CAAC;AAExC,oBAAY,UAAU;IACrB,EAAE,aAAa;IACf,eAAe,aAAa;IAC5B,GAAG,QAAa;IAChB,gBAAgB,QAAa;CAC7B;AAED,oBAAY,aAAa;IACxB,aAAa,IAAI;IACjB,aAAa,IAAI;CACjB;AAGD,eAAO,MAAM,kBAAkB,IAAI,CAAC;AACpC,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,iBAAiB,QAA+B,CAAC;AAC9D,eAAO,MAAM,kBAAkB,MAAa,CAAC;AAC7C,eAAO,MAAM,uBAAuB,KAAK,CAAC;AAC1C,eAAO,MAAM,uBAAuB,QAAqC,CAAC;AAC1E,eAAO,MAAM,uBAAuB,KAAK,CAAC;AAC1C,eAAO,MAAM,sBAAsB,IAAO,CAAC;AAC3C,eAAO,MAAM,qBAAqB,KAAK,CAAC;AACxC,eAAO,MAAM,qBAAqB,KAAK,CAAC;AAExC,eAAO,MAAM,0BAA0B,IAAI,CAAC;AAC5C,eAAO,MAAM,0BAA0B,IAAI,CAAC;AAE5C,eAAO,MAAM,uBAAuB,MAAM,CAAC;AAC3C,eAAO,MAAM,uBAAuB,OAAO,CAAC;AAC5C,eAAO,MAAM,iBAAiB,MAAM,CAAC;AAErC,oBAAY,UAAU;IACrB,SAAS,IAAI;IACb,YAAY,IAAI;IAChB,YAAY,IAAI;IAChB,OAAO,IAAI;IACX,SAAS,IAAI;CACb;AAED,oBAAY,YAAY;IACvB,IAAI,IAAI;IACR,KAAK,IAAI;IACT,IAAI,IAAI;IACR,IAAI,IAAI;CACR"}
1
+ {"version":3,"file":"consts.d.ts","sourceRoot":"","sources":["../../src/nvm3/consts.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,0BAA0B,QAAS,CAAC;AACjD,eAAO,MAAM,uBAAuB,QAAsC,CAAC;AAG3E,eAAO,MAAM,qBAAqB,QAAS,CAAC;AAG5C,eAAO,MAAM,cAAc,IAAI,CAAC;AAGhC,eAAO,MAAM,kBAAkB,MAAM,CAAC;AACtC,eAAO,MAAM,qBAAqB,KAAK,CAAC;AACxC,eAAO,MAAM,sBAAsB,KAAK,CAAC;AACzC,eAAO,MAAM,sBAAsB,QAAoC,CAAC;AACxE,eAAO,MAAM,eAAe,QAAS,CAAC;AAEtC,eAAO,MAAM,uBAAuB,OAAO,CAAC;AAC5C,eAAO,MAAM,uBAAuB,OAAO,CAAC;AAE5C,oBAAY,UAAU;IACrB,EAAE,aAAa;IACf,eAAe,aAAa;IAC5B,GAAG,QAAa;IAChB,gBAAgB,QAAa;CAC7B;AAED,oBAAY,aAAa;IACxB,aAAa,IAAI;IACjB,aAAa,IAAI;CACjB;AAGD,eAAO,MAAM,kBAAkB,IAAI,CAAC;AACpC,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,iBAAiB,QAA+B,CAAC;AAC9D,eAAO,MAAM,kBAAkB,MAAa,CAAC;AAC7C,eAAO,MAAM,uBAAuB,KAAK,CAAC;AAC1C,eAAO,MAAM,uBAAuB,QAAqC,CAAC;AAC1E,eAAO,MAAM,uBAAuB,KAAK,CAAC;AAC1C,eAAO,MAAM,sBAAsB,IAAO,CAAC;AAC3C,eAAO,MAAM,qBAAqB,KAAK,CAAC;AACxC,eAAO,MAAM,qBAAqB,KAAK,CAAC;AAExC,eAAO,MAAM,0BAA0B,IAAI,CAAC;AAC5C,eAAO,MAAM,0BAA0B,IAAI,CAAC;AAE5C,eAAO,MAAM,uBAAuB,MAAM,CAAC;AAC3C,eAAO,MAAM,uBAAuB,OAAO,CAAC;AAC5C,eAAO,MAAM,iBAAiB,MAAM,CAAC;AAErC,oBAAY,UAAU;IACrB,SAAS,IAAI;IACb,YAAY,IAAI;IAChB,YAAY,IAAI;IAChB,OAAO,IAAI;IACX,SAAS,IAAI;CACb;AAED,oBAAY,YAAY;IACvB,IAAI,IAAI;IACR,KAAK,IAAI;IACT,IAAI,IAAI;IACR,IAAI,IAAI;CACR"}
@@ -1,9 +1,12 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.FragmentType = exports.ObjectType = exports.NVM3_COUNTER_SIZE = exports.NVM3_MAX_OBJ_SIZE_LARGE = exports.NVM3_MAX_OBJ_SIZE_SMALL = exports.NVM3_OBJ_HEADER_SIZE_LARGE = exports.NVM3_OBJ_HEADER_SIZE_SMALL = exports.NVM3_CODE_LARGE_SHIFT = exports.NVM3_CODE_SMALL_SHIFT = exports.NVM3_OBJ_FRAGTYPE_MASK = exports.NVM3_OBJ_FRAGTYPE_SHIFT = exports.NVM3_OBJ_LARGE_LEN_MASK = exports.NVM3_OBJ_LARGE_LEN_SIZE = exports.NVM3_OBJ_TYPE_MASK = exports.NVM3_OBJ_KEY_MASK = exports.NVM3_OBJ_KEY_SIZE = exports.NVM3_OBJ_KEY_SHIFT = exports.PageWriteSize = exports.PageStatus = exports.FLASH_MAX_PAGE_SIZE = exports.NVM3_PAGE_MAGIC = exports.NVM3_PAGE_COUNTER_MASK = exports.NVM3_PAGE_COUNTER_SIZE = exports.NVM3_PAGE_HEADER_SIZE = exports.NVM3_MIN_PAGE_SIZE = exports.NVM3_WORD_SIZE = exports.ZWAVE_PROTOCOL_NVM_SIZE = exports.ZWAVE_APPLICATION_NVM_SIZE = void 0;
3
+ exports.FragmentType = exports.ObjectType = exports.NVM3_COUNTER_SIZE = exports.NVM3_MAX_OBJ_SIZE_LARGE = exports.NVM3_MAX_OBJ_SIZE_SMALL = exports.NVM3_OBJ_HEADER_SIZE_LARGE = exports.NVM3_OBJ_HEADER_SIZE_SMALL = exports.NVM3_CODE_LARGE_SHIFT = exports.NVM3_CODE_SMALL_SHIFT = exports.NVM3_OBJ_FRAGTYPE_MASK = exports.NVM3_OBJ_FRAGTYPE_SHIFT = exports.NVM3_OBJ_LARGE_LEN_MASK = exports.NVM3_OBJ_LARGE_LEN_SIZE = exports.NVM3_OBJ_TYPE_MASK = exports.NVM3_OBJ_KEY_MASK = exports.NVM3_OBJ_KEY_SIZE = exports.NVM3_OBJ_KEY_SHIFT = exports.PageWriteSize = exports.PageStatus = exports.FLASH_MAX_PAGE_SIZE_800 = exports.FLASH_MAX_PAGE_SIZE_700 = exports.NVM3_PAGE_MAGIC = exports.NVM3_PAGE_COUNTER_MASK = exports.NVM3_PAGE_COUNTER_SIZE = exports.NVM3_PAGE_HEADER_SIZE = exports.NVM3_MIN_PAGE_SIZE = exports.NVM3_WORD_SIZE = exports.ZWAVE_SHARED_NVM_SIZE = exports.ZWAVE_PROTOCOL_NVM_SIZE = exports.ZWAVE_APPLICATION_NVM_SIZE = void 0;
4
4
  // NVM area sizes
5
5
  exports.ZWAVE_APPLICATION_NVM_SIZE = 0x3000;
6
6
  exports.ZWAVE_PROTOCOL_NVM_SIZE = 0xc000 - exports.ZWAVE_APPLICATION_NVM_SIZE;
7
+ // The 800 series has a shared application/protocol NVM, which is 8 KB smaller
8
+ // than the 700 series
9
+ exports.ZWAVE_SHARED_NVM_SIZE = 0xA000;
7
10
  // Everything must be word-aligned
8
11
  exports.NVM3_WORD_SIZE = 4;
9
12
  // Definitions for NVM3 pages
@@ -12,7 +15,8 @@ exports.NVM3_PAGE_HEADER_SIZE = 20;
12
15
  exports.NVM3_PAGE_COUNTER_SIZE = 27;
13
16
  exports.NVM3_PAGE_COUNTER_MASK = (1 << exports.NVM3_PAGE_COUNTER_SIZE) - 1;
14
17
  exports.NVM3_PAGE_MAGIC = 0xb29a;
15
- exports.FLASH_MAX_PAGE_SIZE = 2048;
18
+ exports.FLASH_MAX_PAGE_SIZE_700 = 2048; // not sure if this is true for all 700 series chips
19
+ exports.FLASH_MAX_PAGE_SIZE_800 = 8192;
16
20
  var PageStatus;
17
21
  (function (PageStatus) {
18
22
  PageStatus[PageStatus["OK"] = 4294967295] = "OK";
@@ -1 +1 @@
1
- {"version":3,"file":"consts.js","sourceRoot":"","sources":["../../src/nvm3/consts.ts"],"names":[],"mappings":";;;AAAA,iBAAiB;AACJ,QAAA,0BAA0B,GAAG,MAAM,CAAC;AACpC,QAAA,uBAAuB,GAAG,MAAM,GAAG,kCAA0B,CAAC;AAE3E,kCAAkC;AACrB,QAAA,cAAc,GAAG,CAAC,CAAC;AAEhC,6BAA6B;AAChB,QAAA,kBAAkB,GAAG,GAAG,CAAC;AACzB,QAAA,qBAAqB,GAAG,EAAE,CAAC;AAC3B,QAAA,sBAAsB,GAAG,EAAE,CAAC;AAC5B,QAAA,sBAAsB,GAAG,CAAC,CAAC,IAAI,8BAAsB,CAAC,GAAG,CAAC,CAAC;AAC3D,QAAA,eAAe,GAAG,MAAM,CAAC;AACzB,QAAA,mBAAmB,GAAG,IAAI,CAAC;AAExC,IAAY,UAKX;AALD,WAAY,UAAU;IACrB,gDAAe,CAAA;IACf,0EAA4B,CAAA;IAC5B,6CAAgB,CAAA;IAChB,uEAA6B,CAAA;AAC9B,CAAC,EALW,UAAU,0BAAV,UAAU,QAKrB;AAED,IAAY,aAGX;AAHD,WAAY,aAAa;IACxB,mEAAiB,CAAA;IACjB,mEAAiB,CAAA;AAClB,CAAC,EAHW,aAAa,6BAAb,aAAa,QAGxB;AAED,+BAA+B;AAClB,QAAA,kBAAkB,GAAG,CAAC,CAAC;AACvB,QAAA,iBAAiB,GAAG,EAAE,CAAC;AACvB,QAAA,iBAAiB,GAAG,CAAC,CAAC,IAAI,yBAAiB,CAAC,GAAG,CAAC,CAAC;AACjD,QAAA,kBAAkB,GAAG,GAAU,CAAC;AAChC,QAAA,uBAAuB,GAAG,EAAE,CAAC;AAC7B,QAAA,uBAAuB,GAAG,CAAC,CAAC,IAAI,+BAAuB,CAAC,GAAG,CAAC,CAAC;AAC7D,QAAA,uBAAuB,GAAG,EAAE,CAAC;AAC7B,QAAA,sBAAsB,GAAG,IAAI,CAAC;AAC9B,QAAA,qBAAqB,GAAG,EAAE,CAAC;AAC3B,QAAA,qBAAqB,GAAG,EAAE,CAAC;AAE3B,QAAA,0BAA0B,GAAG,CAAC,CAAC;AAC/B,QAAA,0BAA0B,GAAG,CAAC,CAAC;AAE/B,QAAA,uBAAuB,GAAG,GAAG,CAAC;AAC9B,QAAA,uBAAuB,GAAG,IAAI,CAAC,CAAC,4CAA4C;AAC5E,QAAA,iBAAiB,GAAG,GAAG,CAAC;AAErC,IAAY,UAMX;AAND,WAAY,UAAU;IACrB,qDAAa,CAAA;IACb,2DAAgB,CAAA;IAChB,2DAAgB,CAAA;IAChB,iDAAW,CAAA;IACX,qDAAa,CAAA;AACd,CAAC,EANW,UAAU,0BAAV,UAAU,QAMrB;AAED,IAAY,YAKX;AALD,WAAY,YAAY;IACvB,+CAAQ,CAAA;IACR,iDAAS,CAAA;IACT,+CAAQ,CAAA;IACR,+CAAQ,CAAA;AACT,CAAC,EALW,YAAY,4BAAZ,YAAY,QAKvB"}
1
+ {"version":3,"file":"consts.js","sourceRoot":"","sources":["../../src/nvm3/consts.ts"],"names":[],"mappings":";;;AAAA,iBAAiB;AACJ,QAAA,0BAA0B,GAAG,MAAM,CAAC;AACpC,QAAA,uBAAuB,GAAG,MAAM,GAAG,kCAA0B,CAAC;AAC3E,8EAA8E;AAC9E,sBAAsB;AACT,QAAA,qBAAqB,GAAG,MAAM,CAAC;AAE5C,kCAAkC;AACrB,QAAA,cAAc,GAAG,CAAC,CAAC;AAEhC,6BAA6B;AAChB,QAAA,kBAAkB,GAAG,GAAG,CAAC;AACzB,QAAA,qBAAqB,GAAG,EAAE,CAAC;AAC3B,QAAA,sBAAsB,GAAG,EAAE,CAAC;AAC5B,QAAA,sBAAsB,GAAG,CAAC,CAAC,IAAI,8BAAsB,CAAC,GAAG,CAAC,CAAC;AAC3D,QAAA,eAAe,GAAG,MAAM,CAAC;AAEzB,QAAA,uBAAuB,GAAG,IAAI,CAAC,CAAC,oDAAoD;AACpF,QAAA,uBAAuB,GAAG,IAAI,CAAC;AAE5C,IAAY,UAKX;AALD,WAAY,UAAU;IACrB,gDAAe,CAAA;IACf,0EAA4B,CAAA;IAC5B,6CAAgB,CAAA;IAChB,uEAA6B,CAAA;AAC9B,CAAC,EALW,UAAU,0BAAV,UAAU,QAKrB;AAED,IAAY,aAGX;AAHD,WAAY,aAAa;IACxB,mEAAiB,CAAA;IACjB,mEAAiB,CAAA;AAClB,CAAC,EAHW,aAAa,6BAAb,aAAa,QAGxB;AAED,+BAA+B;AAClB,QAAA,kBAAkB,GAAG,CAAC,CAAC;AACvB,QAAA,iBAAiB,GAAG,EAAE,CAAC;AACvB,QAAA,iBAAiB,GAAG,CAAC,CAAC,IAAI,yBAAiB,CAAC,GAAG,CAAC,CAAC;AACjD,QAAA,kBAAkB,GAAG,GAAU,CAAC;AAChC,QAAA,uBAAuB,GAAG,EAAE,CAAC;AAC7B,QAAA,uBAAuB,GAAG,CAAC,CAAC,IAAI,+BAAuB,CAAC,GAAG,CAAC,CAAC;AAC7D,QAAA,uBAAuB,GAAG,EAAE,CAAC;AAC7B,QAAA,sBAAsB,GAAG,IAAI,CAAC;AAC9B,QAAA,qBAAqB,GAAG,EAAE,CAAC;AAC3B,QAAA,qBAAqB,GAAG,EAAE,CAAC;AAE3B,QAAA,0BAA0B,GAAG,CAAC,CAAC;AAC/B,QAAA,0BAA0B,GAAG,CAAC,CAAC;AAE/B,QAAA,uBAAuB,GAAG,GAAG,CAAC;AAC9B,QAAA,uBAAuB,GAAG,IAAI,CAAC,CAAC,4CAA4C;AAC5E,QAAA,iBAAiB,GAAG,GAAG,CAAC;AAErC,IAAY,UAMX;AAND,WAAY,UAAU;IACrB,qDAAa,CAAA;IACb,2DAAgB,CAAA;IAChB,2DAAgB,CAAA;IAChB,iDAAW,CAAA;IACX,qDAAa,CAAA;AACd,CAAC,EANW,UAAU,0BAAV,UAAU,QAMrB;AAED,IAAY,YAKX;AALD,WAAY,YAAY;IACvB,+CAAQ,CAAA;IACR,iDAAS,CAAA;IACT,+CAAQ,CAAA;IACR,+CAAQ,CAAA;AACT,CAAC,EALW,YAAY,4BAAZ,YAAY,QAKvB"}
@@ -3,6 +3,7 @@ import { PageWriteSize } from "./consts";
3
3
  import { type NVM3Object } from "./object";
4
4
  import { type NVM3Page } from "./page";
5
5
  export interface NVMMeta {
6
+ sharedFileSystem: boolean;
6
7
  pageSize: number;
7
8
  deviceFamily: number;
8
9
  writeSize: PageWriteSize;
@@ -27,5 +28,5 @@ export declare function encodeNVM(
27
28
  applicationObjects: Map<number, NVM3Object>,
28
29
  /** A compressed map of protocol-level NVM objects */
29
30
  protocolObjects: Map<number, NVM3Object>, options?: EncodeNVMOptions): Buffer;
30
- export declare function getNVMMeta(page: NVM3Page): NVMMeta;
31
+ export declare function getNVMMeta(page: NVM3Page, sharedFileSystem: boolean): NVMMeta;
31
32
  //# sourceMappingURL=nvm.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"nvm.d.ts","sourceRoot":"","sources":["../../src/nvm3/nvm.ts"],"names":[],"mappings":";AAEA,OAAO,EAQN,aAAa,EAGb,MAAM,UAAU,CAAC;AAClB,OAAO,EACN,KAAK,UAAU,EAIf,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,KAAK,QAAQ,EAA6B,MAAM,QAAQ,CAAC;AAWlE,MAAM,WAAW,OAAO;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,aAAa,CAAC;IACzB,YAAY,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,SAAS;IACzB,uCAAuC;IACvC,gBAAgB,EAAE,QAAQ,EAAE,CAAC;IAC7B,uCAAuC;IACvC,aAAa,EAAE,QAAQ,EAAE,CAAC;CAC1B;AAED,MAAM,WAAW,WAAW;IAC3B,wDAAwD;IACxD,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAC5C,qDAAqD;IACrD,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;CACzC;AAED,wBAAgB,QAAQ,CACvB,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,OAAe,GACtB,SAAS,GAAG,WAAW,CAoDzB;AAED,MAAM,MAAM,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAEhD,wBAAgB,SAAS;AACxB,wDAAwD;AACxD,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC;AAC3C,qDAAqD;AACrD,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,EACxC,OAAO,CAAC,EAAE,gBAAgB,GACxB,MAAM,CA4GR;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAOlD"}
1
+ {"version":3,"file":"nvm.d.ts","sourceRoot":"","sources":["../../src/nvm3/nvm.ts"],"names":[],"mappings":";AAGA,OAAO,EASN,aAAa,EAIb,MAAM,UAAU,CAAC;AAClB,OAAO,EACN,KAAK,UAAU,EAIf,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,KAAK,QAAQ,EAA6B,MAAM,QAAQ,CAAC;AAWlE,MAAM,WAAW,OAAO;IACvB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,aAAa,CAAC;IACzB,YAAY,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,SAAS;IACzB,uCAAuC;IACvC,gBAAgB,EAAE,QAAQ,EAAE,CAAC;IAC7B,uCAAuC;IACvC,aAAa,EAAE,QAAQ,EAAE,CAAC;CAC1B;AAED,MAAM,WAAW,WAAW;IAC3B,wDAAwD;IACxD,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAC5C,qDAAqD;IACrD,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;CACzC;AAED,wBAAgB,QAAQ,CACvB,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,OAAe,GACtB,SAAS,GAAG,WAAW,CAmEzB;AAED,MAAM,MAAM,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAEhD,wBAAgB,SAAS;AACxB,wDAAwD;AACxD,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC;AAC3C,qDAAqD;AACrD,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,EACxC,OAAO,CAAC,EAAE,gBAAgB,GACxB,MAAM,CA8HR;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,QAAQ,EAAE,gBAAgB,EAAE,OAAO,GAAG,OAAO,CAU7E"}
package/build/nvm3/nvm.js CHANGED
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getNVMMeta = exports.encodeNVM = exports.parseNVM = void 0;
4
4
  const safe_1 = require("@zwave-js/core/safe");
5
5
  const safe_2 = require("@zwave-js/shared/safe");
6
+ const files_1 = require("../files");
6
7
  const consts_1 = require("./consts");
7
8
  const object_1 = require("./object");
8
9
  const page_1 = require("./page");
@@ -25,8 +26,20 @@ function parseNVM(buffer, verbose = false) {
25
26
  pages.push(page);
26
27
  offset += bytesRead;
27
28
  }
28
- const applicationPages = pages.filter((p) => p.header.offset < consts_1.ZWAVE_APPLICATION_NVM_SIZE);
29
- const protocolPages = pages.filter((p) => p.header.offset >= consts_1.ZWAVE_APPLICATION_NVM_SIZE);
29
+ // 800 series has a shared NVM for protocol and application data.
30
+ // We can distinguish between the two, because the application version is stored in a different file ID
31
+ const isSharedFileSystem = pages.some((p) => p.objects.some((o) => o.key === files_1.ApplicationVersionFile800ID));
32
+ // By convention, we only use the applicationPages in that case
33
+ let applicationPages;
34
+ let protocolPages;
35
+ if (isSharedFileSystem) {
36
+ applicationPages = pages;
37
+ protocolPages = [];
38
+ }
39
+ else {
40
+ applicationPages = pages.filter((p) => p.header.offset < consts_1.ZWAVE_APPLICATION_NVM_SIZE);
41
+ protocolPages = pages.filter((p) => p.header.offset >= consts_1.ZWAVE_APPLICATION_NVM_SIZE);
42
+ }
30
43
  // The pages are written in a ring buffer, find the one with the lowest erase count and start reading from there in order
31
44
  applicationPages.sort(comparePages);
32
45
  protocolPages.sort(comparePages);
@@ -56,7 +69,10 @@ applicationObjects,
56
69
  /** A compressed map of protocol-level NVM objects */
57
70
  protocolObjects, options) {
58
71
  const { deviceFamily = 2047, writeSize = consts_1.PageWriteSize.WRITE_SIZE_16, memoryMapped = true, } = options ?? {};
59
- const pageSize = Math.min(options?.pageSize ?? consts_1.FLASH_MAX_PAGE_SIZE, consts_1.FLASH_MAX_PAGE_SIZE);
72
+ const maxPageSize = options?.sharedFileSystem
73
+ ? consts_1.FLASH_MAX_PAGE_SIZE_800
74
+ : consts_1.FLASH_MAX_PAGE_SIZE_700;
75
+ const pageSize = Math.min(options?.pageSize ?? maxPageSize, maxPageSize);
60
76
  const createEmptyPage = () => {
61
77
  const ret = Buffer.alloc(pageSize, 0xff);
62
78
  (0, page_1.writePageHeader)({
@@ -71,14 +87,6 @@ protocolObjects, options) {
71
87
  }).copy(ret, 0);
72
88
  return ret;
73
89
  };
74
- const applicationPages = [];
75
- for (let i = 0; i < consts_1.ZWAVE_APPLICATION_NVM_SIZE / pageSize; i++) {
76
- applicationPages.push(createEmptyPage());
77
- }
78
- const protocolPages = [];
79
- for (let i = 0; i < consts_1.ZWAVE_PROTOCOL_NVM_SIZE / pageSize; i++) {
80
- protocolPages.push(createEmptyPage());
81
- }
82
90
  const writeObjects = (pages, objects) => {
83
91
  // Keep track where we are at with writing in the pages
84
92
  let pageIndex = -1;
@@ -131,18 +139,43 @@ protocolObjects, options) {
131
139
  }
132
140
  }
133
141
  };
134
- writeObjects(applicationPages, applicationObjects);
135
- writeObjects(protocolPages, protocolObjects);
136
- return Buffer.concat([...applicationPages, ...protocolPages]);
142
+ if (options?.sharedFileSystem) {
143
+ const pages = [];
144
+ for (let i = 0; i < consts_1.ZWAVE_SHARED_NVM_SIZE / pageSize; i++) {
145
+ pages.push(createEmptyPage());
146
+ }
147
+ const objects = new Map([
148
+ ...applicationObjects,
149
+ ...protocolObjects,
150
+ ]);
151
+ writeObjects(pages, objects);
152
+ return Buffer.concat(pages);
153
+ }
154
+ else {
155
+ const applicationPages = [];
156
+ for (let i = 0; i < consts_1.ZWAVE_APPLICATION_NVM_SIZE / pageSize; i++) {
157
+ applicationPages.push(createEmptyPage());
158
+ }
159
+ const protocolPages = [];
160
+ for (let i = 0; i < consts_1.ZWAVE_PROTOCOL_NVM_SIZE / pageSize; i++) {
161
+ protocolPages.push(createEmptyPage());
162
+ }
163
+ writeObjects(applicationPages, applicationObjects);
164
+ writeObjects(protocolPages, protocolObjects);
165
+ return Buffer.concat([...applicationPages, ...protocolPages]);
166
+ }
137
167
  }
138
168
  exports.encodeNVM = encodeNVM;
139
- function getNVMMeta(page) {
140
- return (0, safe_2.pick)(page.header, [
141
- "pageSize",
142
- "writeSize",
143
- "memoryMapped",
144
- "deviceFamily",
145
- ]);
169
+ function getNVMMeta(page, sharedFileSystem) {
170
+ return {
171
+ sharedFileSystem,
172
+ ...(0, safe_2.pick)(page.header, [
173
+ "pageSize",
174
+ "writeSize",
175
+ "memoryMapped",
176
+ "deviceFamily",
177
+ ]),
178
+ };
146
179
  }
147
180
  exports.getNVMMeta = getNVMMeta;
148
181
  //# sourceMappingURL=nvm.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"nvm.js","sourceRoot":"","sources":["../../src/nvm3/nvm.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"nvm.js","sourceRoot":"","sources":["../../src/nvm3/nvm.ts"],"names":[],"mappings":";;;AAAA,8CAAkE;AAClE,gDAA6C;AAC7C,oCAAuD;AACvD,qCAakB;AAClB,qCAKkB;AAClB,iCAAkE;AAClE,mCAA+C;AAE/C,SAAS,YAAY,CAAC,EAAY,EAAE,EAAY;IAC/C,IAAI,EAAE,CAAC,MAAM,CAAC,UAAU,KAAK,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE;QAClD,OAAO,EAAE,CAAC,MAAM,CAAC,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC;KAC3C;SAAM;QACN,OAAO,EAAE,CAAC,MAAM,CAAC,UAAU,GAAG,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC;KACnD;AACF,CAAC;AAwBD,SAAgB,QAAQ,CACvB,MAAc,EACd,UAAmB,KAAK;IAExB,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,MAAM,KAAK,GAAe,EAAE,CAAC;IAC7B,OAAO,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE;QAC9B,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,IAAA,eAAQ,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACrD,IAAI,OAAO;YAAE,IAAA,gBAAQ,EAAC,IAAI,CAAC,CAAC;QAC5B,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjB,MAAM,IAAI,SAAS,CAAC;KACpB;IAED,iEAAiE;IACjE,uGAAuG;IAEvG,MAAM,kBAAkB,GAAG,KAAK,CAAC,IAAI,CACpC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,mCAA2B,CAAC,CACnE,CAAC;IACF,+DAA+D;IAC/D,IAAI,gBAA4B,CAAC;IACjC,IAAI,aAAyB,CAAC;IAE9B,IAAI,kBAAkB,EAAE;QACvB,gBAAgB,GAAG,KAAK,CAAC;QACzB,aAAa,GAAG,EAAE,CAAC;KACnB;SAAM;QACN,gBAAgB,GAAG,KAAK,CAAC,MAAM,CAC9B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,GAAG,mCAA0B,CACnD,CAAC;QACF,aAAa,GAAG,KAAK,CAAC,MAAM,CAC3B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,IAAI,mCAA0B,CACpD,CAAC;KACF;IAED,yHAAyH;IACzH,gBAAgB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACpC,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAEjC,6CAA6C;IAC7C,MAAM,kBAAkB,GAAG,IAAA,wBAAe,EACzC,gBAAgB,CAAC,MAAM,CACtB,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EACvC,EAAE,CACF,CACD,CAAC;IAEF,MAAM,eAAe,GAAG,IAAA,wBAAe,EACtC,aAAa,CAAC,MAAM,CACnB,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EACvC,EAAE,CACF,CACD,CAAC;IAEF,IAAI,OAAO,EAAE;QACZ,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;QACpC,kBAAkB,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,kBAAU,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;QAC3D,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QACjC,eAAe,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,kBAAU,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;KACxD;IAED,OAAO;QACN,gBAAgB;QAChB,aAAa;QACb,kBAAkB;QAClB,eAAe;KACf,CAAC;AACH,CAAC;AAtED,4BAsEC;AAID,SAAgB,SAAS;AACxB,wDAAwD;AACxD,kBAA2C;AAC3C,qDAAqD;AACrD,eAAwC,EACxC,OAA0B;IAE1B,MAAM,EACL,YAAY,GAAG,IAAI,EACnB,SAAS,GAAG,sBAAa,CAAC,aAAa,EACvC,YAAY,GAAG,IAAI,GACnB,GAAG,OAAO,IAAI,EAAE,CAAC;IAClB,MAAM,WAAW,GAAG,OAAO,EAAE,gBAAgB;QAC5C,CAAC,CAAC,gCAAuB;QACzB,CAAC,CAAC,gCAAuB,CAAC;IAC3B,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CACxB,OAAO,EAAE,QAAQ,IAAI,WAAW,EAChC,WAAW,CACX,CAAC;IAEF,MAAM,eAAe,GAAG,GAAW,EAAE;QACpC,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACzC,IAAA,sBAAe,EAAC;YACf,OAAO,EAAE,IAAI;YACb,UAAU,EAAE,CAAC;YACb,SAAS,EAAE,KAAK;YAChB,YAAY;YACZ,YAAY;YACZ,QAAQ;YACR,MAAM,EAAE,mBAAU,CAAC,EAAE;YACrB,SAAS;SACT,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QAChB,OAAO,GAAG,CAAC;IACZ,CAAC,CAAC;IAEF,MAAM,YAAY,GAAG,CACpB,KAAe,EACf,OAAgC,EAC/B,EAAE;QACH,uDAAuD;QACvD,IAAI,SAAS,GAAG,CAAC,CAAC,CAAC;QACnB,IAAI,YAAY,GAAG,CAAC,CAAC,CAAC;QACtB,IAAI,cAAc,GAAG,CAAC,CAAC,CAAC;QACxB,IAAI,WAAoB,CAAC;QACzB,MAAM,QAAQ,GAAG,GAAG,EAAE;YACrB,SAAS,EAAE,CAAC;YACZ,IAAI,SAAS,IAAI,KAAK,CAAC,MAAM,EAAE;gBAC9B,MAAM,IAAI,iBAAU,CACnB,mBAAmB,EACnB,sBAAe,CAAC,WAAW,CAC3B,CAAC;aACF;YACD,WAAW,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;YAC/B,YAAY,GAAG,8BAAqB,CAAC;YACrC,cAAc,GAAG,QAAQ,GAAG,YAAY,CAAC;QAC1C,CAAC,CAAC;QACF,MAAM,eAAe,GAAG,CAAC,EAAU,EAAE,EAAE;YACtC,MAAM,YAAY,GAAG,CAAC,EAAE,GAAG,uBAAc,GAAG,CAAC,CAAC;kBAC3C,CAAC,CAAC,uBAAc,GAAG,CAAC,CAAC,CAAC;YAEzB,YAAY,IAAI,YAAY,CAAC;YAC7B,cAAc,GAAG,QAAQ,GAAG,YAAY,CAAC;QAC1C,CAAC,CAAC;QAEF,QAAQ,EAAE,CAAC;QACX,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,MAAM,EAAE,EAAE;YACnC,IAAI,SAAmC,CAAC;YAExC,IAAI,GAAG,CAAC,IAAI,KAAK,mBAAU,CAAC,OAAO;gBAAE,SAAS;YAC9C,IACC,CAAC,GAAG,CAAC,IAAI,KAAK,mBAAU,CAAC,YAAY;mBACjC,cAAc;sBACd,mCAA0B,GAAG,0BAAiB,CAAC;mBAChD,CAAC,GAAG,CAAC,IAAI,KAAK,mBAAU,CAAC,SAAS;uBACjC,cAAc;0BACd,mCAA0B,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC,CAAC,CAAC,EACxD;gBACD,qEAAqE;gBACrE,QAAQ,EAAE,CAAC;aACX;iBAAM,IACN,GAAG,CAAC,IAAI,KAAK,mBAAU,CAAC,YAAY;mBACjC,GAAG,CAAC,IAAI,KAAK,mBAAU,CAAC,SAAS,EACnC;gBACD,kCAAkC;gBAClC,SAAS,GAAG,IAAA,4BAAmB,EAC9B,GAAU,EACV,cAAc,EACd,QAAQ,GAAG,8BAAqB,CAChC,CAAC;aACF;YACD,IAAI,CAAC,SAAS;gBAAE,SAAS,GAAG,CAAC,GAAG,CAAC,CAAC;YAElC,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;gBACjC,MAAM,SAAS,GAAG,IAAA,oBAAW,EAAC,QAAQ,CAAC,CAAC;gBACxC,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;gBAC1C,eAAe,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;gBAElC,mEAAmE;gBACnE,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC;oBAAE,QAAQ,EAAE,CAAC;aACrC;SACD;IACF,CAAC,CAAC;IAEF,IAAI,OAAO,EAAE,gBAAgB,EAAE;QAC9B,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,8BAAqB,GAAG,QAAQ,EAAE,CAAC,EAAE,EAAE;YAC1D,KAAK,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;SAC9B;QAED,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC;YACvB,GAAG,kBAAkB;YACrB,GAAG,eAAe;SAClB,CAAC,CAAC;QACH,YAAY,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAE7B,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KAC5B;SAAM;QACN,MAAM,gBAAgB,GAAa,EAAE,CAAC;QACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,mCAA0B,GAAG,QAAQ,EAAE,CAAC,EAAE,EAAE;YAC/D,gBAAgB,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;SACzC;QAED,MAAM,aAAa,GAAa,EAAE,CAAC;QACnC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,gCAAuB,GAAG,QAAQ,EAAE,CAAC,EAAE,EAAE;YAC5D,aAAa,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;SACtC;QAED,YAAY,CAAC,gBAAgB,EAAE,kBAAkB,CAAC,CAAC;QACnD,YAAY,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;QAE7C,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,gBAAgB,EAAE,GAAG,aAAa,CAAC,CAAC,CAAC;KAC9D;AACF,CAAC;AApID,8BAoIC;AAED,SAAgB,UAAU,CAAC,IAAc,EAAE,gBAAyB;IACnE,OAAO;QACN,gBAAgB;QAChB,GAAG,IAAA,WAAI,EAAC,IAAI,CAAC,MAAM,EAAE;YACpB,UAAU;YACV,WAAW;YACX,cAAc;YACd,cAAc;SACd,CAAC;KACF,CAAC;AACH,CAAC;AAVD,gCAUC"}
@@ -1 +1 @@
1
- {"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../src/nvm3/page.ts"],"names":[],"mappings":";AACA,OAAO,EAON,KAAK,UAAU,EACf,KAAK,aAAa,EAClB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,KAAK,UAAU,EAAe,MAAM,UAAU,CAAC;AAGxD,MAAM,WAAW,cAAc;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,UAAU,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,aAAa,CAAC;IACzB,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,QAAQ;IACxB,MAAM,EAAE,cAAc,CAAC;IACvB,OAAO,EAAE,UAAU,EAAE,CAAC;CACtB;AAGD,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAErD;AAED,wBAAgB,QAAQ,CACvB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,GACZ;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAiFvC;AAED,wBAAgB,eAAe,CAC9B,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,QAAQ,CAAC,GACpC,MAAM,CAkCR"}
1
+ {"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../src/nvm3/page.ts"],"names":[],"mappings":";AACA,OAAO,EAMN,KAAK,UAAU,EACf,KAAK,aAAa,EAClB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,KAAK,UAAU,EAAe,MAAM,UAAU,CAAC;AAGxD,MAAM,WAAW,cAAc;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,UAAU,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,aAAa,CAAC;IACzB,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,QAAQ;IACxB,MAAM,EAAE,cAAc,CAAC;IACvB,OAAO,EAAE,UAAU,EAAE,CAAC;CACtB;AAGD,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAErD;AAED,wBAAgB,QAAQ,CACvB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,GACZ;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAqEvC;AAiED,wBAAgB,eAAe,CAC9B,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,QAAQ,CAAC,GACpC,MAAM,CAkCR"}
@@ -15,36 +15,36 @@ function pageSizeFromBits(bits) {
15
15
  }
16
16
  exports.pageSizeFromBits = pageSizeFromBits;
17
17
  function readPage(buffer, offset) {
18
- const version = buffer.readUInt16LE(offset);
19
- const magic = buffer.readUInt16LE(offset + 2);
20
- if (magic !== consts_1.NVM3_PAGE_MAGIC) {
21
- throw new safe_1.ZWaveError("Not a valid NVM3 page!", safe_1.ZWaveErrorCodes.NVM_InvalidFormat);
22
- }
23
- if (version !== 0x01) {
24
- throw new safe_1.ZWaveError(`Unsupported NVM3 page version: ${version}`, safe_1.ZWaveErrorCodes.NVM_NotSupported);
25
- }
26
- // The erase counter is saved twice, once normally, once inverted
27
- let eraseCount = buffer.readUInt32LE(offset + 4);
28
- const eraseCountCode = eraseCount >>> consts_1.NVM3_PAGE_COUNTER_SIZE;
29
- eraseCount &= consts_1.NVM3_PAGE_COUNTER_MASK;
30
- (0, utils_1.validateBergerCode)(eraseCount, eraseCountCode, consts_1.NVM3_PAGE_COUNTER_SIZE);
31
- let eraseCountInv = buffer.readUInt32LE(offset + 8);
32
- const eraseCountInvCode = eraseCountInv >>> consts_1.NVM3_PAGE_COUNTER_SIZE;
33
- eraseCountInv &= consts_1.NVM3_PAGE_COUNTER_MASK;
34
- (0, utils_1.validateBergerCode)(eraseCountInv, eraseCountInvCode, consts_1.NVM3_PAGE_COUNTER_SIZE);
35
- if (eraseCount !== (~eraseCountInv & consts_1.NVM3_PAGE_COUNTER_MASK)) {
36
- throw new safe_1.ZWaveError("Invalid erase count!", safe_1.ZWaveErrorCodes.NVM_InvalidFormat);
37
- }
18
+ const { version, eraseCount } = tryGetVersionAndEraseCount(buffer, offset);
38
19
  // Page status
39
20
  const status = buffer.readUInt32LE(offset + 12);
40
21
  const devInfo = buffer.readUInt16LE(offset + 16);
41
22
  const deviceFamily = devInfo & 0x7ff;
42
23
  const writeSize = (devInfo >> 11) & 0b1;
43
24
  const memoryMapped = !!((devInfo >> 12) & 0b1);
44
- const pageSize = pageSizeFromBits((devInfo >> 13) & 0b111);
45
- // Application NVM pages seem to get written with a page size of 0xffff
46
- const actualPageSize = Math.min(pageSize, consts_1.FLASH_MAX_PAGE_SIZE);
47
- if (buffer.length < offset + actualPageSize) {
25
+ let pageSize = pageSizeFromBits((devInfo >> 13) & 0b111);
26
+ if (pageSize > 0xffff) {
27
+ // Some controllers have no valid info in the page size bits, resulting
28
+ // in an impossibly large page size. To try and figure out the actual page
29
+ // size without knowing the hardware, we scan the buffer for the next valid
30
+ // page start.
31
+ for (let exponent = 0; exponent < 0b111; exponent++) {
32
+ const testPageSize = pageSizeFromBits(exponent);
33
+ const nextOffset = offset + testPageSize;
34
+ if (
35
+ // exactly end of NVM OR
36
+ buffer.length === nextOffset
37
+ // next page
38
+ || isValidPageHeaderAtOffset(buffer, nextOffset)) {
39
+ pageSize = testPageSize;
40
+ break;
41
+ }
42
+ }
43
+ }
44
+ if (pageSize > 0xffff) {
45
+ throw new safe_1.ZWaveError("Could not determine page size!", safe_1.ZWaveErrorCodes.NVM_InvalidFormat);
46
+ }
47
+ if (buffer.length < offset + pageSize) {
48
48
  throw new safe_1.ZWaveError("Incomplete page in buffer!", safe_1.ZWaveErrorCodes.NVM_InvalidFormat);
49
49
  }
50
50
  const formatInfo = buffer.readUInt16LE(offset + 18);
@@ -60,7 +60,7 @@ function readPage(buffer, offset) {
60
60
  memoryMapped,
61
61
  deviceFamily,
62
62
  };
63
- const bytesRead = actualPageSize;
63
+ const bytesRead = pageSize;
64
64
  const data = buffer.subarray(offset + 20, offset + bytesRead);
65
65
  const { objects } = (0, object_1.readObjects)(data);
66
66
  return {
@@ -69,6 +69,41 @@ function readPage(buffer, offset) {
69
69
  };
70
70
  }
71
71
  exports.readPage = readPage;
72
+ function tryGetVersionAndEraseCount(buffer, offset) {
73
+ if (offset > buffer.length - consts_1.NVM3_PAGE_HEADER_SIZE) {
74
+ throw new safe_1.ZWaveError("Incomplete page in buffer!", safe_1.ZWaveErrorCodes.NVM_InvalidFormat);
75
+ }
76
+ const version = buffer.readUInt16LE(offset);
77
+ const magic = buffer.readUInt16LE(offset + 2);
78
+ if (magic !== consts_1.NVM3_PAGE_MAGIC) {
79
+ throw new safe_1.ZWaveError("Not a valid NVM3 page!", safe_1.ZWaveErrorCodes.NVM_InvalidFormat);
80
+ }
81
+ if (version !== 0x01) {
82
+ throw new safe_1.ZWaveError(`Unsupported NVM3 page version: ${version}`, safe_1.ZWaveErrorCodes.NVM_NotSupported);
83
+ }
84
+ // The erase counter is saved twice, once normally, once inverted
85
+ let eraseCount = buffer.readUInt32LE(offset + 4);
86
+ const eraseCountCode = eraseCount >>> consts_1.NVM3_PAGE_COUNTER_SIZE;
87
+ eraseCount &= consts_1.NVM3_PAGE_COUNTER_MASK;
88
+ (0, utils_1.validateBergerCode)(eraseCount, eraseCountCode, consts_1.NVM3_PAGE_COUNTER_SIZE);
89
+ let eraseCountInv = buffer.readUInt32LE(offset + 8);
90
+ const eraseCountInvCode = eraseCountInv >>> consts_1.NVM3_PAGE_COUNTER_SIZE;
91
+ eraseCountInv &= consts_1.NVM3_PAGE_COUNTER_MASK;
92
+ (0, utils_1.validateBergerCode)(eraseCountInv, eraseCountInvCode, consts_1.NVM3_PAGE_COUNTER_SIZE);
93
+ if (eraseCount !== (~eraseCountInv & consts_1.NVM3_PAGE_COUNTER_MASK)) {
94
+ throw new safe_1.ZWaveError("Invalid erase count!", safe_1.ZWaveErrorCodes.NVM_InvalidFormat);
95
+ }
96
+ return { version, eraseCount };
97
+ }
98
+ function isValidPageHeaderAtOffset(buffer, offset) {
99
+ try {
100
+ tryGetVersionAndEraseCount(buffer, offset);
101
+ return true;
102
+ }
103
+ catch {
104
+ return false;
105
+ }
106
+ }
72
107
  function writePageHeader(header) {
73
108
  const ret = Buffer.alloc(consts_1.NVM3_PAGE_HEADER_SIZE);
74
109
  ret.writeUInt16LE(header.version, 0);
@@ -1 +1 @@
1
- {"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/nvm3/page.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/nvm3/page.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zwave-js/nvmedit",
3
- "version": "12.5.0-beta.0",
3
+ "version": "12.5.0",
4
4
  "description": "zwave-js: library to edit NVM backups",
5
5
  "keywords": [],
6
6
  "publishConfig": {
@@ -44,8 +44,8 @@
44
44
  "node": ">= 18"
45
45
  },
46
46
  "dependencies": {
47
- "@zwave-js/core": "12.5.0-beta.0",
48
- "@zwave-js/shared": "12.2.3",
47
+ "@zwave-js/core": "12.5.0",
48
+ "@zwave-js/shared": "12.5.0",
49
49
  "alcalzone-shared": "^4.0.8",
50
50
  "fs-extra": "^11.1.1",
51
51
  "reflect-metadata": "^0.1.13",