@zwave-js/config 11.13.0 → 11.14.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.
- package/build/ConfigManager.d.ts +4 -4
- package/build/ConfigManager.d.ts.map +1 -1
- package/build/ConfigManager.js +23 -16
- package/build/ConfigManager.js.map +1 -1
- package/build/DeviceClasses.d.ts.map +1 -1
- package/build/DeviceClasses.js +12 -10
- package/build/DeviceClasses.js.map +1 -1
- package/build/Indicators.d.ts.map +1 -1
- package/build/Indicators.js +6 -6
- package/build/Indicators.js.map +1 -1
- package/build/JsonTemplate.js +2 -1
- package/build/JsonTemplate.js.map +1 -1
- package/build/Logger.d.ts +1 -1
- package/build/Logger.d.ts.map +1 -1
- package/build/Logic.d.ts.map +1 -1
- package/build/LogicParser.d.ts.map +1 -1
- package/build/LogicParser.js +81 -139
- package/build/LogicParser.js.map +1 -1
- package/build/Meters.d.ts.map +1 -1
- package/build/Meters.js.map +1 -1
- package/build/Notifications.d.ts.map +1 -1
- package/build/Notifications.js +6 -5
- package/build/Notifications.js.map +1 -1
- package/build/Scales.d.ts.map +1 -1
- package/build/Scales.js +4 -4
- package/build/Scales.js.map +1 -1
- package/build/SensorTypes.d.ts.map +1 -1
- package/build/SensorTypes.js +8 -5
- package/build/SensorTypes.js.map +1 -1
- package/build/devices/AssociationConfig.d.ts.map +1 -1
- package/build/devices/AssociationConfig.js +6 -6
- package/build/devices/AssociationConfig.js.map +1 -1
- package/build/devices/CompatConfig.d.ts.map +1 -1
- package/build/devices/CompatConfig.js +50 -49
- package/build/devices/CompatConfig.js.map +1 -1
- package/build/devices/ConditionalItem.d.ts.map +1 -1
- package/build/devices/ConditionalItem.js +2 -2
- package/build/devices/ConditionalItem.js.map +1 -1
- package/build/devices/ConditionalPrimitive.d.ts.map +1 -1
- package/build/devices/ConditionalPrimitive.js +4 -4
- package/build/devices/ConditionalPrimitive.js.map +1 -1
- package/build/devices/DeviceConfig.d.ts +2 -2
- package/build/devices/DeviceConfig.d.ts.map +1 -1
- package/build/devices/DeviceConfig.js +28 -25
- package/build/devices/DeviceConfig.js.map +1 -1
- package/build/devices/DeviceMetadata.d.ts.map +1 -1
- package/build/devices/DeviceMetadata.js +3 -3
- package/build/devices/DeviceMetadata.js.map +1 -1
- package/build/devices/EndpointConfig.d.ts +1 -1
- package/build/devices/EndpointConfig.d.ts.map +1 -1
- package/build/devices/EndpointConfig.js.map +1 -1
- package/build/devices/ParamInformation.d.ts.map +1 -1
- package/build/devices/ParamInformation.js +26 -25
- package/build/devices/ParamInformation.js.map +1 -1
- package/build/utils.d.ts.map +1 -1
- package/build/utils.js +4 -4
- package/build/utils.js.map +1 -1
- package/build/utils_safe.js +2 -2
- package/build/utils_safe.js.map +1 -1
- package/config/.dprint.jsonc +13 -0
- package/config/devices/0x011a/zw500d.json +5 -1
- package/config/devices/0x016a/ft100.json +2 -2
- package/config/devices/0x016a/ft111.json +2 -2
- package/config/devices/0x0190/adc-swm150.json +0 -1
- package/config/devices/0x0234/templates/logic_group_template.json +1 -1
- package/config/devices/0x027a/templates/zooz_template.json +11 -1
- package/config/devices/0x027a/zen04.json +13 -1
- package/config/devices/0x027a/zen71.json +15 -3
- package/config/devices/0x027a/zen72.json +21 -3
- package/config/devices/0x027a/zen76.json +15 -2
- package/config/devices/0x027a/zen77.json +23 -8
- package/config/devices/0x0330/ves-zw-dim-001.json +1 -1
- package/config/devices/0x0345/templates/swidget_template.json +3 -3
- package/package.json +5 -8
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeviceMetadata.d.ts","sourceRoot":"","sources":["../../src/devices/DeviceMetadata.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"DeviceMetadata.d.ts","sourceRoot":"","sources":["../../src/devices/DeviceMetadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAQ,MAAM,uBAAuB,CAAC;AAG9D,OAAO,EACN,KAAK,eAAe,EAGpB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACN,KAAK,oBAAoB,EAEzB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEzC,qBAAa,yBACZ,YAAW,eAAe,CAAC,cAAc,CAAC;gBAEvB,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU;IAiD3D,SAAgB,SAAS,CAAC,EAAE,MAAM,CAAC;IAE5B,iBAAiB,CAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,cAAc,GAAG,SAAS;IAuBzE,yCAAyC;IACzC,SAAgB,MAAM,CAAC,EAAE,oBAAoB,CAAC,MAAM,CAAC,CAAC;IACtD,6BAA6B;IAC7B,SAAgB,SAAS,CAAC,EAAE,oBAAoB,CAAC,MAAM,CAAC,CAAC;IACzD,6BAA6B;IAC7B,SAAgB,SAAS,CAAC,EAAE,oBAAoB,CAAC,MAAM,CAAC,CAAC;IACzD,gEAAgE;IAChE,SAAgB,KAAK,CAAC,EAAE,oBAAoB,CAAC,MAAM,CAAC,CAAC;IACrD,kCAAkC;IAClC,SAAgB,MAAM,CAAC,EAAE,oBAAoB,CAAC,MAAM,CAAC,CAAC;IACtD,+BAA+B;IAC/B,SAAgB,QAAQ,CAAC,EACtB,wBAAwB,GACxB,wBAAwB,EAAE,CAAC;CAC9B;AAED,MAAM,WAAW,cAAc;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,aAAa,GAAG,aAAa,EAAE,CAAC;CAC3C;AAED,qBAAa,wBACZ,YAAW,eAAe,CAAC,aAAa,CAAC;aAGxB,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC;aAC7B,IAAI,EAAE,MAAM;aACZ,SAAS,CAAC;gBAFV,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,EAC7B,IAAI,EAAE,MAAM,EACZ,SAAS,CAAC,oBAAQ;IAG5B,iBAAiB,CAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,aAAa,GAAG,SAAS;CAIxE;AAED,MAAM,WAAW,aAAa;IAC7B,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC;IACpC,IAAI,EAAE,MAAM,CAAC;CACb"}
|
|
@@ -21,9 +21,9 @@ class ConditionalDeviceMetadata {
|
|
|
21
21
|
}
|
|
22
22
|
if ("comments" in definition) {
|
|
23
23
|
const value = definition.comments;
|
|
24
|
-
const isComment = (opt) => (0, typeguards_1.isObject)(opt)
|
|
25
|
-
typeof opt.level === "string"
|
|
26
|
-
typeof opt.text === "string";
|
|
24
|
+
const isComment = (opt) => (0, typeguards_1.isObject)(opt)
|
|
25
|
+
&& typeof opt.level === "string"
|
|
26
|
+
&& typeof opt.text === "string";
|
|
27
27
|
if (isComment(value)) {
|
|
28
28
|
this.comments = new ConditionalDeviceComment(value.level, value.text, value.$if);
|
|
29
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeviceMetadata.js","sourceRoot":"","sources":["../../src/devices/DeviceMetadata.ts"],"names":[],"mappings":";;;AAAA,gDAA8D;AAC9D,4DAAgE;AAChE,8CAAmD;AACnD,uDAI2B;AAC3B,iEAGgC;AAGhC,MAAa,yBAAyB;IAGrC,YAAmB,QAAgB,EAAE,UAAsB;QAC1D,
|
|
1
|
+
{"version":3,"file":"DeviceMetadata.js","sourceRoot":"","sources":["../../src/devices/DeviceMetadata.ts"],"names":[],"mappings":";;;AAAA,gDAA8D;AAC9D,4DAAgE;AAChE,8CAAmD;AACnD,uDAI2B;AAC3B,iEAGgC;AAGhC,MAAa,yBAAyB;IAGrC,YAAmB,QAAgB,EAAE,UAAsB;QAC1D,KACC,MAAM,IAAI,IAAI;YACb,QAAQ;YACR,WAAW;YACX,WAAW;YACX,OAAO;YACP,QAAQ;SACC,EACT;YACD,IAAI,IAAI,IAAI,UAAU,EAAE;gBACvB,IAAI,CAAC,IAAI,CAAC,GAAG,IAAA,gDAAyB,EACrC,QAAQ,EACR,QAAQ,EACR,IAAI,EACJ,UAAU,CAAC,IAAI,CAAC,EAChB,qBAAqB,CACrB,CAAC;aACF;SACD;QAED,IAAI,UAAU,IAAI,UAAU,EAAE;YAC7B,MAAM,KAAK,GAAG,UAAU,CAAC,QAAQ,CAAC;YAClC,MAAM,SAAS,GAAG,CAAC,GAAY,EAAE,EAAE,CAClC,IAAA,qBAAQ,EAAC,GAAG,CAAC;mBACV,OAAO,GAAG,CAAC,KAAK,KAAK,QAAQ;mBAC7B,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC;YAEjC,IAAI,SAAS,CAAC,KAAK,CAAC,EAAE;gBACrB,IAAI,CAAC,QAAQ,GAAG,IAAI,wBAAwB,CAC3C,KAAK,CAAC,KAAK,EACX,KAAK,CAAC,IAAI,EACV,KAAK,CAAC,GAAG,CACT,CAAC;aACF;iBAAM,IAAI,IAAA,oBAAO,EAAC,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE;gBACpD,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,GAAG,CACxB,CAAC,CAAM,EAAE,EAAE,CACV,IAAI,wBAAwB,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CACrD,CAAC;aACF;iBAAM;gBACN,IAAA,+BAAkB,EACjB,SAAS,EACT,kCAAkC,QAAQ;wCACP,CACnC,CAAC;aACF;SACD;IACF,CAAC;IAIM,iBAAiB,CAAC,QAAmB;QAC3C,IAAI,CAAC,IAAA,kCAAgB,EAAC,IAAI,EAAE,QAAQ,CAAC;YAAE,OAAO;QAC9C,MAAM,GAAG,GAAmB,EAAE,CAAC;QAC/B,KACC,MAAM,IAAI,IAAI;YACb,QAAQ;YACR,WAAW;YACX,WAAW;YACX,OAAO;YACP,QAAQ;SACC,EACT;YACD,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE;gBACf,MAAM,SAAS,GAAG,IAAA,8BAAY,EAAC,IAAI,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAC;gBACrD,IAAI,SAAS;oBAAE,GAAG,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;aACrC;SACD;QACD,MAAM,QAAQ,GAAG,IAAA,8BAAY,EAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC7D,IAAI,QAAQ;YAAE,GAAG,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAEtC,OAAO,GAAG,CAAC;IACZ,CAAC;CAgBD;AA3FD,8DA2FC;AAWD,MAAa,wBAAwB;IAGpC,YACiB,KAA6B,EAC7B,IAAY,EACZ,SAAkB;QAFlB,UAAK,GAAL,KAAK,CAAwB;QAC7B,SAAI,GAAJ,IAAI,CAAQ;QACZ,cAAS,GAAT,SAAS,CAAS;IAChC,CAAC;IAEG,iBAAiB,CAAC,QAAmB;QAC3C,IAAI,CAAC,IAAA,kCAAgB,EAAC,IAAI,EAAE,QAAQ,CAAC;YAAE,OAAO;QAC9C,OAAO,IAAA,WAAI,EAAC,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;IACtC,CAAC;CACD;AAbD,4DAaC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { JSONObject } from "@zwave-js/shared/safe";
|
|
2
|
-
import {
|
|
2
|
+
import { type AssociationConfig, ConditionalAssociationConfig } from "./AssociationConfig";
|
|
3
3
|
import { type ConditionalItem } from "./ConditionalItem";
|
|
4
4
|
import type { ConditionalDeviceConfig } from "./DeviceConfig";
|
|
5
5
|
import { type ConditionalParamInfoMap, type ParamInfoMap } from "./ParamInformation";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EndpointConfig.d.ts","sourceRoot":"","sources":["../../src/devices/EndpointConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAGxD,OAAO,EACN,
|
|
1
|
+
{"version":3,"file":"EndpointConfig.d.ts","sourceRoot":"","sources":["../../src/devices/EndpointConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAGxD,OAAO,EACN,KAAK,iBAAiB,EACtB,4BAA4B,EAC5B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACN,KAAK,eAAe,EAIpB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EACN,KAAK,uBAAuB,EAC5B,KAAK,YAAY,EAEjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEzC,qBAAa,yBACZ,YAAW,eAAe,CAAC,cAAc,CAAC;gBAGzC,MAAM,EAAE,uBAAuB,EAC/B,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,UAAU;IAsEvB,SAAgB,KAAK,EAAE,MAAM,CAAC;IAC9B,SAAgB,YAAY,CAAC,EAAE,WAAW,CACzC,MAAM,EACN,4BAA4B,CAC5B,CAAC;IAEF,SAAgB,gBAAgB,CAAC,EAAE,uBAAuB,CAAC;IAE3D,SAAgB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnC,SAAgB,KAAK,CAAC,EAAE,MAAM,CAAC;IAExB,iBAAiB,CAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,cAAc,GAAG,SAAS;CAczE;AAED,MAAM,MAAM,cAAc,GACvB,IAAI,CACL,yBAAyB,EACzB,WAAW,GAAG,mBAAmB,GAAG,cAAc,GAAG,kBAAkB,CACvE,GACC;IACD,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAAG,SAAS,CAAC;IAC1D,gBAAgB,CAAC,EAAE,YAAY,CAAC;CAChC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EndpointConfig.js","sourceRoot":"","sources":["../../src/devices/EndpointConfig.ts"],"names":[],"mappings":";;;AACA,4DAAuD;AACvD,8CAAmD;AACnD,2DAG6B;AAC7B,uDAK2B;AAE3B,yDAI4B;AAG5B,MAAa,yBAAyB;IAGrC,YACC,MAA+B,EAC/B,KAAa,EACb,UAAsB;QAEtB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;QAEjC,IAAA,mCAAiB,EAChB,QAAQ,EACR,UAAU,EACV,YAAY,KAAK,cAAc,CAC/B,CAAC;QACF,IAAI,CAAC,SAAS,GAAG,UAAU,CAAC,GAAG,CAAC;QAEhC,IAAI,UAAU,CAAC,KAAK,IAAI,SAAS,EAAE;YAClC,IAAI,OAAO,UAAU,CAAC,KAAK,KAAK,QAAQ,EAAE;gBACzC,IAAA,+BAAkB,EACjB,QAAQ,EACR,kCAAkC,QAAQ;WACpC,KAAK,yBAAyB,CACpC,CAAC;aACF;YACD,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC;SAC9B;QAED,IAAI,UAAU,CAAC,YAAY,IAAI,SAAS,EAAE;YACzC,MAAM,YAAY,GAAG,IAAI,GAAG,EAGzB,CAAC;YACJ,IAAI,CAAC,IAAA,qBAAQ,EAAC,UAAU,CAAC,YAAY,CAAC,EAAE;gBACvC,IAAA,+BAAkB,EACjB,QAAQ,EACR,kCAAkC,QAAQ;WACpC,KAAK,iCAAiC,CAC5C,CAAC;aACF;YACD,
|
|
1
|
+
{"version":3,"file":"EndpointConfig.js","sourceRoot":"","sources":["../../src/devices/EndpointConfig.ts"],"names":[],"mappings":";;;AACA,4DAAuD;AACvD,8CAAmD;AACnD,2DAG6B;AAC7B,uDAK2B;AAE3B,yDAI4B;AAG5B,MAAa,yBAAyB;IAGrC,YACC,MAA+B,EAC/B,KAAa,EACb,UAAsB;QAEtB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;QAEjC,IAAA,mCAAiB,EAChB,QAAQ,EACR,UAAU,EACV,YAAY,KAAK,cAAc,CAC/B,CAAC;QACF,IAAI,CAAC,SAAS,GAAG,UAAU,CAAC,GAAG,CAAC;QAEhC,IAAI,UAAU,CAAC,KAAK,IAAI,SAAS,EAAE;YAClC,IAAI,OAAO,UAAU,CAAC,KAAK,KAAK,QAAQ,EAAE;gBACzC,IAAA,+BAAkB,EACjB,QAAQ,EACR,kCAAkC,QAAQ;WACpC,KAAK,yBAAyB,CACpC,CAAC;aACF;YACD,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC;SAC9B;QAED,IAAI,UAAU,CAAC,YAAY,IAAI,SAAS,EAAE;YACzC,MAAM,YAAY,GAAG,IAAI,GAAG,EAGzB,CAAC;YACJ,IAAI,CAAC,IAAA,qBAAQ,EAAC,UAAU,CAAC,YAAY,CAAC,EAAE;gBACvC,IAAA,+BAAkB,EACjB,QAAQ,EACR,kCAAkC,QAAQ;WACpC,KAAK,iCAAiC,CAC5C,CAAC;aACF;YACD,KACC,MAAM,CAAC,GAAG,EAAE,eAAe,CAAC,IAAI,MAAM,CAAC,OAAO,CAC7C,UAAU,CAAC,YAAY,CACvB,EACA;gBACD,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;oBAC/B,IAAA,+BAAkB,EACjB,QAAQ,EACR,kCAAkC,QAAQ;WACrC,KAAK,iCAAiC,GAAG,mBAAmB,CACjE,CAAC;iBACF;gBAED,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBACjC,YAAY,CAAC,GAAG,CACf,MAAM,EACN,IAAI,gDAA4B,CAC/B,QAAQ,EACR,MAAM,EACN,eAAsB,CACtB,CACD,CAAC;aACF;YACD,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;SACjC;QAED,IAAI,UAAU,CAAC,gBAAgB,IAAI,SAAS,EAAE;YAC7C,IAAI,CAAC,gBAAgB,GAAG,IAAA,sDAAmC,EAC1D,UAAU,EACV,MAAM,EACN,YAAY,KAAK,IAAI,CACrB,CAAC;SACF;IACF,CAAC;IAaM,iBAAiB,CAAC,QAAmB;QAC3C,IAAI,CAAC,IAAA,kCAAgB,EAAC,IAAI,EAAE,QAAQ,CAAC;YAAE,OAAO;QAC9C,MAAM,GAAG,GAAmB;YAC3B,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,KAAK,EAAE,IAAI,CAAC,KAAK;SACjB,CAAC;QACF,MAAM,YAAY,GAAG,IAAA,8BAAY,EAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QAC/D,IAAI,YAAY;YAAE,GAAG,CAAC,YAAY,GAAG,YAAY,CAAC;QAElD,MAAM,gBAAgB,GAAG,IAAA,8BAAY,EAAC,IAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;QACvE,IAAI,gBAAgB;YAAE,GAAG,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QAE9D,OAAO,GAAG,CAAC;IACZ,CAAC;CACD;AArGD,8DAqGC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ParamInformation.d.ts","sourceRoot":"","sources":["../../src/devices/ParamInformation.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"ParamInformation.d.ts","sourceRoot":"","sources":["../../src/devices/ParamInformation.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,KAAK,UAAU,EAEf,KAAK,oBAAoB,EAEzB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EACN,KAAK,eAAe,EAIpB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEzC,qBAAa,2BACZ,YAAW,eAAe,CAAC,gBAAgB,CAAC;gBAG3C,MAAM,EAAE,uBAAuB,EAC/B,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU;IAmKvB,OAAO,CAAC,MAAM,CAA0B;IACxC,SAAgB,eAAe,EAAE,MAAM,CAAC;IACxC,SAAgB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtC,SAAgB,KAAK,EAAE,MAAM,CAAC;IAC9B,SAAgB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrC,SAAgB,SAAS,EAAE,MAAM,CAAC;IAClC,SAAgB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClC,SAAgB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClC,SAAgB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnC,SAAgB,YAAY,EAAE,MAAM,CAAC;IACrC,SAAgB,IAAI,CAAC,EAAE,MAAM,CAAC;IAC9B,SAAgB,QAAQ,CAAC,EAAE,IAAI,CAAC;IAChC,SAAgB,SAAS,CAAC,EAAE,IAAI,CAAC;IACjC,SAAgB,gBAAgB,EAAE,OAAO,CAAC;IAC1C,SAAgB,OAAO,EAAE,SAAS,uBAAuB,EAAE,CAAC;IAE5D,SAAgB,SAAS,CAAC,EAAE,MAAM,CAAC;IAE5B,iBAAiB,CACvB,QAAQ,CAAC,EAAE,QAAQ,GACjB,gBAAgB,GAAG,SAAS;CAgD/B;AAED,MAAM,MAAM,gBAAgB,GACzB,IAAI,CACL,2BAA2B,EAC3B,WAAW,GAAG,mBAAmB,GAAG,SAAS,GAAG,UAAU,GAAG,UAAU,CACvE,GACC;IACD,OAAO,EAAE,SAAS,YAAY,EAAE,CAAC;IACjC,QAAQ,EAAE,WAAW,CAAC,2BAA2B,CAAC,UAAU,CAAC,CAAC,CAAC;IAC/D,QAAQ,EAAE,WAAW,CAAC,2BAA2B,CAAC,UAAU,CAAC,CAAC,CAAC;CAC/D,CAAC;AAEH,qBAAa,uBAAwB,YAAW,eAAe,CAAC,YAAY,CAAC;aAE3D,KAAK,EAAE,MAAM;aACb,KAAK,EAAE,MAAM;aACb,SAAS,CAAC;gBAFV,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,SAAS,CAAC,oBAAQ;IAG5B,iBAAiB,CAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,YAAY,GAAG,SAAS;CAKvE;AAED,MAAM,WAAW,YAAY;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACd;AAED,MAAM,MAAM,uBAAuB,GAAG,oBAAoB,CACzD;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,EAC5C,2BAA2B,EAAE,CAC7B,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,oBAAoB,CAC9C;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,EAC5C,gBAAgB,CAChB,CAAC;AAEF,wBAAgB,mCAAmC,CAClD,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,uBAAuB,EAC/B,WAAW,GAAE,MAAW,GACtB,uBAAuB,CAmEzB"}
|
|
@@ -17,38 +17,38 @@ class ConditionalParamInformation {
|
|
|
17
17
|
Parameter #${parameterNumber} has a non-string label`);
|
|
18
18
|
}
|
|
19
19
|
this.label = definition.label;
|
|
20
|
-
if (definition.description != undefined
|
|
21
|
-
typeof definition.description !== "string") {
|
|
20
|
+
if (definition.description != undefined
|
|
21
|
+
&& typeof definition.description !== "string") {
|
|
22
22
|
(0, utils_safe_1.throwInvalidConfig)("devices", `packages/config/config/devices/${parent.filename}:
|
|
23
23
|
Parameter #${parameterNumber} has a non-string description`);
|
|
24
24
|
}
|
|
25
25
|
this.description = definition.description;
|
|
26
|
-
if (typeof definition.valueSize !== "number"
|
|
27
|
-
definition.valueSize <= 0) {
|
|
26
|
+
if (typeof definition.valueSize !== "number"
|
|
27
|
+
|| definition.valueSize <= 0) {
|
|
28
28
|
(0, utils_safe_1.throwInvalidConfig)("devices", `packages/config/config/devices/${parent.filename}:
|
|
29
29
|
Parameter #${parameterNumber} has an invalid value size`);
|
|
30
30
|
}
|
|
31
31
|
this.valueSize = definition.valueSize;
|
|
32
|
-
if (definition.minValue != undefined
|
|
33
|
-
typeof definition.minValue !== "number") {
|
|
32
|
+
if (definition.minValue != undefined
|
|
33
|
+
&& typeof definition.minValue !== "number") {
|
|
34
34
|
(0, utils_safe_1.throwInvalidConfig)("devices", `packages/config/config/devices/${parent.filename}:
|
|
35
35
|
Parameter #${parameterNumber} has a non-numeric property minValue`);
|
|
36
36
|
}
|
|
37
37
|
this.minValue = definition.minValue;
|
|
38
|
-
if (definition.maxValue != undefined
|
|
39
|
-
typeof definition.maxValue !== "number") {
|
|
38
|
+
if (definition.maxValue != undefined
|
|
39
|
+
&& typeof definition.maxValue !== "number") {
|
|
40
40
|
(0, utils_safe_1.throwInvalidConfig)("devices", `packages/config/config/devices/${parent.filename}:
|
|
41
41
|
Parameter #${parameterNumber} has a non-numeric property maxValue`);
|
|
42
42
|
}
|
|
43
43
|
this.maxValue = definition.maxValue;
|
|
44
|
-
if (definition.unsigned != undefined
|
|
45
|
-
typeof definition.unsigned !== "boolean") {
|
|
44
|
+
if (definition.unsigned != undefined
|
|
45
|
+
&& typeof definition.unsigned !== "boolean") {
|
|
46
46
|
(0, utils_safe_1.throwInvalidConfig)("devices", `packages/config/config/devices/${parent.filename}:
|
|
47
47
|
Parameter #${parameterNumber} has a non-boolean property unsigned`);
|
|
48
48
|
}
|
|
49
49
|
this.unsigned = definition.unsigned === true;
|
|
50
|
-
if (definition.unit != undefined
|
|
51
|
-
typeof definition.unit !== "string") {
|
|
50
|
+
if (definition.unit != undefined
|
|
51
|
+
&& typeof definition.unit !== "string") {
|
|
52
52
|
(0, utils_safe_1.throwInvalidConfig)("devices", `packages/config/config/devices/${parent.filename}:
|
|
53
53
|
Parameter #${parameterNumber} has a non-string unit`);
|
|
54
54
|
}
|
|
@@ -58,8 +58,8 @@ Parameter #${parameterNumber} has a non-string unit`);
|
|
|
58
58
|
Parameter #${parameterNumber}: readOnly must true or omitted!`);
|
|
59
59
|
}
|
|
60
60
|
this.readOnly = definition.readOnly;
|
|
61
|
-
if (definition.writeOnly != undefined
|
|
62
|
-
definition.writeOnly !== true) {
|
|
61
|
+
if (definition.writeOnly != undefined
|
|
62
|
+
&& definition.writeOnly !== true) {
|
|
63
63
|
(0, utils_safe_1.throwInvalidConfig)("devices", `packages/config/config/devices/${parent.filename}:
|
|
64
64
|
Parameter #${parameterNumber}: writeOnly must be true or omitted!`);
|
|
65
65
|
}
|
|
@@ -75,23 +75,22 @@ Parameter #${parameterNumber} is missing defaultValue, which is required unless
|
|
|
75
75
|
Parameter #${parameterNumber} has a non-numeric property defaultValue`);
|
|
76
76
|
}
|
|
77
77
|
this.defaultValue = definition.defaultValue;
|
|
78
|
-
if (definition.allowManualEntry != undefined
|
|
79
|
-
definition.allowManualEntry !== false) {
|
|
78
|
+
if (definition.allowManualEntry != undefined
|
|
79
|
+
&& definition.allowManualEntry !== false) {
|
|
80
80
|
(0, utils_safe_1.throwInvalidConfig)("devices", `packages/config/config/devices/${parent.filename}:
|
|
81
81
|
Parameter #${parameterNumber}: allowManualEntry must be false or omitted!`);
|
|
82
82
|
}
|
|
83
83
|
// Default to allowing manual entry, except if the param is readonly
|
|
84
|
-
this.allowManualEntry =
|
|
85
|
-
|
|
86
|
-
if ((0, typeguards_1.isArray)(definition.options)
|
|
87
|
-
!definition.options.every((opt) => (0, typeguards_1.isObject)(opt)
|
|
88
|
-
typeof opt.label === "string"
|
|
89
|
-
typeof opt.value === "number")) {
|
|
84
|
+
this.allowManualEntry = definition.allowManualEntry
|
|
85
|
+
?? (this.readOnly ? false : true);
|
|
86
|
+
if ((0, typeguards_1.isArray)(definition.options)
|
|
87
|
+
&& !definition.options.every((opt) => (0, typeguards_1.isObject)(opt)
|
|
88
|
+
&& typeof opt.label === "string"
|
|
89
|
+
&& typeof opt.value === "number")) {
|
|
90
90
|
(0, utils_safe_1.throwInvalidConfig)("devices", `packages/config/config/devices/${parent.filename}:
|
|
91
91
|
Parameter #${parameterNumber}: options is malformed!`);
|
|
92
92
|
}
|
|
93
|
-
this.options =
|
|
94
|
-
definition.options?.map((opt) => new ConditionalConfigOption(opt.value, opt.label, opt.$if)) ?? [];
|
|
93
|
+
this.options = definition.options?.map((opt) => new ConditionalConfigOption(opt.value, opt.label, opt.$if)) ?? [];
|
|
95
94
|
}
|
|
96
95
|
evaluateCondition(deviceId) {
|
|
97
96
|
if (!(0, ConditionalItem_1.conditionApplies)(this, deviceId))
|
|
@@ -172,7 +171,9 @@ ${errorPrefix}required property "#" missing in at least one entry of paramInform
|
|
|
172
171
|
${errorPrefix}found invalid param number "${paramNo}" in paramInformation`);
|
|
173
172
|
}
|
|
174
173
|
const keyNum = parseInt(match[1], 10);
|
|
175
|
-
const bitMask = match[2] != undefined
|
|
174
|
+
const bitMask = match[2] != undefined
|
|
175
|
+
? parseInt(match[2], 16)
|
|
176
|
+
: undefined;
|
|
176
177
|
const key = { parameter: keyNum, valueBitMask: bitMask };
|
|
177
178
|
if (!paramInformation.has(key))
|
|
178
179
|
paramInformation.set(key, []);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ParamInformation.js","sourceRoot":"","sources":["../../src/devices/ParamInformation.ts"],"names":[],"mappings":";;;AAAA,gDAK+B;AAC/B,4DAAgE;AAChE,8CAAmD;AACnD,uDAK2B;AAI3B,MAAa,2BAA2B;IAGvC,YACC,MAA+B,EAC/B,eAAuB,EACvB,YAAgC,EAChC,UAAsB;QAEtB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,iEAAiE;QACjE,IAAI,CAAC,SAAS,GAAG,UAAU,CAAC,GAAG,CAAC;QAEhC,IAAI,OAAO,UAAU,CAAC,KAAK,KAAK,QAAQ,EAAE;YACzC,IAAA,+BAAkB,EACjB,SAAS,EACT,kCAAkC,MAAM,CAAC,QAAQ;aACxC,eAAe,yBAAyB,CACjD,CAAC;SACF;QACD,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC;QAE9B,IACC,UAAU,CAAC,WAAW,IAAI,SAAS;
|
|
1
|
+
{"version":3,"file":"ParamInformation.js","sourceRoot":"","sources":["../../src/devices/ParamInformation.ts"],"names":[],"mappings":"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"}
|
package/build/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAErE,gEAAgE;AAChE,eAAO,MAAM,SAAS,QAAuC,CAAC;AAC9D,0EAA0E;AAC1E,wBAAgB,iBAAiB,IAAI,MAAM,GAAG,SAAS,CAEtD;AAED,wBAAgB,uBAAuB,CACtC,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,eAAe,CAAC,EAAE,MAAM,GACtB,CAAC,KAAK,EAAE,sBAAsB,KAAK,OAAO,CAoB5C;AAED,wBAAsB,wBAAwB,IAAI,OAAO,CAAC,MAAM,CAAC,CAEhE;AAED,MAAM,MAAM,2BAA2B,GACpC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAErE,gEAAgE;AAChE,eAAO,MAAM,SAAS,QAAuC,CAAC;AAC9D,0EAA0E;AAC1E,wBAAgB,iBAAiB,IAAI,MAAM,GAAG,SAAS,CAEtD;AAED,wBAAgB,uBAAuB,CACtC,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,eAAe,CAAC,EAAE,MAAM,GACtB,CAAC,KAAK,EAAE,sBAAsB,KAAK,OAAO,CAoB5C;AAED,wBAAsB,wBAAwB,IAAI,OAAO,CAAC,MAAM,CAAC,CAEhE;AAED,MAAM,MAAM,2BAA2B,GACpC;IACD,OAAO,EAAE,KAAK,CAAC;CACf,GACC;IACD,OAAO,EAAE,IAAI,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CAChB,CAAC;AAEH;;GAEG;AACH,wBAAsB,qBAAqB,CAC1C,MAAM,EAAE,YAAY,GAClB,OAAO,CAAC,2BAA2B,CAAC,CAwEtC;AAED,wBAAgB,cAAc,CAC7B,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,GACT,OAAO,CAKT"}
|
package/build/utils.js
CHANGED
|
@@ -48,8 +48,8 @@ function getDeviceEntryPredicate(manufacturerId, productType, productId, firmwar
|
|
|
48
48
|
return false;
|
|
49
49
|
if (firmwareVersion != undefined) {
|
|
50
50
|
// A firmware version was given, only look at files with a matching firmware version
|
|
51
|
-
return (semver.lte((0, shared_1.padVersion)(entry.firmwareVersion.min), (0, shared_1.padVersion)(firmwareVersion))
|
|
52
|
-
semver.gte((0, shared_1.padVersion)(entry.firmwareVersion.max), (0, shared_1.padVersion)(firmwareVersion)));
|
|
51
|
+
return (semver.lte((0, shared_1.padVersion)(entry.firmwareVersion.min), (0, shared_1.padVersion)(firmwareVersion))
|
|
52
|
+
&& semver.gte((0, shared_1.padVersion)(entry.firmwareVersion.max), (0, shared_1.padVersion)(firmwareVersion)));
|
|
53
53
|
}
|
|
54
54
|
return true;
|
|
55
55
|
};
|
|
@@ -125,8 +125,8 @@ async function syncExternalConfigDir(logger) {
|
|
|
125
125
|
}
|
|
126
126
|
exports.syncExternalConfigDir = syncExternalConfigDir;
|
|
127
127
|
function versionInRange(version, min, max) {
|
|
128
|
-
return (semver.gte((0, shared_1.padVersion)(version), (0, shared_1.padVersion)(min))
|
|
129
|
-
semver.lte((0, shared_1.padVersion)(version), (0, shared_1.padVersion)(max)));
|
|
128
|
+
return (semver.gte((0, shared_1.padVersion)(version), (0, shared_1.padVersion)(min))
|
|
129
|
+
&& semver.lte((0, shared_1.padVersion)(version), (0, shared_1.padVersion)(max)));
|
|
130
130
|
}
|
|
131
131
|
exports.versionInRange = versionInRange;
|
|
132
132
|
//# sourceMappingURL=utils.js.map
|
package/build/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAwD;AACxD,6CAA+B;AAC/B,gDAAwB;AACxB,+CAAiC;AAIjC,gEAAgE;AACnD,QAAA,SAAS,GAAG,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;AAC9D,0EAA0E;AAC1E,SAAgB,iBAAiB;IAChC,OAAO,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC;AAC5C,CAAC;AAFD,8CAEC;AAED,SAAgB,uBAAuB,CACtC,cAAsB,EACtB,WAAmB,EACnB,SAAiB,EACjB,eAAwB;IAExB,OAAO,CAAC,KAAK,EAAE,EAAE;QAChB,IAAI,KAAK,CAAC,cAAc,KAAK,IAAA,iBAAQ,EAAC,cAAc,CAAC;YAAE,OAAO,KAAK,CAAC;QACpE,IAAI,KAAK,CAAC,WAAW,KAAK,IAAA,iBAAQ,EAAC,WAAW,CAAC;YAAE,OAAO,KAAK,CAAC;QAC9D,IAAI,KAAK,CAAC,SAAS,KAAK,IAAA,iBAAQ,EAAC,SAAS,CAAC;YAAE,OAAO,KAAK,CAAC;QAC1D,IAAI,eAAe,IAAI,SAAS,EAAE;YACjC,oFAAoF;YACpF,OAAO,CACN,MAAM,CAAC,GAAG,CACT,IAAA,mBAAU,EAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,EACrC,IAAA,mBAAU,EAAC,eAAe,CAAC,CAC3B;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
package/build/utils_safe.js
CHANGED
|
@@ -6,8 +6,8 @@ exports.hexKeyRegexNDigits = /^0x[a-f0-9]+$/;
|
|
|
6
6
|
exports.hexKeyRegex4Digits = /^0x[a-f0-9]{4}$/;
|
|
7
7
|
exports.hexKeyRegex2Digits = /^0x[a-f0-9]{2}$/;
|
|
8
8
|
function throwInvalidConfig(which, reason) {
|
|
9
|
-
throw new safe_1.ZWaveError(`The ${which ? which + " " : ""}config file is malformed!`
|
|
10
|
-
(reason ? `\n${reason}` : ""), safe_1.ZWaveErrorCodes.Config_Invalid);
|
|
9
|
+
throw new safe_1.ZWaveError(`The ${which ? which + " " : ""}config file is malformed!`
|
|
10
|
+
+ (reason ? `\n${reason}` : ""), safe_1.ZWaveErrorCodes.Config_Invalid);
|
|
11
11
|
}
|
|
12
12
|
exports.throwInvalidConfig = throwInvalidConfig;
|
|
13
13
|
function tryParseCCId(from) {
|
package/build/utils_safe.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils_safe.js","sourceRoot":"","sources":["../src/utils_safe.ts"],"names":[],"mappings":";;;AAAA,8CAI6B;AAEhB,QAAA,kBAAkB,GAAG,eAAe,CAAC;AACrC,QAAA,kBAAkB,GAAG,iBAAiB,CAAC;AACvC,QAAA,kBAAkB,GAAG,iBAAiB,CAAC;AAEpD,SAAgB,kBAAkB,CAAC,KAAa,EAAE,MAAe;IAChE,MAAM,IAAI,iBAAU,CACnB,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,2BAA2B;
|
|
1
|
+
{"version":3,"file":"utils_safe.js","sourceRoot":"","sources":["../src/utils_safe.ts"],"names":[],"mappings":";;;AAAA,8CAI6B;AAEhB,QAAA,kBAAkB,GAAG,eAAe,CAAC;AACrC,QAAA,kBAAkB,GAAG,iBAAiB,CAAC;AACvC,QAAA,kBAAkB,GAAG,iBAAiB,CAAC;AAEpD,SAAgB,kBAAkB,CAAC,KAAa,EAAE,MAAe;IAChE,MAAM,IAAI,iBAAU,CACnB,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,2BAA2B;UACvD,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAChC,sBAAe,CAAC,cAAc,CAC9B,CAAC;AACH,CAAC;AAND,gDAMC;AAED,SAAgB,YAAY,CAAC,IAAY;IACxC,IAAI,IAAwB,CAAC;IAC7B,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QACvB,gBAAgB;QAChB,IAAI,GAAG,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;KAC1B;SAAM,IAAI,0BAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QACzC,oBAAoB;QACpB,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;KACnC;SAAM,IAAI,IAAI,IAAI,qBAAc,EAAE;QAClC,UAAU;QACV,OAAQ,qBAAsB,CAAC,IAAI,CAAC,CAAC;KACrC;IAED,IAAI,IAAI,IAAI,SAAS,IAAI,IAAI,IAAI,qBAAc,EAAE;QAChD,wBAAwB;QACxB,OAAO,IAAI,CAAC;KACZ;AACF,CAAC;AAjBD,oCAiBC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
{
|
|
2
|
+
// TODO: Inherit from the root config once supported by dprint
|
|
3
|
+
"lineWidth": 120,
|
|
4
|
+
"useTabs": true,
|
|
5
|
+
"indentWidth": 4,
|
|
6
|
+
"newLineKind": "lf",
|
|
7
|
+
|
|
8
|
+
"json": {},
|
|
9
|
+
|
|
10
|
+
"includes": ["*.json", "devices/**/*.json"],
|
|
11
|
+
|
|
12
|
+
"plugins": ["https://plugins.dprint.dev/json-0.17.4.wasm"]
|
|
13
|
+
}
|
|
@@ -155,9 +155,13 @@
|
|
|
155
155
|
|
|
156
156
|
"enable_scene_control": {
|
|
157
157
|
"$import": "~/templates/master_template.json#base_enable_disable",
|
|
158
|
-
"label": "
|
|
158
|
+
"label": "Scene Control",
|
|
159
159
|
"description": "Enable or disable scene control functionality for quick double tap triggers."
|
|
160
160
|
},
|
|
161
|
+
"enable_scene_control_3way": {
|
|
162
|
+
"$import": "~/templates/master_template.json#base_enable_disable",
|
|
163
|
+
"label": "Scene Control: Remote 3-Way Switch"
|
|
164
|
+
},
|
|
161
165
|
"led_indicator_color": {
|
|
162
166
|
"label": "LED Indicator Color",
|
|
163
167
|
"valueSize": 1,
|
|
@@ -208,6 +212,12 @@
|
|
|
208
212
|
}
|
|
209
213
|
]
|
|
210
214
|
},
|
|
215
|
+
"led_confirm_config_change": {
|
|
216
|
+
"$import": "~/templates/master_template.json#base_enable_disable_inverted",
|
|
217
|
+
"label": "LED Indicator: Confirm Configuration Change",
|
|
218
|
+
"description": "Disable this feature when using the LED indicators in automations.",
|
|
219
|
+
"defaultValue": 0
|
|
220
|
+
},
|
|
211
221
|
"smart_switch_mode_reporting": {
|
|
212
222
|
"label": "Smart Bulb Mode: Reporting Behavior",
|
|
213
223
|
"valueSize": 1,
|
|
@@ -1,7 +1,19 @@
|
|
|
1
|
+
// Firmware versions
|
|
2
|
+
// 1.10 -> 1.20 -> (1.30 = 2.10)
|
|
3
|
+
|
|
4
|
+
// Conditionals:
|
|
5
|
+
// 800 series: firmwareVersion >= 2.10
|
|
6
|
+
|
|
1
7
|
{
|
|
2
8
|
"manufacturer": "Zooz",
|
|
3
9
|
"manufacturerId": "0x027a",
|
|
4
|
-
"label":
|
|
10
|
+
"label": [
|
|
11
|
+
{
|
|
12
|
+
"$if": "firmwareVersion >= 2.10",
|
|
13
|
+
"value": "ZEN04 800LR"
|
|
14
|
+
},
|
|
15
|
+
"ZEN04"
|
|
16
|
+
],
|
|
5
17
|
"description": "Indoor Smart Plug",
|
|
6
18
|
"devices": [
|
|
7
19
|
{
|
|
@@ -1,8 +1,21 @@
|
|
|
1
|
+
// The firmware versions on this device are a mess
|
|
2
|
+
// 1.1 -> (10.0 = 2.0) -> (10.10 = 2.10) -> (10.20 = 2.20 = 3.10) -> 3.20
|
|
3
|
+
|
|
4
|
+
// Conditionals:
|
|
5
|
+
// 2.0 / 10.0 and later: firmwareVersion >= 2.0
|
|
6
|
+
// 800 series: firmwareVersion >= 3.10 && firmwareVersion < 10.0
|
|
7
|
+
|
|
1
8
|
{
|
|
2
9
|
"manufacturer": "Zooz",
|
|
3
10
|
"manufacturerId": "0x027a",
|
|
4
|
-
"label":
|
|
5
|
-
|
|
11
|
+
"label": [
|
|
12
|
+
{
|
|
13
|
+
"$if": "firmwareVersion >= 3.10 && firmwareVersion < 10.0",
|
|
14
|
+
"value": "ZEN71 800LR"
|
|
15
|
+
},
|
|
16
|
+
"ZEN71"
|
|
17
|
+
],
|
|
18
|
+
"description": "ON/OFF Switch",
|
|
6
19
|
"devices": [
|
|
7
20
|
{
|
|
8
21
|
"productType": "0x7000",
|
|
@@ -76,7 +89,6 @@
|
|
|
76
89
|
},
|
|
77
90
|
{
|
|
78
91
|
"#": "17",
|
|
79
|
-
// This parameter was added in firmware 10.0, which the 2.0 firmware is based on
|
|
80
92
|
"$if": "firmwareVersion >= 2.0",
|
|
81
93
|
"$import": "templates/zooz_template.json#local_programming"
|
|
82
94
|
}
|
|
@@ -1,16 +1,24 @@
|
|
|
1
1
|
// The firmware versions on this device are a mess
|
|
2
|
-
// 1.1 -> 10.0 -> (10.20 = 2.0) -> (10.30 = 2.10)
|
|
2
|
+
// 1.1 -> 10.0 -> (10.20 = 2.0) -> (10.30 = 2.10) -> (10.40 = 2.20 = 3.10) -> 3.20
|
|
3
3
|
|
|
4
4
|
// Conditionals:
|
|
5
5
|
// 10.0 and later: firmwareVersion >= 10.0
|
|
6
6
|
// 10.20 and later: firmwareVersion >= 2.0 && firmwareVersion < 10.0 || firmwareVersion >= 10.20
|
|
7
7
|
// 10.30 and later: firmwareVersion >= 2.10 && firmwareVersion < 10.0 || firmwareVersion >= 10.30
|
|
8
|
+
// 10.40 and later: firmwareVersion >= 2.20 && firmwareVersion < 10.0 || firmwareVersion >= 10.40
|
|
9
|
+
// 800 series: firmwareVersion >= 3.10 && firmwareVersion < 10.0
|
|
8
10
|
|
|
9
11
|
{
|
|
10
12
|
"manufacturer": "Zooz",
|
|
11
13
|
"manufacturerId": "0x027a",
|
|
12
|
-
"label":
|
|
13
|
-
|
|
14
|
+
"label": [
|
|
15
|
+
{
|
|
16
|
+
"$if": "firmwareVersion >= 3.10 && firmwareVersion < 10.0",
|
|
17
|
+
"value": "ZEN72 800LR"
|
|
18
|
+
},
|
|
19
|
+
"ZEN72"
|
|
20
|
+
],
|
|
21
|
+
"description": "Dimmer Switch",
|
|
14
22
|
"devices": [
|
|
15
23
|
{
|
|
16
24
|
"productType": "0x7000",
|
|
@@ -59,6 +67,11 @@
|
|
|
59
67
|
"#": "24",
|
|
60
68
|
"$import": "templates/zooz_template.json#led_indicator_brightness"
|
|
61
69
|
},
|
|
70
|
+
{
|
|
71
|
+
"#": "32",
|
|
72
|
+
"$if": "firmwareVersion >= 2.20 && firmwareVersion < 10.0 || firmwareVersion >= 10.40",
|
|
73
|
+
"$import": "templates/zooz_template.json#led_confirm_config_change"
|
|
74
|
+
},
|
|
62
75
|
{
|
|
63
76
|
"#": "3",
|
|
64
77
|
"$import": "templates/zooz_template.json#auto_off_timer_0x_3x_7x"
|
|
@@ -150,6 +163,11 @@
|
|
|
150
163
|
"#": "13",
|
|
151
164
|
"$import": "templates/zooz_template.json#enable_scene_control"
|
|
152
165
|
},
|
|
166
|
+
{
|
|
167
|
+
"#": "31",
|
|
168
|
+
"$if": "firmwareVersion >= 2.20 && firmwareVersion < 10.0 || firmwareVersion >= 10.40",
|
|
169
|
+
"$import": "templates/zooz_template.json#enable_scene_control_3way"
|
|
170
|
+
},
|
|
153
171
|
{
|
|
154
172
|
"#": "15",
|
|
155
173
|
"$import": "~/templates/master_template.json#smart_switch_mode_0-2"
|
|
@@ -1,8 +1,21 @@
|
|
|
1
|
+
// The firmware versions on this device are a mess
|
|
2
|
+
// 1.2 -> (10.0 = 2.0) -> (10.10 = 2.10) -> (10.20 = 2.20 = 3.10) -> 3.20
|
|
3
|
+
|
|
4
|
+
// Conditionals:
|
|
5
|
+
// 2.0 / 10.0 and later: firmwareVersion >= 2.0
|
|
6
|
+
// 800 series: firmwareVersion >= 3.10 && firmwareVersion < 10.0
|
|
7
|
+
|
|
1
8
|
{
|
|
2
9
|
"manufacturer": "Zooz",
|
|
3
10
|
"manufacturerId": "0x027a",
|
|
4
|
-
"label":
|
|
5
|
-
|
|
11
|
+
"label": [
|
|
12
|
+
{
|
|
13
|
+
"$if": "firmwareVersion >= 3.10 && firmwareVersion < 10.0",
|
|
14
|
+
"value": "ZEN76 800LR"
|
|
15
|
+
},
|
|
16
|
+
"ZEN76"
|
|
17
|
+
],
|
|
18
|
+
"description": "S2 ON/OFF Switch",
|
|
6
19
|
"devices": [
|
|
7
20
|
{
|
|
8
21
|
"productType": "0x7000",
|
|
@@ -1,17 +1,27 @@
|
|
|
1
1
|
// The firmware versions on this device are a mess
|
|
2
|
-
// 1.2 -> 1.3 -> 10.0 -> (10.10 = 2.0) -> (10.20 = 2.10 = 3.0)
|
|
2
|
+
// 1.2 -> 1.3 -> 10.0 -> (10.10 = 2.0) -> (10.20 = 2.10 = 3.0)
|
|
3
|
+
// -> (10.30 = 2.20 = 3.10) -> (10.40 = 2.30 = 3.20 = 4.10)
|
|
4
|
+
// -> 4.20
|
|
3
5
|
|
|
4
6
|
// Conditionals:
|
|
5
7
|
// 10.0 and later: firmwareVersion >= 2.0
|
|
6
8
|
// 10.10 and later: firmwareVersion >= 10.10 || firmwareVersion >= 2.0 && firmwareVersion < 10.0
|
|
7
9
|
// 10.20 and later: firmwareVersion >= 10.20 || firmwareVersion >= 2.10 && firmwareVersion < 10.0
|
|
8
|
-
// 10.30 and later: firmwareVersion >= 10.
|
|
10
|
+
// 10.30 and later: firmwareVersion >= 10.30 || firmwareVersion >= 2.20 && firmwareVersion < 3.0 || firmwareVersion >= 3.10
|
|
11
|
+
// 10.40 and later: firmwareVersion >= 10.40 || firmwareVersion >= 2.30 && firmwareVersion < 3.0 || firmwareVersion >= 3.20
|
|
12
|
+
// 800 series: firmwareVersion >= 4.10 && firmwareVersion < 10.0
|
|
9
13
|
|
|
10
14
|
{
|
|
11
15
|
"manufacturer": "Zooz",
|
|
12
16
|
"manufacturerId": "0x027a",
|
|
13
|
-
"label":
|
|
14
|
-
|
|
17
|
+
"label": [
|
|
18
|
+
{
|
|
19
|
+
"$if": "firmwareVersion >= 4.10 && firmwareVersion < 10.0",
|
|
20
|
+
"value": "ZEN77 800LR"
|
|
21
|
+
},
|
|
22
|
+
"ZEN77"
|
|
23
|
+
],
|
|
24
|
+
"description": "S2 Dimmer Switch",
|
|
15
25
|
"devices": [
|
|
16
26
|
{
|
|
17
27
|
"productType": "0x7000",
|
|
@@ -55,6 +65,11 @@
|
|
|
55
65
|
"#": "24",
|
|
56
66
|
"$import": "templates/zooz_template.json#led_indicator_brightness"
|
|
57
67
|
},
|
|
68
|
+
{
|
|
69
|
+
"#": "32",
|
|
70
|
+
"$if": "firmwareVersion >= 10.40 || firmwareVersion >= 2.30 && firmwareVersion < 3.0 || firmwareVersion >= 3.20",
|
|
71
|
+
"$import": "templates/zooz_template.json#led_confirm_config_change"
|
|
72
|
+
},
|
|
58
73
|
{
|
|
59
74
|
"#": "3",
|
|
60
75
|
"$import": "templates/zooz_template.json#auto_off_timer_0x_3x_7x"
|
|
@@ -65,28 +80,28 @@
|
|
|
65
80
|
},
|
|
66
81
|
{
|
|
67
82
|
"#": "7[0x01]",
|
|
68
|
-
"$if": "firmwareVersion >= 10.
|
|
83
|
+
"$if": "firmwareVersion >= 10.30 || firmwareVersion >= 2.20 && firmwareVersion < 3.0 || firmwareVersion >= 3.10",
|
|
69
84
|
"$import": "~/templates/master_template.json#base_enable_disable",
|
|
70
85
|
"label": "Control Groups 2 and 3 With Physical Switch",
|
|
71
86
|
"defaultValue": 1
|
|
72
87
|
},
|
|
73
88
|
{
|
|
74
89
|
"#": "7[0x02]",
|
|
75
|
-
"$if": "firmwareVersion >= 10.
|
|
90
|
+
"$if": "firmwareVersion >= 10.30 || firmwareVersion >= 2.20 && firmwareVersion < 3.0 || firmwareVersion >= 3.10",
|
|
76
91
|
"$import": "~/templates/master_template.json#base_enable_disable",
|
|
77
92
|
"label": "Control Groups 2 and 3 With Connected 3-Way Switch",
|
|
78
93
|
"defaultValue": 1
|
|
79
94
|
},
|
|
80
95
|
{
|
|
81
96
|
"#": "7[0x04]",
|
|
82
|
-
"$if": "firmwareVersion >= 10.
|
|
97
|
+
"$if": "firmwareVersion >= 10.30 || firmwareVersion >= 2.20 && firmwareVersion < 3.0 || firmwareVersion >= 3.10",
|
|
83
98
|
"$import": "~/templates/master_template.json#base_enable_disable",
|
|
84
99
|
"label": "Control Groups 2 and 3 With Z-Wave Commands",
|
|
85
100
|
"defaultValue": 1
|
|
86
101
|
},
|
|
87
102
|
{
|
|
88
103
|
"#": "7[0x08]",
|
|
89
|
-
"$if": "firmwareVersion >= 10.
|
|
104
|
+
"$if": "firmwareVersion >= 10.30 || firmwareVersion >= 2.20 && firmwareVersion < 3.0 || firmwareVersion >= 3.10",
|
|
90
105
|
"$import": "~/templates/master_template.json#base_enable_disable",
|
|
91
106
|
"label": "Control Groups 2 and 3 With On/Off Timers",
|
|
92
107
|
"defaultValue": 1
|