[PATCH 1/2] fff-wireless: merge WiFi adjustments in one simple script
Fabian Bläse
fabian at blaese.de
Di Nov 19 21:40:15 CET 2019
Ja, sehr gut. Viel besser.
Hab jetzt nicht alle Werte gegengeprüft.
Reviewed-by: Fabian Bläse <fabian at blaese.de>
Gruß
Fabian
On 19.11.19 15:06, Adrian Schmutzler wrote:
> This merges the wifi.* files into a single script, which improves
> overview/manageability and makes merging of cases possible.
>
> Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
>
> ---
>
> I'm using this for about a year already ...
> ---
> src/packages/fff/fff-wireless/Makefile | 2 +-
> .../files/etc/uci-defaults/62-config-wireless | 48 +++++++++++++++++--
> .../fff/fff-wireless/files/etc/wifi.cpe210-v2 | 2 -
> .../fff/fff-wireless/files/etc/wifi.cpe210-v3 | 2 -
> .../files/etc/wifi.tl-wr1043nd-v1 | 2 -
> .../fff-wireless/files/etc/wifi.ubnt-loco-m | 2 -
> .../files/etc/wifi.ubnt-loco-m-xw | 2 -
> .../fff-wireless/files/etc/wifi.ubnt-nano-m | 2 -
> .../fff-wireless/files/etc/wifi.ubnt-pico-m | 2 -
> .../files/etc/wifi.ubnt-power-m-xw | 2 -
> .../fff-wireless/files/etc/wifi.ubnt-unifi | 3 --
> .../files/etc/wifi.ubnt-unifiac-lite | 3 --
> 12 files changed, 46 insertions(+), 26 deletions(-)
> delete mode 100644 src/packages/fff/fff-wireless/files/etc/wifi.cpe210-v2
> delete mode 100644 src/packages/fff/fff-wireless/files/etc/wifi.cpe210-v3
> delete mode 100644 src/packages/fff/fff-wireless/files/etc/wifi.tl-wr1043nd-v1
> delete mode 100644 src/packages/fff/fff-wireless/files/etc/wifi.ubnt-loco-m
> delete mode 100644 src/packages/fff/fff-wireless/files/etc/wifi.ubnt-loco-m-xw
> delete mode 100644 src/packages/fff/fff-wireless/files/etc/wifi.ubnt-nano-m
> delete mode 100644 src/packages/fff/fff-wireless/files/etc/wifi.ubnt-pico-m
> delete mode 100644 src/packages/fff/fff-wireless/files/etc/wifi.ubnt-power-m-xw
> delete mode 100644 src/packages/fff/fff-wireless/files/etc/wifi.ubnt-unifi
> delete mode 100644 src/packages/fff/fff-wireless/files/etc/wifi.ubnt-unifiac-lite
>
> diff --git a/src/packages/fff/fff-wireless/Makefile b/src/packages/fff/fff-wireless/Makefile
> index 6c0b6a9b..9b7b4d3f 100644
> --- a/src/packages/fff/fff-wireless/Makefile
> +++ b/src/packages/fff/fff-wireless/Makefile
> @@ -1,7 +1,7 @@
> include $(TOPDIR)/rules.mk
>
> PKG_NAME:=fff-wireless
> -PKG_RELEASE:=8
> +PKG_RELEASE:=9
>
> PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
>
> diff --git a/src/packages/fff/fff-wireless/files/etc/uci-defaults/62-config-wireless b/src/packages/fff/fff-wireless/files/etc/uci-defaults/62-config-wireless
> index f900b2c0..cb057c2d 100644
> --- a/src/packages/fff/fff-wireless/files/etc/uci-defaults/62-config-wireless
> +++ b/src/packages/fff/fff-wireless/files/etc/uci-defaults/62-config-wireless
> @@ -4,6 +4,48 @@
>
> BOARD="$(uci get board.model.name)"
>
> -if [ -s "/etc/wifi.$BOARD" ] ; then
> - . "/etc/wifi.$BOARD"
> -fi
> +# antenna gain
> +case "$BOARD" in
> + tl-wr1043nd-v1)
> + uci -q set wireless.radio0.antenna_gain=3
> + uci -q commit wireless
> + ;;
> + ubnt-loco-m|\
> + ubnt-loco-m-xw)
> + uci -q set wireless.radio0.antenna_gain=9
> + uci -q commit wireless
> + ;;
> + ubnt-nano-m)
> + uci -q set wireless.radio0.antenna_gain=11
> + uci -q commit wireless
> + ;;
> + ubnt-pico-m)
> + uci -q set wireless.radio0.antenna_gain=12
> + uci -q commit wireless
> + ;;
> + ubnt-power-m-xw)
> + uci -q set wireless.radio0.antenna_gain=18
> + uci -q commit wireless
> + ;;
> + ubnt-unifi)
> + # No support for Unifi AP Pro!
> + uci -q set wireless.radio0.antenna_gain=3
> + uci -q commit wireless
> + ;;
> + ubnt-unifiac-lite)
> + # These are the values for the AC MESH.
> + # The actual AC Lite has different values
> + uci -q set wireless.radio0.antenna_gain=4
> + uci -q set wireless.radio1.antenna_gain=3
> + uci -q commit wireless
> + ;;
> +esac
> +
> +# rssileds
> +case "$BOARD" in
> + cpe210-v2|\
> + cpe210-v3)
> + uci -q set system.rssid_wlan0.dev=radio0
> + uci -q commit system
> + ;;
> +esac
> diff --git a/src/packages/fff/fff-wireless/files/etc/wifi.cpe210-v2 b/src/packages/fff/fff-wireless/files/etc/wifi.cpe210-v2
> deleted file mode 100644
> index 3a5f3c49..00000000
> --- a/src/packages/fff/fff-wireless/files/etc/wifi.cpe210-v2
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -uci -q set system.rssid_wlan0.dev=radio0
> -uci -q commit system
> diff --git a/src/packages/fff/fff-wireless/files/etc/wifi.cpe210-v3 b/src/packages/fff/fff-wireless/files/etc/wifi.cpe210-v3
> deleted file mode 100644
> index 3a5f3c49..00000000
> --- a/src/packages/fff/fff-wireless/files/etc/wifi.cpe210-v3
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -uci -q set system.rssid_wlan0.dev=radio0
> -uci -q commit system
> diff --git a/src/packages/fff/fff-wireless/files/etc/wifi.tl-wr1043nd-v1 b/src/packages/fff/fff-wireless/files/etc/wifi.tl-wr1043nd-v1
> deleted file mode 100644
> index f1a7017f..00000000
> --- a/src/packages/fff/fff-wireless/files/etc/wifi.tl-wr1043nd-v1
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -uci -q set wireless.radio0.antenna_gain=3
> -uci -q commit wireless
> diff --git a/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-loco-m b/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-loco-m
> deleted file mode 100644
> index 3c5110e4..00000000
> --- a/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-loco-m
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -uci -q set wireless.radio0.antenna_gain=9
> -uci -q commit wireless
> diff --git a/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-loco-m-xw b/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-loco-m-xw
> deleted file mode 100644
> index 3c5110e4..00000000
> --- a/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-loco-m-xw
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -uci -q set wireless.radio0.antenna_gain=9
> -uci -q commit wireless
> diff --git a/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-nano-m b/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-nano-m
> deleted file mode 100644
> index 8b44ac83..00000000
> --- a/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-nano-m
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -uci -q set wireless.radio0.antenna_gain=11
> -uci -q commit wireless
> diff --git a/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-pico-m b/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-pico-m
> deleted file mode 100644
> index 2cac5233..00000000
> --- a/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-pico-m
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -uci -q set wireless.radio0.antenna_gain=12
> -uci -q commit wireless
> diff --git a/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-power-m-xw b/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-power-m-xw
> deleted file mode 100644
> index 9d3ff906..00000000
> --- a/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-power-m-xw
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -uci -q set wireless.radio0.antenna_gain=18
> -uci -q commit wireless
> diff --git a/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-unifi b/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-unifi
> deleted file mode 100644
> index 903c7b6a..00000000
> --- a/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-unifi
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -# No support for Unifi AP Pro!
> -uci -q set wireless.radio0.antenna_gain=3
> -uci -q commit wireless
> diff --git a/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-unifiac-lite b/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-unifiac-lite
> deleted file mode 100644
> index 9b4438d9..00000000
> --- a/src/packages/fff/fff-wireless/files/etc/wifi.ubnt-unifiac-lite
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -uci -q set wireless.radio0.antenna_gain=4
> -uci -q set wireless.radio1.antenna_gain=3
> -uci -q commit wireless
>
-------------- nächster Teil --------------
Ein Dateianhang mit Binärdaten wurde abgetrennt...
Dateiname : signature.asc
Dateityp : application/pgp-signature
Dateigröße : 833 bytes
Beschreibung: OpenPGP digital signature
URL : <https://lists.freifunk.net/pipermail/franken-dev-freifunk.net/attachments/20191119/c3fae50b/attachment.sig>
Mehr Informationen über die Mailingliste franken-dev