Mirrors/Tasmota
2
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2026-02-20 00:32:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Zigbee] Use WebColor for map visualization (#24375)

Browse Source 
* [Zigbee] Use `WebColor` for map visualization

The color theme is now also used for the Zigbee map visualization.

* Fix compile error

* Update xdrv_23_zigbee_7_5_map.ino
This commit is contained in:
SteWers
2026-01-20 22:39:34 +01:00
committed by GitHub
parent 3b62dd41fa
commit 2e324a9c1c
2 changed files with 66 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_7_5_map.ino
View File

@@ -169,19 +169,11 @@ void Z_Mapper::dumpInternals(void) const {
WSContentSend_P(PSTR("edges:["));
for (auto & edge : edges) {
uint32_t lqi_color = 0x000;
// if (edge.lqi >= 192) {
// lqi_color = 0x364;
// } else if (edge.lqi >= 128) {
// lqi_color = 0x346;
// } else if (edge.lqi > 0) {
// lqi_color = 0xd56;
// }
char hex[8];
snprintf(hex, sizeof(hex), PSTR("%d"), edge.lqi);
WSContentSend_P(PSTR("{from:\"0x%04X\",to:\"0x%04X\",label:\"%s\",color:\"#%03X\"},"),
edge.node_1, edge.node_2, (edge.lqi > 0) ? hex : "", lqi_color);
WSContentSend_P(PSTR("{from:'0x%04X',to:'0x%04X',label:'%s',width:%d},"),
edge.node_1, edge.node_2, (edge.lqi > 0) ? hex : "", changeUIntScale(edge.lqi, 0, 254, 1, 4));
}
WSContentSend_P(PSTR("],"));
}

119
tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_A_impl.ino
View File

@@ -1936,11 +1936,15 @@ const char ZB_WEB_U[] PROGMEM =
// index 2
// Start of vis.js box
//=ZB_WEB_VIS_JS_BEFORE
"<script src=\"https://unpkg.com/vis-network/standalone/umd/vis-network.min.js\"></script>"
"<div id=\"mynetwork\" style=\"background-color:#fff;color:#000;max-width:800px;height:400px;border:1px solid lightgray;\">Unable to load vis.js</div>"
"<script src='https://unpkg.com/vis-network/standalone/umd/vis-network.min.js'></script>"
"<div id='mynetwork' style='background-color:var(--c_csl);color:var(--c_txt);max-width:800px;height:400px;border:1px solid var(--c_tab);'>Unable to load vis.js</div>"
"<script>"
"var container=document.getElementById(\"mynetwork\");"
"var options={groups:{o:{shape:\"circle\",color:\"#d55\"},r:{shape:\"box\",color:\"#fb7\"},e:{shape:\"ellipse\",color:\"#adf\"}}};"
"function gsc(v){return getComputedStyle(document.documentElement,null).getPropertyValue(v)}"
"var container=document.getElementById('mynetwork');"
"var options={"
"groups:{o:{shape:'circle',color:'#d55'},r:{shape:'box',color:'#fb7'},e:{shape:'ellipse',color:'#adf'}},"
"edges:{color:gsc('--c_txt'),font:{color:gsc('--c_txt'),strokeColor:gsc('--c_csl')}}"
"};"
"var data={"
"\0"
@@ -2019,22 +2023,22 @@ enum {
ZB_WEB_CSS=0,
ZB_WEB_DUMMY1=541,
ZB_WEB_VIS_JS_BEFORE=542,
ZB_WEB_VIS_JS_AFTER=961,
ZB_WEB_AUTO_REFRESH=1025,
ZB_WEB_MAP_REFRESH=1091,
ZB_WEB_STATUS_LINE=1157,
ZB_WEB_BATTERY=1265,
ZB_WEB_GP=1337,
ZB_WEB_LAST_SEEN=1393,
ZB_WEB_COLOR_RGB=1441,
ZB_WEB_LINE_START=1502,
ZB_WEB_LIGHT_CT=1540,
ZB_WEB_END_STATUS=1596,
ZB_WEB_LINE_END=1613,
ZB_WEB_VIS_JS_AFTER=1155,
ZB_WEB_AUTO_REFRESH=1219,
ZB_WEB_MAP_REFRESH=1285,
ZB_WEB_STATUS_LINE=1351,
ZB_WEB_BATTERY=1459,
ZB_WEB_GP=1531,
ZB_WEB_LAST_SEEN=1587,
ZB_WEB_COLOR_RGB=1635,
ZB_WEB_LINE_START=1696,
ZB_WEB_LIGHT_CT=1734,
ZB_WEB_END_STATUS=1790,
ZB_WEB_LINE_END=1807,
};
// Compressed from 1625 to 1108, -31.8%
const char ZB_WEB[] PROGMEM = "\x00\x66\x3D\x0E\xCA\xB1\xC1\x33\xF0\xF4\xF5\x19\x04\xCF\xC1\xC2\xEA\xB3\x8F\x31"
// Compressed from 1819 to 1207, -33.6%
const char ZB_WEB[] PROGMEM = "\x00\x72\x3D\x0E\xCA\xB1\xC1\x33\xF0\xF4\xF5\x19\x04\xCF\xC1\xC2\xEA\xB3\x8F\x31"
"\x37\xD6\x38\x26\x21\xED\x1D\x61\x9A\x0F\x7F\x05\xF0\x87\x58\x78\x16\x7C\xF3\x33"
"\xBF\x9D\xD3\xAC\xEB\x0C\xFD\x98\xF8\xD3\xBC\x7B\x8E\x86\xDA\x11\x50\x87\x9F\x65"
"\x1D\xD3\xCC\xC6\xFF\xD4\x75\x86\x2B\x42\x10\xEF\x1E\xD1\xFD\x12\x85\x1E\x67\x29"
@@ -2053,43 +2057,48 @@ const char ZB_WEB[] PROGMEM = "\x00\x66\x3D\x0E\xCA\xB1\xC1\x33\xF0\xF4\xF5\x19\
"\x30\xE6\xB3\xE8\xFA\x3D\xC7\x42\x1C\x72\x88\x10\xE6\x1C\xF1\x02\x0D\xC3\x96\x40"
"\x89\xC4\x51\xC6\xCF\xA3\xE8\xF7\x1E\xE3\xA1\x61\xCB\x67\xB4\xB0\x65\x87\xB4\x64"
"\x79\x9D\x0E\x59\xEE\x3D\x0E\xC2\x04\x1E\x59\x8F\x6D\x1E\xE9\xC2\xFC\xE1\x7C\xF4"
"\xF0\x7F\xD1\x94\xBD\xF0\xCF\x87\xB0\x55\x50\xCF\x1E\x67\x61\xD8\x2F\x86\x1A\x0F"
"\x1D\x03\xC1\xA7\x61\x9E\xF8\xEB\xE7\x43\xF9\xF3\x43\xB3\xD5\x7C\x25\x85\x9C\xCE"
"\xC1\x63\x44\x04\x7A\xE7\x41\xBB\xC7\x43\x5F\x8F\x61\xF8\x7A\x1D\x80\x83\x95\x9F"
"\x87\xA0\x9A\x66\xB4\x43\xE1\xEC\x1A\x64\x08\x58\x01\xEC\x5E\xA3\x20\x99\xF0\xF6"
"\x02\x67\x09\x67\x91\x83\x06\x0F\x2A\x01\x85\x1C\xE3\x6C\xF0\x43\x6C\xD8\x75\x82"
"\x0F\x13\xA7\x3E\xD9\x0C\x36\x02\x1F\x18\x27\x31\xB2\x04\x4E\x26\xC1\x1B\x93\x90"
"\xB4\x78\x55\x0F\x7E\xCC\x8F\x07\xB0\xFC\x21\x7D\x63\x82\x6A\xB1\x05\x96\x22\x33"
"\xDF\x1D\x0D\x7E\x3D\x0E\xC1\x34\xCC\xFC\x04\x2E\x11\x0F\xC3\x3B\xFA\x0F\x3A\xAF"
"\x79\xFC\xF8\x26\x06\x2C\x6B\xEA\x3A\x0F\x3A\x26\x13\x1A\xFA\x88\x71\x91\x68\x87"
"\x74\x11\xB8\x13\x3B\xC7\x83\x3B\xFA\xC1\x95\xB9\xDE\x3E\x1E\xD1\xEF\xE0\xB1\x9E"
"\x3C\xCF\x6E\x1E\x67\xB7\xC2\xAC\x63\x3C\xCF\x60\x7B\xF0\xC2\x67\xB0\xEA\x04\x1E"
"\x07\x8F\x61\xE4\x21\xCD\xD3\xD8\x7B\x8E\xA2\xF8\x22\x5C\x1D\x86\xC0\x45\xB2\x60"
"\x71\xCF\x1E\xC3\xDC\x75\x13\x04\x4B\x2C\x20\xB4\x67\x81\x1B\x1A\xB1\x0C\x1E\xC3"
"\xDC\x7B\x8F\x71\xE0\xCE\xFE\x84\xBA\xB3\xE1\xED\x9C\x2F\x82\x0C\x90\x42\xDB\x0F"
"\x9C\xC7\xD1\x9E\xF8\xE8\x5C\x08\x33\x0E\xE8\x22\x70\x52\x75\x09\x75\x67\x50\x21"
"\x70\x0A\x77\x8F\x2A\x01\x89\xC7\x38\x21\xF2\x7E\x7E\x79\xD1\x56\x8D\x78\x2E\x8E"
"\xE9\x81\x7C\x1D\x6E\x71\xDD\x3B\xC7\xB4\x2C\x0E\xEB\x73\x8E\x9F\x61\x65\x88\x77"
"\x4E\xF1\xE0\xF7\x1D\x47\x22\x4C\x81\x23\x1E\x18\x7E\x1E\x87\x60\xC3\xF0\xF4\x31"
"\x9F\x1A\xAC\x3A\xDC\xE3\xE1\xF6\x6D\x1D\xF3\xED\x0D\x74\x2B\x04\x3E\x1F\x63\xCE"
"\x8F\xB3\xF0\xF4\x04\x1E\x8D\xC1\xF8\x7D\x78\xF4\x3B\x01\x0A\x39\xE8\x76\x18\xCF"
"\x8D\x3F\x27\x0B\xE7\xA5\x7D\x06\x15\xFB\xC7\xC3\xEC\xDB\x42\x21\x55\xF3\xEC\xFC"
"\x3D\x28\x43\xF0\xF4\x1C\xAB\x68\x26\x7C\x3E\xCE\x32\x36\x1F\x47\x1E\x11\x1B\x11"
"\xF5\xE4\x75\xA3\xEB\xC7\xD8\x20\xE4\x27\xE1\xE8\x76\x50\x87\xE1\xE9\x42\x1F\x87"
"\xD7\x81\x12\x39\xE8\x26\x99\x82\x1E\x24\x41\x11\xA8\xB5\x1F\x5E\x3E\xC1\x0F\x38"
"\xF6\x9F\x67\xE4\xE1\x7C\xF4\xD0\x42\x96\x7B\x07\x51\xEC\x04\x2C\x14\xF6\x1F\x42"
"\x1F\x47\xD1\xF5\xE0\x44\xE7\x84\xEB\x3A\xC7\x04\x79\x9F\x42\x0C\x36\x02\x1F\x3A"
"\xA7\xD1\xC7\x44\x6C\x3E\x8E\x3A\x23\x61\xF4\x71\xD1\x1B\x0F\x61\xF8\x7A\x1D\x9A"
"\x7E\x4E\x17\xCF\x4F\x0C\xBE\x04\x3D\x14\x87\xBE\xDF\x22\x19\x83\xEF\xE7\xD8\x21"
"\x64\x27\xD8\x21\x62\xE7\x30\x88\xC1\xCC\x3C\x1F\x67\xE1\x10\xF1\x0C\x3D\x0E\xCF"
"\x0C\xBE\x3F\x27\x0B\xE7\xA5\x08\x08\x7A\x18\x28\x67\x27\xE8\xF2\x36\x1C\x84\x46"
"\x0E\x6E\xF8\xF0\x7D\x3A\x21\x0F\xA0\xE7\x0B\xE8\x11\xB8\x0D\x36\x02\x36\xFC\x18"
"\x47\x99\xE4\x7D\x1C\x74\x44\x6C\x3E\x8E\x3A\x22\x36\x1F\x47\x1D\x11\x1B\x01\x07"
"\x73\x40\x91\x40\x11\xF8\xB5\x04\x3E\x2C\x50\x78\x17\x86\x5F\x1F\x0E\x61\xF8\x7E"
"\x8F\x25\x9E\xF9\xE0\xA7\x0B\xE8\x11\xF8\x28\x3D\x84\x19\x52\x3E\x84\x3D\x87\xE1"
"\xE9\xE1\xB6\x10\x47\xE1\xFA\x3C\x8E\x2F\xAF\x9E\x0E\xE1\xE8\x76\x10\x20\xCC\x3E"
"\x84\x3E\xBC\x08\x9C\x13\x82\x0F\x42\x60\xEC\xA1\x0F\xC3\xEB\xC7\xB5\x9E\xE9\xC2"
"\xF8\x21\xF4\xEA\x4F\x6D\x1E\xE9\xC2\xF9";
"\xF0\x7F\xD1\x94\xBD\xF0\xCF\x87\xD8\xAA\xA1\x9E\x3C\xCE\xC3\xB0\x5F\x0C\x34\x1E"
"\x3A\x07\x83\x4E\xC3\x3D\xF1\xD7\xCE\x87\xF3\xE6\x87\x67\xAA\xF8\x4B\x0B\x39\x9D"
"\x82\xC6\x88\x08\xF5\xCE\x83\x77\x8E\x86\xBF\x1F\x67\xE1\xE8\x76\x02\x0E\x56\x7E"
"\x1E\x82\x69\x9A\xD1\x0F\x87\xD8\xD3\x20\x42\xC0\x0F\xB5\xEA\x32\x09\x9F\x0F\xB0"
"\x54\xE1\x2C\x3F\x04\x77\x8F\x2A\x01\x9B\xC2\xF1\xE0\x6D\x9B\x0E\xB0\x41\xE2\xB4"
"\xE7\xDB\x21\x86\xC0\x43\xE3\x44\xE6\x36\x40\x89\xC5\x58\x23\x72\x92\x08\x98\xBD"
"\x8E\x3B\xC7\x83\xEC\xFC\x21\x7D\x63\x82\x6A\xB1\x05\x96\x22\x33\xDF\x1D\x0D\x7E"
"\x3D\x0E\xC1\x34\xCC\xFC\x04\x2E\x15\xCF\xC3\x02\xF8\x3A\xDC\xE4\x3D\xE0\xCE\xE9"
"\x99\xDE\x3D\xBF\x74\x2F\xFC\x87\x9D\x10\x78\x34\x60\xBA\x62\x17\xA8\xC8\x26\x77"
"\x44\xC0\xC5\x8D\x7D\x47\x40\x43\x8A\x4C\x26\x35\xF5\x1D\x5C\x2C\x20\x8E\xF1\xD0"
"\x79\xD1\x0C\xFE\x0C\x7F\xA3\x22\x33\xB0\x85\xB3\xBA\x66\x77\x8F\x71\x9D\xFD\x07"
"\x9D\x57\xBC\xFE\x7C\x04\x4C\x74\x79\x82\x1E\x30\x43\x8C\x8B\x44\x3B\xA0\x8D\xC4"
"\x09\xDE\x3C\x19\xDF\xD6\x0C\xAD\xCE\xF1\xF0\xF6\x8F\x7F\x05\x8C\xF1\xE6\x7B\x70"
"\xF3\x3D\xBE\x15\x63\x19\xE6\x7D\x87\xBF\x0C\x26\x7D\x9D\x40\x83\xC4\x21\xF6\x79"
"\x08\x73\x74\xFB\x3D\xC7\x51\x7C\x11\x2E\x0E\xC3\x60\x22\xD9\x30\x38\xE7\x8F\xB3"
"\xDC\x75\x13\x04\x4B\x2C\x20\xB4\x67\x81\x1B\x1A\xB1\x0C\x1F\x67\xB8\xF7\x1D\x4C"
"\x41\xE7\xE3\xCC\xF6\x82\x0D\x21\xEF\x06\x77\x4F\xB0\x42\xE3\x64\xFB\x3B\xC7\x51"
"\x8C\xEA\x05\x2A\x2B\xFE\xAF\xE1\xA3\x20\xC1\x26\xB8\x7E\x08\xFB\x3B\xC7\xB8\xF7"
"\x1E\xE3\xC1\x9D\xFD\x09\x75\x67\xC3\xDB\x38\x5F\x04\x19\x20\x85\xC2\x01\xF3\x98"
"\xFA\x33\xDF\x1D\x0B\x81\x06\x61\xDD\x04\x4E\x1F\x4E\xA1\x2E\xAC\xEA\x04\x2E\x16"
"\x4E\xF1\xE0\x11\x39\xA9\x04\x3E\x80\x09\xF9\xE7\x45\x5A\x35\xE0\xBA\x3B\xA0\x87"
"\xC8\x89\xDD\x3B\xC7\xB4\x2C\x0E\xEB\x73\x8E\x9F\x61\x65\x88\x77\x4E\xF1\xE0\xF7"
"\x1D\x47\x22\x4C\x81\x23\x1E\x18\x7E\x1E\x87\x60\xC3\xF0\xF4\x31\x9F\x1A\xAC\x3A"
"\xDC\xE3\xE1\xF6\x6D\x1D\xF3\xED\x0D\x74\x2B\x04\x3E\x1F\x63\xCE\x8F\xB3\xF0\xF4"
"\x04\x1E\x93\xD1\xF8\x7D\x78\xF4\x3B\x01\x0A\x39\xE8\x76\x18\xCF\x8D\x3F\x27\x0B"
"\xE7\xA5\x7D\x06\x15\xFB\xC7\xC3\xEC\xDB\x42\x21\x55\xF3\xEC\xFC\x3D\x28\x43\xF0"
"\xF4\x1C\xAB\x68\x26\x7C\x3E\xCE\x32\x36\x1F\x47\x1E\x11\x1B\x11\xF5\xE4\x75\xA3"
"\xEB\xC7\xD8\x20\xE4\x27\xE1\xE8\x76\x50\x87\xE1\xE9\x42\x1F\x87\xD7\x81\x12\x39"
"\xE8\x26\x99\x82\x1E\x24\x41\x11\xA8\xB5\x1F\x5E\x3E\xC1\x0F\x38\xF6\x9F\x67\xE4"
"\xE1\x7C\xF4\xD0\x42\x96\x7B\x07\x51\xEC\x04\x2C\x14\xF6\x1F\x42\x1F\x47\xD1\xF5"
"\xE3\xD8\x08\x5D\x0A\x33\xD8\x75\x9D\x63\x82\x3C\xCF\xA1\x06\x1B\x01\x0B\xA1\x1E"
"\x79\x1F\x47\x1D\x11\xB0\xFA\x38\xE8\x8D\x87\xD1\xC7\x44\x6C\x3D\x87\xE1\xE8\x76"
"\x69\xF9\x38\x5F\x3D\x3C\x32\xF8\x10\xF4\x52\x1E\xFB\x7C\x88\x66\x0F\xBF\x82\x27"
"\x43\xA0\x10\xB1\x73\x98\x44\x60\xE6\x1E\x0F\xB3\xF0\x88\x78\x86\x1E\x87\x67\x86"
"\x5F\x1F\x93\x85\xF3\xD2\x84\x04\x3D\x0C\x14\x33\x93\xF4\x79\x1B\x0E\x42\x23\x07"
"\x37\x7C\x78\x3E\x9D\x10\x87\xD0\x73\x85\xF4\x08\xDC\x06\x9B\x01\x1B\x7E\x0C\x23"
"\xCC\xF2\x3E\x8E\x3A\x22\x36\x1F\x47\x1D\x11\x1B\x0F\xA3\x8E\x88\x8D\x80\x83\xB9"
"\xA0\x48\xA0\x08\xFC\x5A\x82\x1F\x16\x28\x3C\x0B\xC3\x2F\x8F\x87\x30\xFC\x3F\x47"
"\x92\xCF\x7C\xF0\x53\x85\xF4\x08\xFC\x14\x1E\xC2\x0C\xA9\x1F\x42\x1E\xC3\xF0\xF4"
"\xF0\xDB\x08\x23\xF0\xFD\x1E\x47\x17\xD7\xCF\x07\x70\xF4\x3B\x08\x10\x66\x1F\x42"
"\x1F\x5E\x04\x4E\x09\xC1\x07\xA2\x8E\x76\x50\x87\xE1\xF5\xE3\xDA\xCF\x74\xE1\x7C"
"\x10\xFA\x8D\x67\xB6\x8F\x74\xE1\x7C";
// ++++++++++++++++++++^^^^^^^^^^^^^^^^^^^++++++++++++++++++++
// ++++++++++++++++++++ DO NOT EDIT ABOVE ++++++++++++++++++++