diff --git a/luci-app-3ginfo-lite/Makefile b/luci-app-3ginfo-lite/Makefile index 4e9bbd70..bfe4ac6b 100644 --- a/luci-app-3ginfo-lite/Makefile +++ b/luci-app-3ginfo-lite/Makefile @@ -1,5 +1,5 @@ # -# Copyright 2021-2023 Rafał Wabik - IceG - From eko.one.pl forum +# Copyright 2021-2024 Rafał Wabik - IceG - From eko.one.pl forum # # Licensed to the GNU General Public License v3.0. # @@ -12,7 +12,7 @@ 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_DEPENDS:=+sms-tool +comgt +kmod-usb-serial-option LUCI_PKGARCH:=all -PKG_VERSION:=1.0.60-20231204 +PKG_VERSION:=1.0.61-20240102 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/luci-app-3ginfo-lite/htdocs/luci-static/resources/view/modem/3gconfig.js b/luci-app-3ginfo-lite/htdocs/luci-static/resources/view/modem/3gconfig.js index 53c593f6..4c45c776 100644 --- a/luci-app-3ginfo-lite/htdocs/luci-static/resources/view/modem/3gconfig.js +++ b/luci-app-3ginfo-lite/htdocs/luci-static/resources/view/modem/3gconfig.js @@ -7,7 +7,7 @@ 'require tools.widgets as widgets' /* - Copyright 2021-2023 Rafał Wabik - IceG - From eko.one.pl forum + Copyright 2021-2024 Rafał Wabik - IceG - From eko.one.pl forum Licensed to the GNU General Public License v3.0. */ @@ -16,7 +16,7 @@ return view.extend({ load: function() { return fs.list('/dev').then(function(devs) { return devs.filter(function(dev) { - return dev.name.match(/^ttyUSB/) || dev.name.match(/^cdc-wdm/) || dev.name.match(/^ttyACM/) || dev.name.match(/^mhi_/); + return dev.name.match(/^ttyUSB/) || dev.name.match(/^cdc-wdm/) || dev.name.match(/^ttyACM/) || dev.name.match(/^mhi_/) || dev.name.match(/^wwan/); }); }); }, @@ -27,13 +27,23 @@ return view.extend({ s = m.section(form.TypedSection, '3ginfo', '', null); s.anonymous = true; - + +/* Old config o = s.option(widgets.DeviceSelect, 'network', _('Interface'), _('Network interface for Internet access.') ); o.noaliases = false; o.default = 'wan'; o.rmempty = false; +*/ + + o = s.option(widgets.NetworkSelect, 'network', _('Interface'), + _('Network interface for Internet access.') + ); + o.exclude = s.section; + o.nocreate = true; + o.rmempty = false; + o.default = 'wan'; o = s.option(form.Value, 'device', _('IP adress / Port for communication with the modem'), diff --git a/luci-app-3ginfo-lite/htdocs/luci-static/resources/view/modem/3gdebug.js b/luci-app-3ginfo-lite/htdocs/luci-static/resources/view/modem/3gdebug.js index 0c7b73dd..b80a02ab 100644 --- a/luci-app-3ginfo-lite/htdocs/luci-static/resources/view/modem/3gdebug.js +++ b/luci-app-3ginfo-lite/htdocs/luci-static/resources/view/modem/3gdebug.js @@ -4,7 +4,7 @@ 'require ui'; /* - Copyright 2021-2023 Rafał Wabik - IceG - From eko.one.pl forum + Copyright 2021-2024 Rafał Wabik - IceG - From eko.one.pl forum Licensed to the GNU General Public License v3.0. */ 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 bb3757cc..747df182 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 @@ -10,7 +10,7 @@ 'require tools.widgets as widgets'; /* - Copyright 2021-2023 Rafał Wabik - IceG - From eko.one.pl forum + Copyright 2021-2024 Rafał Wabik - IceG - From eko.one.pl forum Licensed to the GNU General Public License v3.0. diff --git a/luci-app-3ginfo-lite/root/usr/share/3ginfo-lite/modem/2c7c0801 b/luci-app-3ginfo-lite/root/usr/share/3ginfo-lite/modem/2c7c0801 index 22d58677..da76ccfd 100644 --- a/luci-app-3ginfo-lite/root/usr/share/3ginfo-lite/modem/2c7c0801 +++ b/luci-app-3ginfo-lite/root/usr/share/3ginfo-lite/modem/2c7c0801 @@ -107,7 +107,7 @@ if [ "x$MODE_NUM" = "x7" ]; then T=$(echo "$O" | awk -F[,:] '/^\+QENG:/ {print $14}') TAC_DEC=$(printf "%d" "0x$T") TAC_HEX=$T - T=$(echo "$O" | awk -F[,:] '/^\+QENG:/ {print $18}' | awk '{printf "%.1f\n", 0.2*$1*10 - 20}') + T=$(echo "$O" | awk -F[,:] '/^\+QENG:/ {print $18}' | awk '{printf "%.0f\n", 0.2*$1*10 - 20}') SINR=$T T=$(echo "$O" | awk -F[,:] '/^\+QENG:/ {print $12}') case $T in @@ -197,7 +197,7 @@ if [ "x$MODE_NUM" = "x13" ]; then TAC_DEC=$(printf "%d" "0x$T") TAC_HEX=$T - T=$(echo "$LINE" | awk -F[,:] '/^\+QENG:/ {print $16}' | awk '{printf "%.1f\n", 0.2*$1*10 - 20}') + T=$(echo "$LINE" | awk -F[,:] '/^\+QENG:/ {print $16}' | awk '{printf "%.0f\n", 0.2*$1*10 - 20}') SINR=$T T=$(echo "$LINE" | awk -F[,:] '/^\+QENG:/ {print $10}') case $T in @@ -347,7 +347,7 @@ if [ -n "$T" ]; then *) T4="";; esac T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $3}') - [ -n "$T5" ] && addon $((POS + 4)) "(S${IDX}) EARFCN" "$T5" + [ -n "$T5" ] && #addon $((POS + 4)) "(S${IDX}) EARFCN" "$T5" if [ "x$MODE_NUM" = "x11" ]; then T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $7}') if [ -n "$T5" ] && [ "$T5" != "-" ]; then diff --git a/luci-app-3ginfo-lite/root/usr/share/3ginfo-lite/modem/413c81d7 b/luci-app-3ginfo-lite/root/usr/share/3ginfo-lite/modem/413c81d7 index 17bc045f..f59d3179 100644 --- a/luci-app-3ginfo-lite/root/usr/share/3ginfo-lite/modem/413c81d7 +++ b/luci-app-3ginfo-lite/root/usr/share/3ginfo-lite/modem/413c81d7 @@ -52,6 +52,7 @@ if [ -n "$T" ]; then else S2BAND="$(band $T)" fi + MODE="${MODE/LTE/LTE_A} / $(band $T)" fi T=$(echo "$O" | awk '/^SCC3 info:/ {print $5}') @@ -64,6 +65,7 @@ if [ -n "$T" ]; then else S3BAND="$(band $T)" fi + MODE="${MODE/LTE/LTE_A} / $(band $T)" fi T=$(echo "$O" | awk '/^SCC4 info:/ {print $5}') @@ -76,6 +78,7 @@ if [ -n "$T" ]; then else S4BAND="$(band $T)" fi + MODE="${MODE/LTE/LTE_A} / $(band $T)" fi MODE=$(echo $MODE | sed 's,/,+,' | sed 's,LTE_A,LTE-A | ,')