aboutsummaryrefslogtreecommitdiff
path: root/src/modules/controllib
diff options
context:
space:
mode:
authorDaniel Agar <daniel@agar.ca>2015-03-27 19:08:44 -0400
committerDaniel Agar <daniel@agar.ca>2015-03-27 23:38:58 -0400
commit8aae66b893444c74a22ad7beb89e3828e0444108 (patch)
tree893833e818d8138360f8fa0bf5554dc6b036f369 /src/modules/controllib
parent5cc1a5dfdae53626c3cdf35e3d7b60f1a4ca68ed (diff)
downloadpx4-firmware-8aae66b893444c74a22ad7beb89e3828e0444108.tar.gz
px4-firmware-8aae66b893444c74a22ad7beb89e3828e0444108.tar.bz2
px4-firmware-8aae66b893444c74a22ad7beb89e3828e0444108.zip
trivial code style cleanup round 2
Diffstat (limited to 'src/modules/controllib')
-rw-r--r--src/modules/controllib/block/BlockParam.hpp4
-rw-r--r--src/modules/controllib/blocks.hpp5
2 files changed, 5 insertions, 4 deletions
diff --git a/src/modules/controllib/block/BlockParam.hpp b/src/modules/controllib/block/BlockParam.hpp
index a64d0139e..437e43bfb 100644
--- a/src/modules/controllib/block/BlockParam.hpp
+++ b/src/modules/controllib/block/BlockParam.hpp
@@ -58,7 +58,7 @@ public:
*
* @param parent_prefix Set to true to include the parent name in the parameter name
*/
- BlockParamBase(Block *parent, const char *name, bool parent_prefix=true);
+ BlockParamBase(Block *parent, const char *name, bool parent_prefix = true);
virtual ~BlockParamBase() {};
virtual void update() = 0;
const char *getName() { return param_name(_handle); }
@@ -75,7 +75,7 @@ class BlockParam : public BlockParamBase
{
public:
BlockParam(Block *block, const char *name,
- bool parent_prefix=true);
+ bool parent_prefix = true);
T get();
void set(T val);
void update();
diff --git a/src/modules/controllib/blocks.hpp b/src/modules/controllib/blocks.hpp
index bffc355a8..65600190b 100644
--- a/src/modules/controllib/blocks.hpp
+++ b/src/modules/controllib/blocks.hpp
@@ -114,7 +114,7 @@ public:
// methods
BlockLowPass(SuperBlock *parent, const char *name) :
Block(parent, name),
- _state(0.0f/0.0f /* initialize to invalid val, force into is_finite() check on first call */),
+ _state(0.0f / 0.0f /* initialize to invalid val, force into is_finite() check on first call */),
_fCut(this, "") // only one parameter, no need to name
{};
virtual ~BlockLowPass() {};
@@ -492,8 +492,9 @@ public:
X = V1 * float(sqrt(-2 * float(log(S)) / S));
- } else
+ } else {
X = V2 * float(sqrt(-2 * float(log(S)) / S));
+ }
phase = 1 - phase;
return X * getStdDev() + getMean();