Some configuration improvements

README.md

@@ -97,7 +97,7 @@ mqtt: {
     host: 'localhost',
     port: 1883,
     user: 'user',
-  password: 'password'
+    password: 'password',
 },
 ```
 
@@ -120,7 +120,7 @@ clients: [
         name: 'Yandex',
         clientId: 'client',
         clientSecret: 'secret',
-    isTrusted: false
+        isTrusted: false,
     },
 ],
 ```
@@ -129,16 +129,16 @@ clients: [
 ```
 users: [
     {
-    id: "1",
+        id: '1',
-    username: "admin",
+        username: 'admin',
-    password: "admin",
+        password: 'admin',
-    name: "Administrator"
+        name: 'Administrator',
     },
     {
-    id: "2",
+        id: '2',
-    username: "user1",
+        username: 'user1',
-    password: "user1",
+        password: 'user1',
-    name: "User"
+        name: 'User',
     },
 ],
 ```
@@ -147,73 +147,125 @@ users: [
 ```
 devices: [
     {
-    id: "lvr-003-switch",
+        id: 'haw-002-switch',
-    name: "Основной свет",
+        name: 'Свет в коридоре',
-    room: "Гостиная",
+        room: 'Коридор',
-    type: "devices.types.light",
+        type: 'devices.types.light',
+        allowedUsers: ['2'],
         mqtt: [
             {
-        instance: "on",
+                instance: 'on',
-        set: "/yandex/controls/light_LvR_003/state/on",
+                set: '/yandex/controls/light_HaW_002/on',
-        state: "/yandex/controls/light_LvR_003/state"
+                state: '/yandex/controls/light_HaW_002/on/state',
             },
         ],
-    /* mapping значений между yandex и УД */
-    valueMapping: [
-      {
-        type: "on_off",
-        mapping: [[false, true], [0, 1]] // [yandex, mqtt]
-      }
-    ],
         capabilities: [
             {
-        type: "devices.capabilities.on_off",
+                type: 'devices.capabilities.on_off',
                 retrievable: true,
             },
         ],
     },
 
     {
-    id: "lvr-001-weather",
+        id: 'lvr-003-switch',
-    name: "В гостиной",
+        name: 'Основной свет',
-    room: "Гостиная",
+        room: 'Гостиная',
-    type: "devices.types.sensor",
+        type: 'devices.types.light',
+        allowedUsers: ['2'],
         mqtt: [
             {
-        instance: "temperature",
+                instance: 'on',
-        state: "/yandex/sensors/LvR_001_Weather/temperature"
+                set: '/yandex/controls/light_LvR_003/on',
+                state: '/yandex/controls/light_LvR_003/on/state',
+            },
+        ],
+        valueMapping: [
+            {
+                type: 'on_off',
+                mapping: [[false, true], [0, 1]], // [yandex, mqtt]
+            },
+        ],
+        capabilities: [
+            {
+                type: 'devices.capabilities.on_off',
+                retrievable: true,
+            },
+        ],
+    },
+
+    {
+        id: 'lvr-001-weather',
+        name: 'В гостиной',
+        room: 'Гостиная',
+        type: 'devices.types.sensor',
+        allowedUsers: ['2'],
+        mqtt: [
+            {
+                instance: 'temperature',
+                state: '/yandex/sensors/LvR_001_Weather/temperature',
             },
             {
-        instance: "humidity",
+                instance: 'humidity',
-        state: "/yandex/sensors/LvR_001_Weather/humidity"
+                state: '/yandex/sensors/LvR_001_Weather/humidity',
-      }
+            },
         ],
         properties: [
             {
-        type: "devices.properties.float",
+                type: 'devices.properties.float',
                 retrievable: true,
                 parameters: {
-          instance: "temperature",
+                    instance: 'temperature',
-          unit: "unit.temperature.celsius"
+                    unit: 'unit.temperature.celsius',
                 },
             },
             {
-        type: "devices.properties.float",
+                type: 'devices.properties.float',
                 retrievable: true,
                 parameters: {
-          instance: "humidity",
+                    instance: 'humidity',
-          unit: "unit.percent"
+                    unit: 'unit.percent',
                 },
-        /* Блок state указывать не обязательно */
+            },
-        state: {
+        ],
-          instance: "humidity",
+    },
-          value: 0
+
-        }
+    {
-      }
+        id: 'plug-001-flower',
-    ] 
+        name: 'Розетка для цветка',
+        room: 'Гостиная',
+        type: 'devices.types.socket',
+        allowedUsers: ['2'],
+        mqtt: [
+            {
+                instance: 'on',
+                set: '/yandex/controls/socket_LvR_002/on',
+                state: '/yandex/controls/socket_LvR_002/on/state',
+            },
+            {
+                instance: 'power',
+                state: '/yandex/controls/socket_LvR_002/power',
+            },
+        ],
+        capabilities: [
+            {
+                type: 'devices.capabilities.on_off',
+                retrievable: true,
+            },
+        ],
+        properties: [
+            {
+                type: 'devices.properties.float',
+                retrievable: true,
+                parameters: {
+                    instance: 'power',
+                    unit: 'unit.watt',
+                },
+            },
+        ],
     },
     /* --- end */
-]
+],
 ```
 *Рекомендую указывать id в конфиге, чтобы исключить "наложение" новых устройств на "старые", которые уже добавлены в навык.*