From 54b5d4c5b82f8d7547a4047f374880c76d394698 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Wed, 14 Sep 2022 19:16:23 -0400 Subject: [PATCH] drivers/rc_input: don't allow starting on the px4io serial port --- src/drivers/rc_input/RCInput.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/drivers/rc_input/RCInput.cpp b/src/drivers/rc_input/RCInput.cpp index 4d1d023896..f13ede5679 100644 --- a/src/drivers/rc_input/RCInput.cpp +++ b/src/drivers/rc_input/RCInput.cpp @@ -128,6 +128,15 @@ RCInput::task_spawn(int argc, char *argv[]) device_name = RC_SERIAL_PORT; #endif // RC_SERIAL_PORT +#if defined(RC_SERIAL_PORT) && defined(PX4IO_SERIAL_DEVICE) + + // if RC_SERIAL_PORT == PX4IO_SERIAL_DEVICE then don't use it by default if the px4io is running + if ((strcmp(RC_SERIAL_PORT, PX4IO_SERIAL_DEVICE) == 0) && (access("/dev/px4io", R_OK) == 0)) { + device_name = nullptr; + } + +#endif // RC_SERIAL_PORT && PX4IO_SERIAL_DEVICE + while ((ch = px4_getopt(argc, argv, "d:", &myoptind, &myoptarg)) != EOF) { switch (ch) { case 'd':