land_detector: move _parameterSub to the right place

This commit is contained in:
Beat Küng
2018-09-28 16:04:40 +02:00
committed by Lorenz Meier
parent b69dd50d90
commit 465d399e8f
3 changed files with 4 additions and 4 deletions
@@ -105,6 +105,7 @@ void LandDetector::_cycle()
// Initialize uORB topics. // Initialize uORB topics.
_armingSub = orb_subscribe(ORB_ID(actuator_armed)); _armingSub = orb_subscribe(ORB_ID(actuator_armed));
_parameterSub = orb_subscribe(ORB_ID(parameter_update));
_initialize_topics(); _initialize_topics();
_check_params(true); _check_params(true);
+3 -3
View File
@@ -150,9 +150,6 @@ protected:
orb_advert_t _landDetectedPub{nullptr}; orb_advert_t _landDetectedPub{nullptr};
vehicle_land_detected_s _landDetected{}; vehicle_land_detected_s _landDetected{};
int _parameterSub{-1};
int _armingSub{-1};
LandDetectionState _state{LandDetectionState::LANDED}; LandDetectionState _state{LandDetectionState::LANDED};
systemlib::Hysteresis _freefall_hysteresis{false}; systemlib::Hysteresis _freefall_hysteresis{false};
@@ -181,6 +178,9 @@ private:
perf_counter_t _cycle_perf; perf_counter_t _cycle_perf;
bool _previous_arming_state{false}; ///< stores the previous _arming.armed state bool _previous_arming_state{false}; ///< stores the previous _arming.armed state
int _parameterSub{-1};
int _armingSub{-1};
}; };
@@ -97,7 +97,6 @@ void MulticopterLandDetector::_initialize_topics()
_vehicleLocalPositionSetpointSub = orb_subscribe(ORB_ID(vehicle_local_position_setpoint)); _vehicleLocalPositionSetpointSub = orb_subscribe(ORB_ID(vehicle_local_position_setpoint));
_attitudeSub = orb_subscribe(ORB_ID(vehicle_attitude)); _attitudeSub = orb_subscribe(ORB_ID(vehicle_attitude));
_actuatorsSub = orb_subscribe(ORB_ID(actuator_controls_0)); _actuatorsSub = orb_subscribe(ORB_ID(actuator_controls_0));
_parameterSub = orb_subscribe(ORB_ID(parameter_update));
_sensor_bias_sub = orb_subscribe(ORB_ID(sensor_bias)); _sensor_bias_sub = orb_subscribe(ORB_ID(sensor_bias));
_vehicle_control_mode_sub = orb_subscribe(ORB_ID(vehicle_control_mode)); _vehicle_control_mode_sub = orb_subscribe(ORB_ID(vehicle_control_mode));
_battery_sub = orb_subscribe(ORB_ID(battery_status)); _battery_sub = orb_subscribe(ORB_ID(battery_status));