From 6860e06bdad7ebf6da9da5578b5806fef1d5ac85 Mon Sep 17 00:00:00 2001
From: viktorxda <35473052+viktorxda@users.noreply.github.com>
Date: Wed, 19 Feb 2025 17:35:52 +0100
Subject: [PATCH] [no ci] Update wifibroadcast-ng
---
general/package/legacy/datalink/files/tweaksys | 1 -
general/package/wifibroadcast-ng/files/wfb.yaml | 2 +-
.../package/wifibroadcast-ng/files/wifibroadcast | 6 +++++-
.../sensor}/imx415_fpv.bin | Bin
.../package/wifibroadcast-ng/wifibroadcast-ng.mk | 3 +++
5 files changed, 9 insertions(+), 3 deletions(-)
rename general/package/{sigmastar-osdrv-infinity6e/files/sensor/configs => wifibroadcast-ng/sensor}/imx415_fpv.bin (100%)
diff --git a/general/package/legacy/datalink/files/tweaksys b/general/package/legacy/datalink/files/tweaksys
index 9c9d6fbf..e4ab6903 100755
--- a/general/package/legacy/datalink/files/tweaksys
+++ b/general/package/legacy/datalink/files/tweaksys
@@ -90,7 +90,6 @@ sigmastar() {
sed -i "s|serial=/dev/ttyAMA0|serial=/dev/ttyS2|g" /etc/telemetry.conf
sed -i "s|Device = /dev/ttyAMA0|Device = /dev/ttyS2|g" /etc/mavlink.conf
- cli -s .isp.sensorConfig /etc/sensors/imx415_fpv.bin
cli -s .isp.exposure 5
cli -s .video0.codec h265
cli -s .video0.size 1920x1080
diff --git a/general/package/wifibroadcast-ng/files/wfb.yaml b/general/package/wifibroadcast-ng/files/wfb.yaml
index 0bd421e6..0d45dd10 100644
--- a/general/package/wifibroadcast-ng/files/wfb.yaml
+++ b/general/package/wifibroadcast-ng/files/wfb.yaml
@@ -3,7 +3,7 @@ wireless:
channel: 161
mode: HT20
broadcast:
- wfb_index: 1
+ wfb_index: 2
tun_index: 1
fec_k: 8
fec_n: 12
diff --git a/general/package/wifibroadcast-ng/files/wifibroadcast b/general/package/wifibroadcast-ng/files/wifibroadcast
index 11c15ed1..480f2467 100755
--- a/general/package/wifibroadcast-ng/files/wifibroadcast
+++ b/general/package/wifibroadcast-ng/files/wifibroadcast
@@ -63,7 +63,7 @@ load_interface() {
start_broadcast() {
echo "- Starting wfb_tx"
- wfb_tx -K "$wfb_key" -M "$wfb_index" -B "$bandwidth" -C 8000 \
+ wfb_tx -K "$wfb_key" -M "$wfb_index" -B "$bandwidth" -C 8000 -G short \
-k "$fec_k" -n "$fec_n" -i "$link_id" "$wfb_dev" &> /dev/null &
}
@@ -92,12 +92,16 @@ start_telemetry() {
video_settings() {
[ "$(ipcinfo -s)" = "imx415" ] && cli -s .isp.sensorConfig /etc/sensors/imx415_fpv.bin
+
cli -s .isp.exposure 5
cli -s .video0.fps 60
+ cli -s .video0.bitrate 10240
cli -s .video0.codec h265
cli -s .video0.rcMode cbr
cli -s .outgoing.enabled true
cli -s .outgoing.server udp://0.0.0.0:5600
+ cli -s .fpv.enabled true
+ cli -s .fpv.noiseLevel 1
}
start() {
diff --git a/general/package/sigmastar-osdrv-infinity6e/files/sensor/configs/imx415_fpv.bin b/general/package/wifibroadcast-ng/sensor/imx415_fpv.bin
similarity index 100%
rename from general/package/sigmastar-osdrv-infinity6e/files/sensor/configs/imx415_fpv.bin
rename to general/package/wifibroadcast-ng/sensor/imx415_fpv.bin
diff --git a/general/package/wifibroadcast-ng/wifibroadcast-ng.mk b/general/package/wifibroadcast-ng/wifibroadcast-ng.mk
index 2c4fcb33..2a3445a9 100644
--- a/general/package/wifibroadcast-ng/wifibroadcast-ng.mk
+++ b/general/package/wifibroadcast-ng/wifibroadcast-ng.mk
@@ -22,6 +22,9 @@ define WIFIBROADCAST_NG_INSTALL_TARGET_CMDS
$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d
$(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(WIFIBROADCAST_NG_PKGDIR)/files/S98wifibroadcast
+ $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensors
+ $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors $(WIFIBROADCAST_NG_PKGDIR)/sensor/*
+
$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/wfb_rx
$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/wfb_tx