iobroker.zigbee 3.1.2 → 3.1.4

package/admin/admin.js

@@ -60,9 +60,9 @@ const networkOptions = {
 
 
 const savedSettings = [
-    'port', 'panID', 'channel', 'disableLed', 'countDown', 'groups', 'extPanID', 'precfgkey', 'transmitPower',
-    'adapterType', 'debugHerdsman', 'disableBackup', 'disablePing', 'external', 'startWithInconsistent',
-    'warnOnDeviceAnnouncement', 'baudRate', 'flowCTRL', 'autostart', 'readAtAnnounce', 'startReadDelay', 'readAllAtStart',
+    'port', 'panID', 'channel', 'disableLed', 'countDown', 'groups', 'extPanID', 'precfgkey', 'transmitPower','useNewCompositeStates',
+    'adapterType', 'debugHerdsman', 'disableBackup', 'external', 'startWithInconsistent','pingTimeout','listDevicesAtStart',
+    'warnOnDeviceAnnouncement', 'baudRate', 'flowCTRL', 'autostart', 'readAtAnnounce', 'startReadDelay', 'readAllAtStart','pingCluster'
 ];
 
 function getDeviceByID(ID) {
@@ -78,7 +78,7 @@ function getDeviceByID(ID) {
 function getDevice(ieeeAddr) {
     return devices.find((devInfo) => {
         try {
-            return devInfo.info.device._ieeeAddr == ieeeAddr;
+            return devInfo.info.device.ieee == ieeeAddr;
         } catch (e) {
             //console.log("No dev with ieee " + ieeeAddr);
         }
@@ -89,7 +89,7 @@ function getDevice(ieeeAddr) {
 function getDeviceByNetwork(nwk) {
     return devices.find((devInfo) => {
         try {
-            return devInfo.info.device._networkAddress == nwk;
+            return devInfo.info.device.nwk == nwk;
         } catch (e) {
             //console.log("No dev with nwkAddr " + nwk);
         }
@@ -120,7 +120,8 @@ function getCoordinatorCard(dev) {
         rid = id.split('.').join('_'),
         image = `<img src="${img_src}" width="80px">`,
         paired = '',
-        status = dev ? `<div class="col tool"><i class="material-icons icon-green">check_circle</i></div>` : `<div class="col tool"><i class="material-icons icon-red">remove_circle</i></div>`,
+        status = coordinatorinfo.autostart ? (dev ? `<div class="col tool"><i class="material-icons icon-green">check_circle</i></div>` : `<div class="col tool"><i class="material-icons icon-red">remove_circle</i></div>`) :  `<div class="col tool"><i class="material-icons icon-orange">pause_circle_filled</i></div>`,
+        //status = dev ? `<div class="col tool"><i class="material-icons icon-green">check_circle</i></div>` : `<div class="col tool"><i class="material-icons icon-red">remove_circle</i></div>`,
         lqi_cls = dev ? getLQICls(dev.link_quality) : -1,
         lq = (dev && dev.link_quality) ? `<div class="col tool"><i id="${rid}_link_quality_icon" class="material-icons ${lqi_cls}">network_check</i><div id="${rid}_link_quality" class="center" style="font-size:0.7em">${dev.link_quality}</div></div>` : '',
         info = `<div style="min-height:88px; font-size: 0.8em" class="truncate">
@@ -136,13 +137,15 @@ function getCoordinatorCard(dev) {
                         <li><span class="label">ZHC / ZH:</span><span>${coordinatorinfo.converters} / ${coordinatorinfo.herdsman}</span></li>
                     </ul>
                 </div>`,
-        permitJoinBtn = (dev && dev.info && dev.info.device._type == 'Router') ? '<button name="join" class="btn-floating btn-small waves-effect waves-light right hoverable green"><i class="material-icons tiny">leak_add</i></button>' : '',
+        permitJoinBtn = '<div class="col tool"><button name="joinCard" class="waves-effect btn-small btn-flat right hoverable green"><i class="material-icons icon-green">leak_add</i></button></div>',
+        //permitJoinBtn = `<div class="col tool"><button name="join" class="btn-floating-sml waves-effect waves-light right hoverable green><i class="material-icons">leak_add</i></button></div>`,
         card = `<div id="${id}" class="device">
                   <div class="card hoverable">
                     <div class="card-content zcard">
                         <span class="top right small" style="border-radius: 50%">
                             ${lq}
                             ${status}
+                            ${permitJoinBtn}
                         </span>
                         <!--/a--!>
                         <span id="dName" class="card-title truncate">${title}</span><!--${paired}--!>
@@ -150,11 +153,6 @@ function getCoordinatorCard(dev) {
                         ${info}
                         <div class="footer right-align"></div>
                     </div>
-                    <div class="card-action">
-                        <div class="card-reveal-buttons">
-                            ${permitJoinBtn}
-                        </div>
-                    </div>
                   </div>
                 </div>`;
     return card;
@@ -175,9 +173,10 @@ function getGroupCard(dev) {
         }
     }
     devGroups[numid] = dev;
+    const roomInfo = rooms.length ? `<li><span class="labelinfo">rooms:</span><span>${rooms.join(',') || ''}</span></li>` : '';
     const room = rooms.join(',') || '&nbsp';
     let memberCount = 0;
-    let info = `<div style="min-height:88px; font-size: 0.8em; height: 98px; overflow-y: auto" class="truncate">
+    let info = `<div style="min-height:88px; font-size: 0.8em; overflow-y: auto" class="truncate">
                 <ul>`;
     info = info.concat(`<li><span class="labelinfo">Group ${numid}</span></li>`);
     if (dev.memberinfo === undefined) {
@@ -189,7 +188,7 @@ function getGroupCard(dev) {
         memberCount = (dev.memberinfo.length < 8 ? dev.memberinfo.length : 7);
     }
     ;
-    info = info.concat(`                    </ul>
+    info = info.concat(`              ${roomInfo}</ul>
                 </div>`);
     const image = `<img src="${dev.common.icon}" width="64px" onerror="this.onerror=null;this.src='img/unavailable.png';">`;
     const dashCard = getDashCard(dev, dev.common.icon, memberCount > 0);
@@ -207,11 +206,11 @@ function getGroupCard(dev) {
                             </div>
                             <i class="left">${image}</i>
                             ${info}
+
                             <div class="footer right-align"></div>
                         </div>
                         <div class="card-action">
                             <div class="card-reveal-buttons">
-                                <span class="left" style="padding-top:8px">${room}</span>
                                 <button name="deletegrp" class="right btn-flat btn-small">
                                     <i class="material-icons icon-black">delete</i>
                                 </button>
@@ -254,12 +253,13 @@ function getCard(dev) {
             rooms.push(dev.rooms[r]);
         }
     }
-    const room = rooms.join(',') || '&nbsp';
     const paired = (dev.paired) ? '' : '<i class="material-icons right">leak_remove</i>';
     const rid = id.split('.').join('_');
     const modelUrl = (!type) ? '' : `<a href="https://www.zigbee2mqtt.io/devices/${type_url}.html" target="_blank" rel="noopener noreferrer">${type}</a>`;
+    const groupInfo = dev.groupNames ? `<li><span class="labelinfo">groups:</span><span>${dev.groupNames || ''}</span></li>` : '';
+    const roomInfo = rooms.length ? `<li><span class="labelinfo">rooms:</span><span>${rooms.join(',') || ''}</span></li>` : '';
     const image = `<img src="${img_src}" width="80px" onerror="this.onerror=null;this.src='img/unavailable.png';">`,
-        nwk = (dev.info && dev.info.device) ? dev.info.device._networkAddress : undefined,
+        nwk = (dev.info && dev.info.device) ? dev.info.device.nwk : undefined,
         battery_cls = (isActive ? getBatteryCls(dev.battery) : ''),
         lqi_cls = getLQICls(dev.link_quality),
         battery = (dev.battery && isActive) ? `<div class="col tool"><i id="${rid}_battery_icon" class="material-icons ${battery_cls}">battery_std</i><div id="${rid}_battery" class="center" style="font-size:0.7em">${dev.battery}</div></div>` : '',
@@ -272,12 +272,14 @@ function getCard(dev) {
                         <li><span class="labelinfo">ieee:</span><span>0x${ieee}</span></li>
                         <li><span class="labelinfo">nwk:</span><span>${(nwk) ? nwk.toString() + ' (0x' + nwk.toString(16) + ')' : ''}</span></li>
                         <li><span class="labelinfo">model:</span><span>${modelUrl}</span></li>
-                        <li><span class="labelinfo">groups:</span><span>${dev.groupNames || ''}</span></li>
+                        ${groupInfo}
+                        ${roomInfo}
                     </ul>
                 </div>`,
         deactBtn = `<button name="swapactive" class="right btn-flat btn-small tooltipped" title="${(isActive ? 'Deactivate' : 'Activate')}"><i class="material-icons ${(isActive ? 'icon-green' : 'icon-red')}">power_settings_new</i></button>`,
         debugBtn = `<button name="swapdebug" class="right btn-flat btn-small tooltipped" title="${(isDebug > -1 ? (isDebug > 0) ?'Automatic by '+debugDevices[isDebug-1]: 'Disable Debug' : 'Enable Debug')}"><i class="material-icons icon-${(isDebug > -1 ? (isDebug > 0 ? 'orange' : 'green') : 'gray')}">bug_report</i></button>`,
         infoBtn = (nwk) ? `<button name="info" class="left btn-flat btn-small"><i class="material-icons icon-blue">info</i></button>` : '';
+
     const dashCard = getDashCard(dev);
     const card = `<div id="${id}" class="device">
                   <div class="card hoverable flipable  ${isActive ? '' : 'bg_red'}">
@@ -300,7 +302,7 @@ function getCard(dev) {
                         <div class="card-action">
                             <div class="card-reveal-buttons">
                                 ${infoBtn}
-                                <span class="left" style="padding-top:8px">${room}</span>
+
                                 <span class="left fw_info"></span>
                                 <button name="delete" class="right btn-flat btn-small tooltipped" title="Delete">
                                     <i class="material-icons icon-red">delete</i>
@@ -385,7 +387,7 @@ function deleteConfirmation(id, name) {
     $('#modaldelete a.btn[name=\'yes\']').unbind('click');
     $('#modaldelete a.btn[name=\'yes\']').click(() => {
         const force = $('#force').prop('checked');
-        deleteDevice(id, force);
+        deleteZigbeeDevice(id, force);
     });
     $('#modaldelete').modal('open');
     Materialize.updateTextFields();
@@ -444,29 +446,50 @@ function editName(id, name) {
 
     const device_options = {};
     const received_options = {};
+    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 = [];
 
     function removeOption(k) {
-        if (k && device_options.hasOwnProperty(k)) delete device_options[k];
+        if (k && device_options.hasOwnProperty(k)) {
+            if (dev.info.mapped && dev.info.mapped.options && dev.info.mapped.options.includes(device_options[k].key))
+                availableOptions.push(device_options[k].key)
+            delete device_options[k];
+        }
     }
 
     function addOption() {
         let idx=1;
         let key = '';
+        const optionName = $('#option_Selector').val();
+        console.warn(`option name is ${optionName}`);
         do {
             key = `o${idx++}`;
         }
         while (device_options.hasOwnProperty(key));
-        device_options[key] = {key:`option_${idx++}`, value:''};
+        device_options[key] = { key:optionName, value:''};
+        console.warn(`device_options: ${JSON.stringify(device_options)}`);
+        idx = availableOptions.indexOf(optionName);
+        console.warn(`idx: ${idx}, ao:${JSON.stringify(availableOptions)}, on: ${optionName}`);
+        if (idx > -1) availableOptions.splice(idx, 1);
     }
 
-    function updateOptions() {
+    function updateOptions(candidates) {
+        if (candidates.length > 0) {
+            $('#modaledit').find('.new_options_available').removeClass('hide');
+            list2select('#option_Selector', candidates, [], (key, val) => { return val; }, (key, val) => { return val; })
+        }
+        else {
+            $('#modaledit').find('.new_options_available').addClass('hide');
+        }
         const html_options=[];
 
-        console.warn(`device_options is ${JSON.stringify(device_options)}`)
+        console.warn(`option_Selector is ${JSON.stringify(device_options)}`)
 
         for (const k in device_options) {
             html_options.push(`<div class="row">`);
-            html_options.push(`<div class="input-field suffix col s5 m5 l5"><input id="option_key_${k}" type="text" class="value" /><label for="option_key_${k}">Option</label></div>`)
+            html_options.push(`<div class="input-field suffix col s5 m5 l5"><input disabled id="option_key_${k}" type="text" class="value" /><label for="option_key_${k}">Option</label></div>`)
             html_options.push(`<div class="input-field suffix col s5 m5 l5"><input id="option_value_${k}" type="text" class="value" /><label for="option_value_${k}">Value</label></div>`)
             html_options.push(`<div class="col"><a id="option_rem_${k}" class='btn' ><i class="material-icons">remove_circle</i></a></div>`);
             html_options.push(`</div>`)
@@ -480,11 +503,11 @@ function editName(id, name) {
                 $(`#option_key_${k}`).val(device_options[k].key);
                 $(`#option_value_${k}`).val(device_options[k].value);
                 $(`#option_rem_${k}`).unbind('click');
-                $(`#option_rem_${k}`).click(() => { removeOption(k); updateOptions() });
+                $(`#option_rem_${k}`).click(() => { removeOption(k); updateOptions(availableOptions) });
             }
         }
         else {
-            $('#modaledit').find('.options_available').addClass('hide');
+            if (candidates.length == 0) $('#modaledit').find('.options_available').addClass('hide');
         }
     }
 
@@ -513,18 +536,15 @@ function editName(id, 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 = [];
     if (dev && dev.info && dev.info.endpoints) {
         for (const ep of dev.info.endpoints) {
-            if (ep.inputClusters.includes(4)) {
+            if (ep.input_clusters.includes(4)) {
                 groupables.push({epid: EndPointIDfromEndPoint(ep), ep: ep, memberOf: []});
             }
         }
     }
     const numEP = groupables.length;
+    const availableOptions = (dev.info.mapped ? dev.info.mapped.options.slice() || []:[]);
 
     if (numEP > 0) {
         $('#modaledit').find('.groups_available').removeClass('hide');
@@ -571,7 +591,7 @@ function editName(id, name) {
     sendTo(namespace, 'getLocalConfigItems', { target:id, global:false, key:'options' }, function (msg) {
         if (msg) {
             if (msg.error) showMessage(msg.error, '_Error');
-            console.warn(`return is ${msg}`)
+            console.warn(`return is ${JSON.stringify(msg)}`)
             Object.keys(device_options).forEach(key => delete device_options[key]);
             Object.keys(received_options).forEach(key => delete received_options[key]);
             if (typeof msg.options === 'object') {
@@ -579,12 +599,16 @@ function editName(id, name) {
                 let cnt = 1;
                 for (const key in msg.options)
                 {
+                    const idx = availableOptions.indexOf(key);
+                    console.warn(`key ${key} : index : ${idx}`);
+                    if (idx > -1) availableOptions.splice(idx,1);
                     received_options[key]=msg.options[key];
                     device_options[`o${cnt}`] = { key:key, value:msg.options[key]}
                     cnt++;
                 }
             }
-            updateOptions();
+            console.warn(`avo ${JSON.stringify(availableOptions)}, mapped: ${JSON.stringify(dev.info.mapped.options)}`);
+            updateOptions(availableOptions);
 
         } else showMessage('callback without message');
     });
@@ -593,7 +617,7 @@ function editName(id, name) {
     $('#modaledit a.btn[name=\'add_options\']').click(() => {
         getOptionsFromUI(device_options, received_options);
         addOption();
-        updateOptions()
+        updateOptions(availableOptions)
     });
     $('#modaledit a.btn[name=\'save\']').click(() => {
         const newName = $('#modaledit').find('input[id=\'d_name\']').val();
@@ -634,8 +658,8 @@ function GenerateGroupChange(oldmembers, newmembers) {
     return grpchng;
 }
 
-function deleteDevice(id, force) {
-    sendTo(namespace, 'deleteDevice', {id: id, force: force}, function (msg) {
+function deleteZigbeeDevice(id, force) {
+    sendTo(namespace, 'deleteZigbeeDevice', {id: id, force: force}, function (msg) {
         closeWaitingDialog();
         if (msg) {
             if (msg.error) {
@@ -719,12 +743,12 @@ function showDevices() {
             html += card;
             continue;
         };
-        if (d.info && d.info.device && d.info.device._type == 'Coordinator') {
+        if (d.info && d.info.device && d.info.device.type == 'Coordinator') {
             hasCoordinator=true;
             const card = getCoordinatorCard(d);
             html += card;
         } else {
-            //if (d.groups && d.info && d.info.device._type == "Router") {
+            //if (d.groups && d.info && d.info.device.type == "Router") {
             if (d.groups) {
                 //devGroups[d._id] = d.groups;
                 if (typeof d.groups.map == 'function') {
@@ -819,13 +843,18 @@ function showDevices() {
         const name = getDevName(dev_block);
         editGroup(id, name, false);
     });
-    $('button.btn-floating[name=\'join\']').click(function () {
+    $('button[name=\'joinCard\']').click(function () {
         const dev_block = $(this).parents('div.device');
         if (!$('#pairing').hasClass('pulse')) {
             joinProcess(getDevId(dev_block));
         }
         showPairingProcess();
     });
+    $('button[name=\'deviceQuery\']').click(function () {
+        const dev_block = $(this).parents('div.device');
+        sendTo(namespace, 'setState', {id: `${getDevId(dev_block)}.device_query`, val: true}, function (data) {
+            //console.log(data);
+        });    });
     $('#modalpairing a.btn[name=\'extendpairing\']').click(function () {
         letsPairing();
     });
@@ -856,6 +885,14 @@ function showDevices() {
     translateAll();
 }
 
+function downloadIcons() {
+    sendTo(namespace, 'downloadIcons', {}, function (msg) {
+        if (msg && msg.msg) {
+            showMessage(msg.msg, _('Result'));
+        }
+    });
+}
+
 function checkFwUpdate() {
     const deviceCards = getDeviceCards();
     const getFwInfoNode = function (deviceCard) {
@@ -1080,6 +1117,7 @@ function HtmlFromInDebugMessages(messages, devID, filter) {
     const Html = [];
     const filterSet = new Set();
     let isodd = true;
+    const buttonList = [];
     if (dbgMsghide.has('i_'+devID)) {
         console.warn('in all filtered out')
         Html.push('&nbsp;')
@@ -1094,8 +1132,11 @@ function HtmlFromInDebugMessages(messages, devID, filter) {
                 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>`);
+                if (idx==0) {
+                    const msgbutton = `<a id="lx_${item.dataID}" class="btn-floating waves-effect waves-light blue tooltipped center-align hoverable translateT" title="Messages from ${new Date(item.dataID).toLocaleTimeString()}"><i class="material-icons large">speaker_notes</i></a>`
+                    buttonList.push(item.dataID)
+                    LHtml.push(`<td${rowspan}>${msgbutton}</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)
             }
@@ -1108,7 +1149,7 @@ function HtmlFromInDebugMessages(messages, devID, filter) {
     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>`;
+    return {html:`<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>`, buttonList };
 }
 
 
@@ -1116,6 +1157,7 @@ function HtmlFromOutDebugMessages(messages, devID, filter) {
     const Html = [];
     const filterSet = new Set();
     let isodd=true;
+    const buttonList = [];
     if (dbgMsghide.has('o_'+devID)) {
         console.warn('out all filtered out')
         Html.push('&nbsp;')
@@ -1131,8 +1173,11 @@ function HtmlFromOutDebugMessages(messages, devID, filter) {
                 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>`);
+                if (idx==0) {
+                    const msgbutton = `<a id="lx_${item.dataID}" class="btn-floating waves-effect waves-light blue tooltipped center-align hoverable translateT" title="Messages from ${new Date(item.dataID).toLocaleTimeString()}"><i class="material-icons large">speaker_notes</i></a>`
+                    LHtml.push(`<td${rowspan}>${msgbutton}</td><td${rowspan}>${safestring(item.payload)}</td>`);
+                    buttonList.push(item.dataID)
+                }
                 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);
 
@@ -1146,22 +1191,24 @@ function HtmlFromOutDebugMessages(messages, devID, filter) {
     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>`;
+    return { html:`<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>`, buttonList};
 }
 
 
 function displayDebugMessages(msg) {
     const buttonNames = [];
+    const idButtons = [];
     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 dbutton = `<a id="d_all" class="btn-floating waves-effect waves-light red tooltipped center-align hoverable translateT" title="Update debug messages"><i class="material-icons icon-yellowlarge">delete_forever</i></a>`;
+        const fbutton = `<a id="f_all" class="btn-floating waves-effect waves-light green 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>`);
+        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><td>${dbutton}</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(''));
@@ -1176,20 +1223,28 @@ function displayDebugMessages(msg) {
                 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>`
+                const dbutton = `<a id="d_${devID}" class="btn-floating waves-effect waves-light red tooltipped center-align hoverable translateT" title="Update debug messages"><i class="material-icons icon-yellow large">delete_forever</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>`);
+                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>${button}</td><td>${dbutton}</td></tr></thead><tbody>`);
                 if (dbgData[devID].IN.length > 0) {
-                    Html.push(`${HtmlFromInDebugMessages(dbgData[devID].IN, devID, dbgMsgfilter.has('i_'+devID))}`);
+                    const indata = HtmlFromInDebugMessages(dbgData[devID].IN, devID, dbgMsgfilter.has('i_'+devID));
+                    Html.push(`${indata.html}`);
+                    idButtons.push(...indata.buttonList)
                 }
                 if (dbgData[devID].OUT.length > 0) {
-                    Html.push(`${HtmlFromOutDebugMessages(dbgData[devID].OUT, devID, dbgMsgfilter.has('o_'+devID))}`);
+                    const outdata = HtmlFromOutDebugMessages(dbgData[devID].OUT, devID, dbgMsgfilter.has('o_'+devID));
+                    Html.push(`${outdata.html}`);
+                    idButtons.push(...outdata.buttonList)
                 }
                 Html.push('</tbody></table></li>');
             }
             $('#dbg_data_list').html(Html.join(''));
         }
         $(`#e_all`).click(function () {
-            getDebugMessages();
+            getDebugMessages(false);
+        });
+        $(`#d_all`).click(function () {
+            getDebugMessages(true, 'all');
         });
         $(`#l_all`).click(function () {
             debugInLog = !debugInLog;
@@ -1221,7 +1276,10 @@ function displayDebugMessages(msg) {
         });
         for (const b of buttonNames) {
             $(`#e_${b}`).click(function () {
-                getDebugMessages();
+                getDebugMessages(false);
+            });
+            $(`#d_${b}`).click(function () {
+                getDebugMessages(true, b);
             });
             $(`#o_${b}`).click(function () {
                 if (dbgMsgfilter.has(`o_${b}`)) dbgMsgfilter.delete(`o_${b}`); else dbgMsgfilter.add(`o_${b}`);
@@ -1240,76 +1298,167 @@ function displayDebugMessages(msg) {
                 displayDebugMessages(debugMessages);
             });
         }
+        for (const b of idButtons) {
+            console.warn(`trying to add link to button ${b}`);
+            $(`#lx_${b}`).click(function() { showMessageList(b)});
+        }
+    }
+}
+
+function showNamedMessages(messages, title, icon, timestamp) {
+    // noinspection JSJQueryEfficiency
+    let $dialogMessage = $('#dialog-message');
+    if (!$dialogMessage.length) {
+        $('body').append(
+            '<div class="m"><div id="dialog-message" class="modal modal-fixed-footer">' +
+            '    <div class="modal-content">' +
+            '        <h6 class="dialog-title title"></h6>' +
+            '        <p><i class="large material-icons dialog-icon"></i><span class="dialog-text"></span></p>' +
+            '    </div>' +
+            '    <div class="modal-footer">' +
+            '        <a class="modal-action modal-close waves-effect waves-green btn-flat translate">Ok</a>' +
+            '    </div>' +
+            '</div></div>');
+        $dialogMessage = $('#dialog-message');
+    }
+    if (icon) {
+        $dialogMessage.find('.dialog-icon')
+            .show()
+            .html(icon);
+    } else {
+        $dialogMessage.find('.dialog-icon').hide();
+    }
+    if (title) {
+        $dialogMessage.find('.dialog-title').html(title).show();
+    } else {
+        $dialogMessage.find('.dialog-title').hide();
+    }
+    const lihtml = ['```<br><ul>'];
+    for (const key of Object.keys(messages)) {
+        lihtml.push(`<li>${key}: ${messages[key]}</li>`)
+    }
+    lihtml.push('</ul><br>```')
+    $dialogMessage.find('.dialog-text').html(lihtml);
+    $dialogMessage.modal().modal('open');
+
+}
+
+function showMessageList(msgId) {
+    console.warn(`trying to show messages for ${msgId}`);
+    console.warn(JSON.stringify(debugMessages));
+    for (const devId of Object.keys(debugMessages.byId)) {
+        for (const id of debugMessages.byId[devId].IN) {
+            if (id.dataID == msgId) {
+                console.warn(`showing messages for ${id.type} ${devId}`);
+                showNamedMessages(id.messages, `Messages from ${new Date(msgId).toLocaleTimeString()} for device ${devId}`);
+                return;
+            }
+        }
+        for (const id of debugMessages.byId[devId].OUT) {
+            if (id.dataID == msgId) {
+                console.warn(`showing messages for ${msgId}`);
+                showNamedMessages(id.messages, `Messages from ${new Date(msgId).toLocaleTimeString()} for device ${devId}`);
+                return;
+            }
+        }
     }
+    console.warn(`nothing to show`);
+
+
 }
 
-function getDebugMessages() {
-    sendTo(namespace, 'getDebugMessages', { inlog: debugInLog }, function(msg) {
+function getDebugMessages(deleteBeforeRead, deleteSelected) {
+    sendTo(namespace, 'getDebugMessages', { inlog: debugInLog, del:deleteBeforeRead ? deleteSelected : '' }, function(msg) {
         debugMessages = msg;
         if (msg) displayDebugMessages(debugMessages)
     })
 }
 
-
+const lockout = {
+    timeoutid:undefined,
+    isActive:false,
+};
 function getDevices() {
     console.warn('getDevices called')
-    sendTo(namespace, 'getCoordinatorInfo', {}, function (msg) {
-        console.warn(`getCoordinatorInfo returned ${JSON.stringify(msg)}`)
-        if (msg) {
-            console.warn(JSON.stringify(msg))
-            if (msg.error) {
-                errorData.push(msg.error);
-                delete msg.error;
-                isHerdsmanRunning = false;
-            } else {
-                isHerdsmanRunning = true;
-            }
-            coordinatorinfo = msg;
-            updateStartButton()
-        }
-        sendTo(namespace, 'getDevices', {}, function (msg) {
-            if (msg) {
-                devices = msg.devices ? msg.devices : [];
-                // check if stashed error messages are sent alongside
-                if (msg.clean)
-                    $('#state_cleanup_btn').removeClass('hide');
-                else
-                    $('#state_cleanup_btn').addClass('hide');
-                if (msg.errors && msg.errors.length > 0) {
-                    $('#show_errors_btn').removeClass('hide');
-                    errorData = msg.errors;
-                }
-                else {
-                    $('#show_errors_btn').addClass('hide');
-                }
 
-                //check if debug messages are sent alongside
-                if (msg && typeof (msg.debugDevices == 'array')) {
-                    debugDevices = msg.debugDevices;
-                    console.warn('debug devices is sent')
-                }
-                else
-                    debugDevices = [];
-                if (debugMessages.byId) {
-                    debugMessages.byId = msg;
-                    if (msg) displayDebugMessages(debugMessages)
-                }
+    function sendForData() {
+        sendTo(namespace, 'getCoordinatorInfo', {}, function (msg) {
+            console.warn(`getCoordinatorInfo returned ${JSON.stringify(msg)}`)
+            if (msg) {
+                console.warn(JSON.stringify(msg))
                 if (msg.error) {
                     errorData.push(msg.error);
+                    delete msg.error;
                     isHerdsmanRunning = false;
-                    updateStartButton();
-                    showDevices();
                 } else {
                     isHerdsmanRunning = true;
-                    updateStartButton();
-                    showDevices();
-                    getDebugMessages();
-                    getExclude();
-                    getBinding();
                 }
+                coordinatorinfo = msg;
+                updateStartButton()
             }
+            sendTo(namespace, 'getDevices', {}, function (msg) {
+                if (msg) {
+                    devices = msg.devices ? msg.devices : [];
+                    // check if stashed error messages are sent alongside
+                    if (msg.clean)
+                        $('#state_cleanup_btn').removeClass('hide');
+                    else
+                        $('#state_cleanup_btn').addClass('hide');
+                    if (msg.errors && msg.errors.length > 0) {
+                        $('#show_errors_btn').removeClass('hide');
+                        errorData = msg.errors;
+                    }
+                    else {
+                        $('#show_errors_btn').addClass('hide');
+                    }
+                    let newDebugMessages = false;
+
+                    //check if debug messages are sent alongside
+                    if (msg && typeof (msg.debugDevices == 'array')) {
+                        debugDevices = msg.debugDevices;
+                        console.warn('debug devices is sent')
+                    }
+                    else
+                        debugDevices = [];
+                    if (debugMessages.byId) {
+                        newDebugMessages = true;
+                        console.warn('having debug messages');
+                        debugMessages.byId = msg;
+                        if (msg) displayDebugMessages(debugMessages)
+                    }
+                    lockout.isActive = false;
+                    if (msg.error) {
+                        errorData.push(msg.error);
+                        isHerdsmanRunning = false;
+                        updateStartButton();
+                        showDevices();
+                    } else {
+                        isHerdsmanRunning = true;
+                        updateStartButton();
+                        showDevices();
+                        if (!newDebugMessages) {
+                            console.warn('getting debug messages');
+                            getDebugMessages();
+                        }
+                        //getExclude();
+                        getBinding();
+                    }
+                }
+            });
         });
-    });
+    }
+
+    if (lockout.timeoutid) {
+        clearTimeout(lockout.timeoutid);
+        console.warn('clearing getDevices timeout')
+    }
+
+    setTimeout(() => {
+        lockout.isActive = true;
+        lockout.timeoutid = undefined;
+        sendForData();
+    }, 100);
+
 }
 
 function getNamedColors() {
@@ -1331,10 +1480,10 @@ function getDeviceCard(devId) {
     return $('#devices').find(`div[id='${namespace}.${devId}']`);
 }
 
-function getMap() {
+function getMap(rebuild) {
     $('#refresh').addClass('disabled');
     if (isHerdsmanRunning) {
-        sendTo(namespace, 'getMap', {}, function (msg) {
+        sendTo(namespace, 'getMap', { forcebuild:rebuild}, function (msg) {
             $('#refresh').removeClass('disabled');
             if (msg) {
                 if (msg.error) {
@@ -1404,6 +1553,7 @@ function load(settings, onChange) {
         settings.baudRate = 115200;
     }
     if (settings.autostart === undefined) settings.autostart = false;
+    if (typeof settings.pingCluster != 'string') settings.pingCluster = settings.disablePing ? 'off' : 'default';
 
     // example: select elements with id=key and class=value and insert value
     for (const key in settings) {
@@ -1477,6 +1627,9 @@ function load(settings, onChange) {
     $('#show_errors_btn').click(function () {
         showMessage(errorData.join('<br>'), 'Stashed error messages');
     });
+    $('#download_icons_btn').click(function () {
+        showMessage(downloadIcons());
+    });
     $('#fw_check_btn').click(function () {
         checkFwUpdate();
     });
@@ -1493,7 +1646,11 @@ function load(settings, onChange) {
     });
 
     $('#refresh').click(function () {
-        getMap();
+        getMap(false);
+    });
+    $('#regenerate').click(function () {
+        getMap(true);
+        $('#modalviewconfig').modal('close');
     });
 
     $('#reset-btn').click(function () {
@@ -1505,7 +1662,9 @@ function load(settings, onChange) {
     });
 
     $('#ErrorNotificationBtn').click(function () {
-        if (!isHerdsmanRunning) showMessage('The zigbee subsystem is not running. Please ensure that the configuration is correct and either start the subsystem manually from the hardware tab or set it to automatically start in the settings.', _('Zigbee subsystem error'));
+        if (!isHerdsmanRunning) {
+            doTestStart(!isHerdsmanRunning, true);
+        }
     })
 
     $('#viewconfig').click(function () {
@@ -1619,10 +1778,10 @@ function showPairingProcess() {
     Materialize.updateTextFields();
 }
 
-function doTestStart(start) {
+function doTestStart(start, interactive) {
     updateStartButton(true);
     if (start) {
-        const ovr = { extPanID:$('#extPanID.value').val(),
+        const ovr = interactive ? {} : { extPanID:$('#extPanID.value').val(),
             panID: $('#PanID.value').val(),
             channel: $('#channel.value').val(),
             port: $('#port.value').val(),
@@ -1633,12 +1792,18 @@ function doTestStart(start) {
         };
         // $('#testStartStart').addClass('disabled');
         messages = [];
+        if (interactive) showWaitingDialog('Trying to start the zigbee subsystem manually', 120);
         sendTo(namespace, 'testConnect', { start:true, zigbeeOptions:ovr }, function(msg) {
             if (msg) {
+                closeWaitingDialog();
+                isHerdsmanRunning = msg.status;
+                updateStartButton(false);
                 if (msg.status)
                     $('#testStartStop').removeClass('disabled');
-                else
-                    $('#testStartStart').removeClass('disabled');
+                else {
+                    //showMessage(`The zigbee subsystem is not running. Please ensure that the configuration is correct. ${msg.error ? 'Error on start-Attempt ' + msg.error.message : ''}`);
+                    $('#testStartStop').removeClass('disabled');
+                }
             }
         })
     }
@@ -1689,8 +1854,8 @@ function updateStartButton(block) {
         $('#deleteNVRam-btn').addClass('disabled');
         $('#ErrorNotificationBtn').removeClass('hide')
         $('#ErrorNotificationBtn').removeClass('blinking')
-        $('#ErrorNotificationIcon').removeClass('icon-red')
-        $('#ErrorNotificationIcon').addClass('icon-orange')
+        $('#ErrorNotificationBtn').removeClass('red')
+        $('#ErrorNotificationBtn').addClass('orange')
         return;
     }
     if (isHerdsmanRunning)
@@ -1707,8 +1872,8 @@ function updateStartButton(block) {
         //$('#pairing').removeClass('hide');
     }
     else {
-        $('#ErrorNotificationIcon').addClass('icon-red')
-        $('#ErrorNotificationIcon').removeClass('icon-orange')
+        $('#ErrorNotificationBtn').addClass('red')
+        $('#ErrorNotificationBtn').removeClass('orange')
         $('#ErrorNotificationBtn').removeClass('hide')
         $('#ErrorNotificationBtn').addClass('blinking');
         $('#show_test_run').removeClass('disabled');
@@ -1862,7 +2027,7 @@ function showNetworkMap(devices, map) {
             borderWidth: 1,
             borderWidthSelected: 4,
         };
-        if (dev.info && dev.info.device._type == 'Coordinator') {
+        if (dev.info && dev.info.device.type == 'Coordinator') {
             // node.shape = 'star';
             node.image = 'zigbee.png';
             node.label = 'Coordinator';
@@ -2022,7 +2187,7 @@ function showNetworkMap(devices, map) {
 
             if (node) {
                 node.font = {color: '#ff0000'};
-                if (dev.info && dev.info.device._type == 'Coordinator') {
+                if (dev.info && dev.info.device && dev.info.device.type == 'Coordinator') {
                     node.font = {color: '#00ff00'};
                 }
                 nodesArray.push(node);
@@ -2187,35 +2352,37 @@ function loadDeveloperTab() {
     updateSelect('#dev', devices,
         function (key, device) {
             if (device.hasOwnProperty('info')) {
-                if (device.info.device._type === 'Coordinator') {
+                if (device.info.device && device.info.device.type === 'Coordinator') {
                     return null;
                 }
-                return `${device.common.name} (${device.info.name})`;
+                if (device.common.type === 'group') return null;
+                return `${device.common.name} (${device.info.device.ieee})`;
             } else { // fallback if device in list but not paired
                 return device.common.name + ' ' + device.native.id;
             }
         },
         function (key, device) {
-            return device._id;
-        });
-    // add groups to device selector
-    const groupList = [];
-    for (const key in groups) {
-        groupList.push({
-            _id: namespace + '.' + key.toString(16).padStart(16, '0'),
-            groupId: key,
-            groupName: groups[key]
+            return device.native.id;
         });
-    }
-    updateSelect('#dev', groupList,
-        function (key, device) {
-            return 'Group ' + device.groupId + ': ' + device.groupName;
-        },
-        function (key, device) {
-            return device._id;
-        }, true);
+    /*
+        const groupList = [];
+        for (const key in groups) {
+            groupList.push({
+                id: namespace + '.' + key.toString(16).padStart(16, '0'),
+                groupId: key,
+                groupName: groups[key]
+            });
+        }
+        updateSelect('#dev', groupList,
+            function (key, device) {
+                return 'Group ' + device.groupId + ': ' + device.groupName;
+            },
+            function (key, device) {
+                return device.id;
+            }, true);
 
-    // fill cid, cmd, type selector
+        // fill cid, cmd, type selector
+    */
     populateSelector('#cid', 'cidList');
     populateSelector('#cmd', 'cmdListFoundation', this.value);
     populateSelector('#type', 'typeList', this.value);
@@ -2296,10 +2463,11 @@ function loadDeveloperTab() {
             }
 
             const device = devices.find(obj => {
-                return obj._id === this.value;
+                return this.value ===obj.native.id;
             });
+            console.warn(`dev selector: ${this.selectedIndex} ${this.value} ->${JSON.stringify(device)}`)
 
-            const epList = device ? device.info.device._endpoints : null;
+            const epList = device ? device.info.endpoints : null;
             updateSelect('#ep', epList,
                 function (key, ep) {
                     return ep.ID;
@@ -2735,14 +2903,14 @@ function prepareBindingDialog(bindObj) {
                 return 'Select source device';
             }
             if (device.hasOwnProperty('info')) {
-                if (device.info.device._type === 'Coordinator') {
+                if (device.info.device && device.info.device.type === 'Coordinator') {
                     return null;
                 }
                 // check for output clusters
                 let allow = false;
                 for (const cluster of allowClusters) {
                     if (device.info.endpoints) for (const ep of device.info.endpoints) {
-                        if (ep.outputClusters.includes(cluster)) {
+                        if (ep.output_clusters.includes(cluster)) {
                             allow = true;
                             break;
                         }
@@ -2786,14 +2954,14 @@ function prepareBindingDialog(bindObj) {
                 return 'Select target device';
             }
             if (device.hasOwnProperty('info')) {
-                if (device.info.device._type === 'Coordinator') {
+                if (device.info.device && device.info.device.type === 'Coordinator') {
                     return null;
                 }
                 // check for input clusters
                 let allow = false;
                 for (const cluster of allowClusters) {
                     if (device.info.endpoints) for (const ep of device.info.endpoints) {
-                        if (ep.inputClusters.includes(cluster)) {
+                        if (ep.input_clusters.includes(cluster)) {
                             allow = true;
                             break;
                         }
@@ -2837,7 +3005,7 @@ function prepareBindingDialog(bindObj) {
 
         const epList = device ? device.info.endpoints : [];
         const sClusterList = epList.map((ep) => {
-            const clusters = ep.outputClusters.map((cl) => {
+            const clusters = ep.output_clusters.map((cl) => {
                 return allowClusters.includes(cl) ? {ID: ep.ID + '_' + cl, name: allowClustersName[cl]} : null;
             }).filter((i) => {
                 return i != null;
@@ -2863,7 +3031,7 @@ function prepareBindingDialog(bindObj) {
 
         const epList = device ? device.info.endpoints : [];
         const tClusterList = epList.map((ep) => {
-            const clusters = ep.inputClusters.map((cl) => {
+            const clusters = ep.input_clusters.map((cl) => {
                 return (allowClusters.includes(cl) && (!sourceCl || sourceCl == cl)) ? {
                     ID: ep.ID + '_' + cl,
                     name: allowClustersName[cl]
@@ -3096,12 +3264,13 @@ function genDevInfo(device) {
     //console.log(device);
     const dev = (device && device.info) ? device.info.device : undefined;
     const mapped = (device && device.info) ? device.info.mapped : undefined;
+    const endpoints = (device && device.info) ? device.info.endpoints : [];
     if (!dev) return `<div class="truncate">No info</div>`;
     const genRow = function (name, value, refresh) {
         if (value === undefined) {
             return '';
         } else {
-            return `<li><span class="label">${name}:</span><span>${value}</span></li>`;
+            return `<li><span class="label">${name.replace('_',' ')}:</span><span>${value}</span></li>`;
         }
     };
     const genRowValues = function (name, value) {
@@ -3109,66 +3278,68 @@ function genDevInfo(device) {
             return '';
         } else {
             let label = `${name}:`;
-            return value.map((val) => {
-                const row = `<li><span class="label">${label}</span><span>${val}</span></li>`;
-                label = '';
-                return row;
-            }).join('');
+            try {
+                return value.map((val) => {
+                    const row = `<li><span class="label">${label}</span><span>${val}</span></li>`;
+                    label = '';
+                    return row;
+                }).join('');
+            }
+            catch {
+                return `<li><span class="label">${label}</span><span>${JSON.stringify(value)}</span></li>`
+            }
         }
     };
     const modelUrl = (!mapped) ? '' : `<a href="https://www.zigbee2mqtt.io/devices/${sanitizeModelParameter(mapped.model)}.html" target="_blank" rel="noopener noreferrer">${mapped.model}</a>`;
-    const mappedInfo = (!mapped) ? '' :
-        `<div style="font-size: 0.9em">
-            <ul>
-                ${genRow('model', modelUrl)}
-                ${genRow('description', mapped.description)}
-                ${genRow('supports', mapped.supports)}
-            </ul>
-        </div>`;
+    const mappedInfo = [];
+    if (mapped) {
+        mappedInfo.push(
+            `<div style="font-size: 0.9em">
+                <ul>`);
+        for (const item in mapped) {
+            if (item == 'model')
+                mappedInfo.push(genRow(item,modelUrl));
+            else
+                mappedInfo.push(genRow(item,mapped[item]));
+        }
+        mappedInfo.push(
+            `            </ul>
+                    </div>`);
+    }
     let epInfo = '';
-    for (const epind in dev._endpoints) {
-        const ep = dev._endpoints[epind];
+    for (const epind in endpoints) {
+        const ep = endpoints[epind];
+        console.warn(JSON.stringify(ep));
         epInfo +=
             `<div style="font-size: 0.9em" class="truncate">
                 <ul>
                     ${genRow('endpoint', ep.ID)}
-                    ${genRow('profile', ep.profileID)}
-                    ${genRowValues('input clusters', ep.inputClusters.map(findClName))}
-                    ${genRowValues('output clusters', ep.outputClusters.map(findClName))}
+                    ${genRow('profile', ep.profile)}
+                    ${genRowValues('input clusters', ep.input_clusters ? ep.input_clusters.map(findClName) : 'none')}
+                    ${genRowValues('output clusters', ep.output_clusters ? ep.output_clusters.map(findClName): 'none')}
                 </ul>
             </div>`;
     }
     const imgSrc = device.icon || device.common.icon;
     const imgInfo = (imgSrc) ? `<img src=${imgSrc} width='150px' onerror="this.onerror=null;this.src='img/unavailable.png';"><div class="divider"></div>` : '';
-    const info =
+    const info =[
         `<div class="col s12 m6 l6 xl6">
             ${imgInfo}
-            ${mappedInfo}
+            ${mappedInfo.join('')}
             <div class="divider"></div>
             <div style="font-size: 0.9em" class="truncate">
-                <ul>
-                    ${genRow('modelZigbee', dev._modelID)}
-                    ${genRow('type', dev._type)}
-                    ${genRow('ieee', dev.ieeeAddr)}
-                    ${genRow('nwk', dev._networkAddress)}
-                    ${genRow('manuf id', dev._manufacturerID)}
-                    ${genRow('manufacturer', dev._manufacturerName)}
-                    ${genRow('power', dev._powerSource)}
-                    ${genRow('app version', dev._applicationVersion)}
-                    ${genRow('hard version', dev._hardwareVersion)}
-                    ${genRow('zcl version', dev._zclVersion)}
-                    ${genRow('stack version', dev._stackVersion)}
-                    ${genRow('date code', dev._dateCode)}
-                    ${genRow('build', dev._softwareBuildID)}
-                    ${genRow('interviewed', dev._interviewCompleted)}
-                    ${genRow('configured', (device.isConfigured), true)}
+                <ul>`];
+    for (const item in dev) {
+        info.push(genRow(item, dev[item]));
+    }
+    info.push(`                ${genRow('configured', (device.isConfigured), true)}
                 </ul>
             </div>
         </div>
         <div class="col s12 m6 l6 xl6">
         ${epInfo}
-        </div>`;
-    return info;
+        </div>`);
+    return info.join('');
 }
 
 function showDevInfo(id) {
@@ -3276,7 +3447,7 @@ function prepareExcludeDialog(excludeObj) {
                 return 'Select model';
             }
             if (device.hasOwnProperty('info')) {
-                if (device.info.device._type == 'Coordinator') {
+                if (device.info.device && device.info.device.type == 'Coordinator') {
                     return null;
                 }
                 return device.common.type;
@@ -3507,17 +3678,18 @@ function getDashCard(dev, groupImage, groupstatus) {
         rooms = [],
         lang = systemLang || 'en';
     const paired = (dev.paired) ? '' : '<i class="material-icons right">leak_remove</i>';
+    const permitJoinBtn = dev.battery || dev.common.type == 'group' ? '' : `<div class="col tool"><button name="joinCard" class="waves-effect btn-small btn-flat right hoverable green"><i class="material-icons icon-green">leak_add</i></button></div>`;
+    const device_queryBtn = dev.battery || dev.common.type == 'group' ? '' : `<div class="col tool"><button name="deviceQuery" class="waves-effect btn-small btn-flat right hoverable green"><i class="material-icons icon-green">play_for_work</i></button></div>`;
     const rid = id.split('.').join('_');
     const modelUrl = (!type) ? '' : `<a href="https://www.zigbee2mqtt.io/devices/${type}.html" target="_blank" rel="noopener noreferrer">${type}</a>`;
     const image = `<img src="${img_src}" width="64px" onerror="this.onerror=null;this.src='img/unavailable.png';">`,
-        nwk = (dev.info && dev.info.device) ? dev.info.device._networkAddress : undefined,
+        nwk = (dev.info && dev.info.device) ? dev.info.device.nwk : undefined,
         battery_cls = getBatteryCls(dev.battery),
         lqi_cls = getLQICls(dev.link_quality),
         unconnected_icon = (groupImage ? (groupstatus ? '<div class="col tool"><i class="material-icons icon-green">check_circle</i></div>' : '<div class="col tool"><i class="material-icons icon-red">cancel</i></div>') :'<div class="col tool"><i class="material-icons icon-red">leak_remove</i></div>'),
         battery = (dev.battery && isActive) ? `<div class="col tool"><i id="${rid}_battery_icon" class="material-icons ${battery_cls}">battery_std</i><div id="${rid}_battery" class="center" style="font-size:0.7em">${dev.battery}</div></div>` : '',
         lq = (dev.link_quality > 0 && isActive) ? `<div class="col tool"><i id="${rid}_link_quality_icon" class="material-icons ${lqi_cls}">network_check</i><div id="${rid}_link_quality" class="center" style="font-size:0.7em">${dev.link_quality}</div></div>` : (isActive ? unconnected_icon : ''),
         //status = (dev.link_quality > 0 && isActive) ? `<div class="col tool"><i class="material-icons icon-green">check_circle</i></div>` : (groupImage || !isActive ? '' : `<div class="col tool"><i class="material-icons icon-black">leak_remove</i></div>`),
-        //permitJoinBtn = (isActive && dev.info && dev.info.device._type === 'Router') ? '<button name="join" class="btn-floating btn-small waves-effect waves-light right hoverable green"><i class="material-icons tiny">leak_add</i></button>' : '',
         //infoBtn = (nwk) ? `<button name="info" class="left btn-flat btn-small"><i class="material-icons icon-blue">info</i></button>` : '',
         idleTime = (dev.link_quality_lc > 0 && isActive) ? `<div class="col tool"><i id="${rid}_link_quality_lc_icon" class="material-icons idletime">access_time</i><div id="${rid}_link_quality_lc" class="center" style="font-size:0.7em">${getIdleTime(dev.link_quality_lc)}</div></div>` : '';
     const info = (dev.statesDef) ? dev.statesDef.map((stateDef) => {
@@ -3567,13 +3739,19 @@ function getDashCard(dev, groupImage, groupstatus) {
     }).join('') : '';
     const dashCard = `
         <div class="card-content zcard ${isActive ? '' : 'bg_red'}">
-            <div class="flip" style="cursor: pointer">
+            <div style="cursor: pointer">
+            <span class="top right small" style="border-radius: 50%">
+                ${device_queryBtn}
+                ${permitJoinBtn}
+            </span>
+            <div  class="flip">
             <span class="top right small" style="border-radius: 50%">
                 ${idleTime}
                 ${battery}
                 ${lq}
             </span>
-            <span class="card-title truncate">${title}</span>
+             <span class="card-title truncate">${title}</span>
+            </div>
             </div>
             <i class="left">${image}</i>
             <div style="min-height:88px; font-size: 0.8em; height: 130px; overflow-y: auto" class="truncate">
@@ -3708,7 +3886,7 @@ function reconfigureDevice(id) {
             }
         }
     });
-    showWaitingDialog('Device is being reconfigure', 30);
+    showWaitingDialog('Device is being reconfigured', 30);
 }
 
 const warnLevel = {