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

Revert changes to the check_params(const bool force) declaration/definition to match current PX4:master.

This commit is contained in:
mcsauder 2019-06-25 07:15:19 -06:00 committed by Beat Küng
parent 0ec7efcfc4
commit f783982edb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/land_detector/LandDetector.cpp
View File

@ -78,7 +78,7 @@ void LandDetector::Run()
{
perf_begin(_cycle_perf);
_check_params();
_check_params(false);
_actuator_armed_sub.update(&_arming);
_update_topics();
_update_state();
@ -148,11 +148,11 @@ void LandDetector::Run()
}
}
void LandDetector::_check_params()
void LandDetector::_check_params(const bool force)
{
parameter_update_s param_update;
if (_param_update_sub.update(&param_update)) {
if (_param_update_sub.update(&param_update) || force) {
_update_params();
_total_flight_time = static_cast<uint64_t>(_param_total_flight_time_high.get()) << 32;
_total_flight_time |= _param_total_flight_time_low.get();

2
src/modules/land_detector/LandDetector.h
View File

@ -157,7 +157,7 @@ protected:
private:
void _check_params();
void _check_params(bool force = false);
void Run() override;