From 6e9f706b12c44fed92145c04a7d04977a9578607 Mon Sep 17 00:00:00 2001 From: mcsauder Date: Wed, 26 Jun 2019 10:10:50 -0600 Subject: [PATCH] Standardize remaining class member variable naming convention in the MulticopterLandDetector class. --- src/modules/land_detector/MulticopterLandDetector.cpp | 8 ++++---- src/modules/land_detector/MulticopterLandDetector.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/modules/land_detector/MulticopterLandDetector.cpp b/src/modules/land_detector/MulticopterLandDetector.cpp index c4cdd4fc33..2042f29ba3 100644 --- a/src/modules/land_detector/MulticopterLandDetector.cpp +++ b/src/modules/land_detector/MulticopterLandDetector.cpp @@ -92,10 +92,10 @@ MulticopterLandDetector::MulticopterLandDetector() void MulticopterLandDetector::_update_topics() { - _attitudeSub.update(&_vehicle_attitude); - _actuatorsSub.update(&_actuators); + _actuator_controls_sub.update(&_actuator_controls); _battery_sub.update(&_battery); _sensor_bias_sub.update(&_sensor_bias); + _vehicle_attitude_sub.update(&_vehicle_attitude); _vehicle_control_mode_sub.update(&_control_mode); _vehicle_local_position_sub.update(&_vehicle_local_position); _vehicle_local_position_setpoint_sub.update(&_vehicle_local_position_setpoint); @@ -308,7 +308,7 @@ bool MulticopterLandDetector::_has_low_thrust() _params.low_thrust_threshold; // Check if thrust output is less than the minimum auto throttle param. - return _actuators.control[actuator_controls_s::INDEX_THROTTLE] <= sys_min_throttle; + return _actuator_controls.control[actuator_controls_s::INDEX_THROTTLE] <= sys_min_throttle; } bool MulticopterLandDetector::_has_minimal_thrust() @@ -322,7 +322,7 @@ bool MulticopterLandDetector::_has_minimal_thrust() } // Check if thrust output is less than the minimum auto throttle param. - return _actuators.control[actuator_controls_s::INDEX_THROTTLE] <= sys_min_throttle; + return _actuator_controls.control[actuator_controls_s::INDEX_THROTTLE] <= sys_min_throttle; } bool MulticopterLandDetector::_get_ground_effect_state() diff --git a/src/modules/land_detector/MulticopterLandDetector.h b/src/modules/land_detector/MulticopterLandDetector.h index abca738b40..4be91d3910 100644 --- a/src/modules/land_detector/MulticopterLandDetector.h +++ b/src/modules/land_detector/MulticopterLandDetector.h @@ -123,15 +123,15 @@ private: float low_thrust_threshold; } _params{}; - uORB::Subscription _actuatorsSub{ORB_ID(actuator_controls_0)}; - uORB::Subscription _attitudeSub{ORB_ID(vehicle_attitude)}; + uORB::Subscription _actuator_controls_sub{ORB_ID(actuator_controls_0)}; uORB::Subscription _battery_sub{ORB_ID(battery_status)}; uORB::Subscription _sensor_bias_sub{ORB_ID(sensor_bias)}; + uORB::Subscription _vehicle_attitude_sub{ORB_ID(vehicle_attitude)}; uORB::Subscription _vehicle_control_mode_sub{ORB_ID(vehicle_control_mode)}; uORB::Subscription _vehicle_local_position_sub{ORB_ID(vehicle_local_position)}; uORB::Subscription _vehicle_local_position_setpoint_sub{ORB_ID(vehicle_local_position_setpoint)}; - actuator_controls_s _actuators {}; + actuator_controls_s _actuator_controls {}; battery_status_s _battery {}; vehicle_control_mode_s _control_mode {}; sensor_bias_s _sensor_bias {};