Michel2/Tasmota
1
0 Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2026-10-26 22:11:22 +00:00
Code Issues Releases Activity

Improve tooltip on touch devices and provide BSSID to Berry (#25057)

Browse Source 
* Improve tooltip on touch devices and provide SSID to Berry

* Improve rendering of battery symbol
This commit is contained in:
SteWers authored and GitHub committed 2026-09-25 20:06:53 +02:00
1 parent ad1addfd4e
commit f79b26cb5d
6 files changed
+67 -61
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tasmota/html_compressed/HTTP_HEAD_STYLE_TOOLTIP.h
+13 -12
View File
@@ -1,20 +1,21 @@
/////////////////////////////////////////////////////////////////////
// compressed by tools/unishox/compress-html-uncompressed.py
// input sha256: abe141dbc3ce8f03a96ba0e44243cb398b5230d7c4628e411214fbf9f36806c1
// input sha256: 078490da91b25c31f08baf3cc8ccb10b06159c06dc4a701b9424cea0f6f3f961
/////////////////////////////////////////////////////////////////////
const size_t HTTP_HEAD_STYLE_TOOLTIP_SIZE = 315; // compressed size 230 bytes
const size_t HTTP_HEAD_STYLE_TOOLTIP_SIZE = 348; // compressed size 246 bytes
const char HTTP_HEAD_STYLE_TOOLTIP_COMPRESSED[] PROGMEM = "\x3B\xF1\xAC\x4D\xB3\xBA\x33\x37\xA9\xFC\xF3\x0F\x2F\xFE\x67\x78\xEA\x3B\xA2\xB0"
"\xCD\xFC\xF3\xEC\xE6\x77\x8F\x69\xEF\x56\xD0\x4C\xF7\xCF\x68\xCC\xF6\xD6\xE7\x1E"
"\x7F\x61\x5D\x69\x9B\x3C\x1E\xE0\x42\xAE\x79\x82\x0E\x16\x79\xD9\x8A\x7F\x3D\xA1"
"\xE7\x53\xEA\x3C\xEE\xAB\xE7\x76\xB6\x82\x67\x78\xF0\x08\x98\xC5\x8E\xF6\x04\x2E"
"\x99\xE0\xDA\x75\xEF\x08\xCD\x87\x99\xC4\x91\xE0\xAB\x06\x1E\x67\x23\x67\xD1\xE0"
"\x82\x66\x28\xF3\x39\xAC\xFA\x3C\x15\x7E\xFB\xC6\x33\xE3\x4F\x3A\xFD\xF7\x82\xBA"
"\x64\x6C\x3B\xA7\x59\xCD\x67\xD1\xDE\x3C\x10\x78\x16\x7C\xF3\x33\xBF\x9D\xD3\xAC"
"\xEB\x0C\xFD\x8E\xAE\xA3\x65\x1D\xE3\xC0\xEB\x0C\xD0\x7B\xF8\x2F\x84\x3A\xC1\x32"
"\xE9\xDE\x3C\x0E\xCF\x88\xFE\x79\x9C\x84\x30\xD8\xBD\x81\x68\x87\x81\x96\x20\x9B"
"\xC3\xC7\x99\xCA\x21\x86\xC4\x73\x48\x61\xB0\xF0\x63\x3A\x8E\xBF\x51\x90\x4C\xF3"
"\xEC\xF8\xDB\x08\x10\xA7\x69\xB5\x9E\x67\x25\x10\xC3\x61\xE0\x7C\x56\xD3\x3A\xFC"
"\x32\xC3\x67\x98\xCF\xB3\xC1\xEE\x3D\xC6";
"\x7F\x61\x5D\x69\x9B\x3C\x1F\xA3\xCC\x10\x70\x43\xCE\xCC\x53\xF9\xED\x0F\x3A\x9F"
"\x51\xE7\x75\x5F\x3B\xB5\xB4\x13\x3B\xC7\x80\x44\xC4\x6C\x77\xB0\x21\x74\xCF\x06"
"\xD3\xAF\x78\x46\x6C\x3C\xCE\x24\x8F\x05\x58\x30\xF3\x39\x1B\x3E\x8F\x04\x13\x31"
"\x47\x99\xCD\x67\xD1\xE0\xAB\xF7\xDE\x31\x9F\x1A\x79\xD7\xEF\xBC\x15\xD3\x23\x61"
"\xDD\x3A\xCE\x6B\x3E\x8E\xF1\xE0\x83\xC0\xB3\xE7\x99\x9D\xFC\xEE\x9D\x67\x58\x67"
"\xEC\x75\x75\x1B\x28\xEF\x1E\x07\x58\x66\x83\xDF\xC1\x7C\x21\xD6\x09\x97\x4E\xF1"
"\xE0\x76\x7C\x47\xF3\xCC\xE4\x21\x86\xC5\xEC\x0B\x44\x3C\x0C\xB1\x04\xDE\x1E\x3C"
"\xCE\x51\x0C\x36\x23\x9A\x43\x0D\x87\x83\x19\xD4\x75\xFA\x8C\x82\x67\x9F\x67\xC6"
"\xD8\x40\x85\x3B\x4D\xAC\xF3\x39\x28\x86\x1B\x0F\x03\xE2\xB6\x99\xD7\xE1\x96\x1B"
"\x3C\xC6\x7D\x9E\x0F\x70\xE0\x4A\xE1\x48\x26\x62\x8F\x33\x8C\x81\x1B\x81\x5E\xCE"
"\x67\x83\xDC\x7B\x8F\x71";
#define HTTP_HEAD_STYLE_TOOLTIP Decompress(HTTP_HEAD_STYLE_TOOLTIP_COMPRESSED,HTTP_HEAD_STYLE_TOOLTIP_SIZE).c_str()
tasmota/html_compressed/HTTP_HEAD_STYLE_ZIGBEE.h
+8 -7
View File
@@ -1,9 +1,9 @@
/////////////////////////////////////////////////////////////////////
// compressed by tools/unishox/compress-html-uncompressed.py
// input sha256: ee7e68972559c2ad3df6a6594445bfdfeb14a0a37dec2389ec20a197c26c9311
// input sha256: 265cc7d5a4e9db212229c8f211cc50cf4e76d3c8b92a1434b46ac6efa6769868
/////////////////////////////////////////////////////////////////////
const size_t HTTP_HEAD_STYLE_ZIGBEE_SIZE = 363; // compressed size 240 bytes
const size_t HTTP_HEAD_STYLE_ZIGBEE_SIZE = 363; // compressed size 242 bytes
const char HTTP_HEAD_STYLE_ZIGBEE_COMPRESSED[] PROGMEM = "\x3A\x0E\xA3\xDA\x3B\x0D\x87\x5F\xB4\xDB\xBC\x3C\x79\x8E\xCF\x88\xFE\x75\x8E\xC3"
"\x61\xE0\x66\x7B\x6B\x73\x8F\x3F\xB0\xAE\xB4\xCD\x9E\x04\xDF\x0C\x0A\xCC\x8F\x3D"
"\xE0\xB7\x99\xD6\x38\x2C\x0C\xD0\xF0\x3F\xA2\x50\xA3\xCC\xE5\x32\x18\x6C\x3C\x0A"
@@ -11,10 +11,11 @@ const char HTTP_HEAD_STYLE_ZIGBEE_COMPRESSED[] PROGMEM = "\x3A\x0E\xA3\xDA\x3B\x
"\x02\xD1\x01\x0A\x69\xD7\xFB\x13\x45\xF8\xF3\x39\x64\x30\xD8\x78\x1B\x7F\x1E\xDE"
"\x3A\xC2\x66\x28\xF3\x3A\xCE\x59\x0C\x36\x1E\xE3\xA0\xEA\x3C\xCF\x3B\x31\x4F\xE7"
"\x51\xD0\x75\x1E\x67\x98\xE6\x63\x3E\xCF\x68\x79\xD4\xFA\x8F\x33\xD8\x7B\x01\x13"
"\x5E\x04\x1D\x5C\x16\xB8\x14\xB1\xDE\xC0\x85\xD3\x04\x3D\xD0\xE7\x10\xC3\x61\xE0"
"\x75\x86\x68\x3D\xFC\x17\xC2\x1E\x61\x8B\xFF\xDF\x51\x07\x81\x67\xCF\x15\x83\x0F"
"\x33\x90\x81\x0F\x5F\x04\x2D\x53\xFA\x3C\x2A\x2B\x8F\x33\xAC\xE6\x10\x22\x70\x54"
"\x08\xFC\x0C\x82\x0F\x0A\x67\x30\x81\x23\x81\x23\xDA\x08\x34\x4C\xEF\xE7\x74\xEB"
"\x3A\xC7\x04\x75\x1C\x98\x43\x0D\x87\x78\xF0\x13\x31\x47\x99\xC8\x43\x0D\x87\xB8";
"\x5E\x04\x1D\x5C\x16\xB8\x14\xB1\xDE\xC0\x85\xD3\x3C\x0E\xB0\xCD\x07\xBF\x82\xF8"
"\x43\xCC\x31\x7F\xFB\xEA\x20\xF0\x2C\xF9\xE2\xB0\x61\xE6\x72\x10\xC3\x61\xE0\x76"
"\x55\x60\xD3\xCC\xE4\x20\x43\xD7\xC1\x0B\x54\xFE\x8F\x0A\xA3\xCC\xEB\x39\x84\x08"
"\x9C\x15\x02\x3F\x03\x20\x83\xC2\x99\xCC\x20\x48\xE0\x48\xF6\x82\x0D\x13\x3B\xF9"
"\xDD\x3A\xCE\xB1\xC1\x1D\x47\x26\x10\xC3\x61\xDE\x3C\x04\xCC\x51\xE6\x72\x10\xC3"
"\x61\xEE";
#define HTTP_HEAD_STYLE_ZIGBEE Decompress(HTTP_HEAD_STYLE_ZIGBEE_COMPRESSED,HTTP_HEAD_STYLE_ZIGBEE_SIZE).c_str()
tasmota/html_uncompressed/HTTP_HEAD_STYLE_TOOLTIP.h
+18 -15
View File
@@ -1,20 +1,23 @@
const char HTTP_HEAD_STYLE_TOOLTIP[] PROGMEM =
// Enable tooltips on touch media
"@media(pointer:coarse),(hover:none){"
"[title]{position:relative;}"
"[title]:hover::after{"
"content:attr(title);"
"position:absolute;"
"z-index:999;"
"top:100%;"
"left:50%;"
"transform:translateX(-50%);"
"color:var(--c_btntxt);"
"background-color:var(--c_btn);"
"border:1px solid;"
"padding:2px 5px;"
"font-style:normal;" // Disable italic and/or bold
"font-size:12px;"
"white-space:pre;" // Stay on one line except sending \n
"[title]{"
"position:relative;"
"&:hover::after{"
"content:attr(title);"
"position:absolute;"
"z-index:999;"
"top:100%;"
"left:50%;"
"transform:translateX(-50%);"
"color:var(--c_btntxt);"
"background-color:var(--c_btn);"
"border:1px solid;"
"padding:2px 5px;"
"font-style:normal;" // Disable italic and/or bold
"font-size:12px;"
"white-space:pre;" // Stay on one line except sending \n
"}"
"b&:hover::after{left:0;transform:none;}"
"}"
"}";
tasmota/html_uncompressed/HTTP_HEAD_STYLE_ZIGBEE.h
+1 -1
View File
@@ -1,5 +1,5 @@
const char HTTP_HEAD_STYLE_ZIGBEE[] PROGMEM =
".bt{box-sizing:border-box;position:relative;display:inline-block;width:20px;height:12px;border:2px solid;border-radius:3px;margin-left:-3px}"
".bt::after,.bt::before{content:\"\";display:block;box-sizing:border-box;position:absolute;height:6px;background:currentColor;top:1px}"
".bt::after,.bt::before{content:\"\";display:block;box-sizing:border-box;position:absolute;background:currentColor;top:1px;bottom:1px}"
".bt::before{right:-4px;border-radius:3px;width:4px}"
".bt::after{width:var(--bl,14px);left:1px}";
tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_A_impl.ino
+26 -26
View File
@@ -1976,7 +1976,7 @@ const char ZB_WEB_U[] PROGMEM =
// Style
//=ZB_WEB_STATUS_LINE
"<tr class='ztd htr'>"
"<td><b title='0x%04X %s - %s'>%s</b></td>" // name
"<td><b title='0x%04X %s\n%s'>%s</b></td>" // name
"<td>%s</td>" // sbatt (Battery Indicator)
"<td><div title='LQI %s' class='si'>" // slqi
"\0"
@@ -2028,17 +2028,17 @@ enum {
ZB_WEB_AUTO_REFRESH=1219,
ZB_WEB_MAP_REFRESH=1285,
ZB_WEB_STATUS_LINE=1351,
ZB_WEB_BATTERY=1459,
ZB_WEB_GP=1542,
ZB_WEB_LAST_SEEN=1598,
ZB_WEB_COLOR_RGB=1646,
ZB_WEB_LINE_START=1707,
ZB_WEB_LIGHT_CT=1745,
ZB_WEB_END_STATUS=1801,
ZB_WEB_LINE_END=1818,
ZB_WEB_BATTERY=1457,
ZB_WEB_GP=1540,
ZB_WEB_LAST_SEEN=1596,
ZB_WEB_COLOR_RGB=1644,
ZB_WEB_LINE_START=1705,
ZB_WEB_LIGHT_CT=1743,
ZB_WEB_END_STATUS=1799,
ZB_WEB_LINE_END=1816,
};
// Compressed from 1830 to 1212, -33.8%
// Compressed from 1828 to 1211, -33.8%
const char ZB_WEB[] PROGMEM = "\x00\x73\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"
@@ -2084,22 +2084,22 @@ const char ZB_WEB[] PROGMEM = "\x00\x73\x3D\x0E\xCA\xB1\xC1\x33\xF0\xF4\xF5\x19\
"\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\x11\xAE\x1E\xC3\xE8\x43\xE8\xFA\x3E\xBC\x7B\x0F\xC3\xD3\x41\x0A\xF9\xEC"
"\x1D\x47\xB0\x10\xBA\x15\x07\xB0\xEB\x3A\xC7\x04\x79\x9F\x42\x0C\x36\x02\x17\x42"
"\x50\xF2\x3E\x8E\x3A\x23\x61\xF4\x71\xD1\x1B\x0F\xA3\x8E\x88\xD8\x7B\x0F\xC3\xD0"
"\xEC\xD3\xF0\x10\x7A\x09\x13\x85\xF3\xD3\xC3\x2F\x81\x0F\x50\x21\xEF\xB7\xC8\x86"
"\x60\xFB\xF8\x22\x74\x3C\xC1\x0B\x1D\x39\x84\x46\x0E\x61\xE0\xFB\x3F\x08\x87\x88"
"\x61\xE8\x76\x78\x65\xF1\xF9\x38\x5F\x3D\x28\x40\x43\xD2\x41\x43\x3F\x3F\x47\x91"
"\xB0\xE4\x22\x30\x73\x77\xC7\x83\xE9\xD1\x08\x7D\x07\x38\x5F\x40\x8D\xC0\x21\xB0"
"\x11\xB8\x04\x0C\x23\xCC\xF2\x3E\x8E\x3A\x22\x36\x1F\x47\x1D\x11\x1B\x0F\xA3\x8E"
"\x88\x8D\x80\x83\xBC\xA0\x48\xA0\x08\xFC\x60\x02\x1F\x17\x88\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\xA4\x76\x50\x87\xE1\xF5\xE3"
"\xDA\xCF\x74\xE1\x7C\x10\xFA\x8E\xC7\xB6\x8F\x74\xE1\x7C";
"\xF4\x1C\xAB\x68\x26\x7C\x3E\xCE\x32\x36\x1F\x47\x1E\x11\x1B\x11\xF5\xE3\x71\xF5"
"\xE3\xEC\x10\x71\xF3\xF0\xF4\x3B\x28\x43\xF0\xF4\xA1\x0F\xC3\xEB\xC0\x89\x1C\xF4"
"\x13\x4C\xC1\x0F\x10\x20\x88\xD4\x5A\x8F\xAF\x1F\x60\x87\x9B\x7B\x4F\xB3\xF2\x70"
"\xBE\x08\xD7\x0F\x61\xF4\x21\xF4\x7D\x1F\x5E\x3D\x87\xE1\xE9\xA0\x85\x7C\xF6\x0E"
"\xA3\xD8\x08\x5D\x0A\x63\xD8\x75\x9D\x63\x82\x3C\xCF\xA1\x06\x1B\x01\x0B\xA1\x24"
"\x79\x1F\x47\x1D\x11\xB0\xFA\x38\xE8\x8D\x87\xD1\xC7\x44\x6C\x3D\x87\xE1\xE8\x76"
"\x69\xF8\x08\x3D\x04\x69\xC2\xF9\xE9\xE1\x97\xC0\x87\xA8\x10\xF7\xDB\xE4\x43\x30"
"\x7D\xFC\x11\x3A\x1E\x20\x85\x8E\x9C\xC2\x23\x07\x30\xF0\x7D\x9F\x84\x43\xC4\x30"
"\xF4\x3B\x3C\x32\xF8\xFC\x9C\x2F\x9E\x94\x20\x21\xE9\x20\xA1\x9F\x9F\xA3\xC8\xD8"
"\x72\x11\x18\x39\xBB\xE3\xC1\xF4\xE8\x84\x3E\x83\x9C\x2F\xA0\x46\xE0\x10\xD8\x08"
"\xDC\x02\x06\x11\xE6\x79\x1F\x47\x1D\x11\x1B\x0F\xA3\x8E\x88\x8D\x87\xD1\xC7\x44"
"\x46\xC0\x41\xDE\x50\x24\x50\x04\x7E\x2F\x81\x0F\x8B\xA4\x1E\x05\xE1\x97\xC7\xC3"
"\x98\x7E\x1F\xA3\xC9\x67\xBE\x78\x29\xC2\xFA\x04\x7E\x0A\x0F\x61\x06\x54\x8F\xA1"
"\x0F\x61\xF8\x7A\x78\x6D\x84\x11\xF8\x7E\x8F\x23\x8B\xEB\xE7\x83\xB8\x7A\x1D\x84"
"\x08\x33\x0F\xA1\x0F\xAF\x02\x27\x04\xE0\x83\xD1\x50\x3B\x28\x43\xF0\xFA\xF1\xED"
"\x67\xBA\x70\xBE\x08\x7D\x47\x43\xDB\x47\xBA\x70\xBE";
// ++++++++++++++++++++^^^^^^^^^^^^^^^^^^^++++++++++++++++++++
// ++++++++++++++++++++ DO NOT EDIT ABOVE ++++++++++++++++++++
tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_tasmota.ino
+1
View File
@@ -282,6 +282,7 @@ extern "C" {
be_map_insert_int(vm, "rssi", rssi);
be_map_insert_int(vm, "quality", WifiGetRssiAsQuality(rssi));
be_map_insert_str(vm, "ssid", SettingsTextEscaped(SET_STASSID1 + Settings->sta_active).c_str());
be_map_insert_str(vm, "bssid", WiFi.BSSIDstr().c_str());
}
}
be_pop(vm, 1);