From 2725d817ecdc936684c086494a077ba28f7ac430 Mon Sep 17 00:00:00 2001 From: Kim Huebel Date: Tue, 2 Feb 2021 23:01:58 +0000 Subject: [PATCH] Presenting RSSI-values in nicer optics (like on the old dashboard). --- html/css/tooltip.css | 46 +++++++++++++++++++++++++++++++++++++++++++ html/images/0.png | Bin 0 -> 394 bytes html/images/1.png | Bin 0 -> 452 bytes html/images/2.png | Bin 0 -> 493 bytes html/images/3.png | Bin 0 -> 531 bytes html/images/4.png | Bin 0 -> 571 bytes html/index.html | 1 + html/js/functions.js | 27 ++++++++++++++++++++++++- html/js/version.js | 2 +- 9 files changed, 74 insertions(+), 2 deletions(-) create mode 100644 html/css/tooltip.css create mode 100644 html/images/0.png create mode 100644 html/images/1.png create mode 100644 html/images/2.png create mode 100644 html/images/3.png create mode 100644 html/images/4.png diff --git a/html/css/tooltip.css b/html/css/tooltip.css new file mode 100644 index 0000000..0066c88 --- /dev/null +++ b/html/css/tooltip.css @@ -0,0 +1,46 @@ +/* Tooltip container */ +.tooltip2 { + position: relative; + display: inline-block; + border-bottom: 1px dotted black; /* If you want dots under the hoverable text */ +} + +/* Tooltip text */ +.tooltip2 .tooltip2text { + visibility: hidden; + width: 200px; + background-color: #555; + color: #fff; + text-align: center; + padding: 5px 0; + border-radius: 6px; + + /* Position the tooltip text */ + position: absolute; + z-index: 1; + bottom: 125%; + left: 50%; + margin-left: -60px; + + /* Fade in tooltip */ + opacity: 0; + transition: opacity 1s; +} + +/* Tooltip arrow */ +.tooltip2 .tooltip2text::after { + content: ""; + position: absolute; + top: 100%; + left: 50%; + margin-left: -5px; + border-width: 5px; + border-style: solid; + border-color: #555 transparent transparent transparent; +} + +/* Show the tooltip text when you mouse over the tooltip container */ +.tooltip2:hover .tooltip2text { + visibility: visible; + opacity: 1; +} diff --git a/html/images/0.png b/html/images/0.png new file mode 100644 index 0000000000000000000000000000000000000000..ba238270b0e6f3b686df3f949b7ec094189b1763 GIT binary patch literal 394 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6n3BBRT^Rm-==h@v2>8 zUjt#r3Hg(Uq9HdwB{QuOw}u+SS(AYpBtbR==ckpF oCl;kLl$V$5W#(lUCnpx9>g5-u&wghk1ysb~>FVdQ&MBb@0H}0}!T2>8 zUjt#r3Hg(j5Bb6gGB z_*$o@?U>F+@0@=ji_az~zr4WM?2#eA_Lt}N#pM81s z#fIzhdu_DNOnDbrH9>l{%4N4#%in%JHoyJ7{f}IZeGGZc=KUrs#gl>lQY~?fC`m~y zNwrEYN(E93Mh1okx&{`yh6W*qW>zMaK%{M8WMyDr*PP>lq9HdwB{QuOw+8=vSH1u> wNP=t#&QB{TPb^AhC@(M9%goCzPEIUH)ypqRpZ(583aE&|)78&qol`;+06pfcYXATM literal 0 HcmV?d00001 diff --git a/html/images/2.png b/html/images/2.png new file mode 100644 index 0000000000000000000000000000000000000000..cfcd1d53ac862c78c4c3d665aa8bb1c68138dc14 GIT binary patch literal 493 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6n3BBRT^Rm-==h@v2>8 zUjt#r3Hg527^|M?INKH(ubH^rb&@_UjMgvl`~^d2HEUyr231-UkhN z9xpbf3Cr>DY!KP;fnS?x8;3#ww+4eyA={D_(+}<4+hKC;>&s_nnbP7pG`Nb&jjMLm z%;9q_Pi1IXz#*0J>EEK{>W>pwm@%_#7Y~1Yam{j_lTo5U>3ogfK7T!};;p{kLR0Ep z-@z$2zwM2<#kIUO(EhytC&stdo2|}SFI{tMU1;UAUuQo3OP(`ldGk+a^M7_TS2Oha z>sWGV98swWG2>8 zUjt#r3Hg(o<*RbeHeUQXadnZ!ioU#>`fC+Cbq{@fk=S@xNQ6UVg@NJ{zY`r+ z24~zq=SCjVtBd}_)+~{6b&gO=Dlp7cOI#yLQW8s2t&)pUffR$0fuVt}frYN2L5QK5 zm8pT1ftj{}k(Gf#q13ZL6b-rgDVb@NxHT}i$Grt=kObKfoS#-wo>-L1P+nfHmzkGc coSayYs+V7sKKq@G6i^X^r>mdKI;Vst04jCMIRF3v literal 0 HcmV?d00001 diff --git a/html/images/4.png b/html/images/4.png new file mode 100644 index 0000000000000000000000000000000000000000..b9d8a492bb18e5e49e2d65a638c59700528f9b2e GIT binary patch literal 571 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6n3BBRT^Rm-==h@v2>8 zUjt#r3HgJve$<^A$9X}68P0-mB?Rly>TxRzCoxlGszwGub z_Ft65)VjiqtCK!=E{;w7a^Z$~{L%!wlg}02UUGGBuNF0Uv_Z?+r#gJC?)==6>tX&& zI;RA6YHpPk5K)s_QNHUC|Aqy|I#JtM()Jd`&aB{AsCPD~jdikjPuR`&1N$TPL}lI4 ziAn18b>mS}c6)hER4em|`MP&cBMPmKH=QfgnA^xCu|epoX|s!xK9|t>DzgH|C5z5I zQ9hJwcV>$E`}VBp#QUeOye;FHdVB4 + DG9VH - MMDVM-Dashboard by DG9VH diff --git a/html/js/functions.js b/html/js/functions.js index 3c584a5..cac9ac7 100644 --- a/html/js/functions.js +++ b/html/js/functions.js @@ -149,9 +149,34 @@ function getLoss(logline) { } } +function getRSSI(logline) { + rssi_raw = logline.substring(logline.lastIndexOf("RSSI:")); + rssi = parseInt(rssi_raw.substring(rssi_raw.lastIndexOf("/")+1, rssi_raw.lastIndexOf("dBm")-1)); + if (rssi > "-53") retval = "
S9 +40dB (" + rssi + " dBm)(min/max/avg)
" + rssi_raw + "
"; + else if (rssi > "-63") retval = "
S9 +30dB (" + rssi + " dBm)(min/max/avg)
" + rssi_raw + "
"; + else if (rssi > "-73") retval = "
S9 +20dB (" + rssi + " dBm)(min/max/avg)
" + rssi_raw + "
"; + else if (rssi > "-83") retval = "
S9 +10dB (" + rssi + " dBm)(min/max/avg)
" + rssi_raw + "
"; + else if (rssi > "-93") retval = "
S9 (" + rssi + " dBm)(min/max/avg)
" + rssi_raw + "
"; + else if (rssi > "-99") retval = "
S8 (" + rssi + " dBm)(min/max/avg)
" + rssi_raw + "
"; + else if (rssi > "-105") retval = "
S7 (" + rssi + " dBm)(min/max/avg)
" + rssi_raw + "
"; + else if (rssi > "-111") retval = "
S6 (" + rssi + " dBm)(min/max/avg)
" + rssi_raw + "
"; + else if (rssi > "-117") retval = "
S5 (" + rssi + " dBm)(min/max/avg)
" + rssi_raw + "
"; + else if (rssi > "-123") retval = "
S4 (" + rssi + " dBm)(min/max/avg)
" + rssi_raw + "
"; + else if (rssi > "-129") retval = "
S3 (" + rssi + " dBm)(min/max/avg)
" + rssi_raw + "
"; + else if (rssi > "-135") retval = "
S2 (" + rssi + " dBm)(min/max/avg)
" + rssi_raw + "
"; + else if (rssi > "-141") retval = "
S1 (" + rssi + " dBm)(min/max/avg)
" + rssi_raw + "
"; + return retval; +} + function getBER(logline) { if(logline.lastIndexOf("BER") > 0) { - return logline.substring(logline.lastIndexOf("BER") + 4); + if(logline.lastIndexOf("RSSI:") > 0) { + retval = logline.substring(logline.lastIndexOf("BER") + 4, logline.lastIndexOf("RSSI:")); + retval += " " + getRSSI(logline); + return retval; + } else { + return logline.substring(logline.lastIndexOf("BER") + 4); + } } else { return ""; } diff --git a/html/js/version.js b/html/js/version.js index bc11861..103262e 100644 --- a/html/js/version.js +++ b/html/js/version.js @@ -1 +1 @@ -var dashboard_version = "2021-02-02 21:16:56"; +var dashboard_version = "2021-02-02 23:01:58";