Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-24 15:40:31 +08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

serial_passthru:Move CONFIG_xxx to serial_passthru

Browse Source
This commit is contained in:
David Sidrane
2022-02-03 12:15:48 -08:00
committed by Daniel Agar
parent 81b08a0168
commit 0c936e4fd2
3 changed files with 70 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boards/matek/gnss-m9n-f4/nuttx-config/Kconfig
-23
View File
@@ -1,23 +0,0 @@
menu "SERIAL_PASSTHRU Configuration"
config SERIAL_PASSTHRU_UBLOX
bool "Detect and Auto Connect on U-Center messages"
default n
---help---
This option will enable the cdc_acm_check to launch
The passthru driver.
config SERIAL_PASSTHRU_UBLOX_DEV
string "Device path of the GPS"
depends on SERIAL_PASSTHRU_UBLOX
default "/dev/ttyS2"
---help---
This is the path of the device used as the right side
of the passthru.
config SERIAL_PASSTHRU_UBLOX_BAUDRATE
string "baudrate"
depends on SERIAL_PASSTHRU_UBLOX
default "115200"
---help---
This option sets the baudrate for the passthru.
endmenu
platforms/nuttx/src/px4/common/cdc_acm_check.cpp
+19 -1
View File
@@ -50,6 +50,24 @@ __END_DECLS
#define USB_DEVICE_PATH "/dev/ttyACM0"
#if defined(CONFIG_SERIAL_PASSTHRU_UBLOX)
# undef SERIAL_PASSTHRU_UBLOX_DEV
# if defined(CONFIG_SERIAL_PASSTHRU_GPS1) && defined(CONFIG_BOARD_SERIAL_GPS1)
# define SERIAL_PASSTHRU_UBLOX_DEV CONFIG_BOARD_SERIAL_GPS1
# elif defined(CONFIG_SERIAL_PASSTHRU_GPS2)&& defined(CONFIG_BOARD_SERIAL_GPS2)
# define SERIAL_PASSTHRU_UBLOX_DEV CONFIG_BOARD_SERIAL_GPS2
# elif defined(CONFIG_SERIAL_PASSTHRU_GPS3)&& defined(CONFIG_BOARD_SERIAL_GPS3)
# define SERIAL_PASSTHRU_UBLOX_DEV CONFIG_BOARD_SERIAL_GPS3
# elif defined(CONFIG_SERIAL_PASSTHRU_GPS4)&& defined(CONFIG_BOARD_SERIAL_GPS4)
# define SERIAL_PASSTHRU_UBLOX_DEV CONFIG_BOARD_SERIAL_GPS4
# elif defined(CONFIG_SERIAL_PASSTHRU_GPS5) && defined(CONFIG_BOARD_SERIAL_GPS5)
# define SERIAL_PASSTHRU_UBLOX_DEV CONFIG_BOARD_SERIAL_GPS5
# endif
# if !defined(SERIAL_PASSTHRU_UBLOX_DEV)
# error "CONFIG_SERIAL_PASSTHRU_GPSn and CONFIG_BOARD_SERIAL_GPSn must be defined"
# endif
#endif
static struct work_s usb_serial_work;
static bool vbus_present_prev = false;
static int ttyacm_fd = -1;
@@ -204,7 +222,7 @@ static void mavlink_usb_check(void *arg)
snprintf(baudstring, sizeof(baudstring), "%d", baudrate);
static const char *gps_argv[] {"gps", "stop", nullptr};
static const char *passthru_argv[] {"serial_passthru", "start", "-t", "-b", baudstring, "-e", USB_DEVICE_PATH, "-d", CONFIG_SERIAL_PASSTHRU_UBLOX_DEV, nullptr};
static const char *passthru_argv[] {"serial_passthru", "start", "-t", "-b", baudstring, "-e", USB_DEVICE_PATH, "-d", SERIAL_PASSTHRU_UBLOX_DEV, nullptr};
#endif
char **exec_argv = nullptr;
src/systemcmds/serial_passthru/Kconfig
+51
View File
@@ -4,3 +4,54 @@ menuconfig SYSTEMCMDS_SERIAL_PASSTHRU
---help---
Enable support for passing one sevice to another
i.e ttyACM to ttyS5
if SYSTEMCMDS_SERIAL_PASSTHRU
config SERIAL_PASSTHRU_UBLOX
bool "Detect and Auto Connect on U-Center messages"
default n
---help---
This option will enable the cdc_acm_check to launch
The passthru driver.
#
# GPS Passthru device selection
#
choice
prompt "Passthru device"
default SERIAL_PASSTHRU_GPS1 if BOARD_SERIAL_GPS1 != ""
depends on SERIAL_PASSTHRU_UBLOX
---help---
This is the GPS device used as the right side of the passthru.
the path is provided by BOARD_SERIAL_GPSn
config SERIAL_PASSTHRU_GPS1
bool "GPS1"
depends on BOARD_SERIAL_GPS1 !=""
config SERIAL_PASSTHRU_GPS2
bool "GPS2"
depends on BOARD_SERIAL_GPS2 !=""
config SERIAL_PASSTHRU_GPS3
bool "GPS3"
depends on BOARD_SERIAL_GPS3 !=""
config SERIAL_PASSTHRU_GPS4
bool "GPS4"
depends on BOARD_SERIAL_GPS4 !=""
config SERIAL_PASSTHRU_GPS5
bool "GPS5"
depends on BOARD_SERIAL_GPS5 !=""
endchoice
config SERIAL_PASSTHRU_UBLOX_BAUDRATE
string "baudrate"
depends on SERIAL_PASSTHRU_UBLOX
default "115200"
---help---
This option sets the baudrate for the passthru.
endif #SYSTEMCMDS_SERIAL_PASSTHRU