iobroker.zigbee 1.10.3 → 1.10.12

package/admin/admin.js

@@ -15,7 +15,7 @@ let devices = [],
     networkEvents,
     responseCodes = false,
     groups = {},
-    devGroups = {},
+    devGroups = {}, // eslint-disable-line prefer-const
     binding = [],
     excludes = [],
     coordinatorinfo = {
@@ -29,9 +29,25 @@ let devices = [],
     shuffleInstance;
 const updateCardInterval = setInterval(updateCardTimer, 6000);
 
+const networkOptions = {
+    autoResize: true,
+    height: '100%',
+    width: '100%',
+    nodes: {
+        shape: 'box'
+    },
+    layout: {
+        improvedLayout: true,
+    },
+    physics: {
+        enabled: true,
+    }
+};
+
+
 const savedSettings = [
     'port', 'panID', 'channel', 'disableLed', 'countDown', 'groups', 'extPanID', 'precfgkey', 'transmitPower',
-    'adapterType', 'debugHerdsman', 'disableBackup', 'disablePing', 'external', 'startWithInconsistent', 'warnOnDeviceAnnouncement', 'baudRate'
+    'adapterType', 'debugHerdsman', 'disableBackup', 'disablePing', 'external', 'startWithInconsistent', 'warnOnDeviceAnnouncement', 'baudRate', 'flowCTRL'
 ];
 
 function getDeviceByID(ID) {
@@ -54,7 +70,7 @@ function getDevice(ieeeAddr) {
     });
 }
 
-// eslint-disable-next-line no-unused-vars
+
 function getDeviceByNetwork(nwk) {
     return devices.find((devInfo) => {
         try {
@@ -276,7 +292,6 @@ function getCard(dev) {
                 </div>`;
     return card;
 }
-
 /*
 function openReval(e, id, name){
     const $card = $(e.target).closest('.card');
@@ -369,7 +384,6 @@ 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') {
     const groupables = [];
     if (dev && dev.info && dev.info.endpoints) {
         for (const ep of dev.info.endpoints) {
@@ -379,11 +393,13 @@ function editName(id, name) {
         }
     }
     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');
+    $('#modaledit').find('.row.epid4').addClass('hide');
+    $('#modaledit').find('.row.epid5').addClass('hide');
+    $('#modaledit').find('.row.epid6').addClass('hide');
     if (numEP > 0) {
         // go through all the groups. Find the ones to list for each groupable
         if (numEP == 1) {
@@ -396,7 +412,7 @@ function editName(id, name) {
                 if (d.hasOwnProperty('memberinfo')) {
                     for (const member of d.memberinfo) {
                         const epid = EndPointIDfromEndPoint(member.ep);
-                        for (var i = 0; i < groupables.length; i++) {
+                        for (let i = 0; i < groupables.length; i++) {
                             if (groupables[i].epid == epid) {
                                 groupables[i].memberOf.push(d.native.id.replace('group_', ''));
                             }
@@ -406,7 +422,7 @@ function editName(id, name) {
             }
         }
         console.log('groupables: ' + JSON.stringify(groupables));
-        for (var i = 0; i < groupables.length; i++) {
+        for (let i = 0; i < groupables.length; i++) {
             if (i > 1) {
                 $('#modaledit').find('translate.device_with_endpoint').innerHtml = name + ' ' + groupables[i].epid;
             }
@@ -414,16 +430,12 @@ function editName(id, name) {
             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();
         const groupsbyid = {};
         if (groupables.length > 0) {
-            for (var i = 0; i < groupables.length; i++) {
+            for (let 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);
@@ -437,7 +449,7 @@ function editName(id, name) {
 }
 
 function GenerateGroupChange(oldmembers, newmembers) {
-    let grpchng = [];
+    const grpchng = [];
     for (const oldg of oldmembers)
         if (!newmembers.includes(oldg)) grpchng.push('-' + oldg);
     for (const newg of newmembers)
@@ -533,7 +545,7 @@ function showDevices() {
         } else {
             //if (d.groups && d.info && d.info.device._type == "Router") {
             if (d.groups) {
-//                devGroups[d._id] = d.groups;
+                //devGroups[d._id] = d.groups;
                 if (typeof d.groups.map == 'function') {
                     d.groupNames = d.groups.map(item => {
                         return groups[item] || '';
@@ -560,9 +572,11 @@ function showDevices() {
     const roomSelector = $('#room-filter');
     roomSelector.empty();
     roomSelector.append(`<li class="device-order-item" data-type="All" tabindex="0"><a class="translate" data-lang="All">All</a></li>`);
-    allRooms.forEach((item) => {
-        roomSelector.append(`<li class="device-order-item" data-type="${item}" tabindex="0"><a class="translate" data-lang="${item}">${item}</a></li>`);
-    });
+    Array.from(allRooms)
+        .sort()
+        .forEach((item) => {
+            roomSelector.append(`<li class="device-order-item" data-type="${item}" tabindex="0"><a class="translate" data-lang="${item}">${item}</a></li>`);
+        });
     $('#room-filter a').click(function () {
         $('#room-filter-btn').text($(this).text());
         doFilter();
@@ -694,7 +708,7 @@ function letsPairingWithCode(code) {
             showMessage(msg.error, _('Error'));
         }
         else {
-          showPairingProcess();
+            showPairingProcess();
         }
     });
 }
@@ -781,7 +795,7 @@ function getMap() {
 }
 
 // the function loadSettings has to exist ...
-// eslint-disable-next-line no-unused-vars
+
 function load(settings, onChange) {
     if (settings.panID === undefined) {
         settings.panID = 6754;
@@ -889,13 +903,13 @@ function load(settings, onChange) {
     });
 
     $('#code_pairing').click(function () {
-      if (!$('#pairing').hasClass('pulse')) {
-        $('#codeentry a.btn[name=\'pair\']').click(() => {
-            const code = $('#codeentry').find('input[id=\'qr_code\']').val();
-            letsPairingWithCode(code)
-        });
-        $('#codeentry').modal('open');
-      }
+        if (!$('#pairing').hasClass('pulse')) {
+            $('#codeentry a.btn[name=\'pair\']').click(() => {
+                const code = $('#codeentry').find('input[id=\'qr_code\']').val();
+                letsPairingWithCode(code)
+            });
+            $('#codeentry').modal('open');
+        }
     });
 
     $(document).ready(function () {
@@ -914,6 +928,10 @@ function load(settings, onChange) {
             $('#device-order-btn').text($(this).text());
             doSort();
         });
+        $('#device-filter a').click(function () {
+            $('#device-filter-btn').text($(this).text());
+            doFilter();
+        });
     });
 
     const text = $('#pairing').attr('data-tooltip');
@@ -966,9 +984,8 @@ function showPairingProcess() {
 
 // ... and the function save has to exist.
 // you have to make sure the callback is called with the settings object as first param!
-// eslint-disable-next-line no-unused-vars
+
 function save(callback) {
-    // example: select elements with class=value and build settings object
     const obj = {};
     $('.value').each(function () {
         const $this = $(this);
@@ -1098,13 +1115,13 @@ function showNetworkMap(devices, map) {
     const edges = [];
 
     if (map.lqis == undefined || map.lqis.length === 0) { // first init
-        $('#filterParent, #filterSibl, #filterPrvChild, #filterMesh').change(function () {
+        $('#filterParent, #filterSibl, #filterPrvChild, #filterMesh, #physicsOn').change(function () {
             updateMapFilter();
         });
     }
 
     const createNode = function (dev, mapEntry) {
-        if (dev.common && dev.common.type == 'group') return undefined;
+        if (dev.common && (dev.common.type == 'group' || dev.common.deactivated)) return undefined;
         const extInfo = (mapEntry && mapEntry.networkAddress) ? `\n (nwkAddr: 0x${mapEntry.networkAddress.toString(16)} | ${mapEntry.networkAddress})` : '';
         const node = {
             id: dev._id,
@@ -1295,19 +1312,8 @@ function showNetworkMap(devices, map) {
         nodes: nodesArray,
         edges: mapEdges
     };
-    const options = {
-        autoResize: true,
-        height: '100%',
-        width: '100%',
-        nodes: {
-            shape: 'box'
-        },
-        layout: {
-            improvedLayout: true,
-        }
-    };
 
-    network = new vis.Network(container, data, options);
+    network = new vis.Network(container, data, networkOptions);
 
     const onMapSelect = function (event) {
         // workaround for https://github.com/almende/vis/issues/4112
@@ -1405,6 +1411,8 @@ function updateMapFilter() {
     const showSibl = $('#filterSibl').is(':checked');
     const showPrvChild = $('#filterPrvChild').is(':checked');
     const invisColor = $('#filterMesh').is(':checked') ? 0.2 : 0;
+    networkOptions.physics.enabled = $('#physicsOn').is(':checked');
+    network.setOptions(networkOptions);
     mapEdges.forEach((edge) => {
         if (((edge.relationship === 0 || edge.relationship === 1) && showParent)
             || (edge.relationship === 2 && showSibl)
@@ -2746,7 +2754,8 @@ function doFilter(inputText) {
         const lang = systemLang || 'en';
         const searchText = inputText || $('#device-search').val();
         const roomFilter = $('#room-filter-btn').text().toLowerCase();
-        if (searchText || roomFilter !== 'all') {
+        const deviceFilter = $('#device-filter-btn').text().toLowerCase();
+        if (searchText || roomFilter !== 'all' || deviceFilter != 'all') {
             shuffleInstance.filter(function (element, shuffle) {
                 const devId = element.getAttribute('id');
                 const dev = getDeviceByID(devId);
@@ -2770,6 +2779,29 @@ function doFilter(inputText) {
                         valid = false;
                     }
                 }
+                if (valid && dev && deviceFilter !== 'all') {
+                    switch (deviceFilter) {
+                        case 'connected':
+                            valid = (dev.link_quality > 0) && !dev.common.deactivated;
+                            break;
+                        case 'disconnected':
+                            valid = (dev.link_quality <= 0) && !dev.common.deactivated;
+                            break;
+                        case 'deactivated':
+                            valid = dev.common.deactivated;
+                            break;
+                        case 'router':
+                            valid = dev.battery == null;
+                            break;
+                        case 'enddevice':
+                            valid = dev.battery && dev.battery>0;
+                            break;
+                        case 'group':
+                            valid =  (dev.common.type == 'group');
+                            break;
+                        default: valid = true;
+                    }
+                }
                 return valid;
             });
         } else {

package/admin/i18n/de/translations.json

@@ -50,7 +50,7 @@
     "Read Firmware": "Firmware lesen",
     "Refresh": "Aktualisieren",
     "Rename device": "Gerät umbenennen",
-    "Reset Info": "Ein Soft-Reset startet nur den CC253x Adapter und die zugehörige Software neu. Ein Hard-Reset setzt die Liste ALLER gekoppelten Geräte und die CC253x Einstellungen zurück! Alle Geräte müssen anschließend neu gekoppelt werden!",
+    "Reset Info": "Ein Soft-Reset startet den Coordinator und den Adapter neu. Ein Hard-Reset setzt die Liste ALLER gekoppelten Geräte und den Coordinator zurück! Alle Geräte müssen anschließend neu gekoppelt werden!",
     "Reset confirmation": "Reset bestätigen",
     "Reset...": "Zurücksetzen…",
     "Results": "Ergebnisse",

package/admin/i18n/en/translations.json

@@ -51,7 +51,7 @@
     "Read Firmware": "Read Firmware",
     "Refresh": "Refresh",
     "Rename device": "Rename device",
-    "Reset Info": "A soft reset will just restart routines and the CC253x. A hard reset will clear paired devices data and reset CC253x settings too. You will have to repair ALL of your devices!",
+    "Reset Info": "A soft reset will just restart routines and the Coordinator. A hard reset will clear paired devices data and reset the Coordinator settings too. You will have to repair ALL of your devices!",
     "Reset confirmation": "Reset confirmation",
     "Reset...": "Reset…",
     "Results": "Results",

package/admin/i18n/fr/translations.json

@@ -51,7 +51,7 @@
     "Read Firmware": "Lire le micrologiciel",
     "Refresh": "Rafraîchir",
     "Rename device": "Renommer le dispositif",
-    "Reset Info": "Un redémarrage en douceur redémarrera uniquement les routines et le CC253x. Une réinitialisation matérielle efface les données de dispositifs couplés et réinitialise aussi la configuration du CC253x. Vous devez re-coupler TOUS vos dispositifs !",
+    "Reset Info": "Un redémarrage en douceur redémarrera uniquement les routines et le Coordinator. Une réinitialisation matérielle efface les données de dispositifs couplés et réinitialise aussi la configuration du Coordinator. Vous devez re-coupler TOUS vos dispositifs !",
     "Reset confirmation": "Confirmation de réinitialisation",
     "Reset...": "Réinitialiser…",
     "Results": "Résultats",

package/admin/i18n/nl/translations.json

@@ -51,7 +51,7 @@
     "Read Firmware": "Lees Firmware",
     "Refresh": "Vernieuwen",
     "Rename device": "Apparaat hernoemen",
-    "Reset Info": "Een zachte reset herstart de routines en CC253x. Met een harde reset worden gegevens van gekoppelde apparaten gewist en ook de CC253x-instellingen gereset. U moet AL uw apparaten opnieuw aanleren!",
+    "Reset Info": "Een zachte reset herstart de routines en Coordinator. Met een harde reset worden gegevens van gekoppelde apparaten gewist en ook de Coordinator-instellingen gereset. U moet AL uw apparaten opnieuw aanleren!",
     "Reset confirmation": "Reset bevestiging",
     "Reset...": "Reset …",
     "Results": "Resultaten",

package/admin/i18n/pl/translations.json

@@ -51,7 +51,7 @@
     "Read Firmware": "Przeczytaj oprogramowanie sprzętowe",
     "Refresh": "Refresh",
     "Rename device": "Zmień nazwę urządzenia",
-    "Reset Info": "Soft reset zrestartuje tylko procedury i CC253x. Hard-Reset wyczyści dane połączonychurządzeń i zresetuje również ustawienia CC253x. Będziesz musiał naprawić WSZYSTKIE swoje urządzenia!",
+    "Reset Info": "Soft reset zrestartuje tylko procedury i Coordinator. Hard-Reset wyczyści dane połączonych urządzeń i zresetuje również ustawienia Coordynatora. Będziesz musiał połączyć WSZYSTKIE swoje urządzenia!",
     "Reset confirmation": "Reset potwierdzenie",
     "Reset...": "Resetowanie…",
     "Results": "Wyniki",

package/admin/i18n/pt/translations.json

@@ -51,7 +51,7 @@
     "Read Firmware": "Ler Firmware",
     "Refresh": "Atualizar",
     "Rename device": "Renomear dispositivo",
-    "Reset Info": "A Soft reset will just restart routines and CC253x. Hard-Reset will clear paired devices data and it resets CC253x settings too. You will have to repair ALL of your devices!",
+    "Reset Info": "A Soft reset will just restart routines and Coordinator. Hard-Reset will clear paired devices data and it resets Coordinator settings too. You will have to repair ALL of your devices!",
     "Reset confirmation": "Reset confirmação",
     "Reset...": "Redefinir...",
     "Results": "Resultados",