From feb9c1aa59eefab768dc7e64e8c358d924fae2e3 Mon Sep 17 00:00:00 2001 From: henkwiedig Date: Tue, 22 Oct 2024 11:12:15 +0200 Subject: [PATCH] Install vtxmenu files (#1582) --- general/package/datalink/files/telemetry | 4 ++-- general/package/msposd/msposd.mk | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/general/package/datalink/files/telemetry b/general/package/datalink/files/telemetry index b56d25f7..f19409d6 100755 --- a/general/package/datalink/files/telemetry +++ b/general/package/datalink/files/telemetry @@ -40,8 +40,8 @@ case "$1" in mavlink-routerd -c /etc/mavlink.conf > /dev/null 2>&1 & else 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 & + msposd --channels "$channels" --master "$serial" --baudrate "$baud" \ + --out 127.0.0.1:$(($port_tx + 1)) -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 & diff --git a/general/package/msposd/msposd.mk b/general/package/msposd/msposd.mk index 0fca3c71..2de9a8e0 100644 --- a/general/package/msposd/msposd.mk +++ b/general/package/msposd/msposd.mk @@ -28,10 +28,12 @@ endef define MSPOSD_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/msposd + $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/safeboot.sh $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/share/fonts $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/share/fonts $(@D)/fonts/common/font.png $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/share/fonts $(@D)/fonts/common/font_hd.png + $(INSTALL) -m 644 -t $(TARGET_DIR)/etc $(@D)/vtxmenu.ini endef $(eval $(generic-package))