diff --git a/package/wwan/app/luci-app-gobinetmodem/Makefile b/package/wwan/app/luci-app-gobinetmodem/Makefile old mode 100755 new mode 100644 index f12f31aee..08676a32e --- a/package/wwan/app/luci-app-gobinetmodem/Makefile +++ b/package/wwan/app/luci-app-gobinetmodem/Makefile @@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Modem Server LUCI_DEPENDS:=+luci-compat +kmod-usb-net +kmod-usb-net-cdc-ether +kmod-usb-acm \ - +kmod-usb-net-qmi-wwan +kmod-usb-net-rndis +kmod-usb-serial-qualcomm \ - +kmod-usb-net-sierrawireless +kmod-usb-ohci +kmod-usb-serial \ - +kmod-usb-serial-option \ - +kmod-usb2 +kmod-usb3 \ - +quectel-CM-5G +kmod-gobinet + +kmod-usb-net-qmi-wwan +kmod-usb-net-rndis +kmod-usb-serial-qualcomm \ + +kmod-usb-net-sierrawireless +kmod-usb-ohci +kmod-usb-serial \ + +kmod-usb-serial-option \ + +kmod-usb2 +kmod-usb3 \ + +quectel-CM-5G +kmod-gobinet include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/wwan/app/luci-app-gobinetmodem/luasrc/controller/gobinetmodem.lua b/package/wwan/app/luci-app-gobinetmodem/luasrc/controller/gobinetmodem.lua index 2a761d645..5b6de85db 100644 --- a/package/wwan/app/luci-app-gobinetmodem/luasrc/controller/gobinetmodem.lua +++ b/package/wwan/app/luci-app-gobinetmodem/luasrc/controller/gobinetmodem.lua @@ -4,6 +4,6 @@ function index() if not nixio.fs.access("/etc/config/gobinetmodem") then return end - - entry({"admin", "network", "gobinetmodem"}, cbi("gobinetmodem"), _("Gobinet Modem Server"), 80).dependent=false + + entry({"admin", "network", "gobinetmodem"}, cbi("gobinetmodem"), _("Gobinet Modem Server"), 80).dependent = false end diff --git a/package/wwan/app/luci-app-gobinetmodem/luasrc/model/cbi/gobinetmodem.lua b/package/wwan/app/luci-app-gobinetmodem/luasrc/model/cbi/gobinetmodem.lua index a117d7b0b..784130f16 100644 --- a/package/wwan/app/luci-app-gobinetmodem/luasrc/model/cbi/gobinetmodem.lua +++ b/package/wwan/app/luci-app-gobinetmodem/luasrc/model/cbi/gobinetmodem.lua @@ -1,39 +1,39 @@ -- Copyright 2016 David Thornley -- Licensed to the public under the Apache License 2.0. +mp = Map("gobinetmodem") +mp.title = translate("gobinet Modem Server") +mp.description = translate("Modem Server For OpenWrt") -mp=Map("gobinetmodem",translate("gobinet Modem Server")) -mp.description=translate("Modem Server For OpenWrt") - -s=mp:section(TypedSection,"service", "Base Setting") +s = mp:section(TypedSection, "service", "Base Setting") s.anonymous = true -enabled=s:option(Flag,"enabled",translate("Enable")) -enabled.default=0 -enabled.rmempty=false +enabled = s:option(Flag, "enabled", translate("Enable")) +enabled.default = 0 +enabled.rmempty = false -apn=s:option(Value,"apn",translate("APN")) -apn.rmempty=true +apn = s:option(Value, "apn", translate("APN")) +apn.rmempty = true -pincode=s:option(Value,"pincode",translate("PIN")) -pincode.rmempty=true +pincode = s:option(Value, "pincode", translate("PIN")) +pincode.rmempty = true -username=s:option(Value,"username",translate("PAP/CHAP username")) -username.rmempty=true +username = s:option(Value, "username", translate("PAP/CHAP username")) +username.rmempty = true -password=s:option(Value,"password",translate("PAP/CHAP password")) -password.rmempty=true -auth=s:option(Value,"auth",translate("Authentication Type")) -password.rmempty=true -auth:value("",translate("-- Please choose --")) -auth:value("both","PAP/CHAP (both)") -auth:value("pap","PAP") -auth:value("chap","CHAP") -auth:value("none","NONE") +password = s:option(Value, "password", translate("PAP/CHAP password")) +password.rmempty = true -tool=s:option(Value,"tool",translate("Tools")) -tool:value("quectel-CM","quectel-CM") -tool.rmempty=true +auth = s:option(Value, "auth", translate("Authentication Type")) +auth.rmempty = true +auth:value("", translate("-- Please choose --")) +auth:value("both", "PAP/CHAP (both)") +auth:value("pap", "PAP") +auth:value("chap", "CHAP") +auth:value("none", "NONE") + +tool = s:option(Value, "tool", translate("Tools")) +tool:value("quectel-CM", "quectel-CM") +tool.rmempty = true return mp - diff --git a/package/wwan/app/luci-app-gobinetmodem/po/zh_Hans/usbmodem.po b/package/wwan/app/luci-app-gobinetmodem/po/zh-cn/usbmodem.po similarity index 100% rename from package/wwan/app/luci-app-gobinetmodem/po/zh_Hans/usbmodem.po rename to package/wwan/app/luci-app-gobinetmodem/po/zh-cn/usbmodem.po diff --git a/package/wwan/app/luci-app-gobinetmodem/root/etc/uci-defaults/luci-gobinetmodem b/package/wwan/app/luci-app-gobinetmodem/root/etc/uci-defaults/luci-gobinetmodem index 6eb5a0999..b4b7674e3 100755 --- a/package/wwan/app/luci-app-gobinetmodem/root/etc/uci-defaults/luci-gobinetmodem +++ b/package/wwan/app/luci-app-gobinetmodem/root/etc/uci-defaults/luci-gobinetmodem @@ -9,4 +9,3 @@ EOF rm -f /tmp/luci-indexcache exit 0 - diff --git a/package/wwan/app/luci-app-pcimodem/Makefile b/package/wwan/app/luci-app-pcimodem/Makefile old mode 100755 new mode 100644 diff --git a/package/wwan/app/luci-app-pcimodem/luasrc/controller/pcimodem.lua b/package/wwan/app/luci-app-pcimodem/luasrc/controller/pcimodem.lua index e1630c5b8..e1d3daf90 100644 --- a/package/wwan/app/luci-app-pcimodem/luasrc/controller/pcimodem.lua +++ b/package/wwan/app/luci-app-pcimodem/luasrc/controller/pcimodem.lua @@ -4,6 +4,6 @@ function index() if not nixio.fs.access("/etc/config/pcimodem") then return end - - entry({"admin", "network", "pcimodem"}, cbi("pcimodem"), _("PCI Modem Server"), 80).dependent=false + + entry({"admin", "network", "pcimodem"}, cbi("pcimodem"), _("PCI Modem Server"), 80).dependent = false end diff --git a/package/wwan/app/luci-app-pcimodem/luasrc/model/cbi/pcimodem.lua b/package/wwan/app/luci-app-pcimodem/luasrc/model/cbi/pcimodem.lua index 591ba4b5a..258ce6658 100644 --- a/package/wwan/app/luci-app-pcimodem/luasrc/model/cbi/pcimodem.lua +++ b/package/wwan/app/luci-app-pcimodem/luasrc/model/cbi/pcimodem.lua @@ -1,39 +1,39 @@ -- Copyright 2016 David Thornley -- Licensed to the public under the Apache License 2.0. +mp = Map("pcimodem") +mp.title = translate("PCI Modem Server") +mp.description = translate("Modem Server For OpenWrt") -mp=Map("pcimodem",translate("PCI Modem Server")) -mp.description=translate("Modem Server For OpenWrt") - -s=mp:section(TypedSection,"service", "Base Setting") +s = mp:section(TypedSection, "service", "Base Setting") s.anonymous = true -enabled=s:option(Flag,"enabled",translate("Enable")) -enabled.default=0 -enabled.rmempty=false +enabled = s:option(Flag, "enabled", translate("Enable")) +enabled.default = 0 +enabled.rmempty = false -apn=s:option(Value,"apn",translate("APN")) -apn.rmempty=true +apn = s:option(Value, "apn", translate("APN")) +apn.rmempty = true -pincode=s:option(Value,"pincode",translate("PIN")) -pincode.rmempty=true +pincode = s:option(Value, "pincode", translate("PIN")) +pincode.rmempty = true -username=s:option(Value,"username",translate("PAP/CHAP username")) -username.rmempty=true +username = s:option(Value, "username", translate("PAP/CHAP username")) +username.rmempty = true -password=s:option(Value,"password",translate("PAP/CHAP password")) -password.rmempty=true -auth=s:option(Value,"auth",translate("Authentication Type")) -password.rmempty=true -auth:value("",translate("-- Please choose --")) -auth:value("both","PAP/CHAP (both)") -auth:value("pap","PAP") -auth:value("chap","CHAP") -auth:value("none","NONE") +password = s:option(Value, "password", translate("PAP/CHAP password")) +password.rmempty = true -tool=s:option(Value,"tool",translate("Tools")) -tool:value("quectel-CM","quectel-CM") -tool.rmempty=true +auth = s:option(Value, "auth", translate("Authentication Type")) +auth.rmempty = true +auth:value("", translate("-- Please choose --")) +auth:value("both", "PAP/CHAP (both)") +auth:value("pap", "PAP") +auth:value("chap", "CHAP") +auth:value("none", "NONE") + +tool = s:option(Value, "tool", translate("Tools")) +tool:value("quectel-CM", "quectel-CM") +tool.rmempty = true return mp - diff --git a/package/wwan/app/luci-app-pcimodem/po/zh_Hans/pcimodem.po b/package/wwan/app/luci-app-pcimodem/po/zh-cn/pcimodem.po similarity index 100% rename from package/wwan/app/luci-app-pcimodem/po/zh_Hans/pcimodem.po rename to package/wwan/app/luci-app-pcimodem/po/zh-cn/pcimodem.po diff --git a/package/wwan/app/luci-app-pcimodem/root/etc/uci-defaults/luci-pcimodem b/package/wwan/app/luci-app-pcimodem/root/etc/uci-defaults/luci-pcimodem index 213c62cb6..10f5ab839 100755 --- a/package/wwan/app/luci-app-pcimodem/root/etc/uci-defaults/luci-pcimodem +++ b/package/wwan/app/luci-app-pcimodem/root/etc/uci-defaults/luci-pcimodem @@ -9,4 +9,3 @@ EOF rm -f /tmp/luci-indexcache exit 0 - diff --git a/package/wwan/app/luci-app-spdmodem/Makefile b/package/wwan/app/luci-app-spdmodem/Makefile old mode 100755 new mode 100644 diff --git a/package/wwan/app/luci-app-spdmodem/luasrc/controller/spdmodem.lua b/package/wwan/app/luci-app-spdmodem/luasrc/controller/spdmodem.lua index 81e8ad9e0..c0164bb96 100644 --- a/package/wwan/app/luci-app-spdmodem/luasrc/controller/spdmodem.lua +++ b/package/wwan/app/luci-app-spdmodem/luasrc/controller/spdmodem.lua @@ -4,6 +4,6 @@ function index() if not nixio.fs.access("/etc/config/spdmodem") then return end - - entry({"admin", "network", "spdmodem"}, cbi("spdmodem"), _("SPD Modem Server"), 80).dependent=false + + entry({"admin", "network", "spdmodem"}, cbi("spdmodem"), _("SPD Modem Server"), 80).dependent = false end diff --git a/package/wwan/app/luci-app-spdmodem/luasrc/model/cbi/spdmodem.lua b/package/wwan/app/luci-app-spdmodem/luasrc/model/cbi/spdmodem.lua index 3456c3757..c6bade43e 100644 --- a/package/wwan/app/luci-app-spdmodem/luasrc/model/cbi/spdmodem.lua +++ b/package/wwan/app/luci-app-spdmodem/luasrc/model/cbi/spdmodem.lua @@ -1,39 +1,39 @@ -- Copyright 2016 David Thornley -- Licensed to the public under the Apache License 2.0. +mp = Map("spdmodem") +mp.title = translate("SPD Modem Server") +mp.description = translate("Modem Server For OpenWrt") -mp=Map("spdmodem",translate("SPD Modem Server")) -mp.description=translate("Modem Server For OpenWrt") - -s=mp:section(TypedSection,"service", "Base Setting") +s = mp:section(TypedSection, "service", "Base Setting") s.anonymous = true -enabled=s:option(Flag,"enabled",translate("Enable")) -enabled.default=0 -enabled.rmempty=false +enabled = s:option(Flag, "enabled", translate("Enable")) +enabled.default = 0 +enabled.rmempty = false -apn=s:option(Value,"apn",translate("APN")) -apn.rmempty=true +apn = s:option(Value, "apn", translate("APN")) +apn.rmempty = true -pincode=s:option(Value,"pincode",translate("PIN")) -pincode.rmempty=true +pincode = s:option(Value, "pincode", translate("PIN")) +pincode.rmempty = true -username=s:option(Value,"username",translate("PAP/CHAP username")) -username.rmempty=true +username = s:option(Value, "username", translate("PAP/CHAP username")) +username.rmempty = true -password=s:option(Value,"password",translate("PAP/CHAP password")) -password.rmempty=true -auth=s:option(Value,"auth",translate("Authentication Type")) -password.rmempty=true -auth:value("",translate("-- Please choose --")) -auth:value("both","PAP/CHAP (both)") -auth:value("pap","PAP") -auth:value("chap","CHAP") -auth:value("none","NONE") +password = s:option(Value, "password", translate("PAP/CHAP password")) +password.rmempty = true -tool=s:option(Value,"tool",translate("Tools")) -tool:value("quectel-CM","quectel-CM") -tool.rmempty=true +auth = s:option(Value, "auth", translate("Authentication Type")) +auth.rmempty = true +auth:value("", translate("-- Please choose --")) +auth:value("both", "PAP/CHAP (both)") +auth:value("pap", "PAP") +auth:value("chap", "CHAP") +auth:value("none", "NONE") + +tool = s:option(Value, "tool", translate("Tools")) +tool:value("quectel-CM", "quectel-CM") +tool.rmempty = true return mp - diff --git a/package/wwan/app/luci-app-spdmodem/po/zh_Hans/spdmodem.po b/package/wwan/app/luci-app-spdmodem/po/zh-cn/spdmodem.po similarity index 100% rename from package/wwan/app/luci-app-spdmodem/po/zh_Hans/spdmodem.po rename to package/wwan/app/luci-app-spdmodem/po/zh-cn/spdmodem.po diff --git a/package/wwan/app/luci-app-spdmodem/root/etc/uci-defaults/luci-spdmodem b/package/wwan/app/luci-app-spdmodem/root/etc/uci-defaults/luci-spdmodem index 1bfe6e48c..faa1d1e82 100755 --- a/package/wwan/app/luci-app-spdmodem/root/etc/uci-defaults/luci-spdmodem +++ b/package/wwan/app/luci-app-spdmodem/root/etc/uci-defaults/luci-spdmodem @@ -9,4 +9,3 @@ EOF rm -f /tmp/luci-indexcache exit 0 - diff --git a/package/wwan/app/luci-app-usbmodem/Makefile b/package/wwan/app/luci-app-usbmodem/Makefile old mode 100755 new mode 100644 index 334901993..2214f0cf1 --- a/package/wwan/app/luci-app-usbmodem/Makefile +++ b/package/wwan/app/luci-app-usbmodem/Makefile @@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Modem Server LUCI_DEPENDS:=+luci-compat +kmod-usb-net +kmod-usb-net-cdc-ether +kmod-usb-acm \ - +kmod-usb-net-qmi-wwan +kmod-usb-net-rndis +kmod-usb-serial-qualcomm \ - +kmod-usb-net-sierrawireless +kmod-usb-ohci +kmod-usb-serial \ - +kmod-usb-serial-option +kmod-usb-wdm \ - +kmod-usb2 +kmod-usb3 \ - +quectel-CM-5G +kmod-qmi_wwan_q +kmod-usb-net-cdc-mbim + +kmod-usb-net-qmi-wwan +kmod-usb-net-rndis +kmod-usb-serial-qualcomm \ + +kmod-usb-net-sierrawireless +kmod-usb-ohci +kmod-usb-serial \ + +kmod-usb-serial-option +kmod-usb-wdm \ + +kmod-usb2 +kmod-usb3 \ + +quectel-CM-5G +kmod-qmi_wwan_q +kmod-usb-net-cdc-mbim include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/wwan/app/luci-app-usbmodem/luasrc/controller/usbmodem.lua b/package/wwan/app/luci-app-usbmodem/luasrc/controller/usbmodem.lua index 9021a61c5..6cf943c30 100644 --- a/package/wwan/app/luci-app-usbmodem/luasrc/controller/usbmodem.lua +++ b/package/wwan/app/luci-app-usbmodem/luasrc/controller/usbmodem.lua @@ -4,6 +4,6 @@ function index() if not nixio.fs.access("/etc/config/usbmodem") then return end - - entry({"admin", "network", "usbmodem"}, cbi("usbmodem"), _("USB Modem Server"), 80).dependent=false + + entry({"admin", "network", "usbmodem"}, cbi("usbmodem"), _("USB Modem Server"), 80).dependent = false end diff --git a/package/wwan/app/luci-app-usbmodem/luasrc/model/cbi/usbmodem.lua b/package/wwan/app/luci-app-usbmodem/luasrc/model/cbi/usbmodem.lua index 11e4df9a8..97af8026a 100644 --- a/package/wwan/app/luci-app-usbmodem/luasrc/model/cbi/usbmodem.lua +++ b/package/wwan/app/luci-app-usbmodem/luasrc/model/cbi/usbmodem.lua @@ -1,18 +1,18 @@ -- Copyright 2016 David Thornley -- Licensed to the public under the Apache License 2.0. +mp = Map("usbmodem") +mp.title = translate("USB Modem Server") +mp.description = translate("Modem Server For OpenWrt") -mp=Map("usbmodem",translate("USB Modem Server")) -mp.description=translate("Modem Server For OpenWrt") - -s=mp:section(TypedSection,"service", "Base Setting") +s = mp:section(TypedSection, "service", "Base Setting") s.anonymous = true -enabled=s:option(Flag,"enabled",translate("Enable")) -enabled.default=0 -enabled.rmempty=false +enabled = s:option(Flag, "enabled", translate("Enable")) +enabled.default = 0 +enabled.rmempty = false -device=s:option(Value, "device", translate("Modem device")) +device = s:option(Value, "device", translate("Modem device")) device.rmempty = false local device_suggestions = nixio.fs.glob("/dev/cdc-wdm*") @@ -24,28 +24,28 @@ if device_suggestions then end end -apn=s:option(Value,"apn",translate("APN")) -apn.rmempty=true +apn = s:option(Value, "apn", translate("APN")) +apn.rmempty = true -pincode=s:option(Value,"pincode",translate("PIN")) -pincode.rmempty=true +pincode = s:option(Value, "pincode", translate("PIN")) +pincode.rmempty = true -username=s:option(Value,"username",translate("PAP/CHAP username")) -username.rmempty=true +username = s:option(Value, "username", translate("PAP/CHAP username")) +username.rmempty = true -password=s:option(Value,"password",translate("PAP/CHAP password")) -password.rmempty=true -auth=s:option(Value,"auth",translate("Authentication Type")) -password.rmempty=true -auth:value("",translate("-- Please choose --")) -auth:value("both","PAP/CHAP (both)") -auth:value("pap","PAP") -auth:value("chap","CHAP") -auth:value("none","NONE") +password = s:option(Value, "password", translate("PAP/CHAP password")) +password.rmempty = true -tool=s:option(Value,"tool",translate("Tools")) -tool:value("quectel-CM","quectel-CM") -tool.rmempty=true +auth = s:option(Value, "auth", translate("Authentication Type")) +auth.rmempty = true +auth:value("", translate("-- Please choose --")) +auth:value("both", "PAP/CHAP (both)") +auth:value("pap", "PAP") +auth:value("chap", "CHAP") +auth:value("none", "NONE") + +tool = s:option(Value, "tool", translate("Tools")) +tool:value("quectel-CM", "quectel-CM") +tool.rmempty = true return mp - diff --git a/package/wwan/app/luci-app-usbmodem/po/zh_Hans/usbmodem.po b/package/wwan/app/luci-app-usbmodem/po/zh-cn/usbmodem.po similarity index 100% rename from package/wwan/app/luci-app-usbmodem/po/zh_Hans/usbmodem.po rename to package/wwan/app/luci-app-usbmodem/po/zh-cn/usbmodem.po diff --git a/package/wwan/app/luci-app-usbmodem/root/etc/uci-defaults/luci-usbmodem b/package/wwan/app/luci-app-usbmodem/root/etc/uci-defaults/luci-usbmodem index ebc3b752d..1b2ba06c9 100755 --- a/package/wwan/app/luci-app-usbmodem/root/etc/uci-defaults/luci-usbmodem +++ b/package/wwan/app/luci-app-usbmodem/root/etc/uci-defaults/luci-usbmodem @@ -9,4 +9,3 @@ EOF rm -f /tmp/luci-indexcache exit 0 - diff --git a/package/wwan/app/luci-proto-3x/Makefile b/package/wwan/app/luci-proto-3x/Makefile old mode 100755 new mode 100644 diff --git a/package/wwan/app/luci-proto-3x/files/usr/lib/lua/luci/model/cbi/admin_network/proto_3x.lua b/package/wwan/app/luci-proto-3x/files/usr/lib/lua/luci/model/cbi/admin_network/proto_3x.lua old mode 100755 new mode 100644 diff --git a/package/wwan/app/luci-proto-mbim/Makefile b/package/wwan/app/luci-proto-mbim/Makefile old mode 100755 new mode 100644 diff --git a/package/wwan/app/luci-proto-mbim/files/usr/lib/lua/luci/model/cbi/admin_network/proto_mbim.lua b/package/wwan/app/luci-proto-mbim/files/usr/lib/lua/luci/model/cbi/admin_network/proto_mbim.lua old mode 100755 new mode 100644 diff --git a/package/wwan/app/luci-proto-mbim/files/usr/lib/lua/luci/model/network/proto_mbim.lua b/package/wwan/app/luci-proto-mbim/files/usr/lib/lua/luci/model/network/proto_mbim.lua old mode 100755 new mode 100644