dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Standardize remaining class member variable naming convention in the MulticopterLandDetector class.

This commit is contained in:
mcsauder 2019-06-26 10:10:50 -06:00 committed by Daniel Agar
parent df662245a2
commit 6e9f706b12
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/land_detector/MulticopterLandDetector.cpp
View File

@ -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()

6
src/modules/land_detector/MulticopterLandDetector.h
View File

@ -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 {};