diff --git a/luci-app-3ginfo-lite/Makefile b/luci-app-3ginfo-lite/Makefile index 88a3e267..2135dbfa 100644 --- a/luci-app-3ginfo-lite/Makefile +++ b/luci-app-3ginfo-lite/Makefile @@ -8,10 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-3ginfo-lite LUCI_TITLE:=LuCI JS Support for 3ginfo-lite +MAINTAINER:=RafaƂ Wabik <4Rafal@gmail.com> LUCI_DESCRIPTION:=LuCI JS interface for the 3ginfo-lite. The package allows you to view the parameters of the mobile internet connection. -LUCI_PKGARCH:=all LUCI_DEPENDS:=+sms-tool +comgt -PKG_VERSION:=1.0.46-20230501 +LUCI_PKGARCH:=all +PKG_VERSION:=1.0.48-20230629 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/luci-app-3ginfo-lite/htdocs/luci-static/resources/icons/ctime.png b/luci-app-3ginfo-lite/htdocs/luci-static/resources/icons/ctime.png index 733d3a9f..7220b3d5 100644 Binary files a/luci-app-3ginfo-lite/htdocs/luci-static/resources/icons/ctime.png and b/luci-app-3ginfo-lite/htdocs/luci-static/resources/icons/ctime.png differ diff --git a/luci-app-3ginfo-lite/htdocs/luci-static/resources/view/modem/3gdetail.js b/luci-app-3ginfo-lite/htdocs/luci-static/resources/view/modem/3gdetail.js index b6904ee7..e27d6134 100644 --- a/luci-app-3ginfo-lite/htdocs/luci-static/resources/view/modem/3gdetail.js +++ b/luci-app-3ginfo-lite/htdocs/luci-static/resources/view/modem/3gdetail.js @@ -53,22 +53,22 @@ var mn = parseInt(m) || 100; if (vn > -50) { vn = -50 }; if (vn < -110) { vn = -110 }; var pc = Math.floor(100*(1-(-50 - vn)/(-50 - mn))); - if (vn >= -74) + if (vn > -70) { pg.firstElementChild.style.background = 'lime'; var tip = _('Very good'); }; - if (vn >= -85 && vn <= -75) + if (vn >= -85 && vn <= -70) { pg.firstElementChild.style.background = 'yellow'; var tip = _('Good'); }; - if (vn >= -93 && vn <= -86) + if (vn >= -100 && vn <= -86) { pg.firstElementChild.style.background = 'darkorange'; var tip = _('Weak'); }; - if (vn < -94) + if (vn < -100) { pg.firstElementChild.style.background = 'red'; var tip = _('Very weak'); @@ -86,17 +86,17 @@ var mn = parseInt(m) || 100; if (vn > -50) { vn = -50 }; if (vn < -140) { vn = -140 }; var pc = Math.floor(120*(1-(-50 - vn)/(-50 - mn))); - if (vn >= -79 ) + if (vn >= -80 ) { pg.firstElementChild.style.background = 'lime'; var tip = _('Very good'); }; - if (vn >= -90 && vn <= -80) + if (vn >= -90 && vn <= -79) { pg.firstElementChild.style.background = 'yellow'; var tip = _('Good'); }; - if (vn >= -100 && vn <= -91) + if (vn >= -100 && vn <= -89) { pg.firstElementChild.style.background = 'darkorange'; var tip = _('Weak'); @@ -117,7 +117,7 @@ var pg = document.querySelector('#sinr') var vn = parseInt(v) || 0; var mn = parseInt(m) || 100; var pc = Math.floor(100-(100*(1-((mn - vn)/(mn - 31))))); - if (vn >= 21 ) + if (vn > 20 ) { pg.firstElementChild.style.background = 'lime'; var tip = _('Excellent'); @@ -149,17 +149,17 @@ var vn = parseInt(v) || 0; var mn = parseInt(m) || 100; var pc = Math.floor(115-(100/mn)*vn); if (vn > 0) { vn = 0; }; - if (vn >= -9 ) + if (vn >= -10 ) { pg.firstElementChild.style.background = 'lime'; var tip = _('Excellent'); }; - if (vn >= -15 && vn <= -10) + if (vn >= -15 && vn <= -9) { pg.firstElementChild.style.background = 'yellow'; var tip = _('Good'); }; - if (vn >= -20 && vn <= -16) + if (vn >= -20 && vn <= -14) { pg.firstElementChild.style.background = 'darkorange'; var tip = _('Mid cell'); diff --git a/luci-app-3ginfo-lite/root/usr/share/3ginfo-lite/modem/19d21485 b/luci-app-3ginfo-lite/root/usr/share/3ginfo-lite/modem/19d21485 index 82076697..8ed7045f 100644 --- a/luci-app-3ginfo-lite/root/usr/share/3ginfo-lite/modem/19d21485 +++ b/luci-app-3ginfo-lite/root/usr/share/3ginfo-lite/modem/19d21485 @@ -74,6 +74,7 @@ case "$MODE_NUM" in if [ -n "$T" ]; then T1=$(echo "$O" | awk -F[,:\;] '/^\+ZCAINFO/ {print $6}' | xargs) PBAND="$(band $T "") @$T1 MHz" + [ "x$MODE" = "xLTE BUnknown" ] && MODE="LTE $(band $T)" T=$(echo "$O" | awk -F[,:\;] '/^\+ZCAINFO/ {print $2}' | xargs) [ -n "$T" ] && PCI="$T" T=$(echo "$O" | awk -F[,:\;] '/^\+ZCAINFO/ {print $5}' | xargs)