From b054f99e260887c483bbc5d35621ba9162becdef Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Thu, 18 Jul 2024 19:58:17 -0400 Subject: [PATCH] move RC_SERIAL_PORT to CONFIG_BOARD_SERIAL_RC - drivers/rc_input use module.yaml serial_config to start --- ROMFS/px4fmu_common/init.d/rcS | 5 --- .../ctrl-zero-h7-oem-revg/default.px4board | 1 + .../ctrl-zero-h7-oem-revg/src/board_config.h | 3 -- boards/airmind/mindpx-v2/default.px4board | 1 + boards/airmind/mindpx-v2/src/board_config.h | 2 -- boards/ark/fmu-v6x/src/board_config.h | 4 --- boards/ark/pi6x/src/board_config.h | 4 --- boards/atl/mantis-edu/default.px4board | 1 + boards/atl/mantis-edu/src/board_config.h | 1 - boards/av/x-v1/default.px4board | 1 + boards/av/x-v1/src/board_config.h | 3 -- boards/cuav/7-nano/default.px4board | 1 + boards/cuav/7-nano/src/board_config.h | 2 -- boards/cuav/nora/default.px4board | 1 + boards/cuav/nora/src/board_config.h | 2 +- boards/cuav/x7pro/default.px4board | 1 + boards/cuav/x7pro/src/board_config.h | 2 +- .../diatone/mamba-f405-mk2/default.px4board | 1 + .../diatone/mamba-f405-mk2/src/board_config.h | 1 - boards/flywoo/gn-f405/default.px4board | 1 + boards/flywoo/gn-f405/src/board_config.h | 1 - boards/hkust/nxt-dual/src/board_config.h | 1 - boards/hkust/nxt-v1/src/board_config.h | 1 - boards/holybro/kakutef7/src/board_config.h | 2 -- .../holybro/kakuteh7mini/src/board_config.h | 1 - boards/holybro/pix32v5/default.px4board | 1 + boards/holybro/pix32v5/src/board_config.h | 2 -- boards/matek/h743-mini/default.px4board | 1 + boards/matek/h743-mini/src/board_config.h | 1 - boards/matek/h743-slim/default.px4board | 1 + boards/matek/h743-slim/src/board_config.h | 1 - boards/matek/h743/default.px4board | 1 + boards/matek/h743/src/board_config.h | 1 - boards/micoair/h743/src/board_config.h | 1 - boards/modalai/fc-v1/default.px4board | 1 + boards/modalai/fc-v1/src/board_config.h | 2 -- boards/modalai/fc-v2/default.px4board | 1 + boards/modalai/fc-v2/src/board_config.h | 3 -- boards/mro/ctrl-zero-classic/default.px4board | 1 + .../mro/ctrl-zero-classic/src/board_config.h | 2 -- boards/mro/ctrl-zero-f7-oem/default.px4board | 1 + .../mro/ctrl-zero-f7-oem/src/board_config.h | 2 -- boards/mro/ctrl-zero-f7/default.px4board | 1 + boards/mro/ctrl-zero-f7/src/board_config.h | 2 -- boards/mro/ctrl-zero-h7-oem/default.px4board | 1 + .../mro/ctrl-zero-h7-oem/src/board_config.h | 3 -- boards/mro/ctrl-zero-h7/default.px4board | 1 + boards/mro/ctrl-zero-h7/src/board_config.h | 2 -- boards/mro/pixracerpro/default.px4board | 1 + boards/mro/pixracerpro/src/board_config.h | 1 - boards/nxp/fmuk66-e/default.px4board | 1 + boards/nxp/fmuk66-e/src/board_config.h | 3 -- boards/nxp/fmuk66-v3/default.px4board | 1 + boards/nxp/fmuk66-v3/src/board_config.h | 3 -- boards/nxp/mr-canhubk3/src/board_config.h | 1 - boards/omnibus/f4sd/default.px4board | 1 + boards/omnibus/f4sd/src/board_config.h | 1 - boards/px4/fmu-v4/default.px4board | 1 + boards/px4/fmu-v4/src/board_config.h | 4 --- boards/px4/fmu-v5/default.px4board | 1 + boards/px4/fmu-v5/src/board_config.h | 2 -- boards/px4/fmu-v5x/default.px4board | 1 + boards/px4/fmu-v5x/src/board_config.h | 1 - boards/px4/fmu-v6u/default.px4board | 1 + boards/px4/fmu-v6u/src/board_config.h | 2 -- boards/px4/fmu-v6x/default.px4board | 1 + boards/px4/fmu-v6x/src/board_config.h | 1 - boards/px4/fmu-v6xrt/default.px4board | 1 + boards/px4/fmu-v6xrt/src/board_config.h | 1 - boards/raspberrypi/pico/default.px4board | 1 + boards/raspberrypi/pico/src/board_config.h | 2 +- .../smartap-airlink/default.px4board | 1 + .../smartap-airlink/src/board_config.h | 2 -- boards/spracing/h7extreme/default.px4board | 1 + boards/spracing/h7extreme/src/board_config.h | 4 --- boards/uvify/core/default.px4board | 1 + boards/uvify/core/src/board_config.h | 4 --- boards/x-mav/ap-h743v2/src/board_config.h | 1 - boards/zeroone/x6/default.px4board | 1 + boards/zeroone/x6/src/board_config.h | 2 -- .../px4_platform_common/board_common.h | 12 +++---- src/drivers/rc_input/RCInput.cpp | 34 ++++++++----------- src/drivers/rc_input/module.yaml | 5 +-- 83 files changed, 60 insertions(+), 118 deletions(-) diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index 28804361d1..b8a8828c94 100644 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -29,7 +29,6 @@ set LOGGER_ARGS "" set LOGGER_BUF 8 set PARAM_FILE "" set PARAM_BACKUP_FILE "" -set RC_INPUT_ARGS "" set STORAGE_AVAILABLE no set SDCARD_EXT_PATH /fs/microsd/ext_autostart set SDCARD_FORMAT no @@ -464,9 +463,6 @@ else # . ${R}etc/init.d/rc.serial - # Must be started after the serial config is read - rc_input start $RC_INPUT_ARGS - # Manages USB interface if ! cdcacm_autostart start then @@ -620,7 +616,6 @@ unset LOGGER_BUF unset PARAM_FILE unset PARAM_BACKUP_FILE unset PARAM_DEFAULTS_VER -unset RC_INPUT_ARGS unset STORAGE_AVAILABLE unset SDCARD_EXT_PATH unset SDCARD_FORMAT diff --git a/boards/3dr/ctrl-zero-h7-oem-revg/default.px4board b/boards/3dr/ctrl-zero-h7-oem-revg/default.px4board index 549ba99b73..f03422364f 100644 --- a/boards/3dr/ctrl-zero-h7-oem-revg/default.px4board +++ b/boards/3dr/ctrl-zero-h7-oem-revg/default.px4board @@ -4,6 +4,7 @@ CONFIG_BOARD_SERIAL_GPS1="/dev/ttyS2" CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS0" CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS1" CONFIG_BOARD_SERIAL_TEL3="/dev/ttyS4" +CONFIG_BOARD_SERIAL_RC="/dev/ttyS3" CONFIG_DRIVERS_ADC_ADS1115=y CONFIG_DRIVERS_ADC_BOARD_ADC=y CONFIG_DRIVERS_BAROMETER_DPS310=y diff --git a/boards/3dr/ctrl-zero-h7-oem-revg/src/board_config.h b/boards/3dr/ctrl-zero-h7-oem-revg/src/board_config.h index bcc8bba1a6..890509b0fe 100755 --- a/boards/3dr/ctrl-zero-h7-oem-revg/src/board_config.h +++ b/boards/3dr/ctrl-zero-h7-oem-revg/src/board_config.h @@ -113,9 +113,6 @@ #define HRT_PPM_CHANNEL /* T3C3 */ 3 /* use capture/compare channel 3 */ #define GPIO_PPM_IN /* PB0 T3C3 */ GPIO_TIM3_CH3IN_1 -/* RC Serial port */ -#define RC_SERIAL_PORT "/dev/ttyS3" - #define GPIO_RSSI_IN /* PC1 */ (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTC|GPIO_PIN1) /* Safety Switch: Enable the FMU to control it if there is no px4io fixme:This should be BOARD_SAFETY_LED(__ontrue) */ diff --git a/boards/airmind/mindpx-v2/default.px4board b/boards/airmind/mindpx-v2/default.px4board index 33ad75b695..2a16c50290 100644 --- a/boards/airmind/mindpx-v2/default.px4board +++ b/boards/airmind/mindpx-v2/default.px4board @@ -4,6 +4,7 @@ CONFIG_BOARD_CONSTRAINED_MEMORY=y CONFIG_BOARD_SERIAL_GPS1="/dev/ttyS3" CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS1" CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS2" +CONFIG_BOARD_SERIAL_RC="/dev/ttyS0" CONFIG_DRIVERS_ADC_ADS1115=y CONFIG_DRIVERS_ADC_BOARD_ADC=y CONFIG_COMMON_BAROMETERS=y diff --git a/boards/airmind/mindpx-v2/src/board_config.h b/boards/airmind/mindpx-v2/src/board_config.h index 65d587f66c..d973661fed 100644 --- a/boards/airmind/mindpx-v2/src/board_config.h +++ b/boards/airmind/mindpx-v2/src/board_config.h @@ -110,8 +110,6 @@ #define PWMIN_TIMER_CHANNEL 1 #define GPIO_PWM_IN GPIO_TIM1_CH1IN_2 -#define RC_SERIAL_PORT "/dev/ttyS0" - // #define GPIO_RSSI_IN (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTC|GPIO_PIN1) #define GPIO_SBUS_INV (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTA|GPIO_PIN10) #define RC_INVERT_INPUT(_invert_true) px4_arch_gpiowrite(GPIO_SBUS_INV, _invert_true); diff --git a/boards/ark/fmu-v6x/src/board_config.h b/boards/ark/fmu-v6x/src/board_config.h index 04b84631c7..3b33ac6204 100644 --- a/boards/ark/fmu-v6x/src/board_config.h +++ b/boards/ark/fmu-v6x/src/board_config.h @@ -319,10 +319,6 @@ #define HRT_PPM_CHANNEL /* T8C1 */ 1 /* use capture/compare channel 1 */ #define GPIO_PPM_IN /* PI5 T8C1 */ GPIO_TIM8_CH1IN_2 -/* RC Serial port */ - -#define RC_SERIAL_PORT "/dev/ttyS5" - /* Input Capture Channels. */ #define INPUT_CAP1_TIMER 1 #define INPUT_CAP1_CHANNEL /* T1C2 */ 2 diff --git a/boards/ark/pi6x/src/board_config.h b/boards/ark/pi6x/src/board_config.h index 5e123db351..6b3e477808 100644 --- a/boards/ark/pi6x/src/board_config.h +++ b/boards/ark/pi6x/src/board_config.h @@ -270,10 +270,6 @@ #define HRT_TIMER 8 /* use timer8 for the HRT */ #define HRT_TIMER_CHANNEL 3 /* use capture/compare channel 3 */ -/* RC Serial port */ - -#define RC_SERIAL_PORT "/dev/ttyS4" - /* PWM input driver. Use FMU AUX5 pins attached to timer4 channel 2 */ #define PWMIN_TIMER 4 #define PWMIN_TIMER_CHANNEL /* T4C2 */ 2 diff --git a/boards/atl/mantis-edu/default.px4board b/boards/atl/mantis-edu/default.px4board index fd76e4d6ca..acebabce8c 100644 --- a/boards/atl/mantis-edu/default.px4board +++ b/boards/atl/mantis-edu/default.px4board @@ -1,5 +1,6 @@ CONFIG_BOARD_TOOLCHAIN="arm-none-eabi" CONFIG_BOARD_ARCHITECTURE="cortex-m7" +CONFIG_BOARD_SERIAL_RC="/dev/ttyS5" CONFIG_DRIVERS_ADC_BOARD_ADC=y CONFIG_DRIVERS_BAROMETER_MAIERTEK_MPC2520=y CONFIG_DRIVERS_CDCACM_AUTOSTART=y diff --git a/boards/atl/mantis-edu/src/board_config.h b/boards/atl/mantis-edu/src/board_config.h index f589a6b728..7fbda3fa14 100644 --- a/boards/atl/mantis-edu/src/board_config.h +++ b/boards/atl/mantis-edu/src/board_config.h @@ -143,7 +143,6 @@ #define HRT_TIMER_CHANNEL 3 /* use capture/compare channel 3 */ /* RC Serial port */ -#define RC_SERIAL_PORT "/dev/ttyS5" #define RC_SERIAL_SINGLEWIRE /* power on/off */ diff --git a/boards/av/x-v1/default.px4board b/boards/av/x-v1/default.px4board index 86db7c85a3..24f385d5cd 100644 --- a/boards/av/x-v1/default.px4board +++ b/boards/av/x-v1/default.px4board @@ -6,6 +6,7 @@ CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS0" CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS1" CONFIG_BOARD_SERIAL_TEL3="/dev/ttyS2" CONFIG_BOARD_SERIAL_TEL4="/dev/ttyS3" +CONFIG_BOARD_SERIAL_RC="/dev/ttyS4" CONFIG_DRIVERS_ADC_ADS1115=y CONFIG_DRIVERS_ADC_BOARD_ADC=y CONFIG_COMMON_BAROMETERS=y diff --git a/boards/av/x-v1/src/board_config.h b/boards/av/x-v1/src/board_config.h index b87abf26c0..0c0758f30a 100644 --- a/boards/av/x-v1/src/board_config.h +++ b/boards/av/x-v1/src/board_config.h @@ -102,9 +102,6 @@ #define HRT_TIMER 5 /* use timer5 for the HRT */ #define HRT_TIMER_CHANNEL 1 /* use capture/compare channel 3 */ -/* RC Serial port */ - -#define RC_SERIAL_PORT "/dev/ttyS4" /* Power switch controls ******************************************************/ diff --git a/boards/cuav/7-nano/default.px4board b/boards/cuav/7-nano/default.px4board index f6e4511ae2..51d38d5726 100644 --- a/boards/cuav/7-nano/default.px4board +++ b/boards/cuav/7-nano/default.px4board @@ -6,6 +6,7 @@ CONFIG_BOARD_SERIAL_GPS2="/dev/ttyS6" CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS5" CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS3" CONFIG_BOARD_SERIAL_TEL3="/dev/ttyS1" +CONFIG_BOARD_SERIAL_RC="/dev/ttyS4" CONFIG_DRIVERS_ADC_ADS1115=y CONFIG_DRIVERS_ADC_BOARD_ADC=y CONFIG_DRIVERS_BAROMETER_BMP581=y diff --git a/boards/cuav/7-nano/src/board_config.h b/boards/cuav/7-nano/src/board_config.h index 269a4890f3..ada5c1ae07 100644 --- a/boards/cuav/7-nano/src/board_config.h +++ b/boards/cuav/7-nano/src/board_config.h @@ -227,8 +227,6 @@ #define GPIO_PPM_IN /* PC6 T8C1 */ GPIO_TIM3_CH1IN_3 /* RC Serial port */ - -#define RC_SERIAL_PORT "/dev/ttyS4" #define RC_SERIAL_SINGLEWIRE /* Input Capture Channels. */ diff --git a/boards/cuav/nora/default.px4board b/boards/cuav/nora/default.px4board index 675ffa54cb..699eb3ad4c 100644 --- a/boards/cuav/nora/default.px4board +++ b/boards/cuav/nora/default.px4board @@ -4,6 +4,7 @@ CONFIG_BOARD_SERIAL_GPS1="/dev/ttyS0" CONFIG_BOARD_SERIAL_GPS2="/dev/ttyS2" CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS1" CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS3" +CONFIG_BOARD_SERIAL_RC="/dev/ttyS5" CONFIG_DRIVERS_ADC_ADS1115=y CONFIG_DRIVERS_ADC_BOARD_ADC=y CONFIG_COMMON_BAROMETERS=y diff --git a/boards/cuav/nora/src/board_config.h b/boards/cuav/nora/src/board_config.h index 56dbf9cc8c..deaf2d40fd 100644 --- a/boards/cuav/nora/src/board_config.h +++ b/boards/cuav/nora/src/board_config.h @@ -159,7 +159,7 @@ #define HRT_PPM_CHANNEL /* T3C1 */ 1 /* use capture/compare channel 1 */ #define GPIO_PPM_IN /* PB4 T3C1 */ GPIO_TIM3_CH1IN_2 -#define RC_SERIAL_PORT "/dev/ttyS5" + #define RC_SERIAL_SINGLEWIRE /** diff --git a/boards/cuav/x7pro/default.px4board b/boards/cuav/x7pro/default.px4board index c7c30b1a1e..d3cab345fd 100644 --- a/boards/cuav/x7pro/default.px4board +++ b/boards/cuav/x7pro/default.px4board @@ -4,6 +4,7 @@ CONFIG_BOARD_SERIAL_GPS1="/dev/ttyS0" CONFIG_BOARD_SERIAL_GPS2="/dev/ttyS2" CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS1" CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS3" +CONFIG_BOARD_SERIAL_RC="/dev/ttyS5" CONFIG_DRIVERS_ADC_ADS1115=y CONFIG_DRIVERS_ADC_BOARD_ADC=y CONFIG_COMMON_BAROMETERS=y diff --git a/boards/cuav/x7pro/src/board_config.h b/boards/cuav/x7pro/src/board_config.h index f8a1824ebc..e4c80b62cc 100644 --- a/boards/cuav/x7pro/src/board_config.h +++ b/boards/cuav/x7pro/src/board_config.h @@ -159,7 +159,7 @@ #define HRT_PPM_CHANNEL /* T3C1 */ 1 /* use capture/compare channel 1 */ #define GPIO_PPM_IN /* PB4 T3C1 */ GPIO_TIM3_CH1IN_2 -#define RC_SERIAL_PORT "/dev/ttyS5" + #define RC_SERIAL_SINGLEWIRE /** diff --git a/boards/diatone/mamba-f405-mk2/default.px4board b/boards/diatone/mamba-f405-mk2/default.px4board index e8ee5ec656..e329b23bb8 100644 --- a/boards/diatone/mamba-f405-mk2/default.px4board +++ b/boards/diatone/mamba-f405-mk2/default.px4board @@ -6,6 +6,7 @@ CONFIG_BOARD_CONSTRAINED_MEMORY=y CONFIG_BOARD_EXTERNAL_METADATA=y CONFIG_BOARD_SERIAL_URT6="/dev/ttyS2" CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS1" +CONFIG_BOARD_SERIAL_RC="/dev/ttyS0" CONFIG_DRIVERS_ADC_BOARD_ADC=y CONFIG_DRIVERS_BAROMETER_BMP280=y CONFIG_DRIVERS_CDCACM_AUTOSTART=y diff --git a/boards/diatone/mamba-f405-mk2/src/board_config.h b/boards/diatone/mamba-f405-mk2/src/board_config.h index 3c5f0e9830..6309552bba 100644 --- a/boards/diatone/mamba-f405-mk2/src/board_config.h +++ b/boards/diatone/mamba-f405-mk2/src/board_config.h @@ -130,7 +130,6 @@ #define HRT_PPM_CHANNEL 3 // capture/compare channel 3 #define GPIO_PPM_IN (GPIO_ALT|GPIO_AF2|GPIO_PULLUP|GPIO_PORTB|GPIO_PIN8) -#define RC_SERIAL_PORT "/dev/ttyS0" #define BOARD_SUPPORTS_RC_SERIAL_PORT_OUTPUT /* diff --git a/boards/flywoo/gn-f405/default.px4board b/boards/flywoo/gn-f405/default.px4board index 54d17325bc..b2e8d853b5 100644 --- a/boards/flywoo/gn-f405/default.px4board +++ b/boards/flywoo/gn-f405/default.px4board @@ -5,6 +5,7 @@ CONFIG_BOARD_NO_HELP=y CONFIG_BOARD_CONSTRAINED_MEMORY=y CONFIG_BOARD_SERIAL_URT6="/dev/ttyS2" CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS1" +CONFIG_BOARD_SERIAL_RC="/dev/ttyS0" CONFIG_DRIVERS_ADC_BOARD_ADC=y CONFIG_DRIVERS_BAROMETER_BMP280=y CONFIG_DRIVERS_CDCACM_AUTOSTART=y diff --git a/boards/flywoo/gn-f405/src/board_config.h b/boards/flywoo/gn-f405/src/board_config.h index 756389e5b8..6af0b2cbb0 100644 --- a/boards/flywoo/gn-f405/src/board_config.h +++ b/boards/flywoo/gn-f405/src/board_config.h @@ -134,7 +134,6 @@ #define HRT_PPM_CHANNEL 3 // capture/compare channel 3 #define GPIO_PPM_IN (GPIO_ALT|GPIO_AF2|GPIO_PULLUP|GPIO_PORTB|GPIO_PIN8) -#define RC_SERIAL_PORT "/dev/ttyS0" #define BOARD_SUPPORTS_RC_SERIAL_PORT_OUTPUT /* diff --git a/boards/hkust/nxt-dual/src/board_config.h b/boards/hkust/nxt-dual/src/board_config.h index 2b8aba1296..c766ba5f39 100644 --- a/boards/hkust/nxt-dual/src/board_config.h +++ b/boards/hkust/nxt-dual/src/board_config.h @@ -145,7 +145,6 @@ #define HRT_TIMER_CHANNEL 1 /* use capture/compare channel 1 */ /* RC Serial port */ -#define RC_SERIAL_PORT "/dev/ttyS4" #define BOARD_SUPPORTS_RC_SERIAL_PORT_OUTPUT // #define GPIO_SBUS_INV (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTD|GPIO_PIN14) diff --git a/boards/hkust/nxt-v1/src/board_config.h b/boards/hkust/nxt-v1/src/board_config.h index 34dff55da5..82c872e72d 100644 --- a/boards/hkust/nxt-v1/src/board_config.h +++ b/boards/hkust/nxt-v1/src/board_config.h @@ -148,7 +148,6 @@ #define HRT_TIMER_CHANNEL 1 /* use capture/compare channel 1 */ /* RC Serial port */ -#define RC_SERIAL_PORT "/dev/ttyS5" #define BOARD_SUPPORTS_RC_SERIAL_PORT_OUTPUT /* SD card bringup does not work if performed on the IDLE thread because it diff --git a/boards/holybro/kakutef7/src/board_config.h b/boards/holybro/kakutef7/src/board_config.h index 3164a97836..978ebb14f4 100644 --- a/boards/holybro/kakutef7/src/board_config.h +++ b/boards/holybro/kakutef7/src/board_config.h @@ -111,8 +111,6 @@ #define HRT_TIMER_CHANNEL 1 /* use capture/compare channel 1 */ /* RC Serial port */ - -#define RC_SERIAL_PORT "/dev/ttyS4" #define RC_SERIAL_SINGLEWIRE #define GPIO_RSSI_IN /* PC5 */ (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTC|GPIO_PIN5) diff --git a/boards/holybro/kakuteh7mini/src/board_config.h b/boards/holybro/kakuteh7mini/src/board_config.h index d40bbb0105..137f125e50 100644 --- a/boards/holybro/kakuteh7mini/src/board_config.h +++ b/boards/holybro/kakuteh7mini/src/board_config.h @@ -125,7 +125,6 @@ // So we can run CRSF on ttyS4, which corresponds to the TX6/RX6 pins /* RC Serial port */ -#define RC_SERIAL_PORT "/dev/ttyS4" #define BOARD_SUPPORTS_RC_SERIAL_PORT_OUTPUT /* PWM input driver. Use FMU AUX5 pins attached to timer4 channel 2 */ diff --git a/boards/holybro/pix32v5/default.px4board b/boards/holybro/pix32v5/default.px4board index 0093ee2dcf..fad4a56ace 100644 --- a/boards/holybro/pix32v5/default.px4board +++ b/boards/holybro/pix32v5/default.px4board @@ -5,6 +5,7 @@ CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS1" CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS2" CONFIG_BOARD_SERIAL_TEL3="/dev/ttyS4" CONFIG_BOARD_SERIAL_TEL4="/dev/ttyS3" +CONFIG_BOARD_SERIAL_RC="/dev/ttyS4" CONFIG_DRIVERS_ADC_ADS1115=y CONFIG_DRIVERS_ADC_BOARD_ADC=y CONFIG_COMMON_BAROMETERS=y diff --git a/boards/holybro/pix32v5/src/board_config.h b/boards/holybro/pix32v5/src/board_config.h index 67b3909f78..070199298b 100644 --- a/boards/holybro/pix32v5/src/board_config.h +++ b/boards/holybro/pix32v5/src/board_config.h @@ -283,8 +283,6 @@ #define GPIO_PPM_IN /* PI5 T8C1 */ GPIO_TIM8_CH1IN_2 /* RC Serial port */ - -#define RC_SERIAL_PORT "/dev/ttyS4" #define RC_SERIAL_SINGLEWIRE /* PWM input driver. Use FMU AUX5 pins attached to timer4 channel 2 */ diff --git a/boards/matek/h743-mini/default.px4board b/boards/matek/h743-mini/default.px4board index 22efafcfdb..6b6bccffb8 100644 --- a/boards/matek/h743-mini/default.px4board +++ b/boards/matek/h743-mini/default.px4board @@ -5,6 +5,7 @@ CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS2" CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS3" CONFIG_BOARD_SERIAL_TEL3="/dev/ttyS5" CONFIG_BOARD_SERIAL_TEL4="/dev/ttyS6" +CONFIG_BOARD_SERIAL_RC="/dev/ttyS4" CONFIG_DRIVERS_ADC_BOARD_ADC=y CONFIG_DRIVERS_BAROMETER_DPS310=y CONFIG_DRIVERS_CDCACM_AUTOSTART=y diff --git a/boards/matek/h743-mini/src/board_config.h b/boards/matek/h743-mini/src/board_config.h index e47444085a..a239bb0b27 100644 --- a/boards/matek/h743-mini/src/board_config.h +++ b/boards/matek/h743-mini/src/board_config.h @@ -156,7 +156,6 @@ /* RC Serial port */ -#define RC_SERIAL_PORT "/dev/ttyS4" #define BOARD_SUPPORTS_RC_SERIAL_PORT_OUTPUT // #define GPIO_RSSI_IN /* PC5 */ (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTC|GPIO_PIN5) diff --git a/boards/matek/h743-slim/default.px4board b/boards/matek/h743-slim/default.px4board index 71024fea5c..ea9f4d4843 100644 --- a/boards/matek/h743-slim/default.px4board +++ b/boards/matek/h743-slim/default.px4board @@ -5,6 +5,7 @@ CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS2" CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS3" CONFIG_BOARD_SERIAL_TEL3="/dev/ttyS5" CONFIG_BOARD_SERIAL_TEL4="/dev/ttyS6" +CONFIG_BOARD_SERIAL_RC="/dev/ttyS4" CONFIG_DRIVERS_ADC_BOARD_ADC=y CONFIG_DRIVERS_BAROMETER_DPS310=y CONFIG_DRIVERS_CDCACM_AUTOSTART=y diff --git a/boards/matek/h743-slim/src/board_config.h b/boards/matek/h743-slim/src/board_config.h index f977a2e8dd..f7fcece798 100644 --- a/boards/matek/h743-slim/src/board_config.h +++ b/boards/matek/h743-slim/src/board_config.h @@ -149,7 +149,6 @@ /* RC Serial port */ -#define RC_SERIAL_PORT "/dev/ttyS4" #define BOARD_SUPPORTS_RC_SERIAL_PORT_OUTPUT // #define GPIO_RSSI_IN /* PC5 */ (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTC|GPIO_PIN5) diff --git a/boards/matek/h743/default.px4board b/boards/matek/h743/default.px4board index 71024fea5c..ea9f4d4843 100644 --- a/boards/matek/h743/default.px4board +++ b/boards/matek/h743/default.px4board @@ -5,6 +5,7 @@ CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS2" CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS3" CONFIG_BOARD_SERIAL_TEL3="/dev/ttyS5" CONFIG_BOARD_SERIAL_TEL4="/dev/ttyS6" +CONFIG_BOARD_SERIAL_RC="/dev/ttyS4" CONFIG_DRIVERS_ADC_BOARD_ADC=y CONFIG_DRIVERS_BAROMETER_DPS310=y CONFIG_DRIVERS_CDCACM_AUTOSTART=y diff --git a/boards/matek/h743/src/board_config.h b/boards/matek/h743/src/board_config.h index e47444085a..a239bb0b27 100644 --- a/boards/matek/h743/src/board_config.h +++ b/boards/matek/h743/src/board_config.h @@ -156,7 +156,6 @@ /* RC Serial port */ -#define RC_SERIAL_PORT "/dev/ttyS4" #define BOARD_SUPPORTS_RC_SERIAL_PORT_OUTPUT // #define GPIO_RSSI_IN /* PC5 */ (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTC|GPIO_PIN5) diff --git a/boards/micoair/h743/src/board_config.h b/boards/micoair/h743/src/board_config.h index 48ff3ff203..a7997bf077 100644 --- a/boards/micoair/h743/src/board_config.h +++ b/boards/micoair/h743/src/board_config.h @@ -124,7 +124,6 @@ /* RC Serial port */ -#define RC_SERIAL_PORT "/dev/ttyS4" #define BOARD_SUPPORTS_RC_SERIAL_PORT_OUTPUT /* SD Card */ diff --git a/boards/modalai/fc-v1/default.px4board b/boards/modalai/fc-v1/default.px4board index e9104cfaee..a04883ea7a 100644 --- a/boards/modalai/fc-v1/default.px4board +++ b/boards/modalai/fc-v1/default.px4board @@ -5,6 +5,7 @@ CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS6" CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS4" CONFIG_BOARD_SERIAL_TEL3="/dev/ttyS1" CONFIG_BOARD_SERIAL_TEL4="/dev/ttyS3" +CONFIG_BOARD_SERIAL_RC="/dev/ttyS5" CONFIG_DRIVERS_ACTUATORS_VOXL_ESC=y CONFIG_DRIVERS_ADC_ADS1115=y CONFIG_DRIVERS_ADC_BOARD_ADC=y diff --git a/boards/modalai/fc-v1/src/board_config.h b/boards/modalai/fc-v1/src/board_config.h index 93032bb31f..73be403b85 100644 --- a/boards/modalai/fc-v1/src/board_config.h +++ b/boards/modalai/fc-v1/src/board_config.h @@ -182,8 +182,6 @@ #define GPIO_PPM_IN /* PI5 T8C1 */ GPIO_TIM8_CH1IN_2 /* RC Serial port */ - -#define RC_SERIAL_PORT "/dev/ttyS5" #define BOARD_SUPPORTS_RC_SERIAL_PORT_OUTPUT /* Safety Switch: Enable the FMU to control it as there is no px4io in ModalAI FC-v1 */ diff --git a/boards/modalai/fc-v2/default.px4board b/boards/modalai/fc-v2/default.px4board index f95c859e8c..cdd9738235 100644 --- a/boards/modalai/fc-v2/default.px4board +++ b/boards/modalai/fc-v2/default.px4board @@ -3,6 +3,7 @@ CONFIG_BOARD_ARCHITECTURE="cortex-m7" CONFIG_BOARD_SERIAL_GPS1="/dev/ttyS0" CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS6" CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS4" +CONFIG_BOARD_SERIAL_RC="/dev/ttyS5" CONFIG_DRIVERS_ACTUATORS_VOXL_ESC=y CONFIG_DRIVERS_ADC_ADS1115=y CONFIG_DRIVERS_ADC_BOARD_ADC=y diff --git a/boards/modalai/fc-v2/src/board_config.h b/boards/modalai/fc-v2/src/board_config.h index 987f692b22..52d72dfd37 100644 --- a/boards/modalai/fc-v2/src/board_config.h +++ b/boards/modalai/fc-v2/src/board_config.h @@ -248,9 +248,6 @@ //#define HRT_PPM_CHANNEL /* T8C1 */ 1 /* use capture/compare channel 1 */ //#define GPIO_PPM_IN /* PI5 T8C1 */ GPIO_TIM8_CH1IN_2 -/* RC Serial port */ - -#define RC_SERIAL_PORT "/dev/ttyS5" /* Input Capture Channels. */ #define INPUT_CAP1_TIMER 1 diff --git a/boards/mro/ctrl-zero-classic/default.px4board b/boards/mro/ctrl-zero-classic/default.px4board index 665fbc8626..0d5e23bcb0 100644 --- a/boards/mro/ctrl-zero-classic/default.px4board +++ b/boards/mro/ctrl-zero-classic/default.px4board @@ -6,6 +6,7 @@ CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS1" CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS2" CONFIG_BOARD_SERIAL_TEL3="/dev/ttyS5" CONFIG_BOARD_SERIAL_TEL4="/dev/ttyS0" +CONFIG_BOARD_SERIAL_RC="/dev/ttyS5" CONFIG_DRIVERS_ADC_ADS1115=y CONFIG_DRIVERS_ADC_BOARD_ADC=y CONFIG_DRIVERS_BAROMETER_DPS310=y diff --git a/boards/mro/ctrl-zero-classic/src/board_config.h b/boards/mro/ctrl-zero-classic/src/board_config.h index d40eb1e56f..5b3c9b4150 100644 --- a/boards/mro/ctrl-zero-classic/src/board_config.h +++ b/boards/mro/ctrl-zero-classic/src/board_config.h @@ -126,8 +126,6 @@ #define HRT_PPM_CHANNEL /* T3C2 */ 2 /* use capture/compare channel 2 */ #define GPIO_PPM_IN /* PC7 T3C2 */ GPIO_TIM3_CH2IN_3 -/* RC Serial port */ -#define RC_SERIAL_PORT "/dev/ttyS5" #define GPIO_RSSI_IN /* PC0 */ (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTC|GPIO_PIN0) diff --git a/boards/mro/ctrl-zero-f7-oem/default.px4board b/boards/mro/ctrl-zero-f7-oem/default.px4board index 9fe340b87f..c195bf1098 100644 --- a/boards/mro/ctrl-zero-f7-oem/default.px4board +++ b/boards/mro/ctrl-zero-f7-oem/default.px4board @@ -4,6 +4,7 @@ CONFIG_BOARD_SERIAL_GPS1="/dev/ttyS2" CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS0" CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS1" CONFIG_BOARD_SERIAL_TEL3="/dev/ttyS4" +CONFIG_BOARD_SERIAL_RC="/dev/ttyS3" CONFIG_DRIVERS_ADC_ADS1115=y CONFIG_DRIVERS_ADC_BOARD_ADC=y CONFIG_DRIVERS_BAROMETER_DPS310=y diff --git a/boards/mro/ctrl-zero-f7-oem/src/board_config.h b/boards/mro/ctrl-zero-f7-oem/src/board_config.h index 5f00959de0..23ff7cd7fb 100644 --- a/boards/mro/ctrl-zero-f7-oem/src/board_config.h +++ b/boards/mro/ctrl-zero-f7-oem/src/board_config.h @@ -136,8 +136,6 @@ #define HRT_PPM_CHANNEL /* T3C3 */ 3 /* use capture/compare channel 3 */ #define GPIO_PPM_IN /* PB0 T3C3 */ GPIO_TIM3_CH3IN_1 -/* RC Serial port */ -#define RC_SERIAL_PORT "/dev/ttyS3" #define GPIO_RSSI_IN /* PC1 */ (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTC|GPIO_PIN1) diff --git a/boards/mro/ctrl-zero-f7/default.px4board b/boards/mro/ctrl-zero-f7/default.px4board index d09ca8a5b5..a990ed23a4 100644 --- a/boards/mro/ctrl-zero-f7/default.px4board +++ b/boards/mro/ctrl-zero-f7/default.px4board @@ -3,6 +3,7 @@ CONFIG_BOARD_ARCHITECTURE="cortex-m7" CONFIG_BOARD_SERIAL_GPS1="/dev/ttyS2" CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS0" CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS1" +CONFIG_BOARD_SERIAL_RC="/dev/ttyS3" CONFIG_DRIVERS_ADC_ADS1115=y CONFIG_DRIVERS_ADC_BOARD_ADC=y CONFIG_DRIVERS_BAROMETER_DPS310=y diff --git a/boards/mro/ctrl-zero-f7/src/board_config.h b/boards/mro/ctrl-zero-f7/src/board_config.h index 7dc7ce0455..12cfc47e8f 100644 --- a/boards/mro/ctrl-zero-f7/src/board_config.h +++ b/boards/mro/ctrl-zero-f7/src/board_config.h @@ -135,8 +135,6 @@ #define HRT_PPM_CHANNEL /* T3C3 */ 3 /* use capture/compare channel 3 */ #define GPIO_PPM_IN /* PB0 T3C3 */ GPIO_TIM3_CH3IN_1 -/* RC Serial port */ -#define RC_SERIAL_PORT "/dev/ttyS3" #define GPIO_RSSI_IN /* PC1 */ (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTC|GPIO_PIN1) diff --git a/boards/mro/ctrl-zero-h7-oem/default.px4board b/boards/mro/ctrl-zero-h7-oem/default.px4board index ec6c59888d..74b6aa7711 100644 --- a/boards/mro/ctrl-zero-h7-oem/default.px4board +++ b/boards/mro/ctrl-zero-h7-oem/default.px4board @@ -4,6 +4,7 @@ CONFIG_BOARD_SERIAL_GPS1="/dev/ttyS2" CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS0" CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS1" CONFIG_BOARD_SERIAL_TEL3="/dev/ttyS4" +CONFIG_BOARD_SERIAL_RC="/dev/ttyS3" CONFIG_DRIVERS_ADC_ADS1115=y CONFIG_DRIVERS_ADC_BOARD_ADC=y CONFIG_DRIVERS_BAROMETER_DPS310=y diff --git a/boards/mro/ctrl-zero-h7-oem/src/board_config.h b/boards/mro/ctrl-zero-h7-oem/src/board_config.h index c573b6522e..709d9bb132 100644 --- a/boards/mro/ctrl-zero-h7-oem/src/board_config.h +++ b/boards/mro/ctrl-zero-h7-oem/src/board_config.h @@ -112,9 +112,6 @@ #define HRT_PPM_CHANNEL /* T3C3 */ 3 /* use capture/compare channel 3 */ #define GPIO_PPM_IN /* PB0 T3C3 */ GPIO_TIM3_CH3IN_1 -/* RC Serial port */ -#define RC_SERIAL_PORT "/dev/ttyS3" - #define GPIO_RSSI_IN /* PC1 */ (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTC|GPIO_PIN1) /* Safety Switch: Enable the FMU to control it if there is no px4io fixme:This should be BOARD_SAFETY_LED(__ontrue) */ diff --git a/boards/mro/ctrl-zero-h7/default.px4board b/boards/mro/ctrl-zero-h7/default.px4board index 7bb96d3aca..249c65059e 100644 --- a/boards/mro/ctrl-zero-h7/default.px4board +++ b/boards/mro/ctrl-zero-h7/default.px4board @@ -4,6 +4,7 @@ CONFIG_BOARD_SERIAL_GPS1="/dev/ttyS2" CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS0" CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS1" CONFIG_BOARD_SERIAL_TEL3="/dev/ttyS4" +CONFIG_BOARD_SERIAL_RC="/dev/ttyS3" CONFIG_DRIVERS_ADC_ADS1115=y CONFIG_DRIVERS_ADC_BOARD_ADC=y CONFIG_DRIVERS_BAROMETER_DPS310=y diff --git a/boards/mro/ctrl-zero-h7/src/board_config.h b/boards/mro/ctrl-zero-h7/src/board_config.h index cd8f5921ef..ae6efd0965 100644 --- a/boards/mro/ctrl-zero-h7/src/board_config.h +++ b/boards/mro/ctrl-zero-h7/src/board_config.h @@ -112,8 +112,6 @@ #define HRT_PPM_CHANNEL /* T3C3 */ 3 /* use capture/compare channel 3 */ #define GPIO_PPM_IN /* PB0 T3C3 */ GPIO_TIM3_CH3IN_1 -/* RC Serial port */ -#define RC_SERIAL_PORT "/dev/ttyS3" #define GPIO_RSSI_IN /* PC1 */ (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTC|GPIO_PIN1) diff --git a/boards/mro/pixracerpro/default.px4board b/boards/mro/pixracerpro/default.px4board index fb49c90866..ef33e5d94f 100644 --- a/boards/mro/pixracerpro/default.px4board +++ b/boards/mro/pixracerpro/default.px4board @@ -3,6 +3,7 @@ CONFIG_BOARD_ARCHITECTURE="cortex-m7" CONFIG_BOARD_SERIAL_GPS1="/dev/ttyS3" CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS1" CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS2" +CONFIG_BOARD_SERIAL_RC="/dev/ttyS4" CONFIG_DRIVERS_ADC_ADS1115=y CONFIG_DRIVERS_ADC_BOARD_ADC=y CONFIG_DRIVERS_BAROMETER_DPS310=y diff --git a/boards/mro/pixracerpro/src/board_config.h b/boards/mro/pixracerpro/src/board_config.h index 0d067bb12c..431d720050 100644 --- a/boards/mro/pixracerpro/src/board_config.h +++ b/boards/mro/pixracerpro/src/board_config.h @@ -117,7 +117,6 @@ #define GPIO_PPM_IN /* PB0 T3C3 */ GPIO_TIM3_CH3IN_1 /* RC Serial port */ -#define RC_SERIAL_PORT "/dev/ttyS4" #define BOARD_SUPPORTS_RC_SERIAL_PORT_OUTPUT #define GPIO_RSSI_IN /* PC1 */ (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTC|GPIO_PIN1) diff --git a/boards/nxp/fmuk66-e/default.px4board b/boards/nxp/fmuk66-e/default.px4board index 749e62e5d5..689c9bf040 100644 --- a/boards/nxp/fmuk66-e/default.px4board +++ b/boards/nxp/fmuk66-e/default.px4board @@ -4,6 +4,7 @@ CONFIG_BOARD_CONSTRAINED_MEMORY=y CONFIG_BOARD_SERIAL_GPS1="/dev/ttyS3" CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS4" CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS1" +CONFIG_BOARD_SERIAL_RC="/dev/ttyS2" CONFIG_DRIVERS_ADC_ADS1115=y CONFIG_DRIVERS_ADC_BOARD_ADC=y CONFIG_COMMON_BAROMETERS=y diff --git a/boards/nxp/fmuk66-e/src/board_config.h b/boards/nxp/fmuk66-e/src/board_config.h index af6c56a469..bbce079bd6 100644 --- a/boards/nxp/fmuk66-e/src/board_config.h +++ b/boards/nxp/fmuk66-e/src/board_config.h @@ -130,9 +130,6 @@ __END_DECLS #define SPEKTRUM_RX_AS_UART() px4_arch_configgpio(PIN_UART1_RX) #define SPEKTRUM_OUT(_one_true) px4_arch_gpiowrite(GPIO_PPM_IN_AS_OUT, (_one_true)) -/* RC input */ - -#define RC_SERIAL_PORT "/dev/ttyS2" /* UART1 */ #define GPIO_RSSI_IN PIN_ADC1_SE13 /* Ethernet Control diff --git a/boards/nxp/fmuk66-v3/default.px4board b/boards/nxp/fmuk66-v3/default.px4board index 268e89c70f..4b46ad9dbb 100644 --- a/boards/nxp/fmuk66-v3/default.px4board +++ b/boards/nxp/fmuk66-v3/default.px4board @@ -4,6 +4,7 @@ CONFIG_BOARD_CONSTRAINED_MEMORY=y CONFIG_BOARD_SERIAL_GPS1="/dev/ttyS3" CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS4" CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS1" +CONFIG_BOARD_SERIAL_RC="/dev/ttyS2" CONFIG_DRIVERS_ADC_ADS1115=y CONFIG_DRIVERS_ADC_BOARD_ADC=y CONFIG_COMMON_BAROMETERS=y diff --git a/boards/nxp/fmuk66-v3/src/board_config.h b/boards/nxp/fmuk66-v3/src/board_config.h index 56a5c0ceb1..9a171d6e25 100644 --- a/boards/nxp/fmuk66-v3/src/board_config.h +++ b/boards/nxp/fmuk66-v3/src/board_config.h @@ -130,9 +130,6 @@ __END_DECLS #define SPEKTRUM_RX_AS_UART() px4_arch_configgpio(PIN_UART1_RX) #define SPEKTRUM_OUT(_one_true) px4_arch_gpiowrite(GPIO_PPM_IN_AS_OUT, (_one_true)) -/* RC input */ - -#define RC_SERIAL_PORT "/dev/ttyS2" /* UART1 */ #define GPIO_RSSI_IN PIN_ADC1_SE13 /* Ethernet Control diff --git a/boards/nxp/mr-canhubk3/src/board_config.h b/boards/nxp/mr-canhubk3/src/board_config.h index 7ea2a91e8b..7a190fd1fd 100644 --- a/boards/nxp/mr-canhubk3/src/board_config.h +++ b/boards/nxp/mr-canhubk3/src/board_config.h @@ -87,7 +87,6 @@ __BEGIN_DECLS #define DIRECT_PWM_OUTPUT_CHANNELS 8 -#define RC_SERIAL_PORT "/dev/ttyS5" #define RC_SERIAL_SINGLEWIRE_FORCE #define RC_SERIAL_INVERT_RX_ONLY diff --git a/boards/omnibus/f4sd/default.px4board b/boards/omnibus/f4sd/default.px4board index 8d3c58a7f0..5a84574edb 100644 --- a/boards/omnibus/f4sd/default.px4board +++ b/boards/omnibus/f4sd/default.px4board @@ -5,6 +5,7 @@ CONFIG_BOARD_NO_HELP=y CONFIG_BOARD_CONSTRAINED_MEMORY=y CONFIG_BOARD_SERIAL_URT6="/dev/ttyS2" CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS1" +CONFIG_BOARD_SERIAL_RC="/dev/ttyS0" CONFIG_DRIVERS_ADC_BOARD_ADC=y CONFIG_DRIVERS_BAROMETER_BMP280=y CONFIG_DRIVERS_CDCACM_AUTOSTART=y diff --git a/boards/omnibus/f4sd/src/board_config.h b/boards/omnibus/f4sd/src/board_config.h index 627a42e9c0..69e2e9672a 100644 --- a/boards/omnibus/f4sd/src/board_config.h +++ b/boards/omnibus/f4sd/src/board_config.h @@ -122,7 +122,6 @@ #define HRT_PPM_CHANNEL 3 // capture/compare channel 3 #define GPIO_PPM_IN (GPIO_ALT|GPIO_AF2|GPIO_PULLUP|GPIO_PORTB|GPIO_PIN8) -#define RC_SERIAL_PORT "/dev/ttyS0" #define BOARD_SUPPORTS_RC_SERIAL_PORT_OUTPUT /* diff --git a/boards/px4/fmu-v4/default.px4board b/boards/px4/fmu-v4/default.px4board index e7906db52c..d1b494e06e 100644 --- a/boards/px4/fmu-v4/default.px4board +++ b/boards/px4/fmu-v4/default.px4board @@ -4,6 +4,7 @@ CONFIG_BOARD_CONSTRAINED_MEMORY=y CONFIG_BOARD_SERIAL_GPS1="/dev/ttyS3" CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS1" CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS2" +CONFIG_BOARD_SERIAL_RC="/dev/ttyS4" CONFIG_BOARD_SERIAL_WIFI="/dev/ttyS0" CONFIG_DRIVERS_ADC_ADS1115=y CONFIG_DRIVERS_ADC_BOARD_ADC=y diff --git a/boards/px4/fmu-v4/src/board_config.h b/boards/px4/fmu-v4/src/board_config.h index ef6571d84d..c046937f41 100644 --- a/boards/px4/fmu-v4/src/board_config.h +++ b/boards/px4/fmu-v4/src/board_config.h @@ -113,10 +113,6 @@ #define HRT_PPM_CHANNEL 3 /* use capture/compare channel 3 */ #define GPIO_PPM_IN (GPIO_ALT|GPIO_AF2|GPIO_PULLUP|GPIO_PORTB|GPIO_PIN0) -/* RC Serial port */ - -#define RC_SERIAL_PORT "/dev/ttyS4" - /* PWM input driver. Use FMU AUX5 pins attached to timer4 channel 2. */ #define PWMIN_TIMER 4 #define PWMIN_TIMER_CHANNEL 2 diff --git a/boards/px4/fmu-v5/default.px4board b/boards/px4/fmu-v5/default.px4board index 1132a48bbf..a237bf646f 100644 --- a/boards/px4/fmu-v5/default.px4board +++ b/boards/px4/fmu-v5/default.px4board @@ -4,6 +4,7 @@ CONFIG_BOARD_SERIAL_GPS1="/dev/ttyS0" CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS1" CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS2" CONFIG_BOARD_SERIAL_TEL4="/dev/ttyS3" +CONFIG_BOARD_SERIAL_RC="/dev/ttyS4" CONFIG_DRIVERS_ADC_ADS1115=y CONFIG_DRIVERS_ADC_BOARD_ADC=y CONFIG_COMMON_BAROMETERS=y diff --git a/boards/px4/fmu-v5/src/board_config.h b/boards/px4/fmu-v5/src/board_config.h index 8246664dec..c1101c6328 100644 --- a/boards/px4/fmu-v5/src/board_config.h +++ b/boards/px4/fmu-v5/src/board_config.h @@ -297,8 +297,6 @@ #define GPIO_PPM_IN /* PI5 T8C1 */ GPIO_TIM8_CH1IN_2 /* RC Serial port */ - -#define RC_SERIAL_PORT "/dev/ttyS4" #define RC_SERIAL_SINGLEWIRE #define BOARD_SUPPORTS_RC_SERIAL_PORT_OUTPUT diff --git a/boards/px4/fmu-v5x/default.px4board b/boards/px4/fmu-v5x/default.px4board index 8ba41726c0..cc60df3399 100644 --- a/boards/px4/fmu-v5x/default.px4board +++ b/boards/px4/fmu-v5x/default.px4board @@ -6,6 +6,7 @@ CONFIG_BOARD_SERIAL_GPS2="/dev/ttyS7" CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS6" CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS4" CONFIG_BOARD_SERIAL_TEL3="/dev/ttyS1" +CONFIG_BOARD_SERIAL_RC="/dev/ttyS5" CONFIG_BOARD_SERIAL_EXT2="/dev/ttyS3" CONFIG_DRIVERS_ADC_ADS1115=y CONFIG_DRIVERS_ADC_BOARD_ADC=y diff --git a/boards/px4/fmu-v5x/src/board_config.h b/boards/px4/fmu-v5x/src/board_config.h index aaa7c21df8..14c2bdc1fc 100644 --- a/boards/px4/fmu-v5x/src/board_config.h +++ b/boards/px4/fmu-v5x/src/board_config.h @@ -287,7 +287,6 @@ #define GPIO_PPM_IN /* PI5 T8C1 */ GPIO_TIM8_CH1IN_2 /* RC Serial port */ -#define RC_SERIAL_PORT "/dev/ttyS5" /* Some RC protocols are bi-directional, therefore we need a half-duplex UART */ #define RC_SERIAL_SINGLEWIRE /* The STM32 UART by default wires half-duplex mode to the TX pin, but our diff --git a/boards/px4/fmu-v6u/default.px4board b/boards/px4/fmu-v6u/default.px4board index e733dccc35..1884020f0a 100644 --- a/boards/px4/fmu-v6u/default.px4board +++ b/boards/px4/fmu-v6u/default.px4board @@ -5,6 +5,7 @@ CONFIG_BOARD_SERIAL_GPS2="/dev/ttyS7" CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS6" CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS4" CONFIG_BOARD_SERIAL_TEL3="/dev/ttyS1" +CONFIG_BOARD_SERIAL_RC="/dev/ttyS5" CONFIG_DRIVERS_ADC_ADS1115=y CONFIG_DRIVERS_ADC_BOARD_ADC=y CONFIG_COMMON_BAROMETERS=y diff --git a/boards/px4/fmu-v6u/src/board_config.h b/boards/px4/fmu-v6u/src/board_config.h index a61f2a5a57..47d75eab8c 100644 --- a/boards/px4/fmu-v6u/src/board_config.h +++ b/boards/px4/fmu-v6u/src/board_config.h @@ -257,8 +257,6 @@ #define GPIO_PPM_IN /* PI5 T8C1 */ GPIO_TIM8_CH1IN_2 /* RC Serial port */ - -#define RC_SERIAL_PORT "/dev/ttyS5" #define RC_SERIAL_SINGLEWIRE #define RC_SERIAL_SWAP_RXTX diff --git a/boards/px4/fmu-v6x/default.px4board b/boards/px4/fmu-v6x/default.px4board index eedfd4c90e..0df57e9595 100644 --- a/boards/px4/fmu-v6x/default.px4board +++ b/boards/px4/fmu-v6x/default.px4board @@ -6,6 +6,7 @@ CONFIG_BOARD_SERIAL_GPS2="/dev/ttyS7" CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS6" CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS4" CONFIG_BOARD_SERIAL_TEL3="/dev/ttyS1" +CONFIG_BOARD_SERIAL_RC="/dev/ttyS5" CONFIG_BOARD_SERIAL_EXT2="/dev/ttyS3" CONFIG_DRIVERS_ADC_ADS1115=y CONFIG_DRIVERS_ADC_BOARD_ADC=y diff --git a/boards/px4/fmu-v6x/src/board_config.h b/boards/px4/fmu-v6x/src/board_config.h index 6590699a39..6b52aec4ac 100644 --- a/boards/px4/fmu-v6x/src/board_config.h +++ b/boards/px4/fmu-v6x/src/board_config.h @@ -324,7 +324,6 @@ #define GPIO_PPM_IN /* PI5 T8C1 */ GPIO_TIM8_CH1IN_2 /* RC Serial port */ -#define RC_SERIAL_PORT "/dev/ttyS5" /* Some RC protocols are bi-directional, therefore we need a half-duplex UART */ #define RC_SERIAL_SINGLEWIRE /* The STM32 UART by default wires half-duplex mode to the TX pin, but our diff --git a/boards/px4/fmu-v6xrt/default.px4board b/boards/px4/fmu-v6xrt/default.px4board index 17434ed18d..7f04202cc9 100644 --- a/boards/px4/fmu-v6xrt/default.px4board +++ b/boards/px4/fmu-v6xrt/default.px4board @@ -6,6 +6,7 @@ CONFIG_BOARD_SERIAL_GPS2="/dev/ttyS3" CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS2" CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS5" CONFIG_BOARD_SERIAL_TEL3="/dev/ttyS6" +CONFIG_BOARD_SERIAL_RC="/dev/ttyS4" CONFIG_DRIVERS_ADC_ADS1115=y CONFIG_DRIVERS_ADC_BOARD_ADC=y CONFIG_DRIVERS_BAROMETER_BMP388=y diff --git a/boards/px4/fmu-v6xrt/src/board_config.h b/boards/px4/fmu-v6xrt/src/board_config.h index 059d0ac696..75f6dba54d 100644 --- a/boards/px4/fmu-v6xrt/src/board_config.h +++ b/boards/px4/fmu-v6xrt/src/board_config.h @@ -451,7 +451,6 @@ #define HRT_PPM_CHANNEL /* GPIO_EMC_B1_09 GPIO_GPT5_CAPTURE1_1 */ 1 /* use capture/compare channel 1 */ #define GPIO_PPM_IN /* GPIO_EMC_B1_09 GPT1_CAPTURE2 */ (GPIO_GPT5_CAPTURE1_1 | GENERAL_INPUT_IOMUX) -#define RC_SERIAL_PORT "/dev/ttyS4" #define RC_SERIAL_SINGLEWIRE 1 // Suport Single wire wiring #define RC_SERIAL_SWAP_RXTX 1 // Set Swap (but not supported in HW) to use Single wire #define RC_SERIAL_SWAP_USING_SINGLEWIRE 1 // Set to use Single wire swap as HW does not support swap diff --git a/boards/raspberrypi/pico/default.px4board b/boards/raspberrypi/pico/default.px4board index 410f8d4788..d1ca456d01 100644 --- a/boards/raspberrypi/pico/default.px4board +++ b/boards/raspberrypi/pico/default.px4board @@ -4,6 +4,7 @@ CONFIG_BOARD_CONSTRAINED_FLASH=y CONFIG_BOARD_CONSTRAINED_MEMORY=y CONFIG_BOARD_SERIAL_GPS1="/dev/ttyS2" CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS1" +CONFIG_BOARD_SERIAL_RC="/dev/ttyS3" CONFIG_DRIVERS_ADC_BOARD_ADC=y CONFIG_DRIVERS_BAROMETER_BMP280=y CONFIG_DRIVERS_CDCACM_AUTOSTART=y diff --git a/boards/raspberrypi/pico/src/board_config.h b/boards/raspberrypi/pico/src/board_config.h index 581233e7ac..975f722736 100644 --- a/boards/raspberrypi/pico/src/board_config.h +++ b/boards/raspberrypi/pico/src/board_config.h @@ -70,7 +70,7 @@ #define HRT_TIMER_CHANNEL 1 #define HRT_PPM_CHANNEL 1 // Number really doesn't matter for this board #define GPIO_PPM_IN (16 | GPIO_FUN(RP2040_GPIO_FUNC_SIO)) -#define RC_SERIAL_PORT "/dev/ttyS3" + #define BOARD_SUPPORTS_RC_SERIAL_PORT_OUTPUT /* This board provides a DMA pool and APIs */ // Needs to be figured out diff --git a/boards/sky-drones/smartap-airlink/default.px4board b/boards/sky-drones/smartap-airlink/default.px4board index fdfdcdea6a..c2757d4197 100644 --- a/boards/sky-drones/smartap-airlink/default.px4board +++ b/boards/sky-drones/smartap-airlink/default.px4board @@ -6,6 +6,7 @@ CONFIG_BOARD_SERIAL_GPS2="/dev/ttyS7" CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS6" CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS4" CONFIG_BOARD_SERIAL_TEL3="/dev/ttyS1" +CONFIG_BOARD_SERIAL_RC="/dev/ttyS5" CONFIG_DRIVERS_ADC_BOARD_ADC=y CONFIG_COMMON_BAROMETERS=y CONFIG_DRIVERS_BATT_SMBUS=y diff --git a/boards/sky-drones/smartap-airlink/src/board_config.h b/boards/sky-drones/smartap-airlink/src/board_config.h index 158fece58c..94dda444d4 100644 --- a/boards/sky-drones/smartap-airlink/src/board_config.h +++ b/boards/sky-drones/smartap-airlink/src/board_config.h @@ -251,8 +251,6 @@ #define GPIO_PPM_IN /* PI5 T8C1 */ GPIO_TIM8_CH1IN_2 /* RC Serial port */ - -#define RC_SERIAL_PORT "/dev/ttyS5" #define RC_SERIAL_SINGLEWIRE /* Input Capture Channels. */ diff --git a/boards/spracing/h7extreme/default.px4board b/boards/spracing/h7extreme/default.px4board index aa97905609..499cc115ac 100644 --- a/boards/spracing/h7extreme/default.px4board +++ b/boards/spracing/h7extreme/default.px4board @@ -1,5 +1,6 @@ CONFIG_BOARD_TOOLCHAIN="arm-none-eabi" CONFIG_BOARD_ARCHITECTURE="cortex-m7" +CONFIG_BOARD_SERIAL_RC="/dev/ttyS0" CONFIG_DRIVERS_ADC_BOARD_ADC=y CONFIG_COMMON_BAROMETERS=y CONFIG_DRIVERS_CAMERA_CAPTURE=y diff --git a/boards/spracing/h7extreme/src/board_config.h b/boards/spracing/h7extreme/src/board_config.h index 9c1ea8e431..5f2f6711c1 100644 --- a/boards/spracing/h7extreme/src/board_config.h +++ b/boards/spracing/h7extreme/src/board_config.h @@ -107,10 +107,6 @@ #define HRT_TIMER_CHANNEL 3 /* use capture/compare channel 3 */ -/* RC Serial port */ - -#define RC_SERIAL_PORT "/dev/ttyS0" - #define GPIO_RSSI_IN /* PC5 */ (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTC|GPIO_PIN5) #define SDIO_SLOTNO 0 /* Only one slot */ diff --git a/boards/uvify/core/default.px4board b/boards/uvify/core/default.px4board index 8c144aa606..2bce0ea783 100644 --- a/boards/uvify/core/default.px4board +++ b/boards/uvify/core/default.px4board @@ -5,6 +5,7 @@ CONFIG_BOARD_SERIAL_GPS1="/dev/ttyS3" CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS1" CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS2" CONFIG_BOARD_SERIAL_TEL3="/dev/ttyS6" +CONFIG_BOARD_SERIAL_RC="/dev/ttyS4" CONFIG_DRIVERS_ADC_BOARD_ADC=y CONFIG_DRIVERS_BAROMETER_MS5611=y CONFIG_DRIVERS_BATT_SMBUS=y diff --git a/boards/uvify/core/src/board_config.h b/boards/uvify/core/src/board_config.h index 22708b23e2..0726316ecd 100644 --- a/boards/uvify/core/src/board_config.h +++ b/boards/uvify/core/src/board_config.h @@ -111,10 +111,6 @@ #define HRT_PPM_CHANNEL 3 /* use capture/compare channel 3 */ #define GPIO_PPM_IN (GPIO_ALT|GPIO_AF2|GPIO_PULLUP|GPIO_PORTB|GPIO_PIN0) -/* RC Serial port */ - -#define RC_SERIAL_PORT "/dev/ttyS4" - /* PWM input driver. Use FMU AUX5 pins attached to timer4 channel 2. */ #define PWMIN_TIMER 4 #define PWMIN_TIMER_CHANNEL 2 diff --git a/boards/x-mav/ap-h743v2/src/board_config.h b/boards/x-mav/ap-h743v2/src/board_config.h index 96a4fbbbcb..30802b50a0 100644 --- a/boards/x-mav/ap-h743v2/src/board_config.h +++ b/boards/x-mav/ap-h743v2/src/board_config.h @@ -136,7 +136,6 @@ #define HRT_TIMER_CHANNEL 1 /* use capture/compare channel 1 */ /* RC Serial port */ -#define RC_SERIAL_PORT "/dev/ttyS4" #define BOARD_SUPPORTS_RC_SERIAL_PORT_OUTPUT // #define GPIO_SBUS_INV (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTD|GPIO_PIN14) diff --git a/boards/zeroone/x6/default.px4board b/boards/zeroone/x6/default.px4board index ba05f4ab5f..662248309a 100644 --- a/boards/zeroone/x6/default.px4board +++ b/boards/zeroone/x6/default.px4board @@ -7,6 +7,7 @@ CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS6" CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS4" CONFIG_BOARD_SERIAL_TEL3="/dev/ttyS1" CONFIG_BOARD_SERIAL_EXT2="/dev/ttyS3" +CONFIG_BOARD_SERIAL_RC="/dev/ttyS5" CONFIG_DRIVERS_ADC_ADS1115=y CONFIG_DRIVERS_ADC_BOARD_ADC=y CONFIG_DRIVERS_BAROMETER_INVENSENSE_ICP201XX=y diff --git a/boards/zeroone/x6/src/board_config.h b/boards/zeroone/x6/src/board_config.h index f1a00d642b..6e7aa7f484 100644 --- a/boards/zeroone/x6/src/board_config.h +++ b/boards/zeroone/x6/src/board_config.h @@ -313,8 +313,6 @@ #define GPIO_PPM_IN /* PI5 T8C1 */ GPIO_TIM8_CH1IN_2 /* RC Serial port */ - -#define RC_SERIAL_PORT "/dev/ttyS5" #define RC_SERIAL_SINGLEWIRE /* Input Capture Channels. */ diff --git a/platforms/common/include/px4_platform_common/board_common.h b/platforms/common/include/px4_platform_common/board_common.h index 4dff12c1b2..ec3ffd489d 100644 --- a/platforms/common/include/px4_platform_common/board_common.h +++ b/platforms/common/include/px4_platform_common/board_common.h @@ -443,7 +443,7 @@ __BEGIN_DECLS * Name: board_rc_singlewire * * Description: - * A board may define RC_SERIAL_SINGLEWIRE, so that RC_SERIAL_PORT is configured + * A board may define RC_SERIAL_SINGLEWIRE, so that CONFIG_BOARD_SERIAL_RC is configured * as singlewire UART. * * Input Parameters: @@ -456,7 +456,7 @@ __BEGIN_DECLS ************************************************************************************/ #if defined(RC_SERIAL_SINGLEWIRE) -static inline bool board_rc_singlewire(const char *device) { return strcmp(device, RC_SERIAL_PORT) == 0; } +static inline bool board_rc_singlewire(const char *device) { return strcmp(device, CONFIG_BOARD_SERIAL_RC) == 0; } #elif defined(RC_SERIAL_SINGLEWIRE_FORCE) static inline bool board_rc_singlewire(const char *device) { return true; } #else @@ -467,7 +467,7 @@ static inline bool board_rc_singlewire(const char *device) { return false; } * Name: board_rc_swap_rxtx * * Description: - * A board may define RC_SERIAL_SWAP_RXTX, so that RC_SERIAL_PORT is configured + * A board may define RC_SERIAL_SWAP_RXTX, so that CONFIG_BOARD_SERIAL_RC is configured * as UART with RX/TX swapped. * * It can optionaly define RC_SERIAL_SWAP_USING_SINGLEWIRE If the board is wired @@ -489,7 +489,7 @@ static inline bool board_rc_singlewire(const char *device) { return false; } ************************************************************************************/ #if defined(RC_SERIAL_SWAP_RXTX) -static inline bool board_rc_swap_rxtx(const char *device) { return strcmp(device, RC_SERIAL_PORT) == 0; } +static inline bool board_rc_swap_rxtx(const char *device) { return strcmp(device, CONFIG_BOARD_SERIAL_RC) == 0; } #else static inline bool board_rc_swap_rxtx(const char *device) { return false; } #endif @@ -499,7 +499,7 @@ static inline bool board_rc_swap_rxtx(const char *device) { return false; } * * Description: * All boards may optionally define RC_INVERT_INPUT(bool invert) that is - * used to invert the RC_SERIAL_PORT RC port (e.g. to toggle an external XOR via + * used to invert the CONFIG_BOARD_SERIAL_RC RC port (e.g. to toggle an external XOR via * GPIO). * * Input Parameters: @@ -514,7 +514,7 @@ static inline bool board_rc_swap_rxtx(const char *device) { return false; } #ifdef RC_INVERT_INPUT static inline bool board_rc_invert_input(const char *device, bool invert) { - if (strcmp(device, RC_SERIAL_PORT) == 0) { RC_INVERT_INPUT(invert); return true; } + if (strcmp(device, CONFIG_BOARD_SERIAL_RC) == 0) { RC_INVERT_INPUT(invert); return true; } return false; } diff --git a/src/drivers/rc_input/RCInput.cpp b/src/drivers/rc_input/RCInput.cpp index 12cd1ab0bf..4792a10b7c 100644 --- a/src/drivers/rc_input/RCInput.cpp +++ b/src/drivers/rc_input/RCInput.cpp @@ -124,26 +124,11 @@ RCInput::task_spawn(int argc, char *argv[]) int ch; const char *myoptarg = nullptr; const char *device_name = nullptr; - bool silent = false; -#if defined(RC_SERIAL_PORT) - 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; - silent = true; - } - -#endif // RC_SERIAL_PORT && PX4IO_SERIAL_DEVICE while ((ch = px4_getopt(argc, argv, "d:", &myoptind, &myoptarg)) != EOF) { switch (ch) { case 'd': device_name = myoptarg; - silent = false; break; case '?': @@ -161,6 +146,20 @@ RCInput::task_spawn(int argc, char *argv[]) return -1; } +#if defined(CONFIG_BOARD_SERIAL_RC) && defined(PX4IO_SERIAL_DEVICE) + + // if board has optional RC (CONFIG_BOARD_SERIAL_RC) potentially on same + // serial as px4io (PX4IO_SERIAL_DEVICE) don't allow conflict (silently for now) + if ((strcmp(device_name, PX4IO_SERIAL_DEVICE) == 0) + && (strcmp(CONFIG_BOARD_SERIAL_RC, PX4IO_SERIAL_DEVICE) == 0) + && (access("/dev/px4io", R_OK) == 0) + ) { + PX4_INFO("unable to start, conflict with PX4IO on %s", device_name); + return PX4_OK; + } + +#endif // CONFIG_BOARD_SERIAL_RC && PX4IO_SERIAL_DEVICE + if (device_name && (access(device_name, R_OK | W_OK) == 0)) { RCInput *instance = new RCInput(device_name); @@ -176,15 +175,12 @@ RCInput::task_spawn(int argc, char *argv[]) return PX4_OK; - } else if (silent) { - return PX4_OK; - } else { if (device_name) { PX4_ERR("invalid device (-d) %s", device_name); } else { - PX4_INFO("valid device required"); + PX4_ERR("valid device required"); } } diff --git a/src/drivers/rc_input/module.yaml b/src/drivers/rc_input/module.yaml index bf15df0920..61c3556c34 100644 --- a/src/drivers/rc_input/module.yaml +++ b/src/drivers/rc_input/module.yaml @@ -24,11 +24,8 @@ parameters: default: -1 serial_config: - - command: set RC_INPUT_ARGS "-d ${SERIAL_DEV}" + - command: "rc_input start -d ${SERIAL_DEV}" port_config_param: name: RC_PORT_CONFIG group: Serial default: RC - description_extended: | - Setting this to 'Disabled' will use a board-specific default port - for RC input.