Skip to content

Commit ed3d7df

Browse files
4IceG4IceG
authored
Upgrading to version 1.0.42-20230404
Fixes for ZTE MF286R.
1 parent a66a565 commit ed3d7df

File tree

2 files changed

+38
-97
lines changed

2 files changed

+38
-97
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ LUCI_TITLE:=LuCI JS Support for 3ginfo-lite
1111
LUCI_DESCRIPTION:=LuCI JS interface for the 3ginfo-lite. The package allows you to view the parameters of the mobile internet connection.
1212
LUCI_PKGARCH:=all
1313
LUCI_DEPENDS:=+sms-tool +comgt
14-
PKG_VERSION:=1.0.41-20230403
14+
PKG_VERSION:=1.0.42-20230404
1515

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

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

Lines changed: 37 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -1,187 +1,128 @@
11
# ZTE MF286R
22

3-
_DEVICE=/dev/ttyACM0
4-
5-
OB=$(sms_tool -d $_DEVICE at "at+zrssi;+zcellinfo?;+zcainfo?")
6-
7-
O=$(echo $OB | tr -d " \t\n\r" | xargs)
3+
O=$(sms_tool -d $DEVICE at "at+zrssi;+zcellinfo?;+zcainfo?")
84

95
case "$MODE_NUM" in
106
3*)
11-
T=$(echo "$OB" | awk -F[,:] '/^\+ZRSSI/ {print $2}' | xargs)
12-
[ -n "$ADDON" ] && ADDON="$ADDON,"
7+
T=$(echo "$O" | awk -F[,:] '/^\+ZRSSI/ {print $2}' | xargs)
138
RSSI="$T"
149
;;
1510
2*|\
1611
4*|\
1712
5*|\
1813
6*|\
1914
8*)
20-
T=$(echo "$O" | awk -F[,:] '/^\+ZRSSI/ {print $2}' | xargs)
21-
[ -n "$ADDON" ] && ADDON="$ADDON,"
22-
23-
T=$(echo "$O" | awk -F[,:] '/^\+ZRSSI/ {print $3}' | xargs)
24-
[ -n "$ADDON" ] && ADDON="$ADDON,"
25-
2615
T=$(echo "$O" | awk -F[,:] '/^\+ZCELLINFO/ {print $4}' | xargs)
2716
[ -n "$T" ] && MODE="$T"
2817
;;
2918

3019
7*|\
3120
9*)
32-
T=$(echo "$OB" | awk -F[,:\;] '/^\+ZCAINFO/ {print $4}' | xargs)
21+
T=$(echo "$O" | awk -F[,:\;] '/^\+ZCAINFO/ {print $4}' | xargs)
3322
if [ -n "$T" ] && [ "x$T" != "x0" ]; then
34-
[ -n "$ADDON" ] && ADDON="$ADDON,"
3523
T_HEX=$(printf "%X" $T)
3624
T_DEC=$T
3725
LAC_DEC=$T_DEC
3826
LAC_HEX=$T_HEX
3927
fi
4028

41-
T=$(echo "$OB" | awk -F[,:] '/^\+ZRSSI/ {print $4}' | xargs)
42-
[ -n "$ADDON" ] && ADDON="$ADDON,"
29+
T=$(echo "$O" | awk -F[,:] '/^\+ZRSSI/ {print $4}' | xargs)
4330
RSSI="$T"
44-
45-
T=$(echo "$OB" | awk -F[,:] '/^\+ZRSSI/ {print $2}' | xargs)
46-
[ -n "$ADDON" ] && ADDON="$ADDON,"
31+
T=$(echo "$O" | awk -F[,:] '/^\+ZRSSI/ {print $2}' | xargs)
4732
RSRP="$T"
33+
T=$(echo "$O" | awk -F[,:] '/^\+ZRSSI/ {print $3}' | xargs)
34+
RSRQ="$T"
35+
T=$(echo "$O" | awk -F[,:] '/^\+ZRSSI/ {print $5}' | xargs)
36+
SINR="$T"
37+
38+
T=$(echo "$O" | awk -F[,:] '/^\+ZCELLINFO/ {print $4}' | xargs)
39+
MODE="LTE $(band ${T/LTE B/})"
4840

49-
T=$(echo "$OB" | awk -F[,:] '/^\+ZRSSI/ {print $3}' | xargs)
50-
[ -n "$ADDON" ] && ADDON="$ADDON,"
51-
RSRQB="$T"
52-
RSRQ=$(echo $RSRQB | tr ' ' '\n' | grep -E '^[+-]?[0-9]*\.?([0-9]+)$' | cut -f1 -d"." )
53-
54-
55-
T=$(echo "$OB" | awk -F[,:] '/^\+ZRSSI/ {print $5}' | xargs)
56-
[ -n "$ADDON" ] && ADDON="$ADDON,"
57-
SINRB="$T"
58-
SINR=$(echo $SINRB | tr ' ' '\n' | grep -E '^[+-]?[0-9]*\.?([0-9]+)$' | cut -f1 -d"." )
59-
60-
TU=$(echo "$OB" | awk -F[,:\;] '/^\+ZCELLINFO/ {print $4}' | xargs)
61-
case "$TU" in
62-
*"LTE B1") MODE=$(band 1 "LTE ");;
63-
*"LTE B3") MODE=$(band 3 "LTE ");;
64-
*"LTE B5") MODE=$(band 5 "LTE ");;
65-
*"LTE B7") MODE=$(band 7 "LTE ");;
66-
*"LTE B8") MODE=$(band 8 "LTE ");;
67-
*"LTE B20") MODE=$(band 20 "LTE ");;
68-
*"LTE B28") MODE=$(band 28 "LTE ");;
69-
*"LTE B38") MODE=$(band 38 "LTE ");;
70-
*"LTE B40") MODE=$(band 40 "LTE ");;
71-
*"LTE B41") MODE=$(band 41 "LTE ");;
72-
*) MODE="${TU}";;
73-
esac
74-
75-
T=$(echo "$OB" | awk -F[,:\;] '/^\+ZCAINFO/ {print $3}' | xargs)
76-
if [ -n "$T" ]; then
77-
T1=$(echo "$OB" | awk -F[,:\;] '/^\+ZCAINFO/ {print $6}' | xargs)
78-
[ -n "$ADDON" ] && ADDON="$ADDON,"
41+
T=$(echo "$O" | awk -F[,:\;] '/^\+ZCAINFO/ {print $3}' | xargs)
42+
if [ -n "$T" ] && [ "x$T" != "x0" ]; then
43+
T1=$(echo "$O" | awk -F[,:\;] '/^\+ZCAINFO/ {print $6}' | xargs)
7944
PBAND="$(band $T "") @$T1 MHz"
80-
ADDON="$ADDON"'{"Primary band":"'$(band $T "")', '$T1' MHz"}'
8145
fi
82-
T=$(echo "$OB" | awk -F[,:\;] '/^\+ZCAINFO/ {print $2}' | xargs)
83-
if [ -n "$T" ]; then
84-
[ -n "$ADDON" ] && ADDON="$ADDON,"
46+
T=$(echo "$O" | awk -F[,:\;] '/^\+ZCAINFO/ {print $2}' | xargs)
47+
if [ -n "$T" ] && [ "x$T" != "x0" ]; then
8548
PCI="$T"
86-
ADDON="$ADDON"'{"PCI":"'$T'"}'
8749
fi
88-
T=$(echo "$OB" | awk -F[,:\;] '/^\+ZCAINFO/ {print $5}' | xargs)
89-
if [ -n "$T" ]; then
90-
[ -n "$ADDON" ] && ADDON="$ADDON,"
50+
T=$(echo "$O" | awk -F[,:\;] '/^\+ZCAINFO/ {print $5}' | xargs)
51+
if [ -n "$T" ] && [ "x$T" != "x0" ]; then
9152
EARFCN="$T"
92-
ADDON="$ADDON"'{"EARFCN":"'$T'"}'
9353
fi
9454

95-
TS=$(echo "$OB" | awk -F[,:\;] '/^\+ZCAINFO/ {print $9}' | xargs)
96-
if [ -n "$TS" ]; then
97-
case $TS in
98-
*) MODE="${MODE/LTE/LTE_A} / $(band $TS "")";;
99-
esac
100-
101-
T=$(echo "$OB" | awk -F[,:\;] '/^\+ZCAINFO/ {print $9}' | xargs)
102-
103-
if [ -n "$T" ]; then
104-
T2=$(echo "$OB" | awk -F[,:\;] '/^\+ZCAINFO/ {print $11}' | xargs)
105-
[ -n "$ADDON" ] && ADDON="$ADDON,"
106-
T1=$(echo "$T2" | tr -d " \t\n\r" | xargs)
55+
if [ "x$MODE_NUM" = "x9" ]; then
56+
T=$(echo "$O" | awk -F[,:\;] '/^\+ZCAINFO/ {print $9}' | xargs)
57+
if [ -n "$T" ] && [ "x$T" != "x0" ]; then
58+
T1=$(echo "$O" | awk -F[,:\;] '/^\+ZCAINFO/ {print $11}' | xargs)
10759
S1BAND="$(band $T "") @$T1 MHz"
60+
MODE="${MODE/LTE/LTE_A} / $(band ${T})"
10861

62+
T=$(echo "$O" | awk -F[,:\;] '/^\+ZCAINFO/ {print $7}' | xargs)
63+
[ -n "$T" ] && S1PCI="$T"
64+
T=$(echo "$O" | awk -F[,:\;] '/^\+ZCAINFO/ {print $10}' | xargs)
65+
[ -n "$T" ] && S1EARFCN="$T"
10966
fi
110-
T=$(echo "$OB" | awk -F[,:\;] '/^\+ZCAINFO/ {print $7}' | xargs)
111-
if [ -n "$T" ]; then
112-
[ -n "$ADDON" ] && ADDON="$ADDON,"
113-
S1PCI="$T"
114-
115-
fi
116-
T=$(echo "$OB" | awk -F[,:\;] '/^\+ZCAINFO/ {print $10}' | xargs)
117-
if [ -n "$T" ]; then
118-
[ -n "$ADDON" ] && ADDON="$ADDON,"
119-
S1EARFCN="$T"
120-
fi
121-
12267
fi
12368
;;
12469
esac
12570

12671
MODE=$(echo $MODE | sed "s/LTE_A/LTE-A |/g" | sed 's,/,+,')
12772

12873
# Firmware
129-
FWB=$(sms_tool -d $_DEVICE at "AT+GMR")
74+
FWB=$(sms_tool -d $DEVICE at "AT+GMR")
13075
FW=$(echo $FWB | tr -d " \t\n\r" | xargs)
13176

13277
if [[ "$FW" == *"MF286RA"* && "$CSQ" == *"-"* ]]; then
133-
OQ=$(sms_tool -D -d $_DEVICE at "AT+CSQ")
78+
OQ=$(sms_tool -D -d $DEVICE at "AT+CSQ")
13479
CSQ=$(echo "$OQ" | awk -F[,\ ] '/^\+CSQ/ {print $2}')
13580

13681
[ "x$CSQ" = "x" ] && CSQ=-1
13782
if [ $CSQ -ge 0 -a $CSQ -le 31 ]; then
13883
CSQ_PER=$(($CSQ * 100/31))
13984
fi
140-
14185
fi
14286

14387
# Modem
144-
MODELA=$(sms_tool -d $_DEVICE at "AT+CGMI" | tr -s "\n" | xargs)
88+
MODELA=$(sms_tool -d $DEVICE at "AT+CGMI" | tr -s "\n" | xargs)
14589

14690
if [[ "$MODELA" == *"ZTE"* ]]; then
14791
MODELACUT=$(echo $MODELA | awk -F'CGMI: ' '{print $2}' | sed 's/"//g' | sed 's/ CORPORATION//g')
14892
MODELO=$(echo $MODELACUT | tr -d " \t\n\r" | xargs)
149-
MODELB=$(sms_tool -d $_DEVICE at "AT+CGMM")
93+
MODELB=$(sms_tool -d $DEVICE at "AT+CGMM")
15094
MODELBCUT=$(echo $MODELB | awk -F'CGMM: ' '{print $2}' | sed 's/"//g')
15195
MODELCUT=$(echo $MODELBCUT | tr -d " \t\n\r" | xargs)
15296

15397
MODEL="$MODELO "$MODELCUT
15498
else
15599
MODELO=$(echo $MODELA | tr -d " \t\n\r" | cut -d ":" -f2 | xargs)
156-
MODELB=$(sms_tool -d $_DEVICE at "AT+CGMM")
100+
MODELB=$(sms_tool -d $DEVICE at "AT+CGMM")
157101
MODELCUT=$(echo $MODELB | tr -d " \t\n\r" | cut -d ":" -f2 | xargs)
158102

159103
MODEL="$MODELO "$MODELCUT
160104
fi
161105

162-
# Communication Port
163-
DEVICE=$(cat /tmp/modem 2>/dev/null)
164-
165106
# International Mobile Equipment Identity (IMEI)
166-
OI=$(sms_tool -d $_DEVICE at "AT+GSN" | xargs)
107+
OI=$(sms_tool -d $DEVICE at "AT+GSN" | xargs)
167108
NR_I=$(echo "$OI" | sed 's/AT+GSN//g' | xargs)
168109
if [ -z "NR_I" ]; then
169-
OIB=$(sms_tool -d $_DEVICE at "AT*MRD_IMEI?" | xargs)
110+
OIB=$(sms_tool -d $DEVICE at "AT*MRD_IMEI?" | xargs)
170111
NR_I=$(echo "$OIB" | awk -F [:] '/^\*MRD_IMEI:/{print $2}' | xargs)
171112
NR_IMEI="$NR_I"
172113
else
173114
NR_IMEI="$NR_I"
174115
fi
175116

176117
# International Mobile Subscriber Identity (IMSI)
177-
OS=$(sms_tool -d $_DEVICE at "AT+CIMI" | xargs)
118+
OS=$(sms_tool -d $DEVICE at "AT+CIMI" | xargs)
178119
NR_C=$(echo "$OS" | sed 's/AT+CIMI//g' | xargs)
179120
if [ -n "$NR_C" ]; then
180121
NR_IMSI="$NR_C"
181122
fi
182123

183124
# Integrated Circuit Card Identifier (ICCID)
184-
OD=$(sms_tool -d $_DEVICE at "AT*ICCID?" | xargs)
125+
OD=$(sms_tool -d $DEVICE at "AT*ICCID?" | xargs)
185126
NR_D=$(echo "$OD" | awk -F [:] '/^\*ICCID: /{print $2}' | xargs)
186127
if [ -n "$NR_D" ]; then
187128
NR_ICCID="$NR_D"

0 commit comments

Comments
 (0)