diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-03-17 13:35:03 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-03-17 13:35:03 +0100 |
| commit | 199936b1c55d550f37bd5697b6c5050b69294466 (patch) | |
| tree | 49508d95d5da38a1882e820d09bf59e363a27b1f | |
| parent | 8f6ac64e8cbaa95074fd93d1908e40fe6294d576 (diff) | |
| parent | dbd467fe1f3779b45090f556fd05b056f068cd34 (diff) | |
| download | px4-firmware-199936b1c55d550f37bd5697b6c5050b69294466.tar.gz px4-firmware-199936b1c55d550f37bd5697b6c5050b69294466.tar.bz2 px4-firmware-199936b1c55d550f37bd5697b6c5050b69294466.zip | |
Merged mavlink2_hil into paul_estimator_mavlink2
| -rw-r--r-- | src/modules/mavlink/mavlink_receiver.cpp | 2 | ||||
| -rw-r--r-- | src/modules/mavlink/mavlink_receiver.h | 1 | ||||
| -rw-r--r-- | src/modules/sensors/sensors.cpp | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/src/modules/mavlink/mavlink_receiver.cpp b/src/modules/mavlink/mavlink_receiver.cpp index 876466449..71ea832fd 100644 --- a/src/modules/mavlink/mavlink_receiver.cpp +++ b/src/modules/mavlink/mavlink_receiver.cpp @@ -108,7 +108,6 @@ MavlinkReceiver::MavlinkReceiver(Mavlink *parent) : _telemetry_status_pub(-1), _rc_pub(-1), _manual_pub(-1), - _hil_frames(0), _old_timestamp(0), _hil_local_proj_inited(0), @@ -646,7 +645,6 @@ MavlinkReceiver::handle_message_hil_sensor(mavlink_message_t *msg) } /* increment counters */ - _hil_counter++; _hil_frames++; /* print HIL sensors rate */ diff --git a/src/modules/mavlink/mavlink_receiver.h b/src/modules/mavlink/mavlink_receiver.h index beaae2058..0a5a1b5c7 100644 --- a/src/modules/mavlink/mavlink_receiver.h +++ b/src/modules/mavlink/mavlink_receiver.h @@ -139,7 +139,6 @@ private: orb_advert_t _telemetry_status_pub; orb_advert_t _rc_pub; orb_advert_t _manual_pub; - int _hil_counter; int _hil_frames; uint64_t _old_timestamp; bool _hil_local_proj_inited; diff --git a/src/modules/sensors/sensors.cpp b/src/modules/sensors/sensors.cpp index dc5bd95c6..ba75fe82e 100644 --- a/src/modules/sensors/sensors.cpp +++ b/src/modules/sensors/sensors.cpp @@ -1594,6 +1594,8 @@ Sensors::task_main() /* check parameters for updates */ parameter_update_poll(); + /* the timestamp of the raw struct is updated by the gyro_poll() method */ + /* copy most recent sensor data */ gyro_poll(raw); accel_poll(raw); |