From 8d06d1c60714e2ab0702039664d759b95ffe981d Mon Sep 17 00:00:00 2001 From: Hamish Willee Date: Wed, 11 May 2022 11:27:48 +1000 Subject: [PATCH 1/7] commander_params: COM_RC_IN_MODE - comment out of date --- src/modules/commander/commander_params.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/modules/commander/commander_params.c b/src/modules/commander/commander_params.c index 2553dff4a501..cbf3ccf90a2e 100644 --- a/src/modules/commander/commander_params.c +++ b/src/modules/commander/commander_params.c @@ -229,9 +229,7 @@ PARAM_DEFINE_INT32(COM_HOME_IN_AIR, 0); * RC control input mode * * The default value of 0 requires a valid RC transmitter setup. - * Setting this to 1 allows joystick control and disables RC input handling and the associated checks. A value of - * 2 will generate RC control data from manual input received via MAVLink instead - * of directly forwarding the manual input data. + * Setting this to 1 allows joystick control and disables RC input handling and the associated checks. * * @group Commander * @min 0 From 081fb609bcda12c7b45846f28ce76cd3cd1b404c Mon Sep 17 00:00:00 2001 From: Hamish Willee Date: Fri, 13 May 2022 08:40:53 +1000 Subject: [PATCH 2/7] Update src/modules/commander/commander_params.c Co-authored-by: Matthias Grob --- src/modules/commander/commander_params.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/commander/commander_params.c b/src/modules/commander/commander_params.c index cbf3ccf90a2e..35237ca90111 100644 --- a/src/modules/commander/commander_params.c +++ b/src/modules/commander/commander_params.c @@ -228,7 +228,7 @@ PARAM_DEFINE_INT32(COM_HOME_IN_AIR, 0); /** * RC control input mode * - * The default value of 0 requires a valid RC transmitter setup. + * With value 0 a valid RC transmitter calibration is required. * Setting this to 1 allows joystick control and disables RC input handling and the associated checks. * * @group Commander From 06d1469217a943c00f435f6dfc1b57d0f6cbdd40 Mon Sep 17 00:00:00 2001 From: Hamish Willee Date: Fri, 13 May 2022 08:41:07 +1000 Subject: [PATCH 3/7] Update src/modules/commander/commander_params.c Co-authored-by: Matthias Grob --- src/modules/commander/commander_params.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/modules/commander/commander_params.c b/src/modules/commander/commander_params.c index 35237ca90111..458224689f5c 100644 --- a/src/modules/commander/commander_params.c +++ b/src/modules/commander/commander_params.c @@ -229,7 +229,10 @@ PARAM_DEFINE_INT32(COM_HOME_IN_AIR, 0); * RC control input mode * * With value 0 a valid RC transmitter calibration is required. - * Setting this to 1 allows joystick control and disables RC input handling and the associated checks. + * A value of 1 allows joystick control only and disables RC input handling and the associated checks. + * A value of 2 allows both sources and will fall back to the next valid one once the stream in use gets invalid. + * A value of 3 allows either input from RC or joystick. The first available source is kept until reboot. + * A value of 4 ignores any stick input. * * @group Commander * @min 0 From 40b545a20d5039070ea28d4f72383b403d3f6b5b Mon Sep 17 00:00:00 2001 From: Hamish Willee Date: Thu, 7 Jul 2022 13:44:50 +1000 Subject: [PATCH 4/7] Update src/modules/commander/commander_params.c --- src/modules/commander/commander_params.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/commander/commander_params.c b/src/modules/commander/commander_params.c index 458224689f5c..be107fc7ada8 100644 --- a/src/modules/commander/commander_params.c +++ b/src/modules/commander/commander_params.c @@ -231,7 +231,7 @@ PARAM_DEFINE_INT32(COM_HOME_IN_AIR, 0); * With value 0 a valid RC transmitter calibration is required. * A value of 1 allows joystick control only and disables RC input handling and the associated checks. * A value of 2 allows both sources and will fall back to the next valid one once the stream in use gets invalid. - * A value of 3 allows either input from RC or joystick. The first available source is kept until reboot. + * A value of 3 allows either input from RC or joystick. The first available source is selected and used until reboot. * A value of 4 ignores any stick input. * * @group Commander From 2af1dfab0af8378b51c59d3f27c4418c2f2c5b4b Mon Sep 17 00:00:00 2001 From: Hamish Willee Date: Thu, 7 Jul 2022 13:45:05 +1000 Subject: [PATCH 5/7] Update src/modules/commander/commander_params.c --- src/modules/commander/commander_params.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/commander/commander_params.c b/src/modules/commander/commander_params.c index be107fc7ada8..df118053c11a 100644 --- a/src/modules/commander/commander_params.c +++ b/src/modules/commander/commander_params.c @@ -228,7 +228,7 @@ PARAM_DEFINE_INT32(COM_HOME_IN_AIR, 0); /** * RC control input mode * - * With value 0 a valid RC transmitter calibration is required. + * A value of 0 enables RC transmitter control (only). A valid RC transmitter calibration is required. * A value of 1 allows joystick control only and disables RC input handling and the associated checks. * A value of 2 allows both sources and will fall back to the next valid one once the stream in use gets invalid. * A value of 3 allows either input from RC or joystick. The first available source is selected and used until reboot. From 3d22b5125deb86298d021916c94f6c358f6de604 Mon Sep 17 00:00:00 2001 From: Hamish Willee Date: Thu, 7 Jul 2022 13:45:37 +1000 Subject: [PATCH 6/7] Update src/modules/commander/commander_params.c --- src/modules/commander/commander_params.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/commander/commander_params.c b/src/modules/commander/commander_params.c index df118053c11a..5fa92abc28d1 100644 --- a/src/modules/commander/commander_params.c +++ b/src/modules/commander/commander_params.c @@ -229,7 +229,7 @@ PARAM_DEFINE_INT32(COM_HOME_IN_AIR, 0); * RC control input mode * * A value of 0 enables RC transmitter control (only). A valid RC transmitter calibration is required. - * A value of 1 allows joystick control only and disables RC input handling and the associated checks. + * A value of 1 allows joystick control only. RC input handling and the associated checks are disabled. * A value of 2 allows both sources and will fall back to the next valid one once the stream in use gets invalid. * A value of 3 allows either input from RC or joystick. The first available source is selected and used until reboot. * A value of 4 ignores any stick input. From f4c38a20def6f62a78499f4354badbd80a44e258 Mon Sep 17 00:00:00 2001 From: Hamish Willee Date: Thu, 7 Jul 2022 13:46:09 +1000 Subject: [PATCH 7/7] Update src/modules/commander/commander_params.c --- src/modules/commander/commander_params.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/commander/commander_params.c b/src/modules/commander/commander_params.c index 5fa92abc28d1..d4668b027739 100644 --- a/src/modules/commander/commander_params.c +++ b/src/modules/commander/commander_params.c @@ -230,7 +230,7 @@ PARAM_DEFINE_INT32(COM_HOME_IN_AIR, 0); * * A value of 0 enables RC transmitter control (only). A valid RC transmitter calibration is required. * A value of 1 allows joystick control only. RC input handling and the associated checks are disabled. - * A value of 2 allows both sources and will fall back to the next valid one once the stream in use gets invalid. + * A value of 2 allows either RC Transmitter or Joystick input. The first valid input is used, will fallback to other sources if the input stream becomes invalid. * A value of 3 allows either input from RC or joystick. The first available source is selected and used until reboot. * A value of 4 ignores any stick input. *