fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-24 15:53:33 +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-04-03 15:38:50 +02: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(); mavlink_update_parameters();
// save the current system- and component ID because we don't allow them to change during operation // 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) { if (sys_id > 0 && sys_id < 255) {
mavlink_system.sysid = sys_id; 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) { if (comp_id > 0 && comp_id < 255) {
mavlink_system.compid = comp_id; mavlink_system.compid = comp_id;
@@ -302,16 +302,16 @@ Mavlink::mavlink_update_parameters()
{ {
updateParams(); updateParams();
int32_t proto = _param_mav_proto_version.get(); int32_t proto = _param_mav_proto_ver.get();
if (_protocol_version_switch != proto) { if (_protocol_version_switch != proto) {
_protocol_version_switch = proto; _protocol_version_switch = proto;
set_proto_version(proto); set_proto_version(proto);
} }
if (_param_system_type.get() < 0 || _param_system_type.get() >= MAV_TYPE_ENUM_END) { if (_param_mav_type.get() < 0 || _param_mav_type.get() >= MAV_TYPE_ENUM_END) {
_param_system_type.set(0); _param_mav_type.set(0);
_param_system_type.commit_no_notification(); _param_mav_type.commit_no_notification();
PX4_ERR("MAV_TYPE parameter invalid, resetting to 0."); 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 defined(CONFIG_NET)
if (_param_broadcast_mode.get() != BROADCAST_MODE_MULTICAST) { if (_param_mav_broadcast.get() != BROADCAST_MODE_MULTICAST) {
_src_addr_initialized = false; _src_addr_initialized = false;
} }
@@ -2568,7 +2568,7 @@ void Mavlink::publish_telemetry_status()
void Mavlink::check_radio_config() void Mavlink::check_radio_config()
{ {
/* radio config check */ /* 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) { && _tstatus.type == telemetry_status_s::LINK_TYPE_3DR_RADIO) {
/* request to configure radio and radio is present */ /* request to configure radio and radio is present */
FILE *fs = fdopen(_uart_fd, "w"); FILE *fs = fdopen(_uart_fd, "w");
@@ -2579,9 +2579,9 @@ void Mavlink::check_radio_config()
fprintf(fs, "+++\n"); fprintf(fs, "+++\n");
px4_usleep(1200000); px4_usleep(1200000);
if (_param_radio_id.get() > 0) { if (_param_mav_radio_id.get() > 0) {
/* set channel */ /* set channel */
fprintf(fs, "ATS3=%u\n", _param_radio_id.get()); fprintf(fs, "ATS3=%u\n", _param_mav_radio_id.get());
px4_usleep(200000); px4_usleep(200000);
} else { } else {
@@ -2612,8 +2612,8 @@ void Mavlink::check_radio_config()
} }
/* reset param and save */ /* reset param and save */
_param_radio_id.set(0); _param_mav_radio_id.set(0);
_param_radio_id.commit_no_notification(); _param_mav_radio_id.commit_no_notification();
} }
} }
src/modules/mavlink/mavlink_main.h
+18 -18
View File
@@ -244,9 +244,9 @@ public:
bool get_hil_enabled() { return _hil_enabled; } bool get_hil_enabled() { return _hil_enabled; }
bool get_use_hil_gps() { return _param_use_hil_gps.get(); } bool get_use_hil_gps() { return _param_mav_usehilgps.get(); }
bool get_forward_externalsp() { return _param_forward_externalsp.get(); } bool get_forward_externalsp() { return _param_mav_fwdextsp.get(); }
bool get_flow_control_enabled() { return _flow_control_mode; } bool get_flow_control_enabled() { return _flow_control_mode; }
@@ -254,7 +254,7 @@ public:
bool is_connected() { return (hrt_elapsed_time(&_tstatus.heartbeat_time) < 3_s); } bool is_connected() { return (hrt_elapsed_time(&_tstatus.heartbeat_time) < 3_s); }
bool broadcast_enabled() { return _param_broadcast_mode.get() == BROADCAST_MODE_ON; } bool broadcast_enabled() { return _param_mav_broadcast.get() == BROADCAST_MODE_ON; }
/** /**
* Set the boot complete flag on all instances * Set the boot complete flag on all instances
@@ -443,7 +443,7 @@ public:
ringbuffer::RingBuffer *get_logbuffer() { return &_logbuffer; } ringbuffer::RingBuffer *get_logbuffer() { return &_logbuffer; }
unsigned get_system_type() { return _param_system_type.get(); } unsigned get_system_type() { return _param_mav_type.get(); }
Protocol get_protocol() { return _protocol; } Protocol get_protocol() { return _protocol; }
@@ -504,9 +504,9 @@ public:
bool ftp_enabled() const { return _ftp_on; } bool ftp_enabled() const { return _ftp_on; }
bool hash_check_enabled() const { return _param_hash_check_enabled.get(); } bool hash_check_enabled() const { return _param_mav_hash_chk_en.get(); }
bool forward_heartbeats_enabled() const { return _param_heartbeat_forwarding_enabled.get(); } bool forward_heartbeats_enabled() const { return _param_mav_hb_forw_en.get(); }
bool odometry_loopback_enabled() const { return _param_send_odom_loopback.get(); } bool odometry_loopback_enabled() const { return _param_mav_odom_lp.get(); }
struct ping_statistics_s { struct ping_statistics_s {
uint64_t last_ping_time; uint64_t last_ping_time;
@@ -646,17 +646,17 @@ private:
pthread_mutex_t _send_mutex {}; pthread_mutex_t _send_mutex {};
DEFINE_PARAMETERS( DEFINE_PARAMETERS(
(ParamInt<px4::params::MAV_SYS_ID>) _param_system_id, (ParamInt<px4::params::MAV_SYS_ID>) _param_mav_sys_id,
(ParamInt<px4::params::MAV_COMP_ID>) _param_component_id, (ParamInt<px4::params::MAV_COMP_ID>) _param_mav_comp_id,
(ParamInt<px4::params::MAV_PROTO_VER>) _param_mav_proto_version, (ParamInt<px4::params::MAV_PROTO_VER>) _param_mav_proto_ver,
(ParamInt<px4::params::MAV_RADIO_ID>) _param_radio_id, (ParamInt<px4::params::MAV_RADIO_ID>) _param_mav_radio_id,
(ParamInt<px4::params::MAV_TYPE>) _param_system_type, (ParamInt<px4::params::MAV_TYPE>) _param_mav_type,
(ParamBool<px4::params::MAV_USEHILGPS>) _param_use_hil_gps, (ParamBool<px4::params::MAV_USEHILGPS>) _param_mav_usehilgps,
(ParamBool<px4::params::MAV_FWDEXTSP>) _param_forward_externalsp, (ParamBool<px4::params::MAV_FWDEXTSP>) _param_mav_fwdextsp,
(ParamInt<px4::params::MAV_BROADCAST>) _param_broadcast_mode, (ParamInt<px4::params::MAV_BROADCAST>) _param_mav_broadcast,
(ParamBool<px4::params::MAV_HASH_CHK_EN>) _param_hash_check_enabled, (ParamBool<px4::params::MAV_HASH_CHK_EN>) _param_mav_hash_chk_en,
(ParamBool<px4::params::MAV_HB_FORW_EN>) _param_heartbeat_forwarding_enabled, (ParamBool<px4::params::MAV_HB_FORW_EN>) _param_mav_hb_forw_en,
(ParamBool<px4::params::MAV_ODOM_LP>) _param_send_odom_loopback (ParamBool<px4::params::MAV_ODOM_LP>) _param_mav_odom_lp
) )
perf_counter_t _loop_perf; /**< loop performance counter */ perf_counter_t _loop_perf; /**< loop performance counter */