Skip to content

Commit e4ebe02

Browse files
4IceG4IceG
authored
Update to version 1.0.54-20230903
- Added support for Dell Inc modem. DW5821e Snapdragon X20 LTE - Script update for 5G bandwidth decoding (RM520N-GL & RG502Q-EA)
1 parent d1aac9b commit e4ebe02

File tree

6 files changed

+224
-83
lines changed

6 files changed

+224
-83
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.53-20230815
15+
PKG_VERSION:=1.0.54-20230903
1616

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,8 @@ modemDialog: baseclass.extend({
290290

291291
window.setTimeout(function() {
292292
if (!poll.active()) poll.start();
293-
location.reload();
294-
//ev.target.blur();
293+
//location.reload();
294+
ev.target.blur();
295295
}, 2000).finally();
296296
});
297297

‎luci-app-3ginfo-lite/root/usr/share/3ginfo-lite/modem/11999071‎

Lines changed: 13 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,20 @@
44

55
O=$(sms_tool -d $DEVICE at "at!gstatus?")
66

7+
T=$(echo "$O" | awk -F: '/Temperature:/ {print $3}')
8+
[ -n "$T" ] && TEMP="$T &deg;C"
9+
710
if [ "x$MODE_NUM" = "x7" ]; then
811
T=$(echo "$O" | awk '/.*TAC:/ {print $5}')
912
if [ -n "$T" ]; then
1013
T_DEC=$(printf "%d" "0x$T")
11-
T_HEX="$T"
14+
T_HEX=$T
1215
fi
1316

1417
T=$(echo "$O" | awk '/^PCC.*RSSI/ {print $4}' | xargs)
15-
[ -n "$T" ] && RSSI="$(echo "${T// //}" | sed 's,/.*,,')"
18+
[ -n "$T" ] && RSSI="${T// //}"
1619
T=$(echo "$O" | awk '/^PCC.*RSRP/ {print $7}' | xargs)
17-
[ -n "$T" ] && RSRP="$(echo "${T// //}" | sed 's,/.*,,')"
20+
[ -n "$T" ] && RSRP="${T// //}"
1821
T=$(echo "$O" | awk '/^RSRQ/ {print $3}')
1922
[ -n "$T" ] && RSRQ="$T"
2023
T=$(echo "$O" | awk '/^SINR/ {print $3}')
@@ -26,6 +29,10 @@ if [ "x$MODE_NUM" = "x7" ]; then
2629
PBAND="$(band ${T/B/}) @${T1} MHz"
2730
MODE="$MODE $(band ${T/B/})"
2831
fi
32+
T=$(echo "$O" | awk '/^LTE Rx chan:/ {print $4}')
33+
# [ -n "$T" ] && addon 34 "EARFCN DL" "$T"
34+
T=$(echo "$O" | awk '/^LTE Rx chan:/ {print $8}')
35+
# [ -n "$T" ] && addon 34 "EARFCN UL" "$T"
2936

3037
T=$(echo "$O" | awk -F: '/^LTE CA state:.*ACTIVE/ {print $3}')
3138
if [ -n "$T" ]; then
@@ -38,53 +45,19 @@ if [ "x$MODE_NUM" = "x7" ]; then
3845
MODE="${MODE/LTE/LTE_A} / $(band ${T/B/})"
3946

4047
T=$(echo "$O" | awk '/.*LTE Scell chan:/ {print $7}')
41-
[ -n "$T" ] && EARFCN="${T#chan:}"
48+
[ -n "$T" ] && S1EARFCN="${T#chan:}"
4249

4350
T=$(echo "$O" | awk '/^SCC.*RSSI/ {print $4}' | xargs)
44-
[ -n "$T" ] && RSSI=$(echo "${T// //}" | sed 's,/.*,,')
51+
[ -n "$T" ] && RSSI="${T// //} dBm"
4552
T=$(echo "$O" | awk '/^SCC.*RSRP/ {print $7}' | xargs)
46-
[ -n "$T" ] && RSRP=$(echo "${T// //}" | sed 's,/.*,,')
53+
[ -n "$T" ] && RSRP="${T// //} dBm"
4754
fi
4855
fi
4956

50-
T=$(echo "$O" | awk -F: '/Temperature:/ {print $3}' | xargs)
51-
if [ -n "$T" ]; then
52-
TEMP="$T &deg;C"
53-
fi
54-
5557
MODE=$(echo $MODE | sed "s/LTE_A/LTE-A |/g" | sed 's,/,+,')
5658

5759
# Modem
58-
FWA=$(sms_tool -d $DEVICE at "AT+CGMR" | tr -s "\n" | xargs)
59-
FW=$(echo $FWA | sed s/"AT+CGMR "//)
60-
61-
MODELA=$(sms_tool -d $DEVICE at "AT+CGMM" | tr -s "\n" | xargs)
62-
MODELB=$(sms_tool -d $DEVICE at "AT+CGMI" | tr -s "\n" | xargs)
63-
64-
MODELACUT=$(echo $MODELA | sed s/"AT+CGMM "//)
65-
MODELBCUT=$(echo $MODELB | sed s/"AT+CGMI "// | cut -f1 -d",")
66-
MODEL="$MODELBCUT "$MODELACUT
6760

68-
# International Mobile Equipment Identity (IMEI)
69-
O=$(sms_tool -d $DEVICE at "AT+CGSN" | xargs)
70-
NR_I=$(echo "$O" | sed s/"AT+CGSN "//)
71-
if [ -n "$NR_I" ]; then
72-
NR_IMEI="$NR_I"
73-
fi
74-
75-
# International Mobile Subscriber Identity (IMSI)
76-
O=$(sms_tool -d $DEVICE at "AT+CIMI" | xargs)
77-
NR_C=$(echo "$O" | sed s/"AT+CIMI "//)
78-
if [ -n "$NR_C" ]; then
79-
NR_IMSI="$NR_C"
80-
fi
81-
82-
# Integrated Circuit Card Identifier (ICCID)
83-
O=$(sms_tool -d $DEVICE at "AT+ICCID")
84-
NR_D=$(echo "$O" | awk -F[,:] '/^ICCID: /{print $2}' | xargs)
85-
if [ -n "$NR_D" ]; then
86-
NR_ICCID="$NR_D"
87-
fi
8861

8962
# Protocol
9063
# DRIVER=QMI_WWAN & DRIVER=CDC_MBIM & DRIVER=CDC_ETHER

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

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ if [ "x$MODE_NUM" = "x7" ]; then
9696
3*) T1="10";;
9797
4*) T1="15";;
9898
5*) T1="20";;
99-
*) T1="?";;
99+
*) T1="";;
100100
esac
101-
ULBW="UL: @$T1 MHz"
101+
[ -n "$T1" ] && ULBW="UL: @$T1 MHz"
102102
T=$(echo "$O" | awk -F[,:] '/^\+QENG:/ {print $13}')
103103
case $T in
104104
0*) T1="1.4";;
@@ -107,9 +107,9 @@ if [ "x$MODE_NUM" = "x7" ]; then
107107
3*) T1="10";;
108108
4*) T1="15";;
109109
5*) T1="20";;
110-
*) T1="?";;
110+
*) T1="";;
111111
esac
112-
DLBW="DL: @$T1 MHz"
112+
[ -n "$T1" ] && DLBW="DL: @$T1 MHz"
113113

114114
fi
115115
fi
@@ -138,7 +138,7 @@ if [ "x$MODE_NUM" = "x13" ]; then
138138
5*) T1="20";;
139139
*) T1="";;
140140
esac
141-
ULBW="UL: @$T1 MHz"
141+
[ -n "$T1" ] && ULBW="UL: @$T1 MHz"
142142
T=$(echo "$LINE" | awk -F[,:] '/^\+QENG:/ {print $11}')
143143
case $T in
144144
0*) T1="1.4";;
@@ -149,7 +149,7 @@ if [ "x$MODE_NUM" = "x13" ]; then
149149
5*) T1="20";;
150150
*) T1="";;
151151
esac
152-
DLBW="DL: @$T1 MHz"
152+
[ -n "$T1" ] && DLBW="DL: @$T1 MHz"
153153
fi
154154
done
155155
fi
@@ -192,10 +192,9 @@ if [ -n "$T" ]; then
192192
T=$(echo "$O" | awk -F[,:] '/^\+QCAINFO: "(pcc|PCC)"/{print $9}')
193193
RSRQ=$T
194194

195-
IDX=1
195+
IDX=1
196196
LINES=$(echo "$O" | grep -E "^\+QCAINFO: \"(scc|SCC)\"")
197197
for LINE in $LINES; do
198-
POS=$(((IDX + 4) * 10))
199198

200199
T=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $5}')
201200
T3=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $4}')
@@ -213,7 +212,19 @@ IDX=1
213212
100*) T4="20";;
214213
*) T4="";;
215214
esac
215+
216+
# T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $3}')
217+
# [ -n "$T5" ] && addon $((POS + 4)) "(S${IDX}) EARFCN" "$T5"
218+
# T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $7}')
219+
# [ -n "$T5" ] && addon $((POS + 3)) "(S${IDX}) PCI" "$T5"
220+
# T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $10}')
221+
# [ -n "$T5" ] && addon $((POS + 5)) "(S${IDX}) RSSI" "$T5 dBm"
222+
# T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $8}')
223+
# [ -n "$T5" ] && addon $((POS + 6)) "(S${IDX}) RSRP" "$T5 dBm"
224+
# T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $9}')
225+
# [ -n "$T5" ] && addon $((POS + 7)) "(S${IDX}) RSRQ" "$T5 dB"
216226
;;
227+
217228
*"NR5G BAND"*)
218229
B=$(echo $T | sed 's/"NR5G BAND \(.*\)"/\1/')
219230
T2=$(band5g ${B})
@@ -235,9 +246,17 @@ IDX=1
235246
14*) T4="400";;
236247
*) T4="";;
237248
esac
249+
250+
# T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $3}')
251+
# [ -n "$T5" ] && addon $((POS + 4)) "(S${IDX}) EARFCN" "$T5"
252+
# T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $6}')
253+
# [ -n "$T5" ] && addon $((POS + 3)) "(S${IDX}) PCI" "$T5"
254+
# T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $7}')
255+
# [ -n "$T5" ] && addon $((POS + 6)) "(S${IDX}) RSRP" "$T5 dBm"
256+
# T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $8}')
257+
# [ -n "$T5" ] && addon $((POS + 7)) "(S${IDX}) RSRQ" "$T5 dB"
238258
;;
239259
esac
240-
241260
if [ -z "$T4" ]; then
242261

243262
case $IDX in
@@ -299,20 +318,10 @@ IDX=1
299318

300319
fi
301320

302-
# T=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $3}')
303-
# [ -n "$T" ] && addon $((POS + 4)) "(S${IDX}) EARFCN" "$T"
304-
# T=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $7}')
305-
# [ -n "$T" ] && addon $((POS + 3)) "(S${IDX}) PCI" "$T"
306-
# T=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $10}')
307-
# [ -n "$T" ] && addon $((POS + 5)) "(S${IDX}) RSSI" "$T dBm"
308-
# T=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $8}')
309-
# [ -n "$T" ] && addon $((POS + 6)) "(S${IDX}) RSRP" "$T dBm"
310-
# T=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $9}')
311-
# [ -n "$T" ] && addon $((POS + 7)) "(S${IDX}) RSRQ" "$T dB"
312-
313321
IDX=$((IDX + 1))
314322
done
315323
fi
324+
316325
MODE=$(echo $MODE | sed 's,/,+,')
317326

318327
# Modem

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

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ if [ "x$MODE_NUM" = "x7" ]; then
9696
3*) T1="10";;
9797
4*) T1="15";;
9898
5*) T1="20";;
99-
*) T1="?";;
99+
*) T1="";;
100100
esac
101-
ULBW="UL: @$T1 MHz"
101+
[ -n "$T1" ] && ULBW="UL: @$T1 MHz"
102102
T=$(echo "$O" | awk -F[,:] '/^\+QENG:/ {print $13}')
103103
case $T in
104104
0*) T1="1.4";;
@@ -107,9 +107,9 @@ if [ "x$MODE_NUM" = "x7" ]; then
107107
3*) T1="10";;
108108
4*) T1="15";;
109109
5*) T1="20";;
110-
*) T1="?";;
110+
*) T1="";;
111111
esac
112-
DLBW="DL: @$T1 MHz"
112+
[ -n "$T1" ] && DLBW="DL: @$T1 MHz"
113113

114114
fi
115115
fi
@@ -138,7 +138,7 @@ if [ "x$MODE_NUM" = "x13" ]; then
138138
5*) T1="20";;
139139
*) T1="";;
140140
esac
141-
ULBW="UL: @$T1 MHz"
141+
[ -n "$T1" ] && ULBW="UL: @$T1 MHz"
142142
T=$(echo "$LINE" | awk -F[,:] '/^\+QENG:/ {print $11}')
143143
case $T in
144144
0*) T1="1.4";;
@@ -149,7 +149,7 @@ if [ "x$MODE_NUM" = "x13" ]; then
149149
5*) T1="20";;
150150
*) T1="";;
151151
esac
152-
DLBW="DL: @$T1 MHz"
152+
[ -n "$T1" ] && DLBW="DL: @$T1 MHz"
153153
fi
154154
done
155155
fi
@@ -192,10 +192,9 @@ if [ -n "$T" ]; then
192192
T=$(echo "$O" | awk -F[,:] '/^\+QCAINFO: "(pcc|PCC)"/{print $9}')
193193
RSRQ=$T
194194

195-
IDX=1
195+
IDX=1
196196
LINES=$(echo "$O" | grep -E "^\+QCAINFO: \"(scc|SCC)\"")
197197
for LINE in $LINES; do
198-
POS=$(((IDX + 4) * 10))
199198

200199
T=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $5}')
201200
T3=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $4}')
@@ -213,7 +212,19 @@ IDX=1
213212
100*) T4="20";;
214213
*) T4="";;
215214
esac
215+
216+
# T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $3}')
217+
# [ -n "$T5" ] && addon $((POS + 4)) "(S${IDX}) EARFCN" "$T5"
218+
# T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $7}')
219+
# [ -n "$T5" ] && addon $((POS + 3)) "(S${IDX}) PCI" "$T5"
220+
# T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $10}')
221+
# [ -n "$T5" ] && addon $((POS + 5)) "(S${IDX}) RSSI" "$T5 dBm"
222+
# T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $8}')
223+
# [ -n "$T5" ] && addon $((POS + 6)) "(S${IDX}) RSRP" "$T5 dBm"
224+
# T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $9}')
225+
# [ -n "$T5" ] && addon $((POS + 7)) "(S${IDX}) RSRQ" "$T5 dB"
216226
;;
227+
217228
*"NR5G BAND"*)
218229
B=$(echo $T | sed 's/"NR5G BAND \(.*\)"/\1/')
219230
T2=$(band5g ${B})
@@ -235,9 +246,17 @@ IDX=1
235246
14*) T4="400";;
236247
*) T4="";;
237248
esac
249+
250+
# T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $3}')
251+
# [ -n "$T5" ] && addon $((POS + 4)) "(S${IDX}) EARFCN" "$T5"
252+
# T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $6}')
253+
# [ -n "$T5" ] && addon $((POS + 3)) "(S${IDX}) PCI" "$T5"
254+
# T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $7}')
255+
# [ -n "$T5" ] && addon $((POS + 6)) "(S${IDX}) RSRP" "$T5 dBm"
256+
# T5=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $8}')
257+
# [ -n "$T5" ] && addon $((POS + 7)) "(S${IDX}) RSRQ" "$T5 dB"
238258
;;
239259
esac
240-
241260
if [ -z "$T4" ]; then
242261

243262
case $IDX in
@@ -299,20 +318,10 @@ IDX=1
299318

300319
fi
301320

302-
# T=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $3}')
303-
# [ -n "$T" ] && addon $((POS + 4)) "(S${IDX}) EARFCN" "$T"
304-
# T=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $7}')
305-
# [ -n "$T" ] && addon $((POS + 3)) "(S${IDX}) PCI" "$T"
306-
# T=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $10}')
307-
# [ -n "$T" ] && addon $((POS + 5)) "(S${IDX}) RSSI" "$T dBm"
308-
# T=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $8}')
309-
# [ -n "$T" ] && addon $((POS + 6)) "(S${IDX}) RSRP" "$T dBm"
310-
# T=$(echo "$LINE" | awk -F[,:] '/^\+QCAINFO: "(scc|SCC)"/{print $9}')
311-
# [ -n "$T" ] && addon $((POS + 7)) "(S${IDX}) RSRQ" "$T dB"
312-
313321
IDX=$((IDX + 1))
314322
done
315323
fi
324+
316325
MODE=$(echo $MODE | sed 's,/,+,')
317326

318327
# Modem

0 commit comments

Comments
 (0)