diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-08-13 09:08:16 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-08-13 09:08:16 +0200 |
| commit | 3f63b67eb66b44524b74847696a65d7a531d73d6 (patch) | |
| tree | bf4954fb553edb1d9e200899ed531efa87505a90 /src/modules/fw_pos_control_l1/mtecs/mTecs.cpp | |
| parent | ee42d5f53d81580bee56b1cdcf69ebfdefb6ba09 (diff) | |
| parent | fd435532b50428d7aab452d19db1d9c93f47dd5c (diff) | |
| download | px4-firmware-3f63b67eb66b44524b74847696a65d7a531d73d6.tar.gz px4-firmware-3f63b67eb66b44524b74847696a65d7a531d73d6.tar.bz2 px4-firmware-3f63b67eb66b44524b74847696a65d7a531d73d6.zip | |
Merged master into vision_estimate
Diffstat (limited to 'src/modules/fw_pos_control_l1/mtecs/mTecs.cpp')
| -rw-r--r-- | src/modules/fw_pos_control_l1/mtecs/mTecs.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/modules/fw_pos_control_l1/mtecs/mTecs.cpp b/src/modules/fw_pos_control_l1/mtecs/mTecs.cpp index afc411a60..bffeefc1f 100644 --- a/src/modules/fw_pos_control_l1/mtecs/mTecs.cpp +++ b/src/modules/fw_pos_control_l1/mtecs/mTecs.cpp @@ -76,7 +76,6 @@ mTecs::mTecs() : _counter(0), _debug(false) { - warnx("starting"); } mTecs::~mTecs() @@ -110,8 +109,7 @@ int mTecs::updateAltitudeSpeed(float flightPathAngle, float altitude, float alti /* Write part of the status message */ _status.altitudeSp = altitudeSp; - _status.altitude = altitude; - _status.altitudeFiltered = altitudeFiltered; + _status.altitude_filtered = altitudeFiltered; /* use flightpath angle setpoint for total energy control */ @@ -147,8 +145,7 @@ int mTecs::updateFlightPathAngleSpeed(float flightPathAngle, float flightPathAng /* Write part of the status message */ _status.airspeedSp = airspeedSp; - _status.airspeed = airspeed; - _status.airspeedFiltered = airspeedFiltered; + _status.airspeed_filtered = airspeedFiltered; /* use longitudinal acceleration setpoint for total energy control */ |