mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-07-13 08:50:35 +08:00
Merge remote-tracking branch 'upstream/master' into linux
Signed-off-by: Mark Charlebois <charlebm@gmail.com> Conflicts: src/modules/commander/accelerometer_calibration.cpp
This commit is contained in:
@@ -50,18 +50,25 @@
|
||||
/**
|
||||
* MAVLink system ID
|
||||
* @group MAVLink
|
||||
* @min 1
|
||||
* @max 250
|
||||
*/
|
||||
PARAM_DEFINE_INT32(MAV_SYS_ID, 1);
|
||||
|
||||
/**
|
||||
* MAVLink component ID
|
||||
* @group MAVLink
|
||||
* @min 1
|
||||
* @max 50
|
||||
*/
|
||||
PARAM_DEFINE_INT32(MAV_COMP_ID, 50);
|
||||
|
||||
/**
|
||||
* MAVLink type
|
||||
* @group MAVLink
|
||||
*/
|
||||
PARAM_DEFINE_INT32(MAV_TYPE, MAV_TYPE_FIXED_WING);
|
||||
|
||||
/**
|
||||
* Use/Accept HIL GPS message (even if not in HIL mode)
|
||||
*
|
||||
@@ -70,6 +77,7 @@ PARAM_DEFINE_INT32(MAV_TYPE, MAV_TYPE_FIXED_WING);
|
||||
* @group MAVLink
|
||||
*/
|
||||
PARAM_DEFINE_INT32(MAV_USEHILGPS, 0);
|
||||
|
||||
/**
|
||||
* Forward external setpoint messages
|
||||
*
|
||||
@@ -80,6 +88,18 @@ PARAM_DEFINE_INT32(MAV_USEHILGPS, 0);
|
||||
*/
|
||||
PARAM_DEFINE_INT32(MAV_FWDEXTSP, 1);
|
||||
|
||||
/**
|
||||
* Test parameter
|
||||
*
|
||||
* This parameter is not actively used by the system. Its purpose is to allow
|
||||
* testing the parameter interface on the communication level.
|
||||
*
|
||||
* @group MAVLink
|
||||
* @min -1000
|
||||
* @max 1000
|
||||
*/
|
||||
PARAM_DEFINE_INT32(MAV_TEST_PAR, 1);
|
||||
|
||||
mavlink_system_t mavlink_system = {
|
||||
100,
|
||||
50
|
||||
|
||||
@@ -506,6 +506,9 @@ void Mavlink::mavlink_update_system(void)
|
||||
_param_system_type = param_find("MAV_TYPE");
|
||||
_param_use_hil_gps = param_find("MAV_USEHILGPS");
|
||||
_param_forward_externalsp = param_find("MAV_FWDEXTSP");
|
||||
|
||||
/* test param - needs to be referenced, but is unused */
|
||||
(void)param_find("MAV_TEST_PAR");
|
||||
}
|
||||
|
||||
/* update system and component id */
|
||||
|
||||
Reference in New Issue
Block a user