iobroker.zigbee 1.6.8 → 1.6.12

package/README.md

@@ -112,10 +112,20 @@ You can thank the authors by these links:
 
 ## Changelog
 
+### 1.6.12 (2022-01)
+* (asgothian) Groups were newly revised (read here https://github.com/ioBroker/ioBroker.zigbee/pull/1327)
+
+
+### 1.6.9 (2021-12)
+* (simatec) fix admin Dark-Mode
+* (asgothian) Expose Access Handling
+* (arteck) translations
+* (asgothian) fix groups
+* (agross) use different normalization rules
+
 ### 1.6.1 (2021-08)
 * (kirovilya) herdsman compatibility
 
-
 ### 1.6.0 (2021-08-09)
 ## Attention! Attention! Attention! Attention! Attention! Attention! Attention!
 

package/admin/admin.js

@@ -146,7 +146,7 @@ function getGroupCard(dev) {
         info = info.concat(`<li><span class="labelinfo">No devices in group</span></li>`);
     } else {
         for (let m=0;m < dev.memberinfo.length; m++) {
-            info = info.concat(`<li><span class="labelinfo">${dev.memberinfo[m].name}</span><span> ...${dev.memberinfo[m].ieee.slice(-4)}</span></li>`);
+            info = info.concat(`<li><span align:"left">${dev.memberinfo[m].device}.${dev.memberinfo[m].epid}</span><span align:"right"> ...${dev.memberinfo[m].ieee.slice(-4)}</span></li>`);
         }
         memberCount = (dev.memberinfo.length<8?dev.memberinfo.length:7);
     };
@@ -258,6 +258,9 @@ function getCard(dev) {
                                 <button name="edit" class="right btn-flat btn-small">
                                     <i class="material-icons icon-green">edit</i>
                                 </button>
+                                <button name="reconfigure" class="right btn-flat btn-small tooltipped" title="Reconfigure">
+                                    <i class="material-icons icon-red">sync</i>
+                                </button>
                                 ${permitJoinBtn}
                             </div>
                         </div>
@@ -348,25 +351,96 @@ function cleanConfirmation() {
     Materialize.updateTextFields();
 }
 
+function EndPointIDfromEndPoint(ep)
+{
+  if (ep && ep.deviceIeeeAddress && ep.ID)
+    return `${ep.deviceIeeeAddress}:${ep.ID}`;
+  return 'unidentified';
+}
+
 function editName(id, name) {
+  console.log('editName called with '+name);
     const dev = devices.find((d) => d._id == id);
     $('#modaledit').find("input[id='d_name']").val(name);
-    if (dev.info && dev.info.device._type == 'Router') {
-        list2select('#d_groups', groups, devGroups[id] || []);
-        $('#modaledit').find('.input-field.groups').removeClass('hide');
-    } else {
-        $('#modaledit').find('.input-field.groups').addClass('hide');
-    }
+//    if (dev.info && dev.info.device._type == 'Router') {
+      const groupables = [];
+      if (dev && dev.info && dev.info.endpoints) {
+        for (const ep of dev.info.endpoints) {
+          if (ep.inputClusters.includes(4)) {
+            groupables.push({ epid:EndPointIDfromEndPoint(ep), ep:ep, memberOf:[]});
+          }
+        }
+      }
+      const numEP = groupables.length;
+//      console.log('groupables: '+JSON.stringify(groupables));
+      $('#modaledit').find('.row.epid0').addClass('hide');
+      $('#modaledit').find('.row.epid1').addClass('hide');
+      $('#modaledit').find('.row.epid2').addClass('hide');
+      $('#modaledit').find('.row.epid3').addClass('hide');
+      if (numEP > 0) {
+        // go through all the groups. Find the ones to list for each groupable
+        if (numEP == 1) {
+          $('#modaledit').find('.endpointid').addClass('hide');
+        }
+        else {
+          $('#modaledit').find('.endpointid').removeClass('hide');
+        }
+        for (const d of devices) {
+          if (d && d.common && d.common.type == 'group') {
+            if (d.hasOwnProperty("memberinfo")) {
+              for (const member of d.memberinfo) {
+                const epid = EndPointIDfromEndPoint(member.ep)
+                for (var i=0;i<groupables.length;i++) {
+                  if (groupables[i].epid == epid) {
+                    groupables[i].memberOf.push(d.native.id.replace('group_', ''));
+                  }
+                }
+              }
+            }
+          }
+        }
+        console.log("groupables: " + JSON.stringify(groupables));
+        for (var i = 0;i<groupables.length;i++)
+        {
+          if (i > 1) {
+            $('#modaledit').find("translate.device_with_endpoint").innerHtml = name + ' ' + groupables[i].epid;
+          }
+          $('#modaledit').find('.row.epid'+i).removeClass('hide');
+          list2select('#d_groups_ep'+i, groups, groupables[i].memberOf || []);
+        }
+      }
+//    } else {
+//        $('#modaledit').find('.input-field.endpoints').addClass('hide');
+//        $('#modaledit').find('.input-field.groups').addClass('hide');
+//    }
     $("#modaledit a.btn[name='save']").unbind('click');
     $("#modaledit a.btn[name='save']").click(() => {
-        const newName = $('#modaledit').find("input[id='d_name']").val(),
-            newGroups = $('#d_groups').val();
-        updateDev(id, newName, newGroups);
+        const newName = $('#modaledit').find("input[id='d_name']").val();
+        const groupsbyid = {};
+        if (groupables.length  > 0) {
+          for (var i = 0;i<groupables.length;i++) {
+            const ng = $('#d_groups_ep'+i).val();
+            if (ng.toString() != groupables[i].memberOf.toString())
+            groupsbyid[groupables[i].ep.ID] = GenerateGroupChange(groupables[i].memberOf, ng);
+          }
+        }
+        console.log('grpid ' + JSON.stringify(groupsbyid));
+        updateDev(id, newName, groupsbyid);
     });
     $('#modaledit').modal('open');
     Materialize.updateTextFields();
 }
 
+function GenerateGroupChange(oldmembers, newmembers)
+{
+  let grpchng = [];
+  for (const oldg of oldmembers)
+    if (!newmembers.includes(oldg)) grpchng.push('-'+oldg);
+  for (const newg of newmembers)
+    if (!oldmembers.includes(newg)) grpchng.push(newg)
+  return grpchng;
+}
+
 function deleteDevice(id, force) {
     sendTo(namespace, 'deleteDevice', {id: id, force: force}, function (msg) {
         closeWaitingDialog();
@@ -529,7 +603,7 @@ function showDevices() {
         const dev_block = $(this).parents('div.device'),
             id = dev_block.attr('id').replace(namespace+'.group_', ''),
             name = getDevName(dev_block);
-        editGroupName(id, name);
+        editGroupName(id, name, false);
     });
     $("button.btn-floating[name='join']").click(function() {
         const dev_block = $(this).parents('div.device');
@@ -548,6 +622,10 @@ function showDevices() {
     $("a.btn-flat[name='close']").click((e) => {
         closeReval(e);
     });
+    $(".card-reveal-buttons button[name='reconfigure']").click(function() {
+        const dev_block = $(this).parents('div.device');
+        reconfigureDlg(getDevId(dev_block));
+    });
 
     showNetworkMap(devices, map);
     translateAll();
@@ -763,11 +841,11 @@ function load(settings, onChange) {
 
     $('#add_group').click(function() {
         const maxind = parseInt(Object.getOwnPropertyNames(groups).reduce((a,b) => a>b ? a : b, 0));
-        editGroupName(maxind+1, '');
+        editGroupName(maxind+1, 'Group ' + maxind+1, true);
     });
     $('#add_grp_btn').click(function() {
         const maxind = parseInt(Object.getOwnPropertyNames(groups).reduce((a,b) => a>b ? a : b, 0));
-        editGroupName(maxind+1, '');
+        editGroupName(maxind+1, 'Group ' + maxind+1, true);
         getDevices();
     });
 
@@ -1706,7 +1784,7 @@ function showGroups() {
     $("a.btn-floating[name='groupedit']").click(function() {
         const index = $(this).attr('id'),
             name = groups[index];
-        editGroupName(index, name);
+        editGroupName(index, name, false);
     });
     $("a.btn-floating[name='groupdelete']").click(function() {
         const index = $(this).attr('id'),
@@ -1715,8 +1793,35 @@ function showGroups() {
     });
 }
 
-function editGroupName(id, name) {
+function editGroupName(id, name, isnew) {
+    //const dev = devices.find((d) => d._id == id);
+    //console.log('devices: '+ JSON.stringify(devices));
+    const groupables = [];
+    for (const d of devices) {
+      if (d && d.info && d.info.endpoints) {
+        for (const ep of d.info.endpoints) {
+          if (ep.inputClusters.includes(4))
+          {
+            groupables.push(ep);
+          }
+        }
+      }
+      //console.log('device ' + JSON.stringify(d));
+    }
+
     //var text = 'Enter new name for "'+name+'" ('+id+')?';
+    if (isnew) {
+          $('#groupedit').find('.editgroup').addClass('hide');
+          $('#groupedit').find('.addgroup').removeClass('hide');
+          $('#groupedit').find('.input-field.members').addClass('hide');
+          $('#groupedit').find('.input-field.groupid').removeClass('hide');
+    }
+    else {
+          $('#groupedit').find('.editgroup').removeClass('hide');
+          $('#groupedit').find('.addgroup').addClass('hide');
+          $('#groupedit').find('.input-field.members').removeClass('hide');
+          $('#groupedit').find('.input-field.groupid').addClass('hide');
+    }
     $('#groupedit').find("input[id='g_index']").val(id);
     $('#groupedit').find("input[id='g_name']").val(name);
     $("#groupedit a.btn[name='save']").unbind('click');
@@ -1760,6 +1865,21 @@ function updateDev(id, newName, newGroups) {
     if (dev && dev.common.name != newName) {
         renameDevice(id, newName);
     }
+    const keys = Object.keys(newGroups)
+    if (keys && keys.length)
+    {
+      sendTo(namespace, 'updateGroupMembership', { id: id, groups: newGroups }, function (msg) {
+          if (msg && msg.error) {
+                  showMessage(msg.error, _('Error'));
+              }
+              else {
+              // save dev-groups on success
+                  dev.groups = newGroups;
+              }
+          showDevices();
+      });
+    }
+/*
     if (dev.info.device._type == 'Router') {
         const oldGroups = devGroups[id] || [];
         if (oldGroups.toString() != newGroups.toString()) {
@@ -1776,6 +1896,7 @@ function updateDev(id, newName, newGroups) {
             });
         }
     }
+*/
 }
 
 function resetConfirmation() {
@@ -2170,7 +2291,7 @@ function genDevInfo(device) {
     const dev = (device && device.info) ? device.info.device : undefined;
     const mapped = (device && device.info) ? device.info.mapped : undefined;
     if (!dev) return `<div class="truncate">No info</div>`;
-    const genRow = function(name, value) {
+    const genRow = function(name, value, refresh) {
         if (value === undefined) {
             return '';
         } else {
@@ -2234,7 +2355,7 @@ function genDevInfo(device) {
                     ${genRow('date code', dev._dateCode)}
                     ${genRow('build', dev._softwareBuildID)}
                     ${genRow('interviewed', dev._interviewCompleted)}
-                    ${genRow('configured', (dev.meta.configured === 1))}
+                    ${genRow('configured', (dev.meta.configured === 1), true)}
                 </ul>
             </div>
         </div>
@@ -2250,17 +2371,19 @@ function showDevInfo(id){
     $('#modaldevinfo').modal('open');
 }
 
+let waitingTimeout, waitingInt;
 
 function showWaitingDialog(text, timeout){
     let countDown = timeout;
-    const waitingInt = setInterval(function() {
+    waitingInt = setInterval(function() {
         countDown -= 1;
         const percent = 100-100*countDown/timeout;
         $('#waiting_progress_line').css('width', `${percent}%`);
     }, 1000);
-    setTimeout(function() {
+    waitingTimeout = setTimeout(function() {
         $('#waiting_progress_line').css('width', `0%`);
         clearTimeout(waitingInt);
+        clearTimeout(waitingTimeout);
         $('#modalWaiting').modal('close');
     }, timeout*1000);
     $('#waiting_message').text(text);
@@ -2268,6 +2391,8 @@ function showWaitingDialog(text, timeout){
 }
 
 function closeWaitingDialog(){
+    if (waitingInt) clearTimeout(waitingInt);
+    if (waitingTimeout) clearTimeout(waitingTimeout);
     $('#modalWaiting').modal('close');
 }
 
@@ -2702,3 +2827,26 @@ function removeDevice(id) {
         }
     }
 }
+
+function reconfigureDlg(id) {
+    const text = translateWord(`Do you really want to reconfigure device?`);
+    $('#modalreconfigure').find('p').text(text);
+    $("#modalreconfigure a.btn[name='yes']").unbind('click');
+    $("#modalreconfigure a.btn[name='yes']").click(() => {
+        reconfigureDevice(id, force);
+    });
+    $('#modalreconfigure').modal('open');
+    Materialize.updateTextFields();
+}
+
+function reconfigureDevice(id) {
+    sendTo(namespace, 'reconfigure', {id: id}, function (msg) {
+        closeWaitingDialog();
+        if (msg) {
+            if (msg.error) {
+                showMessage(msg.error, _('Error'));
+            }
+        }
+    });
+    showWaitingDialog('Device is being reconfigure', 30);
+}

package/admin/index_m.html

@@ -370,7 +370,7 @@
                     </div>
                     <ul id="nav-mobile" class="right">
                         <li>
-                            <a id="state_cleanup_btn" class="btn-floating waves-effect waves-light blue tooltipped center-align hoverable translateT" title="State Cleanup">
+                            <a id="state_cleanup_btn" class="btn-floating waves-effect waves-light red tooltipped center-align hoverable translateT" title="State Cleanup">
                             <i class="material-icons large icon-blue">sync</i></a>
                         </li>
                         <li>
@@ -378,7 +378,7 @@
                             <i class="material-icons large icon-blue">system_update</i></a>
                         </li>
                         <li>
-                            <a id="add_grp_btn" class="btn-floating waves-effect waves-light green tooltipped center-align hoverable translateT" title="Add Group">
+                            <a id="add_grp_btn" class="btn-floating waves-effect waves-light brown tooltipped center-align hoverable translateT" title="Add Group">
                             <i class="material-icons large">group_work</i></a>
                         </li>
                         <li>
@@ -420,7 +420,7 @@
                                     <input id="device-search" class="filter-input translateP" placeholder="Искать" autocomplete="new-password" readonly="readonly" onfocus="if (this.hasAttribute('readonly')) {this.removeAttribute('readonly'); this.blur(); this.focus();}" data-lang-placeholder="Filter">
                                     <a class="filter-clear btn-floating btn-very-small translateT red lighten-3" title="Очистить" data-lang-title="clear" style="display: none;"><i class="material-icons">clear</i></a>
                                 </div>
-                                
+
                             </li>
                             <li>
                                 <div class="col input-field" style="line-height: 24px;">
@@ -547,6 +547,7 @@
                             <option value="-22">low</option>
                             <option value="0">norm</option>
                             <option value="19">high</option>
+                            <option value="20">high+</option>
                         </select>
                         <label class="translate" for="transmitPower">transmitPower</label>
                     </div>
@@ -579,7 +580,7 @@
                 </div>
                 <div class="input-field col s12 m12 l12 col-disableLed">
                     <input id="startWithInconsistent" type="checkbox" class="value" />
-                    <label class="translate" for="startWithInconsistent">Force start adapter with inconsistent configuration (not recommended). Please update the adapter to compatible firmware and recreate your network as soon as possible.</label>
+                    <label class="translate" for="startWithInconsistent">SettingsExclude</label>
                 </div>
             </div>
 
@@ -810,17 +811,67 @@
     <div class="materialize-dialogs m">
         <div id="modaledit" class="modal">
             <div class="modal-content">
-                <!-- <h3 class="translate">Config device</h3> -->
-                <div class="row">
-                    <div class="input-field">
-                        <input id="d_name" type="text" class="value validate">
-                        <label for="d_name" class="translate">Name</label>
-                    </div>
-                    <div class="input-field groups">
-                        <select id="d_groups" class="materialSelect" multiple><option value="1">Значение</option></select>
-                        <label for="d_groups" class="translate">Groups</label>
-                    </div>
+              <h3 class="translate">Config device</h3>
+              <div class="row">
+                <div class="col">
+                  <div class="input-field">
+                      <input id="d_name" type="text" class="value validate">
+                      <label for="d_name" class="translate">Name</label>
+                  </div>
+                </div>
+              </div>
+              <div class="row epid0">
+                <div class="col">
+                  <div class=endpointid>
+                    <p class="translate device_with_endpoint">Main Endpoint</p>
+                  </div>
+                </div>
+                <div class="col">
+                  <div class="input-field groups">
+                      <select id="d_groups_ep0" class="materialSelect" multiple><option value="1">Значение</option></select>
+                      <label for="d_groups_ep0" class="translate">Groups</label>
+                  </div>
+                </div>
+              </div>
+              <div class="row epid1">
+                <div class="col epid">
+                  <div class=endpointid>
+                    <p class="translate device_with_endpoint">Sub Endpoint 1</p>
+                  </div>
                 </div>
+                <div class="col">
+                  <div class="input-field groups">
+                      <select id="d_groups_ep1" class="materialSelect" multiple><option value="1">Значение</option></select>
+                      <label for="d_groups_ep1" class="translate">Groups</label>
+                  </div>
+                </div>
+              </div>
+              <div class="row epid2">
+                <div class="col epid">
+                  <div class=endpointid>
+                    <p class="translate device_with_endpoint">Sub Endpoint 2</p>
+                  </div>
+                </div>
+                <div class="col">
+                  <div class="input-field groups">
+                      <select id="d_groups_ep2" class="materialSelect" multiple><option value="1">Значение</option></select>
+                      <label for="d_groups_ep2" class="translate">Groups</label>
+                  </div>
+                </div>
+              </div>
+              <div class="row epid3">
+                <div class="col epid">
+                  <div class=endpointid>
+                    <p class="translate device_with_endpoint">Sub Endpoint 3</p>
+                  </div>
+                </div>
+                <div class="col">
+                  <div class="input-field groups">
+                      <select id="d_groups_ep3" class="materialSelect" multiple><option value="1">Значение</option></select>
+                      <label for="d_groups_ep3" class="translate">Groups</label>
+                  </div>
+                </div>
+              </div>
             </div>
             <div class="modal-footer">
                 <a name="save" href="#!" class="modal-action modal-close waves-effect waves-green btn green translate">Save</a>
@@ -830,19 +881,32 @@
 
         <div id="groupedit" class="modal">
             <div class="modal-content">
-                <h3 class="translate">Add/Edit Group</h3>
+                <div class = "addgroup">
+                    <h3 class="translate">Add Group</h3>
+                </div>
+                <div class = "editgroup">
+                    <h3 class="translate">Edit Group</h3>
+                </div>
                 <div class="row">
-                    <div class="input-field col s12 m4 l2">
+                    <div class="col s4 m4 l2">
+                      <div class="input-field groupid">
                         <input id="g_index" type="number" min="1" class="value validate">
                         <label for="g_index" class="translate">№</label>
+                      </div>
                     </div>
-                </div>
-                <div class="row">
-                    <div class="input-field col s12">
+                    <div class="input-field col s8 m8 l10">
                         <input id="g_name" type="text" class="value validate">
                         <label for="g_name" class="translate">Name</label>
                     </div>
                 </div>
+                <div class="row hide">
+                  <div class="col s12">
+                    <div class="input-field members">
+                      <label for="g_members" class="translate">Members</label>
+                      <select id="g_members" class="materialSelect" multiple><option value="1">Значение</option></select>
+                    </div>
+                  </div>
+                </div>
             </div>
             <div class="modal-footer">
                 <a name="save" href="#!" class="modal-action modal-close waves-effect waves-green btn green translate">Save</a>
@@ -878,6 +942,16 @@
                 <a href="#!" class="modal-action modal-close waves-effect waves-red btn-flat translate">Cancel</a>
             </div>
         </div>
+        <div id="modalreconfigure" class="modal">
+            <div class="modal-content">
+                <h3 class="translate">Reconfigure device</h3>
+                <p>A bunch of text</p>
+            </div>
+            <div class="modal-footer">
+                <a name="yes" href="#!" class="modal-action modal-close waves-effect waves-green btn green translate">Yes</a>
+                <a href="#!" class="modal-action modal-close waves-effect waves-red btn-flat translate">Cancel</a>
+            </div>
+        </div>
 
         <div id="modalpairing" class="modal modal-fixed-footer">
             <div class="modal-content">