diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-06 22:06:19 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-06 22:06:19 +0200 |
| commit | be7c2ccdeba10346d5a82a134a6d6b26bc2bc69f (patch) | |
| tree | d5c98e7d6be9cbf659fa9fa2a89777c273564fe6 /src/modules/fw_pos_control_l1 | |
| parent | 7457b78ae0041aaaf3e63245ac4057ab6211229b (diff) | |
| parent | 278aafe939bc20c2882d17b6e21da5ab38d1f400 (diff) | |
| download | px4-firmware-be7c2ccdeba10346d5a82a134a6d6b26bc2bc69f.tar.gz px4-firmware-be7c2ccdeba10346d5a82a134a6d6b26bc2bc69f.tar.bz2 px4-firmware-be7c2ccdeba10346d5a82a134a6d6b26bc2bc69f.zip | |
Merge pull request #1123 from DonLakeFlyer/Warnings
Compiler warning fixes
Diffstat (limited to 'src/modules/fw_pos_control_l1')
| -rw-r--r-- | src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp | 23 | ||||
| -rw-r--r-- | src/modules/fw_pos_control_l1/mtecs/mTecs_blocks.h | 4 |
2 files changed, 14 insertions, 13 deletions
diff --git a/src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp b/src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp index 6c86544fa..3e835cf81 100644 --- a/src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp +++ b/src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp @@ -414,6 +414,17 @@ FixedwingPositionControl::FixedwingPositionControl() : _attitude_sp_pub(-1), _nav_capabilities_pub(-1), + _att(), + _att_sp(), + _nav_capabilities(), + _manual(), + _airspeed(), + _control_mode(), + _global_pos(), + _pos_sp_triplet(), + _sensor_combined(), + _range_finder(), + /* performance counters */ _loop_perf(perf_alloc(PC_ELAPSED, "fw l1 control")), @@ -433,18 +444,8 @@ FixedwingPositionControl::FixedwingPositionControl() : _airspeed_valid(false), _groundspeed_undershoot(0.0f), _global_pos_valid(false), - _att(), - _att_sp(), - _nav_capabilities(), - _manual(), - _airspeed(), - _control_mode(), - _global_pos(), - _pos_sp_triplet(), - _sensor_combined(), _mTecs(), - _was_pos_control_mode(false), - _range_finder() + _was_pos_control_mode(false) { _nav_capabilities.turn_distance = 0.0f; 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..c22e60ae0 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") {}; |