diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-16 15:00:58 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-16 15:00:58 +0200 |
| commit | 11eeb7466d80452f18fd036cc72899a2ddbd33e9 (patch) | |
| tree | 87a79ae904d3c7b4e105ff1e53bb8ce255bc42ff /src/modules/mavlink/mavlink_receiver.cpp | |
| parent | 43bc2c3ef2a867a015e7198c797d089d6252fdde (diff) | |
| parent | c6c9c49823a4c19e156f4ce70bde781890ab04f9 (diff) | |
| download | px4-firmware-11eeb7466d80452f18fd036cc72899a2ddbd33e9.tar.gz px4-firmware-11eeb7466d80452f18fd036cc72899a2ddbd33e9.tar.bz2 px4-firmware-11eeb7466d80452f18fd036cc72899a2ddbd33e9.zip | |
Merge branch 'ext_mag_param' into logging
Diffstat (limited to 'src/modules/mavlink/mavlink_receiver.cpp')
| -rw-r--r-- | src/modules/mavlink/mavlink_receiver.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/modules/mavlink/mavlink_receiver.cpp b/src/modules/mavlink/mavlink_receiver.cpp index 75d3b6ce4..3ee7ec34d 100644 --- a/src/modules/mavlink/mavlink_receiver.cpp +++ b/src/modules/mavlink/mavlink_receiver.cpp @@ -86,7 +86,9 @@ static const float mg2ms2 = CONSTANTS_ONE_G / 1000.0f; MavlinkReceiver::MavlinkReceiver(Mavlink *parent) : _mavlink(parent), - + status{}, + hil_local_pos{}, + _control_mode{}, _global_pos_pub(-1), _local_pos_pub(-1), _attitude_pub(-1), @@ -111,15 +113,13 @@ MavlinkReceiver::MavlinkReceiver(Mavlink *parent) : _manual_pub(-1), _telemetry_heartbeat_time(0), _radio_status_available(false), - _control_mode_sub(-1), + _control_mode_sub(orb_subscribe(ORB_ID(vehicle_control_mode))), _hil_frames(0), _old_timestamp(0), _hil_local_proj_inited(0), - _hil_local_alt0(0.0) + _hil_local_alt0(0.0f), + _hil_local_proj_ref{} { - _control_mode_sub = orb_subscribe(ORB_ID(vehicle_control_mode)); - memset(&hil_local_pos, 0, sizeof(hil_local_pos)); - memset(&_control_mode, 0, sizeof(_control_mode)); // make sure the FTP server is started (void)MavlinkFTP::getServer(); |