diff --git a/luci-app-modem/Makefile b/luci-app-modem/Makefile index 2637cd8..64a61a6 100644 --- a/luci-app-modem/Makefile +++ b/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/luci-app-modem/root/etc/init.d/modem b/luci-app-modem/root/etc/init.d/modem index e93bb07..4371594 100755 --- a/luci-app-modem/root/etc/init.d/modem +++ b/luci-app-modem/root/etc/init.d/modem @@ -780,6 +780,9 @@ service_triggers() start_service() { + #加载模组配置 + config_load modem + #统计模组数量 modem_count=0 config_foreach count_modem_number "modem-device" @@ -787,8 +790,6 @@ start_service() { uci set modem.@global[0].modem_number=${modem_count} uci commit modem - #加载模组配置 - config_load modem #手动设置模组信息 config_foreach manual_set_modem_config "modem-device" diff --git a/luci-app-modem/root/usr/share/modem/modem_network_task.sh b/luci-app-modem/root/usr/share/modem/modem_network_task.sh index ae1faf1..9921f7a 100755 --- a/luci-app-modem/root/usr/share/modem/modem_network_task.sh +++ b/luci-app-modem/root/usr/share/modem/modem_network_task.sh @@ -87,7 +87,7 @@ gobinet_dial() elif [ "$manufacturer" = "fibocom" ]; then at_command='AT$QCRMCALL=1,3' elif [ "$manufacturer" = "meig" ]; then - at_command="ATI" + at_command="ATI" else at_command='ATI' fi @@ -122,7 +122,7 @@ ecm_dial() elif [ "$manufacturer" = "fibocom" ]; then at_command="AT+GTRNDIS=1,${define_connect}" elif [ "$manufacturer" = "meig" ]; then - at_command="AT$QCRMCALL=1,1,${define_connect},2,1" + at_command="AT$QCRMCALL=1,1,${define_connect},2,1" else at_command='ATI' fi