diff --git a/applications/luci-app-modem/Makefile b/applications/luci-app-modem/Makefile index 2637cd8..3b72278 100644 --- a/applications/luci-app-modem/Makefile +++ b/applications/luci-app-modem/Makefile @@ -11,11 +11,23 @@ PKG_LICENSE:=GPLv3 PKG_LINCESE_FILES:=LICENSE PKF_MAINTAINER:=Siriling LUCI_DEPENDS:=+luci-compat \ + +kmod-usb2 +kmod-usb3 \ + +kmod-usb-net-sierrawireless +kmod-usb-ohci \ + +kmod-usb-serial-option +kmod-usb-serial +kmod-usb-serial-qualcomm \ + +kmod-usb-net +kmod-usb-acm \ + +kmod-usb-wdm +kmod-usb-net-qmi-wwan \ + +kmod-usb-net-cdc-ether \ + +kmod-usb-net-cdc-mbim \ + +kmod-usb-net-rndis \ + +kmod-usb-net-cdc-ncm +kmod-usb-net-huawei-cdc-ncm \ +usbutils \ + +kmod-pcie_mhi \ +pciutils \ +quectel-CM-5G \ + +modemmanager \ + +luci-proto-modemmanager \ +sms-tool \ - +jq \ + +jq define Package/luci-app-modem/conffiles /etc/config/modem diff --git a/applications/luci-app-modem/README.md b/applications/luci-app-modem/README.md index 4d7f7ab..52ba500 100644 --- a/applications/luci-app-modem/README.md +++ b/applications/luci-app-modem/README.md @@ -28,6 +28,8 @@ | -------- | -------------------------------------------------- | -------- | ------------ | ---------------------------- | | 移远通信 | RG200U-CN(DONGLE版) | 紫光展锐 | USB | ECM,MBIM,RNDIS,NCM | | 移远通信 | RM500U-CN | 紫光展锐 | USB | ECM,MBIM,RNDIS,NCM | +| 移远通信 | RM500U-EA | 紫光展锐 | USB | ECM,MBIM,RNDIS,NCM | +| 移远通信 | RM500U-CNV | 紫光展锐 | USB | ECM,MBIM,RNDIS,NCM | | 移远通信 | RM500Q-CN | 高通 | USB | RMNET,ECM,MBIM,RNDIS,NCM | | 移远通信 | RM500Q-AE | 高通 | USB | RMNET,ECM,MBIM,RNDIS,NCM | | 移远通信 | RM500Q-GL | 高通 | USB | RMNET,ECM,MBIM,RNDIS,NCM | @@ -39,13 +41,13 @@ | 移远通信 | RM500Q-GL | 高通 | PCIE | RMNET,MBIM | | 移远通信 | RG500Q-EA | 高通 | PCIE | RMNET,MBIM | | 移远通信 | RM502Q-GL | 高通 | PCIE | RMNET,MBIM | -| 移远通信 | RM520Q-GL | 高通 | PCIE | RMNET,MBIM | +| 移远通信 | RM520N-GL | 高通 | PCIE | RMNET,MBIM | | 移远通信 | RG520N-EU | 高通 | PCIE | RMNET,MBIM | | 广和通 | FM650-CN | 紫光展锐 | USB | ECM,MBIM,RNDIS,NCM | | 广和通 | FM350-GL | 联发科 | USB | RNDIS | | 广和通 | FM150-AE-01,FM150-AE-11,FM150-AE-21,FM150-NA-01 | 高通 | USB | RMNET,ECM,MBIM,RNDIS,NCM | | 广和通 | FM350-GL | 联发科 | PCIE | MBIM | | 广和通 | FM150-AE-00,FM150-AE-10,FM150-AE-20,FM150-NA-00 | 高通 | PCIE | QMI | -| 美格智能 | SRM815 | 高通 | USB | ECM,MBIM,RNDIS,NCM | -| 美格智能 | SRM825 | 高通 | USB | ECM,MBIM,RNDIS,NCM | -| 美格智能 | SRM825N | 高通 | USB | ECM,MBIM,RNDIS,NCM | +| 美格智能 | SRM815 | 高通 | USB | RMNET,ECM,MBIM,RNDIS,NCM | +| 美格智能 | SRM825 | 高通 | USB | RMNET,ECM,MBIM,RNDIS,NCM | +| 美格智能 | SRM825N | 高通 | USB | RMNET,ECM,MBIM,RNDIS,NCM | diff --git a/applications/luci-app-modem/luasrc/controller/modem.lua b/applications/luci-app-modem/luasrc/controller/modem.lua index 270df17..c7dcb06 100644 --- a/applications/luci-app-modem/luasrc/controller/modem.lua +++ b/applications/luci-app-modem/luasrc/controller/modem.lua @@ -869,8 +869,10 @@ function getPluginInfo() -- 获取拨号工具信息 local dial_tool_info={} - dial_tool_info["quectel-CM-5G"]="Not installed" dial_tool_info["modemmanager"]="Not installed" + dial_tool_info["quectel-CM-5G"]="Not installed" + dial_tool_info["fibocom-dial"]="Not installed" + dial_tool_info["meig-cm"]="Not installed" setPluginVersionInfo(dial_tool_info) -- 获取通用驱动信息 @@ -882,21 +884,28 @@ function getPluginInfo() -- 获取模组USB驱动信息 local usb_driver_info={} + --通用驱动 usb_driver_info["qmi_wwan.ko"]="Not loaded" usb_driver_info["GobiNet.ko"]="Not loaded" usb_driver_info["cdc_ether.ko"]="Not loaded" usb_driver_info["cdc_mbim.ko"]="Not loaded" usb_driver_info["rndis_host.ko"]="Not loaded" usb_driver_info["cdc_ncm.ko"]="Not loaded" + --制造商私有驱动 + usb_driver_info["qmi_wwan_q.ko"]="Not loaded" + usb_driver_info["qmi_wwan_f.ko"]="Not loaded" + usb_driver_info["meig_cdc_driver.ko"]="Not loaded" setModelStatus(usb_driver_info) -- 获取模组PCIE驱动信息 local pcie_driver_info={} + --通用驱动 pcie_driver_info["mhi_net.ko"]="Not loaded" pcie_driver_info["qrtr_mhi.ko"]="Not loaded" pcie_driver_info["mhi_pci_generic.ko"]="Not loaded" pcie_driver_info["mhi_wwan_mbim.ko"]="Not loaded" pcie_driver_info["mhi_wwan_ctrl.ko"]="Not loaded" + --制造商私有驱动 pcie_driver_info["pcie_mhi.ko"]="Not loaded" pcie_driver_info["mtk_pcie_wwan_m80.ko"]="Not loaded" setModelStatus(pcie_driver_info) diff --git a/applications/luci-app-modem/luasrc/model/cbi/modem/plugin_config.lua b/applications/luci-app-modem/luasrc/model/cbi/modem/plugin_config.lua index dc80fa0..1b54bd7 100644 --- a/applications/luci-app-modem/luasrc/model/cbi/modem/plugin_config.lua +++ b/applications/luci-app-modem/luasrc/model/cbi/modem/plugin_config.lua @@ -63,7 +63,7 @@ o = s:option(DummyValue, "network", translate("Network")) o = s:option(DummyValue, "name", translate("Modem Name")) o.cfgvalue = function(t, n) local name = (Value.cfgvalue(t, n) or "") - return name:upper() + return translate(name:upper()) end -- AT串口 diff --git a/applications/luci-app-modem/luasrc/view/modem/modem_debug.htm b/applications/luci-app-modem/luasrc/view/modem/modem_debug.htm index 24d3f01..ebb9119 100644 --- a/applications/luci-app-modem/luasrc/view/modem/modem_debug.htm +++ b/applications/luci-app-modem/luasrc/view/modem/modem_debug.htm @@ -509,6 +509,9 @@ document.getElementById('mode_option').innerHTML=mode_option_view; //设置拨号模式选项 + if (current_mode=="gobinet") { + current_mode="qmi" + } element=document.getElementById('mode_option_'+current_mode).checked=true; //设置第一次获取数据标志 diff --git a/applications/luci-app-modem/luasrc/view/modem/plugin_info.htm b/applications/luci-app-modem/luasrc/view/modem/plugin_info.htm index 17df663..aa96686 100644 --- a/applications/luci-app-modem/luasrc/view/modem/plugin_info.htm +++ b/applications/luci-app-modem/luasrc/view/modem/plugin_info.htm @@ -118,7 +118,18 @@

<%:Dial Tool Info%>

- + +
+
+ +
+ +
+
+
+
@@ -129,10 +140,21 @@
- +
- + +
+ +
+
+
+ +
+
+