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

Refactor: Name manual_control_setpoint the same way everywhere

Browse Source
This commit is contained in:
Matthias Grob
2020-06-22 12:06:27 -04:00
committed by Daniel Agar
parent c6dd8bfcd6
commit e9eae1bd76
27 changed files with 276 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/logger/logger.cpp
+3 -3
View File
@@ -965,11 +965,11 @@ bool Logger::start_stop_logging()
if (_log_mode == LogMode::rc_aux1) {
// aux1-based logging
manual_control_setpoint_s manual_sp;
manual_control_setpoint_s manual_control_setpoint;
if (_manual_control_sp_sub.update(&manual_sp)) {
if (_manual_control_setpoint_sub.update(&manual_control_setpoint)) {
desired_state = (manual_sp.aux1 > 0.3f);
desired_state = (manual_control_setpoint.aux1 > 0.3f);
updated = true;
}
src/modules/logger/logger.h
+1 -1
View File
@@ -347,7 +347,7 @@ private:
hrt_abstime _logger_status_last {0};
#endif
uORB::Subscription _manual_control_sp_sub{ORB_ID(manual_control_setpoint)};
uORB::Subscription _manual_control_setpoint_sub{ORB_ID(manual_control_setpoint)};
uORB::Subscription _vehicle_command_sub{ORB_ID(vehicle_command)};
uORB::Subscription _vehicle_status_sub{ORB_ID(vehicle_status)};
uORB::SubscriptionInterval _log_message_sub{ORB_ID(log_message), 20};