添加RM520N支持

luci-app-modem/luasrc/model/cbi/modem/index.lua

@@ -20,7 +20,7 @@ m:append(Template("modem/modem_status"))
 s = m:section(TypedSection, "config", translate("Config List"))
 s.anonymous = true
 s.addremove = true
-s.template = "cbi/tblsection"
+s.template = "modem/tblsection"
 s.extedit = d.build_url("admin", "network", "modem", "config", "%s")
 
 function s.create(uci, t)

luci-app-modem/luasrc/model/cbi/modem/quick_commands_config.lua

@@ -15,7 +15,7 @@ s = m:section(TypedSection, "custom-commands", translate("Custom Commands"))
 s.anonymous = true
 s.addremove = true
 s.sortable = true
-s.template = "cbi/tblsection"
+s.template = "modem/tblsection_command"
 
 description = s:option(Value, "description", translate("Description"))
 description.placeholder = translate("Not Null")

luci-app-modem/luasrc/view/modem/at_command_old.htm

@@ -50,19 +50,25 @@
 
 	// 定时触发更新AT串口
 	XHR.poll(5,'<%=luci.dispatcher.build_url("admin", "network", "modem", "get_at_port")%>', null,
-		function(x, port)
+		function(x, data)
 		{
+			var at_ports=data["at_ports"];
+
 			//获取模块选择框元素
 			var modem_select = document.getElementById('modem_select');
 			// 记录所选
 			var selected=modem_select.value;
 			// 删除原来的选项
 			modem_select.options.length=0;
-			// 更新（key：AT串口，value：模块名称）
+			//遍历每一个AT串口
+			for (var port of at_ports)
+			{
+				//更新（key：AT串口，value：模块名称）
 				for (var key in port)
 				{
 					var option = document.createElement('option');
 					option.value = key;
+					var language=navigator.language;
 					if (port[key].includes("unknown"))
 					{
 						option.text = port[key].replace("unknown", key);
@@ -73,6 +79,7 @@
 					}
 					modem_select.appendChild(option);
 				}
+			}
 			// 恢复原来的选择
 			for (let i = 0; i < modem_select.options.length; i++)
 			{
@@ -84,7 +91,7 @@
 			}
 
 			// 界面显示控制
-			if (Object.keys(port).length==0)
+			if (Object.keys(at_ports).length==0)
 			{
 				// 更新提示信息
 				document.getElementById("info_message").innerHTML="<strong><%:No modems found%></strong>";
@@ -235,7 +242,10 @@
 			<div class="tr cbi-rowstyle-2">
 				<div class="td right"><input type="button" style="margin-right: 26%"; id="sendcmd" class="btn cbi-button cbi-button-neutral" value="<%:Send Command%>" /></div>
 			</div>
+		</div>
 
+		<div class="cbi-page-actions">
+			<input class="btn cbi-button cbi-button-link" type="button" value="<%:Return to modem debug%>" onclick="location.href='/cgi-bin/luci/admin/network/modem/modem_debug'">
 		</div>
 	</div>
 

luci-app-modem/luasrc/view/modem/tblsection.htm

@@ -0,0 +1,203 @@
+<%-
+local rowcnt = 0
+
+function rowstyle()
+	rowcnt = rowcnt + 1
+	if rowcnt % 2 == 0 then
+		return " cbi-rowstyle-1"
+	else
+		return " cbi-rowstyle-2"
+	end
+end
+
+function width(o)
+	if o.width then
+		if type(o.width) == 'number' then
+			return ' style="width:%dpx"' % o.width
+		end
+		return ' style="width:%s"' % o.width
+	end
+	return ''
+end
+
+local has_titles = false
+local has_descriptions = false
+
+local anonclass = (not self.anonymous or self.sectiontitle) and "named" or "anonymous"
+local titlename = ifattr(not self.anonymous or self.sectiontitle, "data-title", translate("Name"))
+
+local i, k
+for i, k in pairs(self.children) do
+	if not k.typename then
+		k.typename = k.template and k.template:gsub("^.+/", "") or ""
+	end
+
+	if not has_titles and k.title and #k.title > 0 then
+		has_titles = true
+	end
+
+	if not has_descriptions and k.description and #k.description > 0 then
+		has_descriptions = true
+	end
+end
+
+function render_titles()
+	if not has_titles then
+		return
+	end
+
+	%><tr class="tr cbi-section-table-titles <%=anonclass%>"<%=titlename%>><%
+
+	local i, k
+	for i, k in ipairs(self.children) do
+		if not k.optional then
+			%><th class="th cbi-section-table-cell"<%=
+				width(k) .. attr('data-widget', k.typename) %>><%
+
+			if k.titleref then
+				%><a title="<%=self.titledesc or translate('Go to relevant configuration page')%>" class="cbi-title-ref" href="<%=k.titleref%>"><%
+			end
+
+			write(k.title)
+
+			if k.titleref then
+				%></a><%
+			end
+
+			%></th><%
+		end
+	end
+
+	if self.sortable or self.extedit or self.addremove then
+		%><th class="th cbi-section-table-cell cbi-section-actions"></th><%
+	end
+
+	%></tr><%
+
+	rowcnt = rowcnt + 1
+end
+
+function render_descriptions()
+	if not has_descriptions then
+		return
+	end
+
+	%><tr class="tr cbi-section-table-descr <%=anonclass%>"><%
+
+	local i, k
+	for i, k in ipairs(self.children) do
+		if not k.optional then
+			%><th class="th cbi-section-table-cell"<%=
+				width(k) .. attr("data-widget", k.typename) %>><%
+
+			write(k.description)
+
+			%></th><%
+		end
+	end
+
+	if self.sortable or self.extedit or self.addremove then
+		%><th class="th cbi-section-table-cell cbi-section-actions"></th><%
+	end
+
+	%></tr><%
+
+	rowcnt = rowcnt + 1
+end
+
+-%>
+
+<!-- tblsection -->
+<div class="cbi-section cbi-tblsection" id="cbi-<%=self.config%>-<%=self.sectiontype%>">
+	<% if self.title and #self.title > 0 then -%>
+		<h3><%=self.title%></h3>
+	<%- end %>
+	<%- if self.sortable then -%>
+		<input type="hidden" id="cbi.sts.<%=self.config%>.<%=self.sectiontype%>" name="cbi.sts.<%=self.config%>.<%=self.sectiontype%>" value="" />
+	<%- end -%>
+	<div class="cbi-section-descr"><%=self.description%></div>
+	<table class="table cbi-section-table">
+		<%-
+			render_titles()
+			render_descriptions()
+
+			local isempty, section, i, k = true, nil, nil
+		    for i, k in ipairs(self:cfgsections()) do
+				isempty = false
+				section = k
+
+				local sectionname = striptags((type(self.sectiontitle) == "function") and self:sectiontitle(section) or k)
+				local sectiontitle = ifattr(sectionname and (not self.anonymous or self.sectiontitle), "data-title", sectionname, true)
+				local colorclass = (self.extedit or self.rowcolors) and rowstyle() or ""
+				local scope = {
+					valueheader = "cbi/cell_valueheader",
+					valuefooter = "cbi/cell_valuefooter"
+				}
+		-%>
+		<tr class="tr cbi-section-table-row<%=colorclass%>" id="cbi-<%=self.config%>-<%=section%>"<%=sectiontitle%>>
+			<%-
+				local node
+				for k, node in ipairs(self.children) do
+					if not node.optional then
+						node:render(section, scope or {})
+					end
+				end
+			-%>
+
+			<%- if self.sortable or self.extedit or self.addremove then -%>
+				<td class="td cbi-section-table-cell nowrap cbi-section-actions">
+					<div>
+						<%- if self.sortable then -%>
+							<input class="btn cbi-button cbi-button-up" type="button" value="<%:Up%>" onclick="return cbi_row_swap(this, true, 'cbi.sts.<%=self.config%>.<%=self.sectiontype%>')" title="<%:Move up%>" />
+							<input class="btn cbi-button cbi-button-down" type="button" value="<%:Down%>" onclick="return cbi_row_swap(this, false, 'cbi.sts.<%=self.config%>.<%=self.sectiontype%>')" title="<%:Move down%>" />
+						<% end; if self.extedit then -%>
+							<input class="btn cbi-button cbi-button-edit" type="button" value="<%:Edit%>"
+							<%- if type(self.extedit) == "string" then
+							%> onclick="location.href='<%=self.extedit:format(section)%>'"
+							<%- elseif type(self.extedit) == "function" then
+							%> onclick="location.href='<%=self:extedit(section)%>'"
+							<%- end
+							%> alt="<%:Edit%>" title="<%:Edit%>" />
+						<% end; if self.addremove then %>
+							<input class="btn cbi-button cbi-button-remove" type="submit" value="<%:Delete%>"  onclick="this.form.cbi_state='del-section'; return true" name="cbi.rts.<%=self.config%>.<%=k%>" alt="<%:Delete%>" title="<%:Delete%>" />
+						<%- end -%>
+					</div>
+				</td>
+			<%- end -%>
+		</tr>
+		<%- end -%>
+
+		<%- if isempty then -%>
+		<tr class="tr cbi-section-table-row placeholder">
+			<td class="td"><em><%:This section contains no values yet%></em></td>
+		</tr>
+		<%- end -%>
+	</table>
+
+	<% if self.error then %>
+		<div class="cbi-section-error">
+			<ul><% for _, c in pairs(self.error) do for _, e in ipairs(c) do -%>
+				<li><%=pcdata(e):gsub("\n","<br />")%></li>
+			<%- end end %></ul>
+		</div>
+	<% end %>
+
+	<%- if self.addremove then -%>
+		<% if self.template_addremove then include(self.template_addremove) else -%>
+		<div class="cbi-section-create cbi-tblsection-create">
+			<% if self.anonymous then %>
+				<input class="btn cbi-button cbi-button-add" type="submit" value="<%:Add%>" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" title="<%:Add%>" />
+			<% else %>
+				<% if self.invalid_cts then -%>
+					<div class="cbi-section-error"><%:Invalid%></div>
+				<%- end %>
+				<div>
+					<input type="text" class="cbi-section-create-name" id="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" data-type="uciname" data-optional="true" onkeyup="cbi_validate_named_section_add(this)"/>
+				</div>
+				<input class="btn cbi-button cbi-button-add" type="submit" onclick="this.form.cbi_state='add-section'; return true" value="<%:Add%>" title="<%:Add%>" disabled="" />
+			<% end %>
+		</div>
+		<%- end %>
+	<%- end -%>
+</div>
+<!-- /tblsection -->

luci-app-modem/luasrc/view/modem/tblsection_command.htm

@@ -0,0 +1,208 @@
+<%-
+local rowcnt = 0
+
+function rowstyle()
+	rowcnt = rowcnt + 1
+	if rowcnt % 2 == 0 then
+		return " cbi-rowstyle-1"
+	else
+		return " cbi-rowstyle-2"
+	end
+end
+
+function width(o)
+	if o.width then
+		if type(o.width) == 'number' then
+			return ' style="width:%dpx"' % o.width
+		end
+		return ' style="width:%s"' % o.width
+	end
+	return ''
+end
+
+local has_titles = false
+local has_descriptions = false
+
+local anonclass = (not self.anonymous or self.sectiontitle) and "named" or "anonymous"
+local titlename = ifattr(not self.anonymous or self.sectiontitle, "data-title", translate("Name"))
+
+local i, k
+for i, k in pairs(self.children) do
+	if not k.typename then
+		k.typename = k.template and k.template:gsub("^.+/", "") or ""
+	end
+
+	if not has_titles and k.title and #k.title > 0 then
+		has_titles = true
+	end
+
+	if not has_descriptions and k.description and #k.description > 0 then
+		has_descriptions = true
+	end
+end
+
+function render_titles()
+	if not has_titles then
+		return
+	end
+
+	%><tr class="tr cbi-section-table-titles <%=anonclass%>"<%=titlename%>>
+		<th class="th cbi-section-table-cell"><%:Serial Number%></th>	
+	<%
+	local i, k
+	for i, k in ipairs(self.children) do
+		if not k.optional then
+			%><th class="th cbi-section-table-cell"<%=
+				width(k) .. attr('data-widget', k.typename) %>><%
+
+			if k.titleref then
+				%><a title="<%=self.titledesc or translate('Go to relevant configuration page')%>" class="cbi-title-ref" href="<%=k.titleref%>"><%
+			end
+
+			write(k.title)
+
+			if k.titleref then
+				%></a><%
+			end
+
+			%></th><%
+		end
+	end
+
+	if self.sortable or self.extedit or self.addremove then
+		%><th class="th cbi-section-table-cell cbi-section-actions"></th><%
+	end
+
+	%></tr><%
+
+	rowcnt = rowcnt + 1
+end
+
+function render_descriptions()
+	if not has_descriptions then
+		return
+	end
+
+	%><tr class="tr cbi-section-table-descr <%=anonclass%>"><%
+
+	local i, k
+	for i, k in ipairs(self.children) do
+		if not k.optional then
+			%><th class="th cbi-section-table-cell"<%=
+				width(k) .. attr("data-widget", k.typename) %>><%
+
+			write(k.description)
+
+			%></th><%
+		end
+	end
+
+	if self.sortable or self.extedit or self.addremove then
+		%><th class="th cbi-section-table-cell cbi-section-actions"></th><%
+	end
+
+	%></tr><%
+
+	rowcnt = rowcnt + 1
+end
+
+-%>
+
+<!-- tblsection -->
+<div class="cbi-section cbi-tblsection" id="cbi-<%=self.config%>-<%=self.sectiontype%>">
+	<% if self.title and #self.title > 0 then -%>
+		<h3><%=self.title%></h3>
+	<%- end %>
+	<%- if self.sortable then -%>
+		<input type="hidden" id="cbi.sts.<%=self.config%>.<%=self.sectiontype%>" name="cbi.sts.<%=self.config%>.<%=self.sectiontype%>" value="" />
+	<%- end -%>
+	<div class="cbi-section-descr"><%=self.description%></div>
+	<table class="table cbi-section-table">
+		<%-
+			render_titles()
+			render_descriptions()
+
+			local num = 1
+			local isempty, section, i, k = true, nil, nil
+		    for i, k in ipairs(self:cfgsections()) do
+				isempty = false
+				section = k
+
+				local sectionname = striptags((type(self.sectiontitle) == "function") and self:sectiontitle(section) or k)
+				local sectiontitle = ifattr(sectionname and (not self.anonymous or self.sectiontitle), "data-title", sectionname, true)
+				local colorclass = (self.extedit or self.rowcolors) and rowstyle() or ""
+				local scope = {
+					valueheader = "cbi/cell_valueheader",
+					valuefooter = "cbi/cell_valuefooter"
+				}
+		-%>
+		<tr class="tr cbi-section-table-row<%=colorclass%>" id="cbi-<%=self.config%>-<%=section%>"<%=sectiontitle%>>
+			<td class="td cbi-value-field" data-title="<%:Serial Number%>">
+				<p><%=num%></p>
+				<% num = num + 1 -%>
+			</td>
+			<%-
+				local node
+				for k, node in ipairs(self.children) do
+					if not node.optional then
+						node:render(section, scope or {})
+					end
+				end
+			-%>
+			<%- if self.sortable or self.extedit or self.addremove then -%>
+				<td class="td cbi-section-table-cell nowrap cbi-section-actions">
+					<div>
+						<%- if self.sortable then -%>
+							<input class="btn cbi-button cbi-button-up" type="button" value="<%:Up%>" onclick="return cbi_row_swap(this, true, 'cbi.sts.<%=self.config%>.<%=self.sectiontype%>')" title="<%:Move up%>" />
+							<input class="btn cbi-button cbi-button-down" type="button" value="<%:Down%>" onclick="return cbi_row_swap(this, false, 'cbi.sts.<%=self.config%>.<%=self.sectiontype%>')" title="<%:Move down%>" />
+						<% end; if self.extedit then -%>
+							<input class="btn cbi-button cbi-button-edit" type="button" value="<%:Edit%>"
+							<%- if type(self.extedit) == "string" then
+							%> onclick="location.href='<%=self.extedit:format(section)%>'"
+							<%- elseif type(self.extedit) == "function" then
+							%> onclick="location.href='<%=self:extedit(section)%>'"
+							<%- end
+							%> alt="<%:Edit%>" title="<%:Edit%>" />
+						<% end; if self.addremove then %>
+							<input class="btn cbi-button cbi-button-remove" type="submit" value="<%:Delete%>"  onclick="this.form.cbi_state='del-section'; return true" name="cbi.rts.<%=self.config%>.<%=k%>" alt="<%:Delete%>" title="<%:Delete%>" />
+						<%- end -%>
+					</div>
+				</td>
+			<%- end -%>
+		</tr>
+		<%- end -%>
+
+		<%- if isempty then -%>
+		<tr class="tr cbi-section-table-row placeholder">
+			<td class="td"><em><%:This section contains no values yet%></em></td>
+		</tr>
+		<%- end -%>
+	</table>
+
+	<% if self.error then %>
+		<div class="cbi-section-error">
+			<ul><% for _, c in pairs(self.error) do for _, e in ipairs(c) do -%>
+				<li><%=pcdata(e):gsub("\n","<br />")%></li>
+			<%- end end %></ul>
+		</div>
+	<% end %>
+
+	<%- if self.addremove then -%>
+		<% if self.template_addremove then include(self.template_addremove) else -%>
+		<div class="cbi-section-create cbi-tblsection-create">
+			<% if self.anonymous then %>
+				<input class="btn cbi-button cbi-button-add" type="submit" value="<%:Add%>" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" title="<%:Add%>" />
+			<% else %>
+				<% if self.invalid_cts then -%>
+					<div class="cbi-section-error"><%:Invalid%></div>
+				<%- end %>
+				<div>
+					<input type="text" class="cbi-section-create-name" id="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" data-type="uciname" data-optional="true" onkeyup="cbi_validate_named_section_add(this)"/>
+				</div>
+				<input class="btn cbi-button cbi-button-add" type="submit" onclick="this.form.cbi_state='add-section'; return true" value="<%:Add%>" title="<%:Add%>" disabled="" />
+			<% end %>
+		</div>
+		<%- end %>
+	<%- end -%>
+</div>
+<!-- /tblsection -->

luci-app-modem/po/zh-cn/modem.po

@@ -124,6 +124,15 @@ msgstr "自定义你的快捷命令"
 msgid "Custom Commands"
 msgstr "自定义命令"
 
+msgid "Serial Number"
+msgstr "序号"
+
+msgid "Description"
+msgstr "描述"
+
+msgid "Command"
+msgstr "命令"
+
 msgid "Modem Information"
 msgstr "模组信息"
 

luci-app-modem/root/etc/config/modem

@@ -119,6 +119,22 @@ config custom-commands
 	option description '切换为PCIE通信端口 > AT+QCFG="data_interface",1,0'
 	option command 'AT+QCFG="data_interface",1,0'
 
+config custom-commands
+	option description '查看当前USB速率 > AT+QCFG="usbspeed"'
+	option command 'AT+QCFG="usbspeed"'
+
+config custom-commands
+	option description '切换为USB2.0 > AT+QCFG="usbspeed","20"'
+	option command 'AT+QCFG="usbspeed","20"'
+
+config custom-commands
+	option description '切换为USB3.1 Gen1（5Gbps） > AT+QCFG="usbspeed","311"'
+	option command 'AT+QCFG="usbspeed","311"'
+
+config custom-commands
+	option description '切换为USB3.1 Gen1（10Gbps） > AT+QCFG="usbspeed","312"'
+	option command 'AT+QCFG="usbspeed","312"'
+
 config custom-commands
 	option description '重置模组 > AT+CFUN=1,1'
 	option command 'AT+CFUN=1,1'

luci-app-modem/root/usr/share/modem/custom_at_commands.json

@@ -29,6 +29,10 @@
 		{"获取模组温度 > AT+QTEMP":"AT+QTEMP"},
 		{"切换为USB通信端口 > AT+QCFG=\"data_interface\",0,0":"AT+QCFG=\"data_interface\",0,0"},
 		{"切换为PCIE通信端口 > AT+QCFG=\"data_interface\",1,0":"AT+QCFG=\"data_interface\",1,0"},
+        {"查看当前USB速率 > AT+QCFG=\"usbspeed\"":"AT+QCFG=\"usbspeed\""},
+        {"切换为USB2.0 > AT+QCFG=\"usbspeed\",\"20\"":"AT+QCFG=\"usbspeed\",\"20\""},
+        {"切换为USB3.1 Gen1（5Gbps） > AT+QCFG=\"usbspeed\",\"311\"":"AT+QCFG=\"usbspeed\",\"311\""},
+        {"切换为USB3.1 Gen1（10Gbps） > AT+QCFG=\"usbspeed\",\"312\"":"AT+QCFG=\"usbspeed\",\"312\""},
 		{"重置模组 > AT+CFUN=1,1":"AT+CFUN=1,1"},
 		{"****************广和通****************":"ATI"},
 		{"设置当前使用的为卡1 > AT+GTDUALSIM=0":"AT+GTDUALSIM=0"},

luci-app-modem/root/usr/share/modem/modem_support.json

@@ -25,6 +25,18 @@
                 "network_interface":"usb",
                 "modes":["qmi","gobinet","ecm","mbim","rndis","ncm"]
             },
+            "rm520n-cn":{
+                "manufacturer":"quectel",
+                "platform":"qualcomm",
+                "network_interface":"usb",
+                "modes":["qmi","gobinet","ecm","mbim","rndis","ncm"]
+            },
+            "rm520n-gl":{
+                "manufacturer":"quectel",
+                "platform":"qualcomm",
+                "network_interface":"usb",
+                "modes":["qmi","gobinet","ecm","mbim","rndis","ncm"]
+            },
             "fm650-cn":{
                 "manufacturer":"fibocom",
                 "platform":"unisoc",

luci-app-modem/root/usr/share/modem/quectel_at_commands.json

@@ -27,6 +27,10 @@
         {"获取模组温度 > AT+QTEMP":"AT+QTEMP"},
         {"切换为USB通信端口 > AT+QCFG=\"data_interface\",0,0":"AT+QCFG=\"data_interface\",0,0"},
         {"切换为PCIE通信端口 > AT+QCFG=\"data_interface\",1,0":"AT+QCFG=\"data_interface\",1,0"},
+        {"查看当前USB速率 > AT+QCFG=\"usbspeed\"":"AT+QCFG=\"usbspeed\""},
+        {"切换为USB2.0 > AT+QCFG=\"usbspeed\",\"20\"":"AT+QCFG=\"usbspeed\",\"20\""},
+        {"切换为USB3.1 Gen1（5Gbps） > AT+QCFG=\"usbspeed\",\"311\"":"AT+QCFG=\"usbspeed\",\"311\""},
+        {"切换为USB3.1 Gen1（10Gbps） > AT+QCFG=\"usbspeed\",\"312\"":"AT+QCFG=\"usbspeed\",\"312\""},
         {"重置模组 > AT+CFUN=1,1":"AT+CFUN=1,1"}
 	]
 }