aboutsummaryrefslogtreecommitdiff
path: root/src/modules/fw_pos_control_l1/mtecs/mTecs_blocks.h
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-07-14 00:56:50 +0200
committerLorenz Meier <lm@inf.ethz.ch>2014-07-14 00:56:50 +0200
commit14b5ef66771c6c68f413af885b24eecbd734f6f3 (patch)
tree9976635903869b0eb47c0b48b6973404368c1e67 /src/modules/fw_pos_control_l1/mtecs/mTecs_blocks.h
parentacca14673c4934ea8cdca46286db6d769c4dca40 (diff)
parente28ca7db1baadef9d8833f45ac4e62284fcf11c8 (diff)
downloadpx4-firmware-14b5ef66771c6c68f413af885b24eecbd734f6f3.tar.gz
px4-firmware-14b5ef66771c6c68f413af885b24eecbd734f6f3.tar.bz2
px4-firmware-14b5ef66771c6c68f413af885b24eecbd734f6f3.zip
merged master
Diffstat (limited to 'src/modules/fw_pos_control_l1/mtecs/mTecs_blocks.h')
-rw-r--r--src/modules/fw_pos_control_l1/mtecs/mTecs_blocks.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/fw_pos_control_l1/mtecs/mTecs_blocks.h b/src/modules/fw_pos_control_l1/mtecs/mTecs_blocks.h
index 4f18d36e8..bb2065472 100644
--- a/src/modules/fw_pos_control_l1/mtecs/mTecs_blocks.h
+++ b/src/modules/fw_pos_control_l1/mtecs/mTecs_blocks.h
@@ -56,9 +56,9 @@ class BlockOutputLimiter: public SuperBlock
{
public:
// methods
- BlockOutputLimiter(SuperBlock *parent, const char *name, bool isAngularLimit = false) :
+ BlockOutputLimiter(SuperBlock *parent, const char *name, bool fAngularLimit = false) :
SuperBlock(parent, name),
- _isAngularLimit(isAngularLimit),
+ _isAngularLimit(fAngularLimit),
_min(this, "MIN"),
_max(this, "MAX")
{};