diff --git a/br-ext-chip-goke/Config.in b/br-ext-chip-goke/Config.in index 0ca9b61a..06d9ef06 100644 --- a/br-ext-chip-goke/Config.in +++ b/br-ext-chip-goke/Config.in @@ -21,6 +21,7 @@ source "$BR2_EXTERNAL_GOKE_PATH/package/libwebsockets-openipc/Config.in" source "$BR2_EXTERNAL_GOKE_PATH/package/linux-firmware-openipc/Config.in" source "$BR2_EXTERNAL_GOKE_PATH/package/majestic-fonts/Config.in" source "$BR2_EXTERNAL_GOKE_PATH/package/majestic-gk7205v200/Config.in" +source "$BR2_EXTERNAL_GOKE_PATH/package/mavlink-router/Config.in" source "$BR2_EXTERNAL_GOKE_PATH/package/mbedtls-openipc/Config.in" source "$BR2_EXTERNAL_GOKE_PATH/package/microbe-web/Config.in" source "$BR2_EXTERNAL_GOKE_PATH/package/motors/Config.in" diff --git a/br-ext-chip-goke/configs/unknown_unknown_gk7205v200_fpv_defconfig b/br-ext-chip-goke/configs/unknown_unknown_gk7205v200_fpv_defconfig index e530b5f7..380a1498 100644 --- a/br-ext-chip-goke/configs/unknown_unknown_gk7205v200_fpv_defconfig +++ b/br-ext-chip-goke/configs/unknown_unknown_gk7205v200_fpv_defconfig @@ -104,3 +104,4 @@ BR2_PACKAGE_RTL8812AU_OPENIPC=y # FPV BR2_PACKAGE_WIFIBROADCAST=y +BR2_PACKAGE_MAVLINK_ROUTER=y diff --git a/br-ext-chip-goke/configs/unknown_unknown_gk7205v300_fpv_defconfig b/br-ext-chip-goke/configs/unknown_unknown_gk7205v300_fpv_defconfig index e68f0d28..bd3db177 100644 --- a/br-ext-chip-goke/configs/unknown_unknown_gk7205v300_fpv_defconfig +++ b/br-ext-chip-goke/configs/unknown_unknown_gk7205v300_fpv_defconfig @@ -104,3 +104,4 @@ BR2_PACKAGE_RTL8812AU_OPENIPC=y # FPV BR2_PACKAGE_WIFIBROADCAST=y +BR2_PACKAGE_MAVLINK_ROUTER=y diff --git a/br-ext-chip-goke/external.mk b/br-ext-chip-goke/external.mk index 719e9bc1..b03bce6a 100644 --- a/br-ext-chip-goke/external.mk +++ b/br-ext-chip-goke/external.mk @@ -21,6 +21,7 @@ include $(BR2_EXTERNAL_GOKE_PATH)/package/libwebsockets-openipc/libwebsockets-op include $(BR2_EXTERNAL_GOKE_PATH)/package/linux-firmware-openipc/linux-firmware-openipc.mk include $(BR2_EXTERNAL_GOKE_PATH)/package/majestic-fonts/majestic-fonts.mk include $(BR2_EXTERNAL_GOKE_PATH)/package/majestic-gk7205v200/majestic-gk7205v200.mk +include $(BR2_EXTERNAL_GOKE_PATH)/package/mavlink-router/mavlink-router.mk include $(BR2_EXTERNAL_GOKE_PATH)/package/mbedtls-openipc/mbedtls-openipc.mk include $(BR2_EXTERNAL_GOKE_PATH)/package/microbe-web/microbe-web.mk include $(BR2_EXTERNAL_GOKE_PATH)/package/motors/motors.mk diff --git a/br-ext-chip-goke/package/mavlink-router b/br-ext-chip-goke/package/mavlink-router new file mode 120000 index 00000000..e2c255be --- /dev/null +++ b/br-ext-chip-goke/package/mavlink-router @@ -0,0 +1 @@ +../../general/package/mavlink-router \ No newline at end of file diff --git a/br-ext-chip-hisilicon/Config.in b/br-ext-chip-hisilicon/Config.in index 401f1c3c..e55a383c 100644 --- a/br-ext-chip-hisilicon/Config.in +++ b/br-ext-chip-hisilicon/Config.in @@ -36,6 +36,7 @@ source "$BR2_EXTERNAL_HISILICON_PATH/package/majestic-hi3516cv300/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/majestic-hi3516cv500/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/majestic-hi3516ev300/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/majestic-hi3519v101/Config.in" +source "$BR2_EXTERNAL_HISILICON_PATH/package/mavlink-router/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/mbedtls-openipc/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/microbe-web/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/motors/Config.in" diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_fpv_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_fpv_defconfig index 621d9aa4..f2f22291 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_fpv_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_fpv_defconfig @@ -104,3 +104,4 @@ BR2_PACKAGE_RTL8812AU_OPENIPC=y # FPV BR2_PACKAGE_WIFIBROADCAST=y +BR2_PACKAGE_MAVLINK_ROUTER=y diff --git a/br-ext-chip-hisilicon/external.mk b/br-ext-chip-hisilicon/external.mk index f6bdc543..aea8d415 100644 --- a/br-ext-chip-hisilicon/external.mk +++ b/br-ext-chip-hisilicon/external.mk @@ -36,6 +36,7 @@ include $(BR2_EXTERNAL_HISILICON_PATH)/package/majestic-hi3516cv300/majestic-hi3 include $(BR2_EXTERNAL_HISILICON_PATH)/package/majestic-hi3516cv500/majestic-hi3516cv500.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/majestic-hi3516ev300/majestic-hi3516ev300.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/majestic-hi3519v101/majestic-hi3519v101.mk +include $(BR2_EXTERNAL_HISILICON_PATH)/package/mavlink-router/mavlink-router.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/mbedtls-openipc/mbedtls-openipc.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/microbe-web/microbe-web.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/motors/motors.mk diff --git a/br-ext-chip-hisilicon/package/mavlink-router b/br-ext-chip-hisilicon/package/mavlink-router new file mode 120000 index 00000000..e2c255be --- /dev/null +++ b/br-ext-chip-hisilicon/package/mavlink-router @@ -0,0 +1 @@ +../../general/package/mavlink-router \ No newline at end of file diff --git a/general/package/mavlink-router/Config.in b/general/package/mavlink-router/Config.in new file mode 100644 index 00000000..666743fd --- /dev/null +++ b/general/package/mavlink-router/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_MAVLINK_ROUTER + bool "mavlink-router" + help + MAVLink Router is an application to distribute MAVLink messages between multiple endpoints (connections). It distributes packets to a single port or multiple endpoints depending on the target address. Connections can be made via UART, UDP or TCP. + + https://github.com/mavlink-router/mavlink-router diff --git a/general/package/mavlink-router/files/S97mavlink b/general/package/mavlink-router/files/S97mavlink new file mode 100755 index 00000000..0cc86434 --- /dev/null +++ b/general/package/mavlink-router/files/S97mavlink @@ -0,0 +1,18 @@ +#!/bin/sh +# +# Start MAVlink Router +# + +case "$1" in + start) + echo "Starting mavlink router daemon..." + /usr/bin/mavlink-routerd & + ;; + stop) + echo "Stopping mavlink router daemon..." + kill -9 $(pidof mavlink-routerd) + ;; + *) + echo "Usage: $0 {start|stop}" + exit 1 +esac diff --git a/general/package/mavlink-router/files/mavlink-routerd b/general/package/mavlink-router/files/mavlink-routerd new file mode 100755 index 00000000..e1874891 Binary files /dev/null and b/general/package/mavlink-router/files/mavlink-routerd differ diff --git a/general/package/mavlink-router/files/mavlink.conf b/general/package/mavlink-router/files/mavlink.conf new file mode 100644 index 00000000..09fae7d7 --- /dev/null +++ b/general/package/mavlink-router/files/mavlink.conf @@ -0,0 +1,11 @@ +[General] +TcpServerPort = 0 + +[UartEndpoint drone] +Device = /dev/ttyAMA1 +Baud = 115200 + +[UdpEndpoint wfb] +Mode = Normal +Address = 127.0.0.1 +Port = 14550 diff --git a/general/package/mavlink-router/mavlink-router.mk b/general/package/mavlink-router/mavlink-router.mk new file mode 100644 index 00000000..42b054e3 --- /dev/null +++ b/general/package/mavlink-router/mavlink-router.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# mavlink-router +# +################################################################################ + +MAVLINK_ROUTER_LICENSE = ASF-2.0 + +define MAVLINK_ROUTER_INSTALL_TARGET_CMDS + $(INSTALL) -m 0755 -d $(TARGET_DIR)/usr/bin + cp ../general/package/mavlink-router/files/mavlink-routerd $(TARGET_DIR)/usr/bin/mavlink-routerd + + $(INSTALL) -m 755 -d $(TARGET_DIR)/etc + cp ../general/package/mavlink-router/files/mavlink.conf $(TARGET_DIR)/etc/mavlink.conf + + $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d + cp ../general/package/mavlink-router/files/S97mavlink $(TARGET_DIR)/etc/init.d +endef + +$(eval $(generic-package)) diff --git a/general/package/mavlink-router/readme.md b/general/package/mavlink-router/readme.md new file mode 100644 index 00000000..2ab19d90 --- /dev/null +++ b/general/package/mavlink-router/readme.md @@ -0,0 +1,7 @@ +# MAVLink Router Package + +Все необходимые настройки находятся в /etc/mavlink.conf + +Запуск и остановка сервиса /etc/init.d/S97mavlink [start|stop] + +Полный список всех возможных [настроек](https://github.com/mavlink-router/mavlink-router/blob/master/examples/config.sample) можно получить из сэмпла конфига с официального гитхаба.