Skip to content

Commit dcb42fc

Browse files
4IceG4IceG
authored
Update to 1.0.43-20230406
Update scripts for Mikrotik R11e-LTE6.
1 parent ed3d7df commit dcb42fc

File tree

4 files changed

+137
-46
lines changed

4 files changed

+137
-46
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.42-20230404
14+
PKG_VERSION:=1.0.43-20230406
1515

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

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,20 @@ case "$MODE_NUM" in
3737

3838
T=$(echo "$O" | awk -F[,:] '/^\+ZCELLINFO/ {print $4}' | xargs)
3939
MODE="LTE $(band ${T/LTE B/})"
40-
40+
4141
T=$(echo "$O" | awk -F[,:\;] '/^\+ZCAINFO/ {print $3}' | xargs)
4242
if [ -n "$T" ] && [ "x$T" != "x0" ]; then
4343
T1=$(echo "$O" | awk -F[,:\;] '/^\+ZCAINFO/ {print $6}' | xargs)
4444
PBAND="$(band $T "") @$T1 MHz"
45-
fi
46-
T=$(echo "$O" | awk -F[,:\;] '/^\+ZCAINFO/ {print $2}' | xargs)
47-
if [ -n "$T" ] && [ "x$T" != "x0" ]; then
48-
PCI="$T"
49-
fi
50-
T=$(echo "$O" | awk -F[,:\;] '/^\+ZCAINFO/ {print $5}' | xargs)
51-
if [ -n "$T" ] && [ "x$T" != "x0" ]; then
52-
EARFCN="$T"
45+
46+
T=$(echo "$O" | awk -F[,:\;] '/^\+ZCAINFO/ {print $2}' | xargs)
47+
if [ -n "$T" ] && [ "x$T" != "x0" ]; then
48+
PCI="$T"
49+
fi
50+
T=$(echo "$O" | awk -F[,:\;] '/^\+ZCAINFO/ {print $5}' | xargs)
51+
if [ -n "$T" ] && [ "x$T" != "x0" ]; then
52+
EARFCN="$T"
53+
fi
5354
fi
5455

5556
if [ "x$MODE_NUM" = "x9" ]; then

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

Lines changed: 66 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,74 @@
11
# Quectel EP06
2+
# Quectel EG06
23

3-
. "$RES/modem/05c69215"
4+
O=$(sms_tool -d $DEVICE at "at+qtemp")
45

5-
O=$(sms_tool -d $DEVICE at "AT+QCAINFO")
6+
T=$(echo "$O" | awk -F[,:] '/^\+QTEMP/ {t=$2*1;if($3*1>t)t=$3*1;if($4*1>t)t=$4*1;printf "%d", t}')
7+
[ -n "$T" ] && TEMP="$T °C"
8+
9+
O=$(sms_tool -d $DEVICE at "at+qnwinfo;+qeng=\"servingcell\";+qspn")
10+
11+
T=$(echo "$O" | awk -F[,:] '/^\+QNWINFO/ {print $2"/"$4}' | xargs)
12+
if [ -n "$T" ]; then
13+
if [ "x$MODE_NUM" = "x7" ]; then
14+
B=$(echo $T | sed 's/.*LTE BAND \(.*\)/\1/')
15+
MODE="LTE $(band ${B})"
16+
MAINCUT="$(band ${B})"
17+
fi
18+
fi
19+
20+
T=$(echo "$O" | awk -F[,:] '/^\+QENG:/ {print $4}' | xargs)
21+
if [ "x$T" = "xLTE" ] || [ "x$T" = "x4G" ]; then
22+
T=$(echo "$O" | awk -F[,:] '/^\+QENG:/ {print $14}')
23+
T_DEC=$(printf "%d" "0x$T")
24+
T_HEX=$T
25+
26+
T=$(echo "$O" | awk -F[,:] '/^\+QENG:/ {print $12}')
27+
case $T in
28+
0) T1="1.4";;
29+
1) T1="3";;
30+
2) T1="5";;
31+
3) T1="10";;
32+
4) T1="15";;
33+
5) T1="20";;
34+
*) T1="?";;
35+
esac
36+
ULBW="UL: @$T1 MHz"
37+
T=$(echo "$O" | awk -F[,:] '/^\+QENG:/ {print $13}')
38+
case $T in
39+
0) T1="1.4";;
40+
1) T1="3";;
41+
2) T1="5";;
42+
3) T1="10";;
43+
4) T1="15";;
44+
5) T1="20";;
45+
*) T1="?";;
46+
esac
47+
DLBW="DL: @$T1 MHz"
48+
PBAND="$MAINCUT $DLBW $ULBW"
49+
50+
T=$(echo "$O" | awk -F[,:] '/^\+QENG:/ {print $9}')
51+
PCI=$T
52+
T=$(echo "$O" | awk -F[,:] '/^\+QENG:/ {print $10}')
53+
EARFCN=$T
54+
T=$(echo "$O" | awk -F[,:] '/^\+QENG:/ {print $17}')
55+
RSSI=$T
56+
T=$(echo "$O" | awk -F[,:] '/^\+QENG:/ {print $15}')
57+
RSRP=$T
58+
T=$(echo "$O" | awk -F[,:] '/^\+QENG:/ {print $16}')
59+
RSRQ=$T
60+
T=$(echo "$O" | awk -F[,:] '/^\+QENG:/ {print $18}' | awk '{printf "%.1f\n", $1*0.2-20}')
61+
SINR=$T
62+
fi
63+
64+
T=$(echo "$O" | awk -F[,:] '/^\+QSPN/ {print $2}' | xargs)
65+
if [ -n "$T" ] && [ -z "$FORCE_PLMN" ]; then
66+
COPS="$T"
67+
fi
668

769
if [ "x$MODE_NUM" = "x7" ]; then
70+
O=$(sms_tool -d $DEVICE at "AT+QCAINFO")
71+
872
T=$(echo "$O" | awk -F[,] '/^\+QCAINFO: "scc"/{print $4}' | xargs)
973
if [ -n "$T" ]; then
1074
B=$(echo $T | sed 's/.*LTE BAND \(.*\)/\1/')

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

Lines changed: 60 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,42 @@
11
# Mikrotik R11e-LTE6
22

33
O=$(sms_tool -d $DEVICE at "at+cesq;+zcainfo?;+zpas?;+zcellinfo?")
4+
T=$(echo "$O" | awk -F[,:] '/^\+CESQ/ {print $2}' | xargs)
5+
if [ -n "$T" ]; then
6+
[ "$T" != "99" ] && RSSI="$((T - 111))"
7+
fi
48
T=$(echo "$O" | awk -F[,:] '/^\+CESQ/ {print $4}' | xargs)
59
if [ -n "$T" ]; then
6-
if [ "$T" != "255" ]; then
7-
RSCP="-$T"
8-
[ -n "$ADDON" ] && ADDON="$ADDON,"
9-
ADDON="$ADDON"'{"RSCP":"-'$T' dBm"}'
10-
fi
10+
[ "$T" != "255" ] && RSCP="$((T - 121))"
1111
fi
1212
T=$(echo "$O" | awk -F[,:] '/^\+CESQ/ {print $5}' | xargs)
1313
if [ -n "$T" ]; then
1414
if [ "$T" != "255" ]; then
15-
[ -n "$ADDON" ] && ADDON="$ADDON,"
16-
ADDON="$ADDON"'{"ECNO":"-'$T' dB"}'
15+
T=$(echo "$T" | awk '{printf "%.1f", -1 * (24.5 - $1 * 0.5)}')
16+
ECIO="$T dB"
1717
fi
1818
fi
19-
T=$(echo "$O" | awk -F[,:] '/^\+CESQ/ {print $6}' | xargs)
19+
T=$(echo "$O" | awk -F[,:] '/^\+CESQ/ {print $7}' | xargs)
2020
if [ -n "$T" ]; then
21-
if [ "$T" != "255" ]; then
22-
RSRQ="-$T"
23-
[ -n "$ADDON" ] && ADDON="$ADDON,"
24-
ADDON="$ADDON"'{"RSRQ":"-'$T' dB"}'
25-
fi
21+
[ "$T" != "255" ] && RSRP="$((T - 141))"
2622
fi
27-
T=$(echo "$O" | awk -F[,:] '/^\+CESQ/ {print $7}' | xargs)
23+
T=$(echo "$O" | awk -F[,:] '/^\+CESQ/ {print $6}' | xargs)
2824
if [ -n "$T" ]; then
2925
if [ "$T" != "255" ]; then
30-
RSRP="-$T"
31-
[ -n "$ADDON" ] && ADDON="$ADDON,"
32-
ADDON="$ADDON"'{"RSRP":"-'$T' dBm"}'
26+
T=$(echo "$T" | awk '{printf "%.1f", -1 * (20 - $1 * 0.5)}')
27+
RSRQ="-$T"
28+
SINR=""
3329
fi
3430
fi
3531

3632
T=$(echo "$O" | awk -F[,:] '/^\+ZPAS/ {print $2}' | xargs)
3733
if [ -n "$T" ]; then
3834
MODE=$T
3935
T=$(echo "$O" | awk -F[,:] '/^\+ZCELLINFO/ {print $4}' | xargs)
40-
if [ -n "$T" ]; then
41-
case $T in
42-
*"LTE B1") MODE=$(band 1 "$MODE ");;
43-
*"LTE B3") MODE=$(band 3 "$MODE ");;
44-
*"LTE B7") MODE=$(band 7 "$MODE ");;
45-
*"LTE B8") MODE=$(band 8 "$MODE ");;
46-
*"LTE B20") MODE=$(band 20 "$MODE ");;
47-
*) MODE="$MODE / $T";;
48-
esac
36+
if [ "x$MODE_NUM" = "x7" ]; then
37+
MODE="$MODE $(band ${T/LTE B/})"
38+
else
39+
MODE="$MODE $T"
4940
fi
5041
fi
5142

@@ -54,15 +45,50 @@ case "$MODE_NUM" in
5445
T=$(echo "$O" | awk -F[,] '/^\+ZCAINFO: /{print $11}')
5546
if [ -n "$T" ]; then
5647
if [ "$T" != "0" ]; then
57-
case $T in
58-
*"1") MODE="$MODE / "$(band 1 "");;
59-
*"3") MODE="$MODE / "$(band 3 "");;
60-
*"7") MODE="$MODE / "$(band 7 "");;
61-
*"8") MODE="$MODE / "$(band 8 "");;
62-
*"20") MODE="$MODE / "$(band 20 "");;
63-
*) MODE="$MODE / B${T}";;
64-
esac
48+
MODE="$MODE / $(band ${T})"
6549
fi
6650
fi
6751
;;
6852
esac
53+
54+
MODE=$(echo $MODE | sed 's,/,+,' | sed "s/LTE_A/LTE-A | /g")
55+
56+
# Modem
57+
FWA=$(sms_tool -d $DEVICE at "AT+CGMR" | xargs)
58+
FW=$(echo $FWA | sed s/"AT+CGMR"//)
59+
60+
MODELA=$(sms_tool -d $DEVICE at "AT+CGMM" | xargs)
61+
MODELB=$(sms_tool -d $DEVICE at "AT+CGMI" | xargs)
62+
MODELACUT=$(echo $MODELA | awk -F [:] '/^\+CGMM:/{print $2}' | xargs)
63+
MODELBCUT=$(echo $MODELB | awk -F [:] '/^\+CGMI:/{print $2}' | xargs)
64+
MODEL="$MODELBCUT "$MODELACUT
65+
66+
# International Mobile Equipment Identity (IMEI)
67+
O=$(sms_tool -d $DEVICE at "AT+CGSN" | xargs)
68+
NR_I=$(echo "$O" | sed s/"AT+CGSN"//)
69+
if [ -n "$NR_I" ]; then
70+
NR_IMEI="$NR_I"
71+
fi
72+
73+
# International Mobile Subscriber Identity (IMSI)
74+
O=$(sms_tool -d $DEVICE at "AT+CIMI" | xargs)
75+
NR_C=$(echo "$O" | sed s/"AT+CIMI"//)
76+
if [ -n "$NR_C" ]; then
77+
NR_IMSI="$NR_C"
78+
fi
79+
80+
# Integrated Circuit Card Identifier (ICCID)
81+
O=$(sms_tool -d $DEVICE at "AT*ICCID?")
82+
NR_D=$(echo "$O" | awk -F [:] '/^\*ICCID:/{print $2}' | xargs)
83+
if [ -n "$NR_D" ]; then
84+
NR_ICCID="$NR_D"
85+
fi
86+
87+
# Protocol
88+
# DRIVER=QMI_WWAN & DRIVER=CDC_MBIM & DRIVER=CDC_ETHER
89+
PV=$(cat /sys/kernel/debug/usb/devices 2>/dev/null)
90+
PVCUT=$(echo $PV | awk -F 'Vendor=2cd2 ProdID=0004' '{print $2}' | cut -c-1220)
91+
if echo "$PVCUT" | grep -q "cdc_ncm"
92+
then
93+
PROTO="ncm"
94+
fi

0 commit comments

Comments
 (0)