diff --git a/docs/index.rst b/docs/index.rst index d9d681a9..84e71888 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -352,6 +352,14 @@ ramips-mt7620 - GL-MT300N [#80211s]_ - GL-MT750 [#80211s]_ +* Nexx + + - WT3020AD/F/H + +* Xiaomi + + - Mi WiFi Mini + ramips-mt7621 ^^^^^^^^^^^^^ diff --git a/modules b/modules index 5583b77b..ddb56142 100644 --- a/modules +++ b/modules @@ -2,7 +2,7 @@ GLUON_FEEDS='packages routing luci gluon' OPENWRT_REPO=https://git.openwrt.org/openwrt/openwrt.git OPENWRT_BRANCH=openwrt-18.06 -OPENWRT_COMMIT=eef6bd3393f406f73187a670fa34d5e6a228f9e8 +OPENWRT_COMMIT=6e16dd1234ea4814af2b46a22b4aea111baef3ab PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git PACKAGES_PACKAGES_BRANCH=openwrt-18.06 @@ -10,7 +10,7 @@ PACKAGES_PACKAGES_COMMIT=d05b98c6c86da58db5cbda3c945007be09583609 PACKAGES_ROUTING_REPO=https://github.com/openwrt-routing/packages.git PACKAGES_ROUTING_BRANCH=openwrt-18.06 -PACKAGES_ROUTING_COMMIT=bc6e7f6903c8237c77131aedfc92dba40e1bc6ac +PACKAGES_ROUTING_COMMIT=ea345d16a6e27c2a8fdf67bf543cc36a5f189131 PACKAGES_LUCI_REPO=https://github.com/openwrt/luci.git PACKAGES_LUCI_BRANCH=openwrt-18.06 diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac b/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac index 18ae8229..f1bb79f1 100755 --- a/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac +++ b/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac @@ -26,10 +26,10 @@ end if platform.match('ar71xx', 'generic', {'tl-wdr3600', 'tl-wdr4300', 'tl-wr902ac-v1'}) then table.insert(try_files, 1, '/sys/class/ieee80211/phy1/macaddress') -elseif platform.match('ramips', 'mt7621', {'dir-860l-b1'}) then - table.insert(try_files, 1, '/sys/class/ieee80211/phy1/macaddress') -elseif platform.match('ar71xx', 'generic', {'unifi-outdoor-plus', 'carambola2', - 'a40', 'a60', 'koala', +elseif platform.match('ar71xx', 'generic', {'a40', 'a60', + 'archer-c7-v4', 'archer-c7-v5', + 'carambola2', + 'koala', 'mr600', 'mr600v2', 'mr900', 'mr900v2', 'mr1750', 'mr1750v2', @@ -39,7 +39,8 @@ elseif platform.match('ar71xx', 'generic', {'unifi-outdoor-plus', 'carambola2', 'om2p-lc', 'om5p', 'om5p-an', 'om5p-ac', 'om5p-acv2', - 'archer-c7-v4', 'archer-c7-v5'}) then + 'unifi-outdoor-plus', + 'unifiac-lite', 'unifiac-pro'}) then table.insert(try_files, 1, '/sys/class/net/eth0/address') elseif platform.match('ar71xx', 'generic', {'archer-c5', 'archer-c58-v1', 'archer-c59-v1', 'archer-c60-v1', @@ -48,6 +49,10 @@ elseif platform.match('ar71xx', 'generic', {'archer-c5', 'archer-c58-v1', elseif platform.match('ipq40xx', nil, {'avm,fritzbox-4040', 'openmesh,a42', 'openmesh,a62'}) then table.insert(try_files, 1, '/sys/class/net/eth0/address') +elseif platform.match('ramips', 'mt7620', {'miwifi-mini'}) then + table.insert(try_files, 1, '/sys/class/net/eth0/address') +elseif platform.match('ramips', 'mt7621', {'dir-860l-b1'}) then + table.insert(try_files, 1, '/sys/class/ieee80211/phy1/macaddress') end diff --git a/package/gluon-status-page/files/lib/gluon/status-page/www/static/status-page.js b/package/gluon-status-page/files/lib/gluon/status-page/www/static/status-page.js index 61d5f016..37bda815 100644 --- a/package/gluon-status-page/files/lib/gluon/status-page/www/static/status-page.js +++ b/package/gluon-status-page/files/lib/gluon/status-page/www/static/status-page.js @@ -1 +1 @@ -"use strict";!function(){var a=JSON.parse(document.body.getAttribute("data-translations"));function i(t,e){return t.toFixed(e).replace(/\./,a["."])}function o(t,e){e--;for(var n=t;10<=n&&0e[0]?-1:t[1]e[1]?1:0});var e=t[0][2];return e&&!/^fe80:/i.test(e)?e:void 0}}(t.network.addresses);if(u){if("span"===h.nodeName.toLowerCase()){var f=h;h=document.createElement("a"),f.parentNode.replaceChild(h,f)}h.href="http://["+u+"]/"}if(h.textContent=t.hostname,y&&t.location){var l=(e=y.latitude,n=y.longitude,r=t.location.latitude,i=t.location.longitude,a=Math.PI/180,o=(r*=a)-(e*=a),c=(i*=a)-(n*=a),s=Math.sin(o/2)*Math.sin(o/2)+Math.sin(c/2)*Math.sin(c/2)*Math.cos(e)*Math.cos(r),2*Math.asin(Math.sqrt(s))*6372.8);d.textContent=Math.round(1e3*l)+" m"}p()},update_mesh:function(n){Object.keys(v).forEach(function(t){var e=v[t];e.td.textContent=n[t]+e.suffix}),p()},update_wifi:function(t){s.textContent=t.signal,u.textContent=Math.round(t.inactive/1e3)+" s",a.classList.toggle("inactive",200e[0]?-1:t[1]e[1]?1:0});var e=t[0][2];return e&&!/^fe80:/i.test(e)?e:void 0}}(t.network.addresses);if(u){if("span"===h.nodeName.toLowerCase()){var l=h;h=document.createElement("a"),l.parentNode.replaceChild(h,l)}h.href="http://["+u+"]/"}if(h.textContent=t.hostname,y&&t.location){var f=(e=y.latitude,n=y.longitude,i=t.location.latitude,r=t.location.longitude,a=Math.PI/180,o=(i*=a)-(e*=a),c=(r*=a)-(n*=a),s=Math.sin(o/2)*Math.sin(o/2)+Math.sin(c/2)*Math.sin(c/2)*Math.cos(e)*Math.cos(i),2*Math.asin(Math.sqrt(s))*6372.8);d.textContent=Math.round(1e3*f)+" m"}p()},update_mesh:function(n){Object.keys(v).forEach(function(t){var e=v[t];e.td.textContent=n[t]+e.suffix}),p()},update_wifi:function(t){s.textContent=t.signal,u.textContent=Math.round(t.inactive/1e3)+" s",a.classList.toggle("inactive",200 -Date: Thu, 27 Dec 2018 15:02:41 +0100 -Subject: ramips: mt7621: fix 5GHz WiFi LED on ZBT WG3526 - -This fixes the 5GHz WiFi LED which was previously not working. - -Signed-off-by: Andreas Ziegler - -diff --git a/target/linux/ramips/dts/ZBT-WG3526.dtsi b/target/linux/ramips/dts/ZBT-WG3526.dtsi -index 104a51f8de7110c0f65f760af70033853f3da745..e42ec5e33de7fb69a9c668406f876f6443d2912b 100644 ---- a/target/linux/ramips/dts/ZBT-WG3526.dtsi -+++ b/target/linux/ramips/dts/ZBT-WG3526.dtsi -@@ -101,6 +101,10 @@ - mediatek,mtd-eeprom = <&factory 0x8000>; - ieee80211-freq-limit = <5000000 6000000>; - }; -+ -+ led { -+ led-sources = <2>; -+ }; - }; - }; - diff --git a/targets/ar71xx-generic b/targets/ar71xx-generic index 96b19d8f..2f6828ba 100644 --- a/targets/ar71xx-generic +++ b/targets/ar71xx-generic @@ -79,7 +79,7 @@ factory device gl-ar300m gl-ar300m factory -device gl-ar750 gl-ar750 +device gl.inet-gl-ar750 gl-ar750 packages $ATH10K_PACKAGES factory diff --git a/targets/ramips-mt7620 b/targets/ramips-mt7620 index 2f70cd65..026eb287 100644 --- a/targets/ramips-mt7620 +++ b/targets/ramips-mt7620 @@ -1,4 +1,5 @@ # GL Innovations + device gl-mt300a gl-mt300a factory @@ -7,3 +8,15 @@ factory device gl-mt750 gl-mt750 factory + +# Nexx + +device nexx-wt3020-8m wt3020-8M +alias nexx-wt3020ad +alias nexx-wt3020f +alias nexx-wt3020h + +# Xiaomi + +device xiaomi-miwifi-mini miwifi-mini +factory