iobroker.zigbee 2.0.4 → 2.0.5

package/README.md

@@ -9,18 +9,15 @@
 [![Translation status](https://weblate.iobroker.net/widgets/adapters/-/zigbee/svg-badge.svg)](https://weblate.iobroker.net/engage/adapters/?utm_source=widget)
 [![Downloads](https://img.shields.io/npm/dm/iobroker.zigbee.svg)](https://www.npmjs.com/package/iobroker.zigbee)
 
-## ioBroker adapter for Zigbee devices via TI cc26x2r/cc2538/cc26x2px and deCONZ ConBee/RaspBee.
-### cc2531/cc2530 are obsolet
+## ioBroker adapter for Zigbee devices via Zigbee coordinator hardware.
 
-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.
+Using specialized Zigbee-coordinator hardware, the adapter creates and manages a Zigbee Network which can control and connect a large number of Zigbee Devices. The list of compatible devices inlcudes > 4000 devices from > 450 different vendors. The number of devices in the network depends on the available coordinator hardware. Common coordinator hardware are USB sticks with Texas Instruments CC26xx, Silicon Labs EZSP or ZIGate chipsetz. Some branded USB devices (Sonoff ZB-Dongle, Dresden Electronic Conbee) can also be used. There are also network-based hubs from various manufacturers.
 
-
-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).
+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). More information about the  Zigbee-network can be read [here (in English)](https://www.zigbee2mqtt.io/information/zigbee_network.html).
 
 ## Hardware
 
-
-One coordinator device is required for each zigbee Adapter instance. The device must be flashed with the respective coordinator firmware. A list of supported coordinators, the necessary equipment for the firmware and the device preparation process for different coordinator devices are described [here in English](https://www.zigbee2mqtt.io/guide/adapters/) or [smarthomescene.com ](https://smarthomescene.com/blog/best-zigbee-dongles-for-home-assistant-2023/) or [here in Russian](https://myzigbee.ru/books/%D0%BF%D1%80%D0%BE%D1%88%D0%B8%D0%B2%D0%BA%D0%B8/page/%D0%BF%D1%80%D0%BE%D1%88%D0%B8%D0%B2%D0%BA%D0%B0-cc2531cc2530)
+One coordinator device is required for each Zigbee Adapter instance. The device must be flashed with the respective coordinator firmware. A list of supported coordinators, the necessary equipment for the firmware and the device preparation process for different coordinator devices are described [here in English](https://www.zigbee2mqtt.io/guide/adapters/) or [smarthomescene.com ](https://smarthomescene.com/blog/best-zigbee-dongles-for-home-assistant-2023/) or [here in Russian](https://myzigbee.ru/books/%D0%BF%D1%80%D0%BE%D1%88%D0%B8%D0%B2%D0%BA%D0%B8/page/%D0%BF%D1%80%D0%BE%D1%88%D0%B8%D0%B2%D0%BA%D0%B0-cc2531cc2530)
 
 
 ### Texas Instruments SoC
@@ -35,7 +32,6 @@ Current firmware files for these devices can be found [on GitHub](https://github
 <span><img src="https://raw.githubusercontent.com/ioBroker/ioBroker.zigbee/master/docs/de/img/CC2538_CC2592_PA.PNG" width="100"></span>
 <span><img src="https://raw.githubusercontent.com/ioBroker/ioBroker.zigbee/master/docs/de/img/cc26x2r.PNG" width="100"></span>
 
-tutorial/zigbee.png
 ### Dresden Elektronik SoC
 <span><img src="https://raw.githubusercontent.com/ioBroker/ioBroker.zigbee/master/docs/en/img/deconz.png" width="180"></span>
 
@@ -62,62 +58,82 @@ Support for [Silicon Lab Zigbee](https://www.silabs.com/wireless/zigbee) based a
 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
+## Getting started
+
+The adapter should **always** be installed from within the ioBroker Admin. Direct npm and GitHub installations are **not recommended**.
+
+At first start, it is vital to set up the adapter settings. These include:
+- the communication to the zigbee Coordinator (COM Port). This can be a device identifier or a network address for Network-based coordinators
+- the required firmware-Type
+- the network parameters PanID (a number between 0 and 65565), extended PanID (a 16 digit HEX number) and the zigbee Channel **important: Do not run the adapter without changing the values for PanID (6754) and Extended PanID (DDDDDDDDDDDDDDDD) to unique values for your Zigbee Installation.**
+
+
+![](docs/de/img/Zigbee_config_de.png)
+Please refer to the [in depth documentation](docs/en/readme.md) ([german version](docs/de/readme.md), [russian version](docs/ru/readme.md)) for a detailed explanation on how to configure the adapter.
+
+Once the adapter is up and running, the desired devices need to be integrated into the network. This requires for both the adapter and the device to be in pairing mode. Most new devices will be in pairing-mode when they are powered up for the first time, but some will require a special procedure for this. Please refer to the device manual for information on this.
 
-![](docs/tutorial/zigbee.png)
+The adapter is placed in pairing mode by pressing the pairing button:
+![](docs/de/img/Bild12.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.
+A dialog showing a pairing countdown appears. When a new device is discovered, interviewed and paired with the network, messages will be shown in this dialog, and the device will show up in the grid of active devices. Any known device should show up with an image and the correct device name, as well as a number of changable settings. Any unknown device will show up with a device name and a ? as icon, while devices which failed the pairing will show up as 'unknown' with the same ? icon. These should be removed from the network to be paired again. Please refer to the documentation linked above for more details.
 
-open the settings and change port
-![](docs/tutorial/settings.png)
+## Advanced options
 
+### Groups
 
-For Windows, this will be the COM port number.
+The adapter allows for the creation of groups via the 'add group' button. Once a group has been formed, devices can be added to and removed from the group from the device card. Removal is also possible from the group card.
+Groups have the advantage that a single command is sent to control all group members. This is especially helpful when changing the groups brightness and/or color settings.
+Note that not all devices may be added to groups - the device itself needs to support this feature.
 
-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
+Group configuration is available from the device grid.
 
-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)
+### Bindings
 
-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.
+Bindings can be used to link a remote control directly to a device, like it is e.g. done for the ikea devices. This binding has the advantage that bound devices will continue to work together even if the Zigbee Coordinator is unavailable.
+Note that not all devices may be part of a binding - the devices themselves need to support this feature.
 
-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).
+The binding configuration is only available from the zigbee tab
 
-### Device Groups
-You may create groups of devices.
+### Network Map
 
-![](docs/tutorial/groups-1.png)
+The adapter has the ability to generate a map of the mesh network. This usually takes a few minutes and provides a momentary glimpse into how the devices are meshed with each other.
 
-It is a Zigbee feature, intended for example to switch bulbs synchronized. Assign groups via device tabs edit button. A group will show as own "device" in Objects.
+The network map is only available the zigbee tab.
 
-![](docs/tutorial/groups-2.png)
+### Debug information
 
-Note: Not all devices support groups (not supported by end devices like sensors).
+The Adapter offers to collect debug information for specific devices in order to identify problems in device operation and integration. This needs to be enabled on the desired devices from the device grid.
 
+The debug information is only available from the zigbee tab.
 
-### Binding
+### Local overrides
 
-https://www.zigbee2mqtt.io/information/binding
+Device integration can be modified on a *per Model* basis, allowing the user to customise the states associated with the device. Note that before version 2.1.0, this is limited to choosing between the default *expose based* integration and the previous *legacy* integration. More options for customisation are under development.
+
+The local overrides are only available from the instance configuration
+
+### Developer Mode
+
+The developer mode offers the ability to communicate with any paired device solely based on the details of the Zigbee communication rules. Use of this requires an insight into Zigbee Clusters, Attributes and messaging structure. It can be used to control devices which are not currently supported. An in depth desctiption of the developer Tab is available in the documentation.
+
+The developer tab is only available from the instance configuration
 
-### Developer 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
 
-There is a [friendly project](https://github.com/koenkk/zigbee2mqtt) with similar functionality on the same technologies, where you can work with the same devices using the MQTT protocol. Therefore, if any improvements or support for new zigbee-devices occur in the Zigbee2MQTT project, we can transfer and add the same functionality to this adapter. If you notice this, then write the issue - we'll postpone it.
+There is a [friendly project](https://github.com/koenkk/zigbee2mqtt) with similar functionality which is based on the same technology. It uses the same base libraries for hardware communication and device integration. Any device listed as compatible in this project is likely to be compatible with the ioBroker.zigbee Adapter. Note that there is a delay between device integration into zigbee2mqtt.io and the Zigbee-Adapter, as compatibility with the hardware libraries requires verification before the adapter can move to the latest version.
 
 There are knowledge bases that can be useful for working with Zigbee-devices and equipment:
-* in English https://www.zigbee2mqtt.io/
+* in English https://www.zigbee2mqtt.io/ or https://zigbee.blakadder.com
 * in Russian https://myzigbee.ru/
 
 ## Supported devices
 
-[Works with devices from this list](https://github.com/ioBroker/ioBroker.zigbee/wiki/Supported-devices)
+Pleae refer to [this list](https://www.zigbee2mqtt.io/supported-devices/) to check compatibility. Once a device is listed as compatible there, it is either already compatible with the Zigbee Adapter or can be made compatible using an external converter.
 
-
-## More Information
+## In Depth Documentation
 
 [in Deutsch](https://github.com/ioBroker/ioBroker.zigbee/blob/master/docs/de/readme.md)
 
@@ -136,33 +152,44 @@ You can thank the authors by these links:
 
 -----------------------------------------------------------------------------------------------------
 ## Changelog
+### 2.0.5 (2025-03-25)
+* (asgothian) ZHC 23.6.0
+* (asgothian) ZH 3.3.x
+* (asgothian) removed extra logging
+* (asgothian) fixed memory issue.
+* (asgothian) Configure on Message - 5 attempts.
+* (arteck) update transmitPower
+* (asgothian) fix crash in ZigbeeController.ByteArrayToString
+* (AlexHaxe) device designation for  devices without mapped model (allows use in groups and bindings)
+*
+
 ### 2.0.4 (2025-03-09)
-* back to 2.0.2
+* (arteck) back to 2.0.2
 
 ### 2.0.3 (2025-03-07)
-* fix configured info
-* fix battery voltage (V -> mV)
-* enable debug interface v1.0
-* Push Zigbee-Herdsman to 3.5.7
-* Push Zigbee-Herdsman-Converters to 23.1.1
-* fix configure on message
-* remove extra warning messages
-* fix Adapter-Checker notes
-* improve base64 image detection
-* removed unused adaptert objects (info.groups, excludes) from adapter config
+* (asgothian) fix configured info
+* (asgothian) fix battery voltage (V -> mV)
+* (asgothian) enable debug interface v1.0
+* (asgothian) Push Zigbee-Herdsman to 2.5.7
+* (asgothian) Push Zigbee-Herdsman-Converters to 23.1.1
+* (asgothian) fix configure on message
+* (asgothian) remove extra warning messages
+* (asgothian) fix Adapter-Checker notes
+* (asgothian) improve base64 image detection
+* (asgothian) removed unused adaptert objects (info.groups, excludes) from adapter config
 *
 
 ### 2.0.2 (2025-03-02)
-* fix expose generation with expose function requiring a device. (Issue #1842)
-* fix failure to configure for devices needing multiple configurations (Issue #2375)
-* fix hold/release and press/release action handling (Issue #2387)
-* fix lib/legacy requirement for external converters (Issue #2376)
-* improved external converter handling
-* fix OTA bug
-* improved message handling for devices which report values outside their defined ranges
-* preparation for ZHC 22.x (model definition loaded on demand
-* fix legacy definition for devices
-* added action state for remotes.
+* (asgothian)  expose generation with expose function requiring a device. (Issue #1842)
+* (asgothian) fix failure to configure for devices needing multiple configurations (Issue #2375)
+* (asgothian) fix hold/release and press/release action handling (Issue #2387)
+* (asgothian) fix lib/legacy requirement for external converters (Issue #2376)
+* (asgothian) improved external converter handling
+* (asgothian) fix OTA bug
+* (asgothian) improved message handling for devices which report values outside their defined ranges
+* (asgothian) preparation for ZHC 22.x (model definition loaded on demand
+* (asgothian) fix legacy definition for devices
+* (asgothian) added action state for remotes.
 *
 
 ### 2.0.1 (2025-02-25)

package/admin/admin.js

@@ -1,5 +1,4 @@
 /*global $, M, _, sendTo, systemLang, translateWord, translateAll, showMessage, socket, document, instance, vis, Option*/
-
 /*
  * you must run 'iobroker upload zigbee' if you edited this file to make changes visible
  */
@@ -31,7 +30,11 @@ let devices = [],
     },
     cidList,
     shuffleInstance,
-    errorData = [];
+    errorData = [],
+    debugMessages = {},
+    debugInLog = true;
+const dbgMsgfilter = new Set();
+const dbgMsghide = new Set();
 const updateCardInterval = setInterval(updateCardTimer, 6000);
 
 const networkOptions = {
@@ -240,7 +243,6 @@ function getCard(dev) {
             rooms.push(dev.rooms[r]);
         }
     }
-    console.warn('debug for ' + ieee + ' is ' + isDebug);
     const room = rooms.join(',') || '&nbsp';
     const paired = (dev.paired) ? '' : '<i class="material-icons right">leak_remove</i>';
     const rid = id.split('.').join('_');
@@ -400,7 +402,7 @@ function EndPointIDfromEndPoint(ep) {
 }
 
 function editName(id, name) {
-    console.log('editName called with ' + name);
+    console.warn('editName called with ' + id + ' and ' + name);
     const dev = devices.find((d) => d._id == id);
     $('#modaledit').find('input[id=\'d_name\']').val(name);
     const groupables = [];
@@ -830,7 +832,6 @@ async function selectImageOverride(id) {
     sendTo(namespace, 'getLocalImages', {}, function(msg) {
         if (msg && msg.imageData) {
             const imagedata = msg.imageData;
-            console.warn(JSON.stringify(dev.common));
             const default_icon = (dev.common.type === 'group' ? dev.common.modelIcon : `img/${dev.common.type.replace(/\//g, '-')}.png`);
             if (dev.legacyIcon) imagedata.unshift( { file:dev.legacyIcon, name:'legacy', data:dev.legacyIcon});
             imagedata.unshift( { file:'none', name:'default', data:default_icon});
@@ -844,10 +845,10 @@ async function selectImageOverride(id) {
                     return image.file;
                 },
                 function (key, image) {
-                    if (image.file.length < 50) {
-                        return `data-icon="${image.data}"`;
-                    } else {
+                    if (image.isBase64) {
                         return `data-icon="data:image/png; base64, ${image.data}"`;
+                    } else {
+                        return `data-icon="${image.data}"`;
                     }
                 },
             );
@@ -857,7 +858,6 @@ async function selectImageOverride(id) {
                 const image = $('#chooseimage').find('#images option:selected').val();
                 const global = $('#chooseimage').find('#globaloverride').prop('checked');
                 const name = $('#chooseimage').find('input[id=\'d_name\']').val();
-                console.warn(`update device image : ${id} : ${image} : ${global} : ${name} : ${dev.common.name}`);
                 const data = {};
                 if (image != 'current') data.icon= image;
                 if (name != dev.common.name) data.name = name;
@@ -869,6 +869,202 @@ async function selectImageOverride(id) {
     });
 }
 
+
+function safestring(val) {
+    const t = typeof val;
+    if (t==='object') return JSON.stringify(val).replaceAll(',',', ');
+    if (t==='string') return val.replaceAll(',',', ');
+    if (t==='function') return 'function';
+    return val;
+}
+
+function fne(item) {
+    const rv = [];
+    if (item.flags) {
+        if (item.flags.includes('SUCCESS')) rv.push('SUCCESS');
+        else rv.push(...item.flags);
+    }
+    if (item.errors && item.errors.length > 0) {
+        if (item.errors.length > 1) rv.push('errors: '+item.errors.join(','));
+        else rv.push('error: '+item.errors[0]);
+    }
+    return rv.join(', ');
+}
+
+function HtmlFromInDebugMessages(messages, devID, filter) {
+    const Html = [];
+    const filterSet = new Set();
+    let isodd = true;
+    if (dbgMsghide.has('i_'+devID)) {
+        console.warn('in all filtered out')
+        Html.push('&nbsp;')
+    } else for (const item of messages) {
+        if (item.states.length > 0) {
+            const rowspan = item.states.length > 1 ? ` rowspan="${item.states.length}"` : '';
+            let idx = item.states.length;
+            const IHtml = [];
+            let fs = '';
+            for (const state of item.states) {
+                fs = fs+state.id+'.'+fne(item);
+                const redText = (item.errors && item.errors.length > 0 ? ' id="dbgred"' : '');
+                idx--;
+                const LHtml = [(`<tr id="${isodd ? 'dbgrowodd' : 'dbgroweven'}">`)];
+                if (idx==0)
+                    LHtml.push(`<td${rowspan}>${item.dataID.toString(16).slice(-4)}</td><td${rowspan}>${safestring(item.payload)}</td>`);
+                LHtml.push(`<td></td><td${redText}>${safestring(state.payload)}</td><td${redText}>${state.id}</td><td${redText}>${state.value}</td><td${redText}>${fne(item)}</td></tr>`);
+                IHtml.unshift(...LHtml)
+            }
+            if (filter)
+                if (filterSet.has(fs)) continue; else filterSet.add(fs);
+            Html.unshift(...IHtml);
+            isodd=!isodd;
+        }
+    }
+    const ifbutton = `<a id="i_${devID}" class="btn-floating waves-effect waves-light blue tooltipped center-align hoverable translateT" title="Update debug messages"><i class="material-icons large">${dbgMsgfilter.has('i_'+devID) ? 'filter_list' : 'format_align_justify' }</i></a>`
+    const ofbutton = `<a id="hi_${devID}" class="btn-floating waves-effect waves-light blue tooltipped center-align hoverable translateT" title="Update debug messages"><i class="material-icons large">${dbgMsghide.has('i_'+devID) ? 'unfold_more' : 'unfold_less' }</i></a>`
+    const dataHide = dbgMsgfilter.has('hi_'+devID) ? 'Data hidden' : '&nbsp;';
+    return `<thead id="dbgtable"><tr><td>&nbsp</td><td>Incoming messages</td><td>&nbsp;</td><td>&nbsp;</td><td>${dataHide}</td><td>${ifbutton}</td><td>${ofbutton}</td></tr><tr><td>ID</td><td>Zigbee Payload</td><td>&nbsp;</td><td>State Payload</td><td>ID</td><td>value</td><td>Flags</td></tr></thead><tbody>${Html.join('')}</tbody>`;
+}
+
+
+function HtmlFromOutDebugMessages(messages, devID, filter) {
+    const Html = [];
+    const filterSet = new Set();
+    let isodd=true;
+    if (dbgMsghide.has('o_'+devID)) {
+        console.warn('out all filtered out')
+        Html.push('&nbsp;')
+    }
+    else for (const item of messages) {
+        if (item.states.length > 0) {
+            const rowspan = item.states.length > 1 ? ` rowspan="${item.states.length}"` : '';
+            let idx = item.states.length;
+            let fs = '';
+            const IHtml = [];
+            for (const state of item.states) {
+                fs = fs+state.id+'.'+fne(item);
+                const redText = (item.errors && item.errors.length > 0 ? ' id="dbgred"' : '');
+                const LHtml = [(`<tr id="${isodd ? 'dbgrowodd' : 'dbgroweven'}">`)];
+                idx--;
+                if (idx==0)
+                    LHtml.push(`<td${rowspan}>${item.dataID.toString(16).slice(-4)}</td><td${rowspan}>${safestring(item.payload)}</td>`);
+                LHtml.push(`<td${redText}>${state.ep ? state.ep : ''}</td><td${redText}>${state.id}</td><td${redText}>${safestring(state.value)}</td><td${redText}>${safestring(state.payload)}</td><td${redText}>${fne(item)}</td></tr>`);
+                IHtml.unshift(...LHtml);
+
+            }
+            if (filter)
+                if (filterSet.has(fs)) continue; else filterSet.add(fs);
+            Html.unshift(...IHtml);
+            isodd=!isodd;
+        }
+    }
+    const ifbutton = `<a id="o_${devID}" class="btn-floating waves-effect waves-light blue tooltipped center-align hoverable translateT" title="Update debug messages"><i class="material-icons large">${dbgMsgfilter.has('o_'+devID) ? 'filter_list' : 'format_align_justify' }</i></a>`
+    const ofbutton = `<a id="ho_${devID}" class="btn-floating waves-effect waves-light blue tooltipped center-align hoverable translateT" title="Update debug messages"><i class="material-icons large">${dbgMsghide.has('o_'+devID) ? 'unfold_more' : 'unfold_less'}</i></a>`
+    const dataHide = dbgMsgfilter.has('ho_'+devID) ? 'Data hidden' : '&nbsp;';
+    return `<thead id="dbgtable"><tr><td>&nbsp</td><td>Outgoing messages</td><td>&nbsp;</td><td>&nbsp;</td><td>${dataHide}</td><td>${ifbutton}</td><td>${ofbutton}</td></tr><tr><td>ID</td><td>Zigbee Payload</td><td>EP</td><td>ID</td><td>value</td><td>State Payload</td><td>Flags</td></tr></thead><tbody>${Html.join('')}</tbody>`;
+}
+
+
+function displayDebugMessages(msg) {
+    const buttonNames = [];
+    if (msg.byId) {
+        const dbgData = msg.byId;
+        const keys = Object.keys(dbgData);
+        const keylength = keys.length;
+        const Html = [];
+        const button = `<a id="e_all" class="btn-floating waves-effect waves-light green tooltipped center-align hoverable translateT" title="Update debug messages"><i class="material-icons large">sync_problem</i></a>`;
+        const fbutton = `<a id="f_all" class="btn-floating waves-effect waves-light blue tooltipped center-align hoverable translateT" title="Update debug messages"><i class="material-icons large">${dbgMsgfilter.size != 0 ? 'filter_list' : 'format_align_justify' }</i></a>`;
+        const hbutton = `<a id="h_all" class="btn-floating waves-effect waves-light blue tooltipped center-align hoverable translateT" title="Update debug messages"><i class="material-icons large">${dbgMsghide.size != 0 ? 'unfold_more' : 'unfold_less'}</i></a>`;
+        const logbutton = `<a id="l_all" class="btn-floating waves-effect waves-light ${debugInLog ? 'green' : 'red'} tooltipped center-align hoverable translateT" title="Log messages"><i class="material-icons large">${debugInLog ? 'speaker_notes' : 'speaker_notes_off'}</i></a>`;
+        Html.push(`<li><table><thead id="dbgtable"><tr><td>${logbutton}</td><td colspan="3">Debug information by device</td><td>${fbutton}</td><td>${hbutton}</td><td>${button}</td></tr></thead><tbody>`);
+        if (!keylength) {
+            Html.push('<tr><td></td><td>No debug data loaded - press reload to refresh</td><td></td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr></tbody></table></li>')
+            $('#dbg_data_list').html(Html.join(''));
+        }
+        else {
+            Html.push('</tbody></table></li>')
+            for (const devID of Object.keys(dbgData)) {
+                const dev = devices.find((d) => d._id.endsWith(devID.slice(-16)));
+                const type_url = (dev && dev.common && dev.common.type ? sanitizeModelParameter(dev.common.type) : 'unknown');
+                const image = `<img src="${dev.common.icon || dev.icon}" width="40px" onerror="this.onerror=null;this.src='img/unavailable.png';">`
+                const modelUrl = (type_url === 'unknown') ? 'unknown' : `<a href="https://www.zigbee2mqtt.io/devices/${type_url}.html" target="_blank" rel="noopener noreferrer">${image}</a>`;
+                const devName = (dev && dev.common && dev.common.name) ? dev.common.name : 'unnamed';
+                const button = `<a id="e_${devID}" class="btn-floating waves-effect waves-light green tooltipped center-align hoverable translateT" title="Update debug messages"><i class="material-icons large">sync_problem</i></a>`
+                buttonNames.push(devID);
+                Html.push(`<li><table><thead id="dbgtable"><tr><td colspan="4">${devName} (ID: ${devID} Model: ${dev && dev.common ? dev.common.name : 'unknown'})</td><td>${modelUrl}</td><td>&nbsp;</td><td>${button}</td></tr></thead><tbody>`);
+                if (dbgData[devID].IN.length > 0) {
+                    Html.push(`${HtmlFromInDebugMessages(dbgData[devID].IN, devID, dbgMsgfilter.has('i_'+devID))}`);
+                }
+                if (dbgData[devID].OUT.length > 0) {
+                    Html.push(`${HtmlFromOutDebugMessages(dbgData[devID].OUT, devID, dbgMsgfilter.has('o_'+devID))}`);
+                }
+                Html.push('</tbody></table></li>');
+            }
+            $('#dbg_data_list').html(Html.join(''));
+        }
+        $(`#e_all`).click(function () {
+            getDebugMessages();
+        });
+        $(`#l_all`).click(function () {
+            debugInLog = !debugInLog;
+            getDebugMessages();
+        });
+        $(`#f_all`).click(function () {
+            if (dbgMsgfilter.size > 0) {
+                dbgMsgfilter.clear();
+            }
+            else {
+                for (const item of Object.keys(msg.byId)) {
+                    dbgMsgfilter.add(`o_${item}`)
+                    dbgMsgfilter.add(`i_${item}`)
+                }
+            }
+            displayDebugMessages(debugMessages);
+        });
+        $(`#h_all`).click(function () {
+            if (dbgMsghide.size > 0) {
+                dbgMsghide.clear();
+            }
+            else {
+                for (const item of Object.keys(msg.byId)) {
+                    dbgMsghide.add(`o_${item}`)
+                    dbgMsghide.add(`i_${item}`)
+                }
+            }
+            displayDebugMessages(debugMessages);
+        });
+        for (const b of buttonNames) {
+            $(`#e_${b}`).click(function () {
+                getDebugMessages();
+            });
+            $(`#o_${b}`).click(function () {
+                if (dbgMsgfilter.has(`o_${b}`)) dbgMsgfilter.delete(`o_${b}`); else dbgMsgfilter.add(`o_${b}`);
+                displayDebugMessages(debugMessages);
+            });
+            $(`#i_${b}`).click(function () {
+                if (dbgMsgfilter.has(`i_${b}`)) dbgMsgfilter.delete(`i_${b}`); else dbgMsgfilter.add(`i_${b}`);
+                displayDebugMessages(debugMessages);
+            });
+            $(`#ho_${b}`).click(function () {
+                if (dbgMsghide.has(`o_${b}`)) dbgMsghide.delete(`o_${b}`); else dbgMsghide.add(`o_${b}`);
+                displayDebugMessages(debugMessages);
+            });
+            $(`#hi_${b}`).click(function () {
+                if (dbgMsghide.has(`i_${b}`)) dbgMsghide.delete(`i_${b}`); else dbgMsghide.add(`i_${b}`);
+                displayDebugMessages(debugMessages);
+            });
+        }
+    }
+}
+
+function getDebugMessages() {
+    sendTo(namespace, 'getDebugMessages', { inlog: debugInLog }, function(msg) {
+        debugMessages = msg;
+        if (msg) displayDebugMessages(debugMessages)
+    })
+}
+
+
 function getDevices() {
     getCoordinatorInfo();
     sendTo(namespace, 'getDeviceCleanupRequired', {}, function(msg) {
@@ -899,6 +1095,7 @@ function getDevices() {
             } else {
                 devices = msg;
                 showDevices();
+                getDebugMessages();
                 getExclude();
                 getBinding();
             }
@@ -1009,6 +1206,7 @@ function load(settings, onChange) {
     //dialog = new MatDialog({EndingTop: '50%'});
     getDevices();
     getNamedColors();
+    //getDebugMessages();
     //getMap();
     //addCard();
 
@@ -1200,8 +1398,13 @@ socket.on('stateChange', function (id, state) {
                 $('#progress_line').css('width', `${percent}%`);
             }
         } else if (id.match(/\.info\.pairingMessage$/)) {
-            messages.push(state.val);
-            showMessages();
+            if (state.val == 'NewDebugMessage') {
+                getDebugMessages();
+            }
+            else {
+                messages.push(state.val);
+                showMessages();
+            }
         } else {
             const devId = getDevId(id);
             putEventToNode(devId);
@@ -1226,6 +1429,7 @@ socket.on('stateChange', function (id, state) {
     }
 });
 
+
 socket.on('objectChange', function (id, obj) {
     if (id.substring(0, namespaceLen) !== namespace) return;
     //console.log('objectChange', id, obj);
@@ -1486,7 +1690,6 @@ function showNetworkMap(devices, map) {
                 const options = data.edges._data.get(id);
                 if (select) {
                     options.font.size = 15;
-                    console.warn(JSON.stringify(options.font));
                 } else {
                     options.font.size = 0;
                 }
@@ -2065,7 +2268,6 @@ function editGroup(id, name) {
                     removeMembers.push({id:member.ieee.replace('0x',''), ep:member.epid})
             }
         }
-        console.warn(`ID: ${Id} name: ${newName} removeMembers: ${JSON.stringify(removeMembers)}`)
         updateGroup(Id, newName, (removeMembers.length > 0 ? removeMembers: undefined));
         // showGroups();
         getDevices();
@@ -2625,7 +2827,7 @@ function genDevInfo(device) {
                     ${genRow('date code', dev._dateCode)}
                     ${genRow('build', dev._softwareBuildID)}
                     ${genRow('interviewed', dev._interviewCompleted)}
-                    ${genRow('configured', (dev.meta.configured === 1), true)}
+                    ${genRow('configured', (device.isConfigured), true)}
                 </ul>
             </div>
         </div>
@@ -2817,16 +3019,12 @@ function addExcludeDialog() {
     $('#excludemodaledit a.btn[name=\'save\']').unbind('click');
     $('#excludemodaledit a.btn[name=\'save\']').click(() => {
         const exclude_id = $('#excludemodaledit').find('#exclude_target option:selected').val();
-
         const ids = devices.map(el => el._id);
         const idx = ids.indexOf(exclude_id);
         const exclude_model = devices[idx];
-        console.warn('calling addExclude mit model ' + exclude_model)
-
         addExclude(exclude_model);
     });
     prepareExcludeDialog();
-    console.warn('opening dialog');
     $('#excludemodaledit').modal('open');
     Materialize.updateTextFields();
 }
@@ -2855,7 +3053,7 @@ function getExclude() {
                 excludes = msg.legacy;
                 showExclude();
             }
-        } else console.warn('getExclude without msg')
+        }
     });
 }
 

package/admin/tab_m.html

@@ -9,7 +9,6 @@
 <!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.js"></script>
 <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.css"/> -->
 <script type="text/javascript" src="vis-network.min.js"></script>
-<script type="text/javascript" src="webcolors.js"></script>
 <link rel="stylesheet" type="text/css" href="vis-network.min.css"/>
 
 <!-- these files always have to be included -->
@@ -231,16 +230,18 @@
         color: blue;
     }
     .m.react-blue div.bg_red {
-        background-color: #400000;
-        color: DimGray;
-    }
-    .m div.bg_red {
-      background-color: LightGray;
-      color: DimGray;
+            background-color: #400000;
+            color: DimGray;
     }
     .m.react-dark div.bg_red {
-      background-color: #400000;
+            background-color: #400000;
+            color: DimGray;
     }
+    #dbgroweven { background-color: #404040; color: #c0c0c0 !important; }
+    #dbgrowodd  { background-color: #c0c0c0; color: #404040 !important; }
+    #dbgtable   { background-color: #3090c0; color: #404040 !important; }
+    #dbgred     { color: #C00000 !important;}
+
     .m.react-dark i.icon-blue {
         color: rgb(100, 181, 246)!important;
     }
@@ -911,6 +912,10 @@
                 <div id="exclude" class="row">
                 </div>
             </div>
+            <div id="tab-debug" class="col s12 page">
+                <ul id="dbg_data_list">
+                </ul>
+            </div>
         </div>
     </div>