fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-16 13:40:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Parameter update - Rename variables in modules/mavlink

Browse Source 
using parameter_update.py script
This commit is contained in:
bresch
2019-03-25 14:45:10 +01:00
committed by Matthias Grob
parent f3990c84fc
commit da2deaa0b2
2 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mavlink/mavlink_main.cpp
+12 -12
View File
@@ -258,13 +258,13 @@ Mavlink::Mavlink() :
mavlink_update_parameters();
// save the current system- and component ID because we don't allow them to change during operation
int sys_id = _param_system_id.get();
int sys_id = _param_mav_sys_id.get();
if (sys_id > 0 && sys_id < 255) {
mavlink_system.sysid = sys_id;
}
int comp_id = _param_component_id.get();
int comp_id = _param_mav_comp_id.get();
if (comp_id > 0 && comp_id < 255) {
mavlink_system.compid = comp_id;
@@ -302,16 +302,16 @@ Mavlink::mavlink_update_parameters()
{
updateParams();
int32_t proto = _param_mav_proto_version.get();
int32_t proto = _param_mav_proto_ver.get();
if (_protocol_version_switch != proto) {
_protocol_version_switch = proto;
set_proto_version(proto);
}
if (_param_system_type.get() < 0 || _param_system_type.get() >= MAV_TYPE_ENUM_END) {
_param_system_type.set(0);
_param_system_type.commit_no_notification();
if (_param_mav_type.get() < 0 || _param_mav_type.get() >= MAV_TYPE_ENUM_END) {
_param_mav_type.set(0);
_param_mav_type.commit_no_notification();
PX4_ERR("MAV_TYPE parameter invalid, resetting to 0.");
}
}
@@ -2221,7 +2221,7 @@ Mavlink::task_main(int argc, char *argv[])
#if defined(CONFIG_NET)
if (_param_broadcast_mode.get() != BROADCAST_MODE_MULTICAST) {
if (_param_mav_broadcast.get() != BROADCAST_MODE_MULTICAST) {
_src_addr_initialized = false;
}
@@ -2568,7 +2568,7 @@ void Mavlink::publish_telemetry_status()
void Mavlink::check_radio_config()
{
/* radio config check */
if (_uart_fd >= 0 && _param_radio_id.get() != 0
if (_uart_fd >= 0 && _param_mav_radio_id.get() != 0
&& _tstatus.type == telemetry_status_s::LINK_TYPE_3DR_RADIO) {
/* request to configure radio and radio is present */
FILE *fs = fdopen(_uart_fd, "w");
@@ -2579,9 +2579,9 @@ void Mavlink::check_radio_config()
fprintf(fs, "+++\n");
px4_usleep(1200000);
if (_param_radio_id.get() > 0) {
if (_param_mav_radio_id.get() > 0) {
/* set channel */
fprintf(fs, "ATS3=%u\n", _param_radio_id.get());
fprintf(fs, "ATS3=%u\n", _param_mav_radio_id.get());
px4_usleep(200000);
} else {
@@ -2612,8 +2612,8 @@ void Mavlink::check_radio_config()
}
/* reset param and save */
_param_radio_id.set(0);
_param_radio_id.commit_no_notification();
_param_mav_radio_id.set(0);
_param_mav_radio_id.commit_no_notification();
}
}