update 2022-10-23 20:25:46

This commit is contained in:
github-actions[bot]
2022-10-23 20:25:46 +08:00
parent 53f1c94fa9
commit 48cf7ff241
7 changed files with 97 additions and 8 deletions

View File

@@ -16,7 +16,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-amlogic
PKG_VERSION:=3.1.135
PKG_VERSION:=3.1.136
PKG_RELEASE:=1
PKG_LICENSE:=GPL-2.0 License

View File

@@ -69,6 +69,13 @@ elif [[ "$(echo ${MYDEVICE_NAME} | grep "Radxa ROCK 5B")" != "" ]]; then
MYDTB_FDTFILE="rk3588-rock-5b.dtb"
fi
SOC="rock5b"
elif [[ "$(echo ${MYDEVICE_NAME} | grep "HINLINK OWL H88K V1 Board")" != "" ]]; then
if [ -n "${CURRENT_FDTFILE}" ]; then
MYDTB_FDTFILE="${CURRENT_FDTFILE}"
else
MYDTB_FDTFILE="rk3588-h88k.dtb"
fi
SOC="h88k"
else
echo "Unknown device: [ ${MYDEVICE_NAME} ], Not supported."
exit 1

View File

@@ -11,8 +11,8 @@ PKG_NAME:=luci-app-netspeedtest
LUCI_TITLE:=LuCI Support for netspeedtest
LUCI_DEPENDS:=+python3 +iperf3 +speedtest-web
LUCI_PKGARCH:=all
PKG_VERSION:=2.0.3
PKG_RELEASE:=20221018
PKG_VERSION:=2.0.4
PKG_RELEASE:=20221023
PKG_MAINTAINER:=<https://github.com/sirpdboy/netspeedtest>
include $(TOPDIR)/feeds/luci/luci.mk

View File

@@ -136,7 +136,7 @@ luci-app-netspeedtest 网络速度诊断测试(包括:内网网页版测速
## 感谢
感谢sivel、user1121114685、ZeaKyX、佐须之男、lean等。因为有你们珠玉在前
感谢superspeed、user1121114685、ZeaKyX、佐须之男、lean等。因为有你们珠玉在前
## 捐助

View File

@@ -0,0 +1,79 @@
<%#
Copyright 2020-2022 sirpdboy Wich <sirpdboy@qq.com>
https://github.com/sirpdboy/netspeedtest
Licensed to the public under the Apache License 2.0.
-%>
<script type="text/javascript" src="<%=resource%>/cbi.js?v=1.1"></script>
<%+cbi/valueheader%>
<script type="text/javascript">//<![CDATA[
var stxhr = new XHR();
function update_status(field, proto)
{
var tool = field.name;
var addr = field.value;
var protocol = proto ;
var legend = document.getElementById('test-iperf-legend');
var output = document.getElementById('test-iperf-output');
if (legend && output)
{
output.innerHTML =
'<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /> ' +
'<%:Waiting for command to complete...%>'
;
legend.parentNode.style.display = 'block';
legend.style.display = 'inline';
stxhr.post('<%=url('admin/network')%>/test_' + tool + protocol + '/' + addr, { token: '<%=token%>' },
function(x)
{
if (x.responseText)
{
legend.style.display = 'none';
output.innerHTML = String.format('<pre>%h</pre>', x.responseText);
}
else
{
legend.style.display = 'none';
output.innerHTML ='</p> <%:Operation execution complete%></p>';
}
}
);
}
}
//]]></script>
<form method="post" action="<%=url('admin/network/netspeedtest')%>">
<table>
<tr><td class="cbi-value-title" ><input style="margin: 5px 0" type="hidden" value="" name="iperf" />
<select name="iperf_to" style="width:auto">
<option value="0" selected="selected"><%:iperfstart%></option>
<option value="1"><%:iperfstop%></option>
</select></td>
<td class="cbi-value-field" style="width:100%;" >
<input type="button" value="<%:Perform operation%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.iperf,this.form.iperf_to.selectedIndex)" /></td>
</tr>
<tr><td class="cbi-value-title" ><%:iperf3 instructions%></td>
<td class="cbi-value-field" ><%:The speed measurement terminal must be in the same LAN as the router that starts the speed measurement%><br /><%:Operation steps: start router speed measurement service download test client run speed measurement client input IP address of router speed measurement service%></td>
</tr>
<tr>
<td class="cbi-value-title"><%:Iperf3 speed measurement software download%></td>
<td class="cbi-value-field" >
<input type="button" class="cbi-button cbi-input-reload" value="<%:Domestic download password:%>cpd6" onclick="javascript:window.open('https://sipdboy.lanzoui.com/b01c3esih','target');" />
<input type="button" class="cbi-button cbi-input-reload" value="<%:Download from foreign official websites%>" onclick="javascript:window.open('https://iperf.fr/iperf-download.php','target');" /></td>
</tr>
</table>
<fieldset class="cbi-section" style="display:none">
<legend id="test-iperf-legend">
<%:Collecting data...%>
</legend>
<span id="test-iperf-output"></span>
</fieldset>
</form>
<%+cbi/valuefooter%>

6
luci-app-netspeedtest/root/etc/init.d/netspeedtest Normal file → Executable file
View File

@@ -2,9 +2,7 @@
#
# Copyright (C) 2020-2022 sirpdboy <herboy2008@gmail.com> https://github.com/sirpdboy/netspeedtest
#
# This file is part of ddns-go .
#
# This is free software, licensed under the Apache License, Version 2.0 .
#
@@ -84,6 +82,6 @@ start_service() {
}
service_triggers() {
procd_add_reload_trigger "speedtest-web"
procd_add_reload_trigger "netspeedtest"
}

View File

@@ -0,0 +1,5 @@
#!/bin/sh
chmod +x /etc/init.d/netspeedtest /usr/bin/speedtest >/dev/null 2>&1
rm -rf /tmp/luci-modulecache /tmp/luci-indexcache*
exit 0