Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement ModuleParams inheritance and DEFINE_PARAMETERS in the LandDetector class #12209

Merged
merged 4 commits into from
Jun 26, 2019
+51 −38
Merged

Implement ModuleParams inheritance and DEFINE_PARAMETERS in the LandDetector class #12209

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aabe8da
Refactor the LandDetector class to
mcsauder Jun 5, 2019
55d52c4
Delete _measure_interval and redundant parentheses in LandDetector.h.
mcsauder Jun 24, 2019
bf67344
Revert changes to the check_params(const bool force) declaration/defi…
mcsauder Jun 25, 2019
a0d3f51
Add check_params(true) call to the LandDetector start() method. Break…
mcsauder Jun 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Delete _measure_interval and redundant parentheses in LandDetector.h.
@mcsauder
mcsauder committed Jun 25, 2019
commit 55d52c4affac65a80e6b8c454a1f7d60a46855d6
4 changes: 1 addition & 3 deletions src/modules/land_detector/LandDetector.h
View file
Original file line number Diff line number Diff line change
@@ -165,13 +165,11 @@ class LandDetector : public ModuleBase<LandDetector>, ModuleParams, px4::Schedul

bool _previous_armed_state{false}; ///< stores the previous actuator_armed.armed state

uint32_t _measure_interval{LAND_DETECTOR_UPDATE_INTERVAL};

uint64_t _total_flight_time{0}; ///< in microseconds

hrt_abstime _takeoff_time{0};

perf_counter_t _cycle_perf{(perf_alloc(PC_ELAPSED, "land_detector_cycle"))};
perf_counter_t _cycle_perf{perf_alloc(PC_ELAPSED, "land_detector_cycle")};

uORB::Subscription _actuator_armed_sub{ORB_ID(actuator_armed)};
uORB::Subscription _param_update_sub{ORB_ID(parameter_update)};