fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-03 16:28:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

simulator_mavlink: zero initializer instead of memset

Browse Source 
Needed a clear scope inside a case for irlock_reports.
This commit is contained in:
Matthias Grob
2019-02-05 10:09:15 -05:00
committed by Daniel Agar
parent 73f4706597
commit 664674c36b
1 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/simulator/simulator_mavlink.cpp
+18 -22
View File
@@ -388,24 +388,24 @@ void Simulator::handle_message(mavlink_message_t *msg, bool publish)
break; break;
case MAVLINK_MSG_ID_LANDING_TARGET: case MAVLINK_MSG_ID_LANDING_TARGET: {
mavlink_landing_target_t landing_target_mavlink; mavlink_landing_target_t landing_target_mavlink;
mavlink_msg_landing_target_decode(msg, &landing_target_mavlink); mavlink_msg_landing_target_decode(msg, &landing_target_mavlink);
struct irlock_report_s report; struct irlock_report_s report = {};
memset(&report, 0, sizeof(report));
report.timestamp = hrt_absolute_time(); report.timestamp = hrt_absolute_time();
report.signature = landing_target_mavlink.target_num; report.signature = landing_target_mavlink.target_num;
report.pos_x = landing_target_mavlink.angle_x; report.pos_x = landing_target_mavlink.angle_x;
report.pos_y = landing_target_mavlink.angle_y; report.pos_y = landing_target_mavlink.angle_y;
report.size_x = landing_target_mavlink.size_x; report.size_x = landing_target_mavlink.size_x;
report.size_y = landing_target_mavlink.size_y; report.size_y = landing_target_mavlink.size_y;
int irlock_multi; int irlock_multi;
orb_publish_auto(ORB_ID(irlock_report), &_irlock_report_pub, &report, &irlock_multi, ORB_PRIO_HIGH); orb_publish_auto(ORB_ID(irlock_report), &_irlock_report_pub, &report, &irlock_multi, ORB_PRIO_HIGH);
break; break;
}
case MAVLINK_MSG_ID_HIL_STATE_QUATERNION: case MAVLINK_MSG_ID_HIL_STATE_QUATERNION:
mavlink_hil_state_quaternion_t hil_state; mavlink_hil_state_quaternion_t hil_state;
@@ -738,8 +738,7 @@ void Simulator::pollForMAVLinkMessages(bool publish)
param.sched_priority = SCHED_PRIORITY_DEFAULT; param.sched_priority = SCHED_PRIORITY_DEFAULT;
(void)pthread_attr_setschedparam(&sender_thread_attr, &param); (void)pthread_attr_setschedparam(&sender_thread_attr, &param);
struct pollfd fds[2]; struct pollfd fds[2] = {};
memset(fds, 0, sizeof(fds));
unsigned fd_count = 1; unsigned fd_count = 1;
fds[0].fd = _fd; fds[0].fd = _fd;
fds[0].events = POLLIN; fds[0].events = POLLIN;
@@ -900,8 +899,7 @@ int openUart(const char *uart_name, int baud)
/* Try to set baud rate */ /* Try to set baud rate */
struct termios uart_config; struct termios uart_config = {};
memset(&uart_config, 0, sizeof(uart_config));
int termios_state; int termios_state;
@@ -1031,8 +1029,7 @@ int Simulator::publish_flow_topic(mavlink_hil_optical_flow_t *flow_mavlink)
{ {
uint64_t timestamp = hrt_absolute_time(); uint64_t timestamp = hrt_absolute_time();
struct optical_flow_s flow; struct optical_flow_s flow = {};
memset(&flow, 0, sizeof(flow));
flow.sensor_id = flow_mavlink->sensor_id; flow.sensor_id = flow_mavlink->sensor_id;
flow.timestamp = timestamp; flow.timestamp = timestamp;
@@ -1186,8 +1183,7 @@ int Simulator::publish_distance_topic(mavlink_distance_sensor_t *dist_mavlink)
{ {
uint64_t timestamp = hrt_absolute_time(); uint64_t timestamp = hrt_absolute_time();
struct distance_sensor_s dist; struct distance_sensor_s dist = {};
memset(&dist, 0, sizeof(dist));
dist.timestamp = timestamp; dist.timestamp = timestamp;
dist.min_distance = dist_mavlink->min_distance / 100.0f; dist.min_distance = dist_mavlink->min_distance / 100.0f;