mirror of https://github.com/arendst/Tasmota.git
Merge branch 'development' of https://github.com/arendst/Tasmota into development
This commit is contained in:
commit
ad11f70876
|
@ -1914,7 +1914,7 @@ void ZigbeeShow(bool json)
|
|||
} else {
|
||||
UnishoxStrings msg(ZB_WEB);
|
||||
uint32_t zigbee_num = zigbee_devices.devicesSize();
|
||||
if (!zigbee_num) { return; }
|
||||
if (zigbee_num > 0) {
|
||||
if (zigbee_num > 255) { zigbee_num = 255; }
|
||||
|
||||
WSContentSend_P(msg[ZB_WEB_CSS], WebColor(COL_TEXT));
|
||||
|
@ -2078,6 +2078,7 @@ void ZigbeeShow(bool json)
|
|||
}
|
||||
|
||||
WSContentSend_P(msg[ZB_WEB_LINE_END]); // Terminate current multi column table and open new table
|
||||
}
|
||||
if (zigbee.permit_end_time) {
|
||||
// PermitJoin in progress
|
||||
|
||||
|
|
Loading…
Reference in New Issue