mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-10-15 21:33:34 +08:00
fw_pos_ctrl_l1 var naming consistency and effc++
This commit is contained in:
committed by
Lorenz Meier
parent
ebce725720
commit
de14418e93
@@ -78,6 +78,9 @@ class BlockParam : public BlockParamBase
|
||||
public:
|
||||
BlockParam(Block *block, const char *name,
|
||||
bool parent_prefix = true, T *extern_address = NULL);
|
||||
BlockParam(const BlockParam &) = delete;
|
||||
BlockParam &operator=(const BlockParam &) = delete;
|
||||
|
||||
T get();
|
||||
void commit();
|
||||
void set(T val);
|
||||
|
||||
@@ -66,6 +66,8 @@ public:
|
||||
_TASmin(3.0f),
|
||||
_TAS_dem(0.0f),
|
||||
_TAS_dem_last(0.0f),
|
||||
_EAS_dem(0.0f),
|
||||
_hgt_dem(0.0f),
|
||||
_hgt_dem_in_old(0.0f),
|
||||
_hgt_dem_adj(0.0f),
|
||||
_hgt_dem_adj_last(0.0f),
|
||||
|
||||
@@ -55,7 +55,10 @@ class __EXPORT LaunchDetector : public control::SuperBlock
|
||||
{
|
||||
public:
|
||||
LaunchDetector();
|
||||
~LaunchDetector();
|
||||
LaunchDetector(const LaunchDetector &) = delete;
|
||||
LaunchDetector operator=(const LaunchDetector &) = delete;
|
||||
virtual ~LaunchDetector();
|
||||
|
||||
void reset();
|
||||
|
||||
void update(float accel_x);
|
||||
@@ -80,7 +83,6 @@ private:
|
||||
control::BlockParamInt launchdetection_on;
|
||||
control::BlockParamFloat throttlePreTakeoff;
|
||||
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -58,6 +58,8 @@ enum LaunchDetectionResult {
|
||||
class LaunchMethod
|
||||
{
|
||||
public:
|
||||
virtual ~LaunchMethod() {};
|
||||
|
||||
virtual void update(float accel_x) = 0;
|
||||
virtual LaunchDetectionResult getLaunchDetected() const = 0;
|
||||
virtual void reset() = 0;
|
||||
|
||||
Reference in New Issue
Block a user