aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2014-06-30 20:55:02 +0200
committerThomas Gubler <thomasgubler@gmail.com>2014-06-30 20:55:02 +0200
commitf0cfa04b852212cd0be4bc1bffbc4eece54ce659 (patch)
tree622190d370dd9d79fbd9b68dd5e2c646ef70e4c0
parent8408993a676acd0149e880ffeded74ce9c67b9c5 (diff)
downloadpx4-firmware-f0cfa04b852212cd0be4bc1bffbc4eece54ce659.tar.gz
px4-firmware-f0cfa04b852212cd0be4bc1bffbc4eece54ce659.tar.bz2
px4-firmware-f0cfa04b852212cd0be4bc1bffbc4eece54ce659.zip
mtecs blocks: fix warning
-rw-r--r--src/modules/fw_pos_control_l1/mtecs/mTecs_blocks.h6
1 files changed, 3 insertions, 3 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 e4e405227..4f18d36e8 100644
--- a/src/modules/fw_pos_control_l1/mtecs/mTecs_blocks.h
+++ b/src/modules/fw_pos_control_l1/mtecs/mTecs_blocks.h
@@ -72,8 +72,8 @@ public:
* @return: true if the limit is applied, false otherwise
*/
bool limit(float& value, float& difference) {
- float minimum = isAngularLimit() ? getMin() * M_DEG_TO_RAD_F : getMin();
- float maximum = isAngularLimit() ? getMax() * M_DEG_TO_RAD_F : getMax();
+ float minimum = getIsAngularLimit() ? getMin() * M_DEG_TO_RAD_F : getMin();
+ float maximum = getIsAngularLimit() ? getMax() * M_DEG_TO_RAD_F : getMax();
if (value < minimum) {
difference = value - minimum;
value = minimum;
@@ -86,7 +86,7 @@ public:
return false;
}
//accessor:
- bool isAngularLimit() {return _isAngularLimit ;}
+ bool getIsAngularLimit() {return _isAngularLimit ;}
float getMin() { return _min.get(); }
float getMax() { return _max.get(); }
void setMin(float value) { _min.set(value); }