mirror of https://github.com/aredn/aredn.git
Compare commits
4 Commits
75383b9312
...
e51fedc394
Author | SHA1 | Date |
---|---|---|
Tim Wilkinson | e51fedc394 | |
Tim Wilkinson | 608ec75ff8 | |
Tim Wilkinson | d1342289c2 | |
Paul K3PGM | 3fee4eadae |
|
@ -41,6 +41,24 @@
|
|||
"maxpower": "23"
|
||||
},
|
||||
"gl.inet gl-b1300": {
|
||||
"wlan0": {
|
||||
"maxpower": 20,
|
||||
"bandwidths": [ 5, 10, 20 ],
|
||||
"antenna": {
|
||||
"description": "2.1 dBi Omni",
|
||||
"gain": 2.1,
|
||||
"beamwidth": 360
|
||||
}
|
||||
},
|
||||
"wlan1": {
|
||||
"maxpower": 20,
|
||||
"bandwidths": [ 5, 10, 20 ],
|
||||
"antenna": {
|
||||
"description": "8.4 dBi Omni",
|
||||
"gain": 8.4,
|
||||
"beamwidth": 360
|
||||
}
|
||||
}
|
||||
},
|
||||
"gl.inet gl-mt1300": {
|
||||
"wlan0": {
|
||||
|
|
|
@ -483,6 +483,15 @@ if fw_install and nixio.fs.stat(tmpdir .. "/firmware") then
|
|||
aredn.info.set_nvram("nodeupgraded", "0")
|
||||
os.execute("reboot >/dev/null 2>&1")
|
||||
else
|
||||
-- Show a different reload address if we're running on the ramdisk
|
||||
local hostname = "192.168.1.1"
|
||||
for line in io.lines("/proc/mounts")
|
||||
do
|
||||
if line:match("overlay") or line:match("ext4") then
|
||||
hostname = node .. ".local.mesh"
|
||||
break
|
||||
end
|
||||
end
|
||||
html.print([[
|
||||
<center><h2>Firmware will be written in the background.</h2>
|
||||
<h3>If your computer is connected to the LAN of this node you may need to acquire<br>
|
||||
|
@ -490,7 +499,7 @@ if fw_install and nixio.fs.stat(tmpdir .. "/firmware") then
|
|||
<h3>The node will reboot twice while the configuration is applied<br>
|
||||
When the node has finished booting you should ensure your computer has<br>
|
||||
received a new IP address and reconnect with<br>
|
||||
<a href='http://]] .. node .. [[.local.mesh:8080/'>http://]] .. node .. [[.local.mesh:8080/</a><br>
|
||||
<a href='http://]] .. hostname .. [[:8080/'>http://]] .. hostname .. [[:8080/</a><br>
|
||||
This page will automatically reload once the upgrade has completed</h3>
|
||||
<br><h1 id='countdown'></h1>
|
||||
</center></body></html>
|
||||
|
|
|
@ -26,3 +26,17 @@
|
|||
+ { "s25fl116k", INFO(0x014015, 0, 64 * 1024, 32,
|
||||
+ SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
|
||||
+ { "s25fl132k", INFO(0x014016, 0, 64 * 1024, 64, SECT_4K) },
|
||||
--- /dev/null
|
||||
+++ b/target/linux/ath79/patches-5.15/941-mikrotik-nand-flash.patch
|
||||
@@ -0,0 +1,11 @@
|
||||
+--- a/drivers/mtd/nand/raw/nand_amd.c
|
||||
++++ b/drivers/mtd/nand/raw/nand_amd.c
|
||||
+@@ -44,6 +44,8 @@
|
||||
+ chip->options |= NAND_BBM_FIRSTPAGE | NAND_BBM_SECONDPAGE |
|
||||
+ NAND_BBM_LASTPAGE;
|
||||
+
|
||||
++ chip->options |= NAND_NO_SUBPAGE_WRITE;
|
||||
++
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
|
|
|
@ -2,15 +2,6 @@ Index: openwrt/feeds/packages/net/iperf3/Makefile
|
|||
===================================================================
|
||||
--- openwrt.orig/feeds/packages/net/iperf3/Makefile
|
||||
+++ openwrt/feeds/packages/net/iperf3/Makefile
|
||||
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=iperf
|
||||
PKG_VERSION:=3.16
|
||||
-PKG_RELEASE:=1
|
||||
+PKG_RELEASE:=1AREDN
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://downloads.es.net/pub/iperf
|
||||
@@ -72,6 +72,18 @@ endef
|
||||
define Package/iperf3/install
|
||||
$(INSTALL_DIR) $(1)/usr/bin
|
||||
|
|
Loading…
Reference in New Issue