Merge 1.1.x into master.

sbozarth · Nov 15, 2020 · 9c27a33 · 9c27a33
2 parents f25065c + 40fb81e
commit 9c27a33
Show file tree

Hide file tree

Showing 12 changed files with 804 additions and 702 deletions.
diff --git a/config.schema.json b/config.schema.json
@@ -15,6 +15,13 @@
         "minlength": 1,
         "required": true
       },
+      "lc7001-password": {
+        "title": "Password",
+        "type": "string",
+        "default": "",
+        "description": "Password assigned to LC7001 via the Legrand Lighting Control app. (Pre-2020 configurations may not have a password.)",
+        "required": false
+      },
       "lc7001-hostname": {
         "title": "Hostname",
         "type": "string",
@@ -112,6 +119,7 @@
   },
   "form": [
     "name",
+    "lc7001-password",
     "lc7001-hostname",
     {
       "key": "lc7001-port",

diff --git a/lib/lc7001.d.ts b/lib/lc7001.d.ts
@@ -10,6 +10,8 @@ export declare class LC7001 {
     private interface;
     private readonly tcpOptions;
     private _commandID;
+    private passwordHash;
+    private isAuthenticated;
     private readonly delimiter;
     private tcpBuffer;
     private commandQueue;
@@ -55,7 +57,8 @@ export declare class LC7001 {
     private lastPingSeq;
     private lastPingTime;
     private lastSysPropTime;
-    constructor(platform: PlatformLC7001, tcpOptions: TcpSocketConnectOpts, delimiter?: string);
+    constructor(platform: PlatformLC7001, password: string | undefined, tcpOptions: TcpSocketConnectOpts, delimiter?: string);
+    private answerChallenge;
     private checkInitialized;
     private get commandID();
     private cmdGetAccessory;

diff --git a/lib/lc7001.d.ts.map b/lib/lc7001.d.ts.map
diff --git a/lib/lc7001.js b/lib/lc7001.js
diff --git a/lib/lc7001.js.map b/lib/lc7001.js.map
diff --git a/lib/platform.d.ts b/lib/platform.d.ts
@@ -16,6 +16,7 @@ export declare class PlatformLC7001 implements DynamicPlatformPlugin {
     readonly logEliotErrors: boolean;
     private readonly useOldUUID;
     private lc7001;
+    private readonly password;
     private readonly tcpOptions;
     private readonly jsonDelimiter;
     constructor(log: Logger, config: PlatformConfig, api: API);