iobroker.zigbee 1.10.2 → 1.10.11

package/README.md

@@ -11,7 +11,11 @@
 
 ## ioBroker adapter for Zigbee devices via TI cc2531/cc2530/cc26x2r/cc2538 and deCONZ ConBee/RaspBee.
 
-With the Zigbee-coordinator based on Texas Instruments SoC, deCONZ ConBee/RaspBee modules, Silicon Labs EZSP v8 or ZIGate USB-TTL it creates its own zigbee-network, into which zigbee-devices are connected. By work directly with the coordinator, the driver allows you to manage devices without additional application / gateways / bridge from device manufacturers (Xiaomi / TRADFRI / Hue / Tuya). About the device Zigbee-network can be read [here (in English)](https://www.zigbee2mqtt.io/information/zigbee_network.html).
+With the Zigbee-coordinator based on Texas Instruments SoC, deCONZ ConBee/RaspBee modules, Silicon Labs EZSP v8 or ZIGate USB-TTL it creates its own zigbee-network, into which zigbee-devices are connected.
+
+
+
+By working directly with the coordinator, the driver allows you to manage devices without additional application / gateways / bridge from device manufacturers (Xiaomi / TRADFRI / Hue / Tuya). About the device Zigbee-network can be read [here (in English)](https://www.zigbee2mqtt.io/information/zigbee_network.html).
 
 ## Hardware
 
@@ -50,32 +54,32 @@ While Conbee/RaspBee Support is no longer considered experimental in the zigbee-
 
 ### Silicon Labs SoC
 
-Support for [Silicon Lab Zigbee](https://www.silabs.com/wireless/zigbee) based adapters is experimental. The initial support for EZSP v8 is still not yet considered stable and the project is in need of more developers volunteering to help with this integration. Please refer to the respective documentation on [this page](https://www.zigbee2mqtt.io/guide/adapters/) and [ongoing development discussion](https://github.com/Koenkk/zigbee-herdsman/issues/319) with regards to the state of Silabs EmberZNet Serial Protocol (EZSP) adapter implementation integration into the zigbee-herdsman and zigbee-herdsman-converters libraries which it depends on.
+Support for [Silicon Lab Zigbee](https://www.silabs.com/wireless/zigbee) based adapters is experimental. The initial support for EZSP v8 is still not yet considered stable, and the project is in need of more developers volunteering to help with this integration. Please refer to the respective documentation on [this page](https://www.zigbee2mqtt.io/guide/adapters/) and [ongoing development discussion](https://github.com/Koenkk/zigbee-herdsman/issues/319) with regards to the state of Silabs EmberZNet Serial Protocol (EZSP) adapter implementation integration into the zigbee-herdsman and zigbee-herdsman-converters libraries which it depends on.
 
 
 ### ZiGate SoC
 
-Support for [ZiGate](https://zigate.fr) based adapters is experimental. The initial support for ZiGate is still not yet considered stable and the project is in need of more developers volunteering to help with this integration. Please refer to the respective documentation on [this page](https://www.zigbee2mqtt.io/guide/adapters/) and [ongoing development discussion](https://github.com/Koenkk/zigbee-herdsman/issues/242) with regards to the state of ZiGate adapter implementation into the zigbee-herdsman and zigbee-herdsman-converters libraries which it depends on.
+Support for [ZiGate](https://zigate.fr) based adapters is experimental. The initial support for ZiGate is still not yet considered stable, and the project is in need of more developers volunteering to help with this integration. Please refer to the respective documentation on [this page](https://www.zigbee2mqtt.io/guide/adapters/) and [ongoing development discussion](https://github.com/Koenkk/zigbee-herdsman/issues/242) with regards to the state of ZiGate adapter implementation into the zigbee-herdsman and zigbee-herdsman-converters libraries which it depends on.
 
 
 ## Work with adapter
 
 ![](docs/tutorial/zigbee.png)
 
-To start the driver, you must specify the name of the port on which the Zigbee-module (stick) is connected. Usually this is the port `/dev/ttyACM0` or `/dev/ttyUSB0` for the UART-connection. Or you can find with `ls -l /dev/serial/by-id` the device direct.
+To start the driver, you must specify the name of the port on which the Zigbee module (stick) is connected. Usually this is the port `/dev/ttyACM0` or `/dev/ttyUSB0` for the UART-connection. Or you can find with `ls -l /dev/serial/by-id` the device direct.
 
 open the settings and change port
 ![](docs/tutorial/settings.png)
 
 
-For Windows this will be the COM port number.
+For Windows, this will be the COM port number.
 
-Starting from version 1.0.0 you can also use *tcp connection* for cases using esp8266 (or other microcontrollers) as serial-bridge. For example `tcp://192.168.1.46:8880`. Read more info here https://www.zigbee2mqtt.io/information/connecting_cc2530#via-an-esp8266
+Starting from version 1.0.0, you can also use *tcp connection* for cases using esp8266 (or other microcontrollers) as serial-bridge. For example `tcp://192.168.1.46:8880`. Read more info here https://www.zigbee2mqtt.io/information/connecting_cc2530#via-an-esp8266
 
-To connect devices, you need to switch the Zigbee-coordinator to pairing mode by pressing the green button. The countdown will begin (60 seconds) until the device connectivity is available.
+To connect devices, you need to switch the Zigbee coordinator to pairing mode by pressing the green button. The countdown will begin (60 seconds) until the device connectivity is available.
 To connect Zigbee devices in most cases, just press the pairing button on the device itself. But there are features for some devices. More information about pairing with devices can be found [here (in English)](https://www.zigbee2mqtt.io/getting_started/pairing_devices.html)
 
-After successful pairing, the device appears in the configuration panel. If the device appears in the configuration panel but has the type "undefined", then this is an unknown device and can not be work with it. If the device is in the list of available devices, but added as "undefined", then try to remove the device and add it again.
+After successful pairing, the device appears in the configuration panel. If the device appears in the configuration panel but has the type "undefined", then this is an unknown device and cannot be worked with it. If the device is in the list of available devices, but added as "undefined", then try to remove the device and add it again.
 
 The devices connected to the Zigbee-network and inform the coordinator of their status and events (button presses, motion detection, temperature change). This information is reflected in the ioBroker object-states. Some ioBroker states have feedback and send commands to the zigbee-device when the value changes (switching the state of the outlet or lamp, changing the scene or the brightness of the lamp).
 
@@ -97,7 +101,7 @@ https://www.zigbee2mqtt.io/information/binding
 
 ### Developer Tab
 
-This is a tool for advanced users to test currently unsupported devices or enhance this adapters functionality. More instructions can be found on tab.
+This is a tool for advanced users to test currently unsupported devices or enhance this adapter's functionality. More instructions can be found on the tab.
 ![](docs/tutorial/tab-dev-1.png)
 
 ## Additional info
@@ -113,7 +117,7 @@ There are knowledge bases that can be useful for working with Zigbee-devices and
 [Works with devices from this list](https://github.com/ioBroker/ioBroker.zigbee/wiki/Supported-devices)
 
 
-## More Informations
+## More Information
 
 [in Deutsch](https://github.com/ioBroker/ioBroker.zigbee/blob/master/docs/de/readme.md)
 
@@ -128,17 +132,54 @@ or
 ## Donate
 
 You can thank the authors by these links:
-* to Kirov Ilya https://www.paypal.me/goofyk
 * to Arthur Rupp https://paypal.me/ArthurRupp
 
 -----------------------------------------------------------------------------------------------------
-
 ## Changelog
+### 1.10.11 (2024-11-02)
+* BREAKING CHANGE
+* 
+*  bugs : ChannelScan is currently not available
+* 
+* 
+* (lebrinkma) fix linter errors
+* (asgothian) disable map display for deactivated devices
+* (asgothian) new option on map: disable physics interaction
+* (asgothian) new zigbee-herdsman-converters 20.28.0
+* (asgothian) new zigbee-herdsman 2.1.1
+* (asgothian) Allow use of keyless converters (used for TuYa and compatible devices in zigbee-herdsman-converters
+* (arteck) swap from request to axios
+* (arteck) delete groups works again
+
+### 1.10.9 (2024-09-05)
+* (arteck) typo admin settings
+* (arteck) eslint config
+
+### 1.10.8 (2024-09-05)
+* (arteck) corr admin settings
+* (arteck) add new eslint version
+
+### 1.10.7 (2024-09-05)
+* (arteck) add flow control option 
+* (asgothian) add new NewHerdsman
+* (arteck) add new ezsp coordinator Firmware (7.4.1.0)
+
+### 1.10.5 (2024-06-21)
+* (arteck) icon ota device update
+* (arteck) icon fix
+
+### 1.10.4 (2024-04-20)
+* (arteck) core update
+* (arteck) dependency update
+
+### 1.10.3 (2024-04-06)
+* (arteck) dependency update
+
 ### 1.10.2 (2024-01-25)
 * (arteck) dependency update
 
 ### 1.10.1 (2024-01-21)
-* (arteck) Baudrate is now configurable. works ONLY with Deconz/Conbee( 38400 )
+* (arteck) Baudrate is now configurable. works ONLY with Deconz/Conbee(38400)
 * (arteck) add nvbackup.json delete button
 
 ### 1.10.0 (2024-01-13)
@@ -226,17 +267,17 @@ You can thank the authors by these links:
 * (arteck) new Documentation (thx Stefan)
 
 ### 1.8.11 (2022-12-10)
-* (arteck) fix compsite exposes with list
+* (arteck) fix compsite exposes with a list
 
 ### 1.8.10 (2022-12-12)
 * (asgothian) fix group access
 * (asgothian) add option for pairing code:
-   A new icon allows to open the network after first entering a pairing code
+   A new icon allows opening the network after first entering a pairing code
    listed on the device
 * (asgothian) easier use of external converters
    - external converters can now be placed in the zigbee adapter data folder
    - no absolite path is required to access them
-   - external converters posted on the github for zigbee-herdsman-converters
+   - external converters posted on the GitHub for zigbee-herdsman-converters
      should work as they are - folders for libraries are rewritten to match
      the expected location when 'required' from within the zigbee adapter
    - Log entries will identify which files are entered as converters. Errors
@@ -406,7 +447,7 @@ in this case, the *states* attribute will be formed based on the *exposes* descr
 
 ### 1.2.1 (2020-08-16)
 * Fixes after changing device identify method
-* (Garfonso) Allow to unbind from coordinator
+* (Garfonso) Allow unbinding from coordinator
 
 ### 1.2.0 (2020-08-09)
 * Serialport 9.0.0. (zigbee-herdsman)
@@ -422,8 +463,8 @@ Improvements and fixes:
 * (allofmex) Improved DeveloperTab logs
 * (allofmex) Add humidity and temperature calibration state to Tuya RH3052
 * (kirovilya) Fixed a typo due to which extPanID was not set
-* (allofmex) Retry reconnect gateway all the time for tcp connected gateway
-* (kirovilya) Allow to collect zigbee-herdsman logs to iobroker logs
+* (allofmex) Retry reconnect gateway all the time for TCP-connected gateway
+* (kirovilya) Allow collecting zigbee-herdsman logs to iobroker logs
 * (kirovilya) Additional states for QBKG12LM
 
 New devices:
@@ -481,7 +522,7 @@ new Zigbee-herdsman features:
 * (kirovilya) Moes Zigbee Thermostatic Radiator
 * (kirovilya) LifeControl power plug MCLH-03, bulb MCLH-02, water leak MCLH-07, door sensor MCLH-04
 * (kirovilya) Philips LCT002, LCT011, LTW015, LWG004
-* (kirovilya) Gledopto GL-C-007 with with channel
+* (kirovilya) Gledopto GL-C-007 with a channel
 * (MultivitaminJuice) Iluminize 511.040
 * (Sacred-Shadow) Bitron 902010/24
 * (kirovilya) Color indication of LQI and Battery icon

package/admin/adapter-settings.js

@@ -4,8 +4,8 @@ const parts = path.split('/');
 parts.splice(-3);
 
 const socket = io.connect('/', { path: parts.join('/') + '/socket.io' });
-var query = (window.location.search || '').replace(/^\?/, '').replace(/#.*$/, '');
-var args = {};
+const query = (window.location.search || '').replace(/^\?/, '').replace(/#.*$/, '');
+const args = {};
 let theme = null;
 
 // parse parameters
@@ -14,7 +14,7 @@ query.trim().split('&').filter(function (t) { return t.trim(); }).forEach(functi
     if (!i && parts.length === 1 && !isNaN(parseInt(b, 10))) {
         args.instance = parseInt(b, 10);
     }
-    var name = parts[0];
+    const name = parts[0];
     args[name] = parts.length === 2 ? parts[1] : true;
 
     if (name === 'instance') {
@@ -28,7 +28,7 @@ query.trim().split('&').filter(function (t) { return t.trim(); }).forEach(functi
     }
 });
 
-var instance = args.instance;
+const instance = args.instance;
 
 let common   = null; // common information of adapter
 const host     = null; // host object on which the adapter runs
@@ -55,7 +55,7 @@ $(document).ready(function () {
 function loadSystemConfig(callback) {
     socket.emit('getObject', 'system.config', function (err, res) {
         if (!err && res && res.common) {
-            systemLang   = res.common.language || systemLang;
+        //    systemLang   = res.common.language || systemLang;
             systemConfig = res;
         }
         socket.emit('getObject', 'system.certificates', function (err, res) {
@@ -96,17 +96,13 @@ function loadSettings(callback) {
             if (typeof load === 'undefined') {
                 alert('Please implement save function in your admin/index.html');
             } else {
-		// detect, that we are now in react container (themeNames = ['dark', 'blue', 'colored', 'light'])
-		
-		const _query = query.split('&');
-		
-		for (var q = 0; q < _query.length; q++) {
-			if (_query[q].indexOf('react=') !== -1) {
-				$('.adapter-container').addClass('react-' + _query[q].substring(6));
-				theme = 'react-' + _query[q].substring(6);
-			}
+                const _query = query.split('&');
+                for (let q = 0; q < _query.length; q++) {
+                    if (_query[q].indexOf('react=') !== -1) {
+                        $('.adapter-container').addClass('react-' + _query[q].substring(6));
+                        theme = 'react-' + _query[q].substring(6);
+                    }
                 }
-
                 load(res.native, onChange);
             }
             if (typeof callback === 'function') {
@@ -118,9 +114,101 @@ function loadSettings(callback) {
             }
             alert('error loading settings for ' + _adapterInstance + '\n\n' + err);
         }
+        // Design Fix simatec
+        checkMediaQuery();
     });
 }
 
+window.addEventListener('resize', checkMediaQuery);
+
+function checkMediaQuery() {
+    const mediaQuery = window.matchMedia('(max-width: 600px)');
+
+    if (mediaQuery.matches) {
+        designFix();
+        console.log('Screen < 600px.');
+    } else {
+        console.log('Screen > 600px.');
+    }
+}
+
+// Design Fix simatec
+function designFix() {
+    const dropdownToggle = document.querySelector('.dropdown-toggle');
+
+    if (!dropdownToggle) {
+        const cols = document.querySelectorAll('.col:not(.tab)');
+        const sClasses = ['s1', 's2', 's3', 's4', 's5', 's6', 's7', 's8', 's9', 's10', 's11'];
+
+        cols.forEach(col => {
+            sClasses.forEach(sClass => {
+                if (col.classList.contains(sClass)) {
+                    col.classList.remove(sClass);
+                }
+            });
+
+            col.classList.add('s12');
+        });
+
+        const logo = document.querySelector('.logo');
+
+        if (logo) {
+            const col = logo.closest('.col');
+            if (col) {
+                const sClasses = ['s1', 's2', 's3', 's4', 's5', 's6', 's7', 's8', 's9', 's10', 's11', 's12', 'm2', 'm4', 'm8', 'm10', 'm12', 'l2', 'l4', 'l8', 'l10', 'l12',];
+                sClasses.forEach(sClass => {
+                    if (col.classList.contains(sClass)) {
+                        col.classList.remove(sClass);
+                    }
+                });
+                col.classList.add('s10');
+                col.classList.add('m6');
+                col.classList.add('l6');
+            }
+        }
+
+        const allTabs = document.querySelectorAll('.tabs');
+
+        allTabs.forEach(function (tabs) {
+            const dropdownToggle = document.createElement('div');
+            dropdownToggle.classList.add('dropdown-toggle');
+
+            const icon = document.createElement('i');
+            icon.classList.add('material-icons');
+            icon.textContent = 'menu';
+            dropdownToggle.appendChild(icon);
+
+            tabs.insertAdjacentElement('beforebegin', dropdownToggle);
+
+            const dropdownMenu = document.createElement('div');
+            dropdownMenu.classList.add('dropdown-menu');
+
+            const tabLinks = tabs.querySelectorAll('li a');
+
+            tabLinks.forEach(function (tab) {
+                const dropdownLink = document.createElement('a');
+                dropdownLink.href = tab.getAttribute('href');
+                dropdownLink.textContent = tab.textContent;
+                dropdownMenu.appendChild(dropdownLink);
+                dropdownLink.addEventListener('click', function () {
+                    tab.click();
+                    dropdownMenu.classList.remove('show');
+                });
+            });
+
+            tabs.insertAdjacentElement('beforebegin', dropdownMenu);
+
+            dropdownToggle.addEventListener('click', function () {
+                dropdownMenu.classList.toggle('show');
+            });
+
+            const rect = dropdownToggle.getBoundingClientRect();
+            dropdownMenu.style.top = `${rect.bottom}px`;
+            dropdownMenu.style.right = '10px';
+        });
+    }
+}
+
 function prepareTooltips() {
     $('.admin-icon').each(function () {
         let id = $(this).data('id');
@@ -156,7 +244,7 @@ function prepareTooltips() {
                     link = 'https://github.com/ioBroker/ioBroker.' + common.name + '#' + id;
                 }
             }
-            if (!link.match('^https?:\/\/')) {
+            if (!link.match('^https?:\/\/')) { //eslint-disable-line no-useless-escape
                 if (common.readme) {
                     link = common.readme + '#' + link;
                 } else {
@@ -211,9 +299,8 @@ function onChange(isChanged) {
 }
 
 function showMessage(message, title, icon) {
-    var $dialogMessage;
     // noinspection JSJQueryEfficiency
-    $dialogMessage = $('#dialog-message');
+    let $dialogMessage = $('#dialog-message');
     if (!$dialogMessage.length) {
         $('body').append(
             '<div class="m"><div id="dialog-message" class="modal modal-fixed-footer">' +

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)
@@ -2544,7 +2552,7 @@ function showChannels() {
             }
         }
     });
-    showWaitingDialog('Scanning channels', 10);
+    showWaitingDialog('Scanning channels - not working yet', 10);
 }
 
 function onlyOne(devs) {
@@ -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",