Merge remote-tracking branch 'upstream/master'

libc0607 · Sep 30, 2024 · 79d8407 · 79d8407
2 parents 9bcbdf2 + fb89615
commit 79d8407
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 10 deletions.
diff --git a/general/overlay/etc/wireless/usb b/general/overlay/etc/wireless/usb
@@ -48,6 +48,14 @@ if [ "$1" = "mt7601u-gk7205v200-camhi" ]; then
 	exit 0
 fi
 
+# GK7205V300 CamHi
+if [ "$1" = "mt7601u-gk7205v300-camhi" ]; then
+	devmem 0x100C0080 32 0x530
+	set_gpio 7 0
+	modprobe mt7601u
+	exit 0
+fi
+
 # GK7205V200 CamHi
 if [ "$1" = "rtl8733bu-gk7205v200-camhi" ]; then
 	set_gpio 9 0

diff --git a/general/package/datalink/files/telemetry b/general/package/datalink/files/telemetry
@@ -39,8 +39,13 @@ case "$1" in
 		if [ "$router" -eq 1 ] || [ "$fw" = "lte" ]; then
 			mavlink-routerd -c /etc/mavlink.conf > /dev/null 2>&1 &
 		else
-			mavfwd --channels "$channels" --master "$serial" --baudrate "$baud" -p 100 -t -a "$aggregate" \
+			if [ "$router" -eq 2  ]; then
+				msposd --master "$serial" --baudrate "$baud" --channels "$channels" \
+				--out 127.0.0.1:14555 -osd -r "$fps" --ahi "$ahi" > /dev/null &
+			else
+				mavfwd --channels "$channels" --master "$serial" --baudrate "$baud" -p 100 -t -a "$aggregate" \
 				--out 127.0.0.1:$port_tx --in 127.0.0.1:$port_rx > /dev/null &
+			fi
 		fi
 		if [ "$fw" = "fpv" ] || [ "$fw" = "venc" ]; then
 			start_${unit}_telemetry
@@ -53,6 +58,7 @@ case "$1" in
 		killall -q telemetry_tx
 		killall -q mavlink-routerd
 		killall -q mavfwd
+		killall -q msposd
 		;;
 
 	*)

diff --git a/general/package/datalink/files/telemetry_drone.conf b/general/package/datalink/files/telemetry_drone.conf
@@ -4,7 +4,7 @@ unit=drone
 serial=/dev/ttyAMA0
 baud=115200
 
-### router: use simple mavfwd (0) or classic mavlink-routerd (1)
+### router: use simple mavfwd (0), classic mavlink-routerd (1) or msposd instead of mavfwd (2)
 router=0
 
 wlan=wlan0
@@ -27,3 +27,7 @@ aggregate=15
 
 ### for mavfwd: RC override channels to parse after first 4 and call /usr/sbin/channels.sh $ch $val, default 0
 channels=8
+
+### for msposd: OSD over video
+fps=20
+ahi=0
diff --git a/general/package/mavfwd/mavfwd.mk b/general/package/mavfwd/mavfwd.mk
@@ -4,25 +4,24 @@
 #
 ################################################################################
 
-MAVFWD_SITE_METHOD = git
-MAVFWD_SITE = https://github.com/openipc/mavfwd
-MAVFWD_VERSION = 70da7adbdbe36d371ca849c4a3bc3cadb54498d3
+MAVFWD_SITE = $(call github,openipc,mavfwd,$(MAVFWD_VERSION))
+MAVFWD_VERSION = HEAD
 
 MAVFWD_LICENSE = MIT
 MAVFWD_LICENSE_FILES = LICENSE
 
 MAVFWD_DEPENDENCIES = libevent-openipc
 
 define MAVFWD_BUILD_CMDS
-    (cd $(@D); $(TARGET_CC) -levent_core -s mavfwd.c -o mavfwd)
+	$(TARGET_CC) $(@D)/mavfwd.c -o $(@D)/mavfwd -levent_core -s
 endef
 
 define MAVFWD_INSTALL_TARGET_CMDS
-    $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
-    $(INSTALL) -m 0755 -D $(@D)/mavfwd $(TARGET_DIR)/usr/bin/mavfwd
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
+	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/mavfwd
 
-    $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/sbin
-    cp $(MAVFWD_PKGDIR)/files/channels.sh $(TARGET_DIR)/usr/sbin
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/sbin
+	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/sbin $(MAVFWD_PKGDIR)/files/channels.sh
 endef
 
 $(eval $(generic-package))