Skip to content

Commit 1798aee

Browse files
4IceG4IceG
authored
Up to 1.0.76-r20250609
1 parent 6d4d02b commit 1798aee

File tree

5 files changed

+44
-32
lines changed

5 files changed

+44
-32
lines changed

‎luci-app-3ginfo-lite/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2021-2024 Rafał Wabik - IceG - From eko.one.pl forum
2+
# Copyright 2021-2025 Rafał Wabik - IceG - From eko.one.pl forum
33
#
44
# Licensed to the GNU General Public License v3.0.
55
#
@@ -12,8 +12,8 @@ MAINTAINER:=Rafał Wabik <4Rafal@gmail.com>
1212
LUCI_DESCRIPTION:=LuCI JS interface for the 3ginfo-lite. The package allows you to view the parameters of the mobile internet connection.
1313
LUCI_DEPENDS:=+sms-tool +comgt +kmod-usb-serial-option
1414
LUCI_PKGARCH:=all
15-
PKG_VERSION:=1.0.75
16-
PKG_RELEASE:=20250505
15+
PKG_VERSION:=1.0.76
16+
PKG_RELEASE:=20250609
1717

1818
include $(TOPDIR)/feeds/luci/luci.mk
1919

‎luci-app-3ginfo-lite/htdocs/luci-static/resources/view/modem/3gdetail.js‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,7 @@ simDialog: baseclass.extend({
701701

702702
if (document.getElementById('csq')) {
703703
var view = document.getElementById("csq");
704-
if (json.signal == 0 || json.signal == '') {
704+
if (json.signal == 0 || json.signal == '-') {
705705
view.style.visibility = 'hidden';
706706
}
707707
else {
@@ -716,7 +716,7 @@ simDialog: baseclass.extend({
716716

717717
if (document.getElementById('rssi')) {
718718
var view = document.getElementById("rssi");
719-
if (json.rssi == '') {
719+
if (json.rssi == '-') {
720720
view.style.visibility = 'hidden';
721721
}
722722
else {
@@ -735,7 +735,7 @@ simDialog: baseclass.extend({
735735

736736
if (document.getElementById('rsrp')) {
737737
var view = document.getElementById('rsrp');
738-
if (json.rsrp == '') {
738+
if (json.rsrp == '-') {
739739
view.style.visibility = 'hidden';
740740
}
741741
else {
@@ -755,7 +755,7 @@ simDialog: baseclass.extend({
755755

756756
if (document.getElementById('sinr')) {
757757
var view = document.getElementById("sinr");
758-
if (json.sinr == '') {
758+
if (json.sinr == '-') {
759759
view.style.visibility = 'hidden';
760760
}
761761
else {
@@ -773,7 +773,7 @@ simDialog: baseclass.extend({
773773

774774
if (document.getElementById('rsrq')) {
775775
var view = document.getElementById("rsrq");
776-
if (json.rsrq == '') {
776+
if (json.rsrq == '-') {
777777
view.style.visibility = 'hidden';
778778
}
779779
else {
@@ -791,7 +791,7 @@ simDialog: baseclass.extend({
791791

792792
if (document.getElementById('mccmnc')) {
793793
var view = document.getElementById("mccmnc");
794-
if (json.operator_mcc == '' & json.operator_mnc == '') {
794+
if (json.operator_mcc == '-' & json.operator_mnc == '-') {
795795
view.textContent = '-';
796796
}
797797
else {
@@ -849,7 +849,7 @@ simDialog: baseclass.extend({
849849

850850
if (document.getElementById('pband')) {
851851
var view = document.getElementById("pband");
852-
if (json.pband == '' || json.pband.includes('-')) {
852+
if (json.pband == '-') {
853853
view.textContent = '-';
854854
}
855855
else {
@@ -864,7 +864,7 @@ simDialog: baseclass.extend({
864864

865865
if (document.getElementById('s1band')) {
866866
var view = document.getElementById("s1band");
867-
if (json.s1band == '' || json.s1band.includes('-')) {
867+
if (json.s1band == '-') {
868868
view.textContent = '-';
869869
}
870870
else {
@@ -879,7 +879,7 @@ simDialog: baseclass.extend({
879879

880880
if (document.getElementById('s2band')) {
881881
var view = document.getElementById("s2band");
882-
if (json.s2band == '' || json.s2band.includes('-')) {
882+
if (json.s2band == '-') {
883883
view.textContent = '-';
884884
}
885885
else {
@@ -894,7 +894,7 @@ simDialog: baseclass.extend({
894894

895895
if (document.getElementById('s3band')) {
896896
var view = document.getElementById("s3band");
897-
if (json.s3band == '' || json.s3band.includes('-')) {
897+
if (json.s3band == '-') {
898898
view.textContent = '-';
899899
}
900900
else {
@@ -909,7 +909,7 @@ simDialog: baseclass.extend({
909909

910910
if (document.getElementById('s4band')) {
911911
var view = document.getElementById("s4band");
912-
if (json.s4band == '' || json.s4band.includes('-')) {
912+
if (json.s4band == '-') {
913913
view.textContent = '-';
914914
}
915915
else {

‎luci-app-3ginfo-lite/root/usr/share/3ginfo-lite/3ginfo.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,7 @@ esac
404404

405405
# MODE
406406
if [ -z "$MODE_NUM" ] || [ "x$MODE_NUM" == "x0" ]; then
407+
# MODE_NUM=$(echo "$O" | awk -F[,] '/^\+COPS/ {print $4;exit}' | xargs)
407408
MODE_NUM=$(echo "$O" | awk -F[,] '/^\+COPS: 0,2/ {print $4;exit}' | xargs)
408409
fi
409410
case "$MODE_NUM" in
@@ -463,7 +464,7 @@ sanitize_string() {
463464
[ -z "$1" ] && echo "-" || echo "$1" | tr -d '\r\n'
464465
}
465466
sanitize_number() {
466-
[ -z "$1" ] && echo "0" || echo "$1"
467+
[ -z "$1" ] && echo "-" || echo "$1"
467468
}
468469

469470
cat <<EOF

‎luci-app-3ginfo-lite/root/usr/share/3ginfo-lite/modem/usb/0e8d7127‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,12 @@ if [ -z "$T_MODE" ]; then
258258
fi
259259
fi
260260

261+
# Modem data forcing
262+
if [ "$CSQ" = "0" ]; then
263+
$CSQ="1"
264+
$CSQ_PER="10"
265+
fi
266+
261267
# Modem
262268
OA=$(sms_tool -d $DEVICE at "AT+CGMM?")
263269
MODELA=$(echo "$OA" | awk -F [:,] '/\+CGMM/{print $2}' | xargs)

‎luci-app-3ginfo-lite/root/usr/share/3ginfo-lite/modem/usb/12d1155e‎

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -81,33 +81,38 @@ if [ -n "$NR_D" ]; then
8181
NR_ICCID="$NR_D"
8282
fi
8383

84+
if [[ "$MODE" == *"LTE"* ]]; then
85+
8486
XFR=$(sms_tool -d $DEVICE at "at^hfreqinfo?")
8587
XFRCOUNT=$(echo -n "$XFR" | wc -c)
8688

87-
if [ -n "$XFR" ] && [ "$XFRCOUNT" -gt "15" ]; then
88-
89-
# DL / UL / Band
90-
TBX=$(echo "$XFR" | awk -F [:] '/^\^HFREQINFO:/{print $2}' | xargs)
91-
TB=$(echo "$TBX" | cut -d ',' -f3-3 )
89+
if [ -n "$XFR" ]; then
90+
if [ -n "$XFRCOUNT" ]; then
91+
if [ "$XFRCOUNT" -gt "15" ]; then
9292

93-
TDL=$(echo "$TBX" | cut -d ',' -f6-6 )
94-
DL=$(($TDL/1000))
93+
# DL / UL / Band
94+
TBX=$(echo "$XFR" | awk -F [:] '/^\^HFREQINFO:/{print $2}' | xargs)
95+
TB=$(echo "$TBX" | cut -d ',' -f3-3 )
9596

96-
TUL=$(echo "$TBX" | cut -d ',' -f9-9 )
97-
UL=$(($TUL/1000))
97+
TDL=$(echo "$TBX" | cut -d ',' -f6-6 )
98+
DL=$(($TDL/1000))
9899

99-
ULBW="UL: @$UL MHz"
100-
DLBW="DL: @$DL MHz"
100+
TUL=$(echo "$TBX" | cut -d ',' -f9-9 )
101+
UL=$(($TUL/1000))
101102

102-
PBAND="$(band4g $TB "") $DLBW $ULBW"
103-
EARFCN=$(echo "$TBX" | cut -d ',' -f4-4 )
104-
PCI="-"
103+
ULBW="UL: @$UL MHz"
104+
DLBW="DL: @$DL MHz"
105+
106+
PBAND="$(band4g $TB "") $DLBW $ULBW"
107+
EARFCN=$(echo "$TBX" | cut -d ',' -f4-4 )
108+
PCI="-"
109+
fi
110+
fi
111+
fi
105112

106-
if [[ "$MODE" == *"LTE"* ]] && [ -n "$TB" ]; then
107113
MODE="LTE | "$(band4g $TB "")
108114
fi
109-
110-
fi
115+
111116

112117
# LAC & TAC
113118
T_HEX=$LAC_HEX

0 commit comments

Comments
 (0)