Skip to content

Commit 8049fd5

Browse files
4IceG4IceG
authored
Up to 1.0.67-20240421
- Fix for reading interface settings - Fix for missing TAC HEX value for RM520N-GL
1 parent 3b20a7e commit 8049fd5

File tree

7 files changed

+69
-118
lines changed

7 files changed

+69
-118
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ 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.66-20240421
15+
PKG_VERSION:=1.0.67-20240421
1616

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

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

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -193,21 +193,6 @@ else
193193
O=$(gcom -d $DEVICE -s $RES/info.gcom 2>/dev/null)
194194
fi
195195

196-
197-
CONFIG=modemdefine
198-
MODEMZ=$(uci show $CONFIG | grep -o "@modemdefine\[[0-9]*\]\.modem" | wc -l | xargs)
199-
if [ -z "$MODEMZ" ]; then
200-
if [[ $MODEMZ > 1 ]]; then
201-
SEC=$(uci -q get modemdefine.@general[0].main_network)
202-
fi
203-
if [[ $MODEMZ = "0" ]]; then
204-
SEC=$(uci -q get 3ginfo.@3ginfo[0].network)
205-
fi
206-
if [[ $MODEMZ = 1 ]]; then
207-
SEC=$(uci -q get modemdefine.@modemdefine[0].network)
208-
fi
209-
fi
210-
211196
getpath() {
212197
devname="$(basename $1)"
213198
case "$devname" in
@@ -230,6 +215,18 @@ getpath() {
230215
esac
231216
}
232217

218+
CONFIG=modemdefine
219+
MODEMZ=$(uci show $CONFIG | grep -o "@modemdefine\[[0-9]*\]\.modem" | wc -l | xargs)
220+
if [[ $MODEMZ > 1 ]]; then
221+
SEC=$(uci -q get modemdefine.@general[0].main_network)
222+
fi
223+
if [[ $MODEMZ = "0" ]]; then
224+
SEC=$(uci -q get 3ginfo.@3ginfo[0].network)
225+
fi
226+
if [[ $MODEMZ = 1 ]]; then
227+
SEC=$(uci -q get modemdefine.@modemdefine[0].network)
228+
fi
229+
233230
if [ -z "$SEC" ]; then
234231
getpath $DEVICE
235232
PORIG=$P

‎luci-app-3ginfo-lite/root/usr/share/3ginfo-lite/modem/usb/1e2d00b3‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Dell DW5930e
22
# Foxconn T99W175
3-
# Thales's Cinterion MV31-W
3+
# Thales Cinterion MV31-W
44

55
O=$(sms_tool -d $DEVICE at "AT^TEMP?")
66

‎luci-app-3ginfo-lite/root/usr/share/3ginfo-lite/modem/usb/1e2d00b7‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Dell DW5930e
22
# Foxconn T99W175
3-
# Thales's Cinterion MV31-W
3+
# Thales Cinterion MV31-W
44

55
O=$(sms_tool -d $DEVICE at "AT^TEMP?")
66

‎luci-app-3ginfo-lite/root/usr/share/3ginfo-lite/modem/usb/2c7c0800‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,9 +229,9 @@ if [ "x$MODE_NUM" = "x13" ]; then
229229
if [ "x${MODE:0:3}" = "xLTE" ]; then
230230
T=$(echo "$O" | awk -F[,:] '/^\+QENG:/ {print $14}')
231231
T_DEC=$(printf "%d" "0x$T")
232-
addon 23 "TAC" "${T_DEC} ($T)"
232+
T_HEX="$T"
233233
T=$(echo "$O" | awk -F[,:] '/^\+QENG:/ {print $18}' | awk '{printf "%.1f\n", 0.2*$1*10 - 20}')
234-
addon 38 "SINR" "$T dB"
234+
SINR="$T"
235235
T=$(echo "$O" | awk -F[,:] '/^\+QENG:/ {print $12}')
236236
case $T in
237237
0*) T1="1.4";;

‎luci-app-3ginfo-lite/root/usr/share/3ginfo-lite/modem/usb/2c7c0801‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,9 +226,9 @@ if [ "x$MODE_NUM" = "x13" ]; then
226226
if [ "x${MODE:0:3}" = "xLTE" ]; then
227227
T=$(echo "$O" | awk -F[,:] '/^\+QENG:/ {print $14}')
228228
T_DEC=$(printf "%d" "0x$T")
229-
addon 23 "TAC" "${T_DEC} ($T)"
229+
T_HEX="$T"
230230
T=$(echo "$O" | awk -F[,:] '/^\+QENG:/ {print $18}' | awk '{printf "%.1f\n", 0.2*$1*10 - 20}')
231-
addon 38 "SINR" "$T dB"
231+
SINR="$T"
232232
T=$(echo "$O" | awk -F[,:] '/^\+QENG:/ {print $12}')
233233
case $T in
234234
0*) T1="1.4";;

‎luci-app-3ginfo-lite/root/usr/share/3ginfo-lite/modem/usb/2c7c0900‎

Lines changed: 50 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,6 @@ if [ -n "$T" ]; then
7878
B=$(echo $T | sed 's/"LTE BAND \(.*\)"/\1/')
7979
MODE="$MODE $(band4g ${B})"
8080
;;
81-
*"NR N"*)
82-
B=$(echo $T | sed 's/NR N\(.*\)/\1/')
83-
MODE="$MODE $(band5g ${B})"
84-
;;
8581
*"NR5G BAND"*)
8682
B=$(echo $T | sed 's/"NR5G BAND \(.*\)"/\1/')
8783
MODE="$MODE $(band5g ${B})"
@@ -96,10 +92,6 @@ if [ -n "$T" ]; then
9692
B=$(echo $T | sed 's/"LTE-BAND-\(.*\)"/\1/')
9793
MODE="$MODE / $(band4g ${B})"
9894
;;
99-
*"NR-N"*)
100-
B=$(echo $T | sed 's/NR-N\(.*\)/\1/')
101-
MODE="$MODE / $(band5g ${B})"
102-
;;
10395
*"NR5G-BAND"*)
10496
B=$(echo $T | sed 's/"NR5G-BAND-\(.*\)"/\1/')
10597
MODE="$MODE / $(band5g ${B})"
@@ -206,7 +198,7 @@ if [ "x$MODE_NUM" = "x13" ]; then
206198
TAC_DEC=$(printf "%d" "0x$T")
207199
TAC_HEX=$T
208200

209-
T=$(echo "$LINE" | awk -F[,:] '/^\+QENG:/ {print $16}' | awk '{printf "%.1f\n", 0.2*$1*10 - 20}')
201+
T=$(echo "$LINE" | awk -F[,:] '/^\+QENG:/ {print $16}' | awk '{printf "%.0f\n", 0.2*$1*10 - 20}')
210202
SINR="$T"
211203
T=$(echo "$LINE" | awk -F[,:] '/^\+QENG:/ {print $10}')
212204
case $T in
@@ -230,6 +222,36 @@ if [ "x$MODE_NUM" = "x13" ]; then
230222
*) T1="";;
231223
esac
232224
[ -n "$T1" ] && DLBW="DL: @$T1 MHz"
225+
elif [ "x$T" = "xservingcell" ]; then
226+
if [ "x${MODE:0:3}" = "xLTE" ]; then
227+
T=$(echo "$O" | awk -F[,:] '/^\+QENG:/ {print $14}')
228+
T_DEC=$(printf "%d" "0x$T")
229+
T_HEX="$T"
230+
T=$(echo "$O" | awk -F[,:] '/^\+QENG:/ {print $18}' | awk '{printf "%.1f\n", 0.2*$1*10 - 20}')
231+
SINR="$T"
232+
T=$(echo "$O" | awk -F[,:] '/^\+QENG:/ {print $12}')
233+
case $T in
234+
0*) T1="1.4";;
235+
1*) T1="3";;
236+
2*) T1="5";;
237+
3*) T1="10";;
238+
4*) T1="15";;
239+
5*) T1="20";;
240+
*) T1="";;
241+
esac
242+
[ -n "$T1" ] && ULBW="UL: @$T1 MHz"
243+
T=$(echo "$O" | awk -F[,:] '/^\+QENG:/ {print $13}')
244+
case $T in
245+
0*) T1="1.4";;
246+
1*) T1="3";;
247+
2*) T1="5";;
248+
3*) T1="10";;
249+
4*) T1="15";;
250+
5*) T1="20";;
251+
*) T1="";;
252+
esac
253+
[ -n "$T1" ] && DLBW="DL: @$T1 MHz"
254+
fi
233255
fi
234256
done
235257
fi
@@ -241,10 +263,6 @@ if [ -n "$T" ]; then
241263
B=$(echo $T | sed 's/"LTE BAND \(.*\)"/\1/')
242264
T2=$(band4g ${B})
243265
;;
244-
*"NR N"*)
245-
B=$(echo $T | sed 's/NR N\(.*\)/\1/')
246-
T2=$(band5g ${B})
247-
;;
248266
*"NR5G BAND"*)
249267
B=$(echo $T | sed 's/"NR5G BAND \(.*\)"/\1/')
250268
T2=$(band5g ${B})
@@ -260,16 +278,14 @@ if [ -n "$T" ]; then
260278
100*) T4="20";;
261279
*) T4="";;
262280
esac
263-
264281
if [ -z "$T4" ]; then
265282
PBAND="$T2"
266283
if [ -n "$DBW" ]; then
267284
PBAND="$T2 $DBW"
268285
fi
269286
else
270-
PBAND="${T2} @${T4} MHz"
287+
PBAND="$T2 @$T4 MHz"
271288
fi
272-
273289
if [ "x$MODE_NUM" = "x11" ]; then
274290
T=$(echo "$O" | awk -F[,:] '/^\+QCAINFO: "(pcc|PCC)"/{print $3}')
275291
[ -n "$T" ] && EARFCN="$T"
@@ -308,7 +324,7 @@ if [ -n "$T" ]; then
308324
100*) T4="20";;
309325
*) T4="";;
310326
esac
311-
T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $3}')
327+
T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $3}' | xargs)
312328
if [ -n "$T5" ]; then
313329
case $IDX in
314330
1) S1EARFCN="$T5";;
@@ -318,6 +334,7 @@ if [ -n "$T" ]; then
318334
*) ;;
319335
esac
320336
fi
337+
321338
T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $7}' | xargs)
322339
if [ -n "$T5" ]; then
323340
case $IDX in
@@ -329,79 +346,15 @@ if [ -n "$T" ]; then
329346
esac
330347
fi
331348

332-
T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $10}')
349+
T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $10}' | xargs)
333350
# [ -n "$T5" ] && addon $((POS + 5)) "(S${IDX}) RSSI" "$T5 dBm"
334351

335-
T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $8}')
352+
T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $8}' | xargs)
336353
# [ -n "$T5" ] && addon $((POS + 6)) "(S${IDX}) RSRP" "$T5 dBm"
337354

338-
T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $9}')
355+
T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $9}' | xargs)
339356
# [ -n "$T5" ] && addon $((POS + 7)) "(S${IDX}) RSRQ" "$T5 dB"
340357
;;
341-
*"NR N"*)
342-
B=$(echo $T | sed 's/NR N\(.*\)/\1/')
343-
T2=$(band5g ${B})
344-
case $T3 in
345-
0) T4="5";;
346-
1) T4="10";;
347-
2) T4="15";;
348-
3) T4="20";;
349-
4) T4="25";;
350-
5) T4="30";;
351-
6) T4="40";;
352-
7) T4="50";;
353-
8) T4="60";;
354-
9) T4="70";;
355-
10) T4="80";;
356-
11) T4="90";;
357-
12) T4="100";;
358-
13) T4="200";;
359-
14) T4="400";;
360-
*) T4="";;
361-
esac
362-
T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $3}')
363-
if [ -n "$T5" ]; then
364-
case $IDX in
365-
1) S1EARFCN="$T5";;
366-
2) S2EARFCN="$T5";;
367-
3) S3EARFCN="$T5";;
368-
4) S4EARFCN="$T5";;
369-
*) ;;
370-
esac
371-
fi
372-
373-
if [ "x$MODE_NUM" = "x11" ]; then
374-
T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $7}')
375-
if [ -n "$T5" ] && [ "$T5" != "-" ]; then
376-
case $IDX in
377-
1) S1PCI="$T5";;
378-
2) S2PCI="$T5";;
379-
3) S3PCI="$T5";;
380-
4) S4PCI="$T5";;
381-
*) ;;
382-
esac
383-
fi
384-
T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $8}')
385-
# [ -n "$T5" ] && [ "$T5" != "-" ] && addon $((POS + 6)) "(S${IDX}) RSRP" "$T5 dBm"
386-
T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $9}')
387-
# [ -n "$T5" ] && [ "$T5" != "-" ] && addon $((POS + 7)) "(S${IDX}) RSRQ" "$T5 dB"
388-
else
389-
T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $6}')
390-
if [ -n "$T5" ] && [ "$T5" != "-" ]; then
391-
case $IDX in
392-
1) S1PCI="$T5";;
393-
2) S2PCI="$T5";;
394-
3) S3PCI="$T5";;
395-
4) S4PCI="$T5";;
396-
*) ;;
397-
esac
398-
fi
399-
T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $7}')
400-
# [ -n "$T5" ] && [ "$T5" != "-" ] && addon $((POS + 6)) "(S${IDX}) RSRP" "$T5 dBm"
401-
T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $8}')
402-
# [ -n "$T5" ] && [ "$T5" != "-" ] && addon $((POS + 7)) "(S${IDX}) RSRQ" "$T5 dB"
403-
fi
404-
;;
405358
*"NR5G BAND"*)
406359
B=$(echo $T | sed 's/"NR5G BAND \(.*\)"/\1/')
407360
T2=$(band5g ${B})
@@ -436,7 +389,7 @@ if [ -n "$T" ]; then
436389
fi
437390

438391
if [ "x$MODE_NUM" = "x11" ]; then
439-
T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $7}')
392+
T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $7}' | xargs)
440393
if [ -n "$T5" ] && [ "$T5" != "-" ]; then
441394
case $IDX in
442395
1) S1PCI="$T5";;
@@ -446,21 +399,22 @@ if [ -n "$T" ]; then
446399
*) ;;
447400
esac
448401
fi
402+
449403
T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $8}')
450404
# [ -n "$T5" ] && [ "$T5" != "-" ] && addon $((POS + 6)) "(S${IDX}) RSRP" "$T5 dBm"
451405
T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $9}')
452406
# [ -n "$T5" ] && [ "$T5" != "-" ] && addon $((POS + 7)) "(S${IDX}) RSRQ" "$T5 dB"
453407
else
454-
T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $6}')
455-
if [ -n "$T5" ] && [ "$T5" != "-" ]; then
456-
case $IDX in
457-
1) S1PCI="$T5";;
458-
2) S2PCI="$T5";;
459-
3) S3PCI="$T5";;
460-
4) S4PCI="$T5";;
461-
*) ;;
462-
esac
463-
fi
408+
T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $6}' | xargs)
409+
if [ -n "$T5" ]; then
410+
case $IDX in
411+
1) S1PCI="$T5";;
412+
2) S2PCI="$T5";;
413+
3) S3PCI="$T5";;
414+
4) S4PCI="$T5";;
415+
*) ;;
416+
esac
417+
fi
464418
T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $7}')
465419
# [ -n "$T5" ] && [ "$T5" != "-" ] && addon $((POS + 6)) "(S${IDX}) RSRP" "$T5 dBm"
466420
T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $8}')
@@ -497,7 +451,7 @@ MODE=$(echo $MODE | sed 's,/,+,'| sed 's,LTE B,LTE | B,')
497451
if [ "${LAC_DEC}" = "0" ]; then
498452
LAC_DEC="-"
499453
LAC_HEX="-"
500-
fi
454+
fi
501455

502456
# Modem
503457
FWA=$(sms_tool -d $DEVICE at "AT+GMR" | tr -s "\n" | xargs)

0 commit comments

Comments
 (0)