This commit is contained in:
ling 2024-04-30 13:02:46 +08:00
parent 22c05cb3b7
commit fce875bfbe
7 changed files with 96 additions and 151 deletions

View File

@ -10,10 +10,7 @@ PKG_VERSION:=1.4.3
PKG_LICENSE:=GPLv3
PKG_LINCESE_FILES:=LICENSE
PKF_MAINTAINER:=siriling <siriling@qq.com>
LUCI_DEPENDS:=+luci-compat \
+usbutils \
+pciutils \
+quectel-CM-5G \
LUCI_DEPENDS:= \
+sms-tool \
+jq \

View File

@ -533,7 +533,7 @@ end
else if (key=="SCS") {
value=value+" kHz";
}
cell_info_view+='<tr class="tr"><td class="td left" title="'+full_name+'">'+translation[key]+'</td><td class="td left" id="'+key+'">'+value+'</td></tr>';
cell_info_view+='<tr class="tr"><td class="td left" title="'+full_name+'">'+translation[key]+' ('+key+')</td><td class="td left" id="'+key+'">'+value+'</td></tr>';
break;
}
}

View File

@ -41,6 +41,6 @@ function modem_scan()
<input class="btn cbi-button cbi-button-apply" type="button" id="modem_scan_button" value="<%:Scan%>" onclick="modem_scan()" alt="<%:Scan%>" title="<%:Scan%>"/>
<div class="cbi-value-description" id="modem_scan_description">
<%:The automatic configuration modem is triggered only at modem startup, otherwise, manual scanning is necessary%>
<%:The automatic configuration modem is triggered only at startup, otherwise, manual scanning is necessary%>
</div>
<%+cbi/valuefooter%>

View File

@ -395,112 +395,112 @@ msgid "WCDMA Mode"
msgstr "WCDMA 模式"
msgid "MCC"
msgstr "移动国家代码 (MCC)"
msgstr "移动国家代码"
msgid "MNC"
msgstr "移动网络代码 (MNC)"
msgstr "移动网络代码"
msgid "Duplex Mode"
msgstr "双工模式 (Duplex Mode)"
msgstr "双工模式"
msgid "LAC"
msgstr "位置区码 (LAC)"
msgstr "位置区码"
msgid "Cell ID"
msgstr "小区ID (Cell ID)"
msgstr "小区ID"
msgid "Physical Cell ID"
msgstr "物理小区ID (Physical Cell ID)"
msgstr "物理小区ID"
msgid "TAC"
msgstr "跟踪区编码 (TAC)"
msgstr "跟踪区编码"
msgid "ARFCN"
msgstr "绝对射频信道号 (ARFCN)"
msgstr "绝对射频信道号"
msgid "EARFCN"
msgstr "E-UTRA绝对射频信道号 (EARFCN)"
msgstr "E-UTRA绝对射频信道号"
msgid "UARFCN"
msgstr "UTRA绝对射频信道号 (UARFCN)"
msgstr "UTRA绝对射频信道号"
msgid "Band"
msgstr "频段 (Band)"
msgstr "频段"
msgid "Freq band indicator"
msgstr "频带指示 (Freq band indicator)"
msgstr "频带指示"
msgid "UL Bandwidth"
msgstr "上行带宽 (UL Bandwidth)"
msgstr "上行带宽"
msgid "DL Bandwidth"
msgstr "下行带宽 (DL Bandwidth)"
msgstr "下行带宽"
msgid "RSRP"
msgstr "参考信号接收功率 (RSRP)"
msgstr "参考信号接收功率"
msgid "RSRQ"
msgstr "参考信号接收质量 (RSRQ)"
msgstr "参考信号接收质量"
msgid "RSSI"
msgstr "接收信号强度指示 (RSSI)"
msgstr "接收信号强度指示"
msgid "SINR"
msgstr "信号与干扰加噪声比 (SINR)"
msgstr "信号与干扰加噪声比"
msgid "RxLev"
msgstr "接收信号功率 (RxLev)"
msgstr "接收信号功率"
msgid "RSSNR"
msgstr "信号干扰比 (RSSNR)"
msgstr "信号干扰比"
msgid "SCS"
msgstr "NR子载波间隔 (SCS)"
msgstr "NR子载波间隔"
msgid "CQI"
msgstr "信道质量指示 (CQI)"
msgstr "信道质量指示"
msgid "TX Power"
msgstr "TX 功率 (TX Power)"
msgstr "TX 功率"
msgid "Srxlev"
msgstr "服务小区接收信号功率 (Srxlev)"
msgstr "服务小区接收信号功率"
msgid "PSC"
msgstr "主扰码 (PSC)"
msgstr "主扰码"
msgid "RAC"
msgstr "路由区域码 (RAC)"
msgstr "路由区域码"
msgid "RSCP"
msgstr "接收信号码功率 (RSCP)"
msgstr "接收信号码功率"
msgid "Eb/Io"
msgstr "每比特能量与干扰功率密度(干扰比)之比"
msgid "每比特能量与干扰功率密度(干扰比)之比"
msgstr "Eb/Io"
msgid "Eb/No"
msgstr "每比特能量与噪声功率密度(噪声比)之比"
msgid "每比特能量与噪声功率密度(噪声比)之比"
msgstr "Eb/No"
msgid "Ec/Io"
msgstr "每码片能量与干扰功率密度(干扰比)之比"
msgid "每码片能量与干扰功率密度(干扰比)之比"
msgstr "Ec/Io"
msgid "Ec/No"
msgstr "每码片能量与噪声功率密度(噪声比)之比"
msgid "每码片能量与噪声功率密度(噪声比)之比"
msgstr "Ec/No"
msgid "Physical Channel"
msgstr "物理信道 (Physical Channel)"
msgstr "物理信道"
msgid "Spreading Factor"
msgstr "扩频因子 (Spreading Factor)"
msgstr "扩频因子"
msgid "Slot"
msgstr "插槽格式 (Slot)"
msgstr "插槽格式"
msgid "Speech Code"
msgstr "语音编码 (Speech Code)"
msgstr "语音编码"
msgid "Compression Mode"
msgstr "压缩模式 (Compression Mode)"
msgstr "压缩模式"
msgid "CHN-CMCC"
msgstr "中国移动"
@ -539,16 +539,16 @@ msgid "46011"
msgstr "中国电信"
msgid "Excellent"
msgstr "优秀"
msgstr "非常好"
msgid "Good"
msgstr "好"
msgstr "好"
msgid "Fair"
msgstr "一般"
msgid "Bad"
msgstr "差"
msgstr "差"
msgid "Plugin Config"
msgstr "插件配置"
@ -565,8 +565,8 @@ msgstr "扫描"
msgid "Scaning modem..."
msgstr "正在扫描中..."
msgid "The automatic configuration modem is triggered only at modem startup, otherwise, manual scanning is necessary"
msgstr "自动配置模组只有在模组启动的时候才会触发,其他情况需要手动点击扫描"
msgid "The automatic configuration modem is triggered only at startup, otherwise, manual scanning is necessary"
msgstr "自动配置模组只有在启动的时候才会触发,其他情况需要手动点击扫描"
msgid "Manual Configuration"
msgstr "手动配置"
@ -575,7 +575,7 @@ msgid "Enable the manual configuration of modem information"
msgstr "启用手动配置模组信息"
msgid "(After enable, the automatic scanning and configuration function for modem information will be disabled)"
msgstr "(启用后将禁用自动扫描配置模组信息功能)"
msgstr "(启用后将禁用自动扫描配置模组信息功能)"
msgid "Plugin Info"
msgstr "插件信息"

View File

@ -352,18 +352,6 @@ msgstr "网络信息"
msgid "Network Type"
msgstr "网络类型"
msgid "CQI UL"
msgstr "上行信道质量指示"
msgid "CQI DL"
msgstr "下行信道质量指示"
msgid "AMBR UL"
msgstr "上行访问最大比特率"
msgid "AMBR DL"
msgstr "下行访问最大比特率"
msgid "Tx Rate"
msgstr "上传速率"
@ -395,112 +383,109 @@ msgid "WCDMA Mode"
msgstr "WCDMA 模式"
msgid "MCC"
msgstr "移动国家代码 (MCC)"
msgstr "移动国家代码"
msgid "MNC"
msgstr "移动网络代码 (MNC)"
msgstr "移动网络代码"
msgid "Duplex Mode"
msgstr "双工模式 (Duplex Mode)"
msgstr "双工模式"
msgid "LAC"
msgstr "位置区码 (LAC)"
msgstr "位置区码"
msgid "Cell ID"
msgstr "小区ID (Cell ID)"
msgstr "小区ID"
msgid "Physical Cell ID"
msgstr "物理小区ID (Physical Cell ID)"
msgstr "物理小区ID"
msgid "TAC"
msgstr "跟踪区编码 (TAC)"
msgstr "跟踪区编码"
msgid "ARFCN"
msgstr "绝对射频信道号 (ARFCN)"
msgstr "绝对射频信道号"
msgid "EARFCN"
msgstr "E-UTRA绝对射频信道号 (EARFCN)"
msgstr "E-UTRA绝对射频信道号"
msgid "UARFCN"
msgstr "UTRA绝对射频信道号 (UARFCN)"
msgstr "UTRA绝对射频信道号"
msgid "Band"
msgstr "频段 (Band)"
msgstr "频段"
msgid "Freq band indicator"
msgstr "频带指示 (Freq band indicator)"
msgstr "频带指示"
msgid "UL Bandwidth"
msgstr "上行带宽 (UL Bandwidth)"
msgstr "上行带宽"
msgid "DL Bandwidth"
msgstr "下行带宽 (DL Bandwidth)"
msgstr "下行带宽"
msgid "RSRP"
msgstr "参考信号接收功率 (RSRP)"
msgstr "参考信号接收功率"
msgid "RSRQ"
msgstr "参考信号接收质量 (RSRQ)"
msgstr "参考信号接收质量"
msgid "RSSI"
msgstr "接收信号强度指示 (RSSI)"
msgstr "接收信号强度指示"
msgid "SINR"
msgstr "信号与干扰加噪声比 (SINR)"
msgid "RxLev"
msgstr "接收信号功率 (RxLev)"
msgstr "信号与干扰加噪声比"
msgid "RSSNR"
msgstr "信号干扰比 (RSSNR)"
msgstr "信号干扰比"
msgid "SCS"
msgstr "NR子载波间隔 (SCS)"
msgstr "NR子载波间隔"
msgid "CQI"
msgstr "信道质量指示 (CQI)"
msgstr "信道质量指示"
msgid "TX Power"
msgstr "TX 功率 (TX Power)"
msgid "Srxlev"
msgstr "服务小区接收信号功率 (Srxlev)"
msgstr "TX 功率"
msgid "PSC"
msgstr "主扰码 (PSC)"
msgstr "主扰码"
msgid "RAC"
msgstr "路由区域码 (RAC)"
msgstr "路由区域码"
msgid "RSCP"
msgstr "接收信号码功率 (RSCP)"
msgstr "接收信号码功率"
msgid "Eb/Io"
msgstr "每比特能量与干扰功率密度(干扰比)之比"
msgid "每比特能量与干扰功率密度(干扰比)之比"
msgstr "Eb/Io"
msgid "Eb/No"
msgstr "每比特能量与噪声功率密度(噪声比)之比"
msgid "每比特能量与噪声功率密度(噪声比)之比"
msgstr "Eb/No"
msgid "Ec/Io"
msgstr "每码片能量与干扰功率密度(干扰比)之比"
msgid "每码片能量与干扰功率密度(干扰比)之比"
msgstr "Ec/Io"
msgid "Ec/No"
msgstr "每码片能量与噪声功率密度(噪声比)之比"
msgid "每码片能量与噪声功率密度(噪声比)之比"
msgstr "Ec/No"
msgid "Physical Channel"
msgstr "物理信道 (Physical Channel)"
msgstr "物理信道"
msgid "Spreading Factor"
msgstr "扩频因子 (Spreading Factor)"
msgstr "扩频因子"
msgid "Slot"
msgstr "插槽格式 (Slot)"
msgstr "插槽格式"
msgid "Speech Code"
msgstr "语音编码 (Speech Code)"
msgstr "语音编码"
msgid "Compression Mode"
msgstr "压缩模式 (Compression Mode)"
msgstr "压缩模式"
msgid "RxLev"
msgstr "接收信号功率"
msgid "CHN-CMCC"
msgstr "中国移动"
@ -539,16 +524,16 @@ msgid "46011"
msgstr "中国电信"
msgid "Excellent"
msgstr "优秀"
msgstr "非常好"
msgid "Good"
msgstr "好"
msgstr "好"
msgid "Fair"
msgstr "一般"
msgid "Bad"
msgstr "差"
msgstr "差"
msgid "Plugin Config"
msgstr "插件配置"
@ -565,8 +550,8 @@ msgstr "扫描"
msgid "Scaning modem..."
msgstr "正在扫描中..."
msgid "The automatic configuration modem is triggered only at modem startup, otherwise, manual scanning is necessary"
msgstr "自动配置模组只有在模组启动的时候才会触发,其他情况需要手动点击扫描"
msgid "The automatic configuration modem is triggered only at startup, otherwise, manual scanning is necessary"
msgstr "自动配置模组只有在启动的时候才会触发,其他情况需要手动点击扫描"
msgid "Manual Configuration"
msgstr "手动配置"
@ -575,7 +560,7 @@ msgid "Enable the manual configuration of modem information"
msgstr "启用手动配置模组信息"
msgid "(After enable, the automatic scanning and configuration function for modem information will be disabled)"
msgstr "(启用后将禁用自动扫描配置模组信息功能)"
msgstr "(启用后将禁用自动扫描配置模组信息功能)"
msgid "Plugin Info"
msgstr "插件信息"

View File

@ -197,29 +197,9 @@ set_interface()
esac
}
#设置移远模组MAC地址
set_quectel_mac()
{
local mac_address=$(cat /sys/class/net/${network}/address)
local null_mac="00:00:00:00:00:00"
[ -z "$mac_address" ] || [ "$mac_address" = "$null_mac" ] && {
#方法一lua
# local mac_address=$(lua -e 'math.randomseed(os.time()); for i=1,6 do io.write(string.format("%02X", math.random(0, 255))); if i < 6 then io.write(":") end; end')
#方法二shell
mac_address=$(generate_mac_address)
ifconfig ${network} hw ether "${mac_address}"
}
}
#移远拨号工具
quectel_cm()
{
#获取制造商
local manufacturer=$(uci -q get modem.modem${modem_no}.manufacturer)
#对移远500系列模组特殊处理解决6.x内核下缺失Mac地址导致拨号异常问题
[ "$manufacturer" = "quectel" ] && set_quectel_mac
#拨号
procd_open_instance
procd_set_param command "quectel-CM"

View File

@ -24,23 +24,6 @@ m_log()
logger -p "daemon.${level}" -t "Modem[$$]" "hotplug: $*"
}
#生成16进制数
generate_hex() {
echo "$(openssl rand -hex 1)"
}
#生成随机MAC地址
generate_mac_address() {
local mac=""
for i in $(seq 1 6); do
mac="${mac}$(generate_hex)"
if [[ $i != 6 ]]; then
mac="${mac}:"
fi
done
echo "$mac"
}
#上报USB事件
# $1:事件行为addremovebind
# $2:类型