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

uORB: SubscriptionCallback cleanup naming

Browse Source
This commit is contained in:
Daniel Agar
2019-09-28 13:43:56 -04:00
parent 3f9b3fb4da
commit fd67bd0680
9 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/sensors/vehicle_acceleration/VehicleAcceleration.cpp
+5 -5
View File
@@ -69,7 +69,7 @@ VehicleAcceleration::Start()
SensorBiasUpdate(true);
// needed to change the active sensor if the primary stops updating
_sensor_selection_sub.register_callback();
_sensor_selection_sub.registerCallback();
return SensorCorrectionsUpdate(true);
}
@@ -81,10 +81,10 @@ VehicleAcceleration::Stop()
// clear all registered callbacks
for (auto &sub : _sensor_sub) {
sub.unregister_callback();
sub.unregisterCallback();
}
_sensor_selection_sub.unregister_callback();
_sensor_selection_sub.unregisterCallback();
}
void
@@ -132,12 +132,12 @@ VehicleAcceleration::SensorCorrectionsUpdate(bool force)
if (corrections.selected_accel_instance < MAX_SENSOR_COUNT) {
// clear all registered callbacks
for (auto &sub : _sensor_sub) {
sub.unregister_callback();
sub.unregisterCallback();
}
const int sensor_new = corrections.selected_accel_instance;
if (_sensor_sub[sensor_new].register_callback()) {
if (_sensor_sub[sensor_new].registerCallback()) {
PX4_DEBUG("selected sensor changed %d -> %d", _selected_sensor, sensor_new);
_selected_sensor = sensor_new;
src/modules/sensors/vehicle_angular_velocity/VehicleAngularVelocity.cpp
+7 -7
View File
@@ -69,7 +69,7 @@ VehicleAngularVelocity::Start()
SensorBiasUpdate(true);
// needed to change the active sensor if the primary stops updating
_sensor_selection_sub.register_callback();
_sensor_selection_sub.registerCallback();
return SensorCorrectionsUpdate(true);
}
@@ -81,10 +81,10 @@ VehicleAngularVelocity::Stop()
// clear all registered callbacks
for (auto &sub : _sensor_sub) {
sub.unregister_callback();
sub.unregisterCallback();
}
_sensor_selection_sub.unregister_callback();
_sensor_selection_sub.unregisterCallback();
}
void
@@ -143,11 +143,11 @@ VehicleAngularVelocity::SensorCorrectionsUpdate(bool force)
if (corrections.selected_gyro_instance < MAX_SENSOR_COUNT) {
// clear all registered callbacks
for (auto &sub : _sensor_control_sub) {
sub.unregister_callback();
sub.unregisterCallback();
}
for (auto &sub : _sensor_sub) {
sub.unregister_callback();
sub.unregisterCallback();
}
const int sensor_new = corrections.selected_gyro_instance;
@@ -159,7 +159,7 @@ VehicleAngularVelocity::SensorCorrectionsUpdate(bool force)
_sensor_control_sub[i].copy(&report);
if ((report.device_id != 0) && (report.device_id == _selected_sensor_device_id)) {
if (_sensor_control_sub[i].register_callback()) {
if (_sensor_control_sub[i].registerCallback()) {
PX4_DEBUG("selected sensor (control) changed %d -> %d", _selected_sensor, i);
_selected_sensor_control = i;
@@ -176,7 +176,7 @@ VehicleAngularVelocity::SensorCorrectionsUpdate(bool force)
// otherwise fallback to using sensor_gyro (legacy that will be removed)
_sensor_control_available = false;
if (_sensor_sub[sensor_new].register_callback()) {
if (_sensor_sub[sensor_new].registerCallback()) {
PX4_DEBUG("selected sensor changed %d -> %d", _selected_sensor, sensor_new);
_selected_sensor = sensor_new;