From 38bc46fd1af5823c58a84abc7c08172e82a85039 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Fri, 16 Apr 2021 09:49:01 -0400 Subject: [PATCH] re-add RC_MAP_RATT_SW (unused) and mark active for QGC --- src/modules/rc_update/params_deprecated.c | 60 +++++++++++++++++++++++ src/modules/rc_update/rc_update.cpp | 12 +++++ 2 files changed, 72 insertions(+) create mode 100644 src/modules/rc_update/params_deprecated.c diff --git a/src/modules/rc_update/params_deprecated.c b/src/modules/rc_update/params_deprecated.c new file mode 100644 index 0000000000..7664aeef31 --- /dev/null +++ b/src/modules/rc_update/params_deprecated.c @@ -0,0 +1,60 @@ +/**************************************************************************** + * + * Copyright (c) 2021 PX4 Development Team. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name PX4 nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/** + * Rattitude switch channel (deprecated) + * + * @min 0 + * @max 18 + * @group Radio Switches + * @value 0 Unassigned + * @value 1 Channel 1 + * @value 2 Channel 2 + * @value 3 Channel 3 + * @value 4 Channel 4 + * @value 5 Channel 5 + * @value 6 Channel 6 + * @value 7 Channel 7 + * @value 8 Channel 8 + * @value 9 Channel 9 + * @value 10 Channel 10 + * @value 11 Channel 11 + * @value 12 Channel 12 + * @value 13 Channel 13 + * @value 14 Channel 14 + * @value 15 Channel 15 + * @value 16 Channel 16 + * @value 17 Channel 17 + * @value 18 Channel 18 + */ +PARAM_DEFINE_INT32(RC_MAP_RATT_SW, 0); diff --git a/src/modules/rc_update/rc_update.cpp b/src/modules/rc_update/rc_update.cpp index d259496866..7e80417a4f 100644 --- a/src/modules/rc_update/rc_update.cpp +++ b/src/modules/rc_update/rc_update.cpp @@ -155,6 +155,18 @@ void RCUpdate::parameters_updated() } update_rc_functions(); + + // deprecated parameters, will be removed post v1.12 once QGC is updated + { + int32_t rc_map_value = 0; + + if (param_get(param_find("RC_MAP_RATT_SW"), &rc_map_value) == PX4_OK) { + if (rc_map_value != 0) { + PX4_WARN("RC_MAP_RATT_SW deprecated"); + param_reset(param_find("RC_MAP_RATT_SW")); + } + } + } } void RCUpdate::update_rc_functions()