diff --git a/luci-app-modem/po/zh-cn/modem.po b/luci-app-modem/po/zh-cn/modem.po index 43b12f2..036433f 100644 --- a/luci-app-modem/po/zh-cn/modem.po +++ b/luci-app-modem/po/zh-cn/modem.po @@ -190,6 +190,9 @@ msgstr "找不到网络设备" msgid "Only display the modes available for the adaptation modem" msgstr "仅显示适配模组可用的拨号模式" +msgid "Config ID" +msgstr "配置ID" + msgid "Dial Tool" msgstr "拨号工具" diff --git a/luci-app-modem/root/usr/share/modem/fibocom.sh b/luci-app-modem/root/usr/share/modem/fibocom.sh index 64735c5..e988e99 100755 --- a/luci-app-modem/root/usr/share/modem/fibocom.sh +++ b/luci-app-modem/root/usr/share/modem/fibocom.sh @@ -312,10 +312,18 @@ fibocom_base_info() #Temperature(温度) at_command="AT+MTSM=1,6" - response=$(sh ${SCRIPT_DIR}/modem_at.sh $at_port $at_command | sed -n '2p' | sed 's/+MTSM: //g' | sed 's/\r//g') - if [ -n "$response" ]; then - temperature="$response$(printf "\xc2\xb0")C" - fi + response=$(sh ${SCRIPT_DIR}/modem_at.sh $at_port $at_command | grep "+MTSM: " | sed 's/+MTSM: //g' | sed 's/\r//g') + + [ -z "$response" ] && { + #联发科平台 + at_command="AT+GTSENRDTEMP=0" + response=$(sh ${SCRIPT_DIR}/modem_at.sh $at_port $at_command | grep "+GTSENRDTEMP: " | awk -F',' '{print $2}' | sed 's/\r//g') + response="${response:0:2}" + } + + [ -n "$response" ] && { + temperature="$response$(printf "\xc2\xb0")C" + } } #获取SIM卡状态 diff --git a/luci-app-modem/root/usr/share/modem/modem_util.sh b/luci-app-modem/root/usr/share/modem/modem_util.sh index 8613fb4..3eee9e8 100755 --- a/luci-app-modem/root/usr/share/modem/modem_util.sh +++ b/luci-app-modem/root/usr/share/modem/modem_util.sh @@ -348,6 +348,11 @@ retry_set_modem_config() modem_name=$(at ${at_port} ${at_command} | sed -n '2p' | sed 's/\r//g' | tr 'A-Z' 'a-z') } + #特殊处理FM350-GL-00 5G Module + [[ "$modem_name" = *"fm350-gl"* ]] && { + modem_name="fm350-gl" + } + [ -n "$modem_name" ] && { #获取模组信息 local data_interface=$(uci -q get modem.modem${modem_no}.data_interface) diff --git a/luci-app-modem/root/usr/share/modem/quectel.sh b/luci-app-modem/root/usr/share/modem/quectel.sh index b64c5f3..ff198da 100755 --- a/luci-app-modem/root/usr/share/modem/quectel.sh +++ b/luci-app-modem/root/usr/share/modem/quectel.sh @@ -211,7 +211,7 @@ quectel_get_self_test_info() #Voltage(电压) at_command="AT+CBC" - local voltage=$(sh ${SCRIPT_DIR}/modem_at.sh $at_port $at_command | grep "+CBC:" | awk -F',' '{print $2}' | sed 's/\r//g') + local voltage=$(sh ${SCRIPT_DIR}/modem_at.sh $at_port $at_command | grep "+CBC:" | awk -F',' '{print $3}' | sed 's/\r//g') echo "${voltage}" }