diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-12 18:43:09 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-12 18:43:09 +0200 |
| commit | 0144a7dacfdb398c6133a9bf2df35facdbdfe6e3 (patch) | |
| tree | d7efdbf957867099f6a0b5b6d563b71f569ecd4a /src/modules/mavlink/mavlink_mission.h | |
| parent | ffebe45c4ce6cb248314141d91abcb74fbf9174e (diff) | |
| download | px4-firmware-0144a7dacfdb398c6133a9bf2df35facdbdfe6e3.tar.gz px4-firmware-0144a7dacfdb398c6133a9bf2df35facdbdfe6e3.tar.bz2 px4-firmware-0144a7dacfdb398c6133a9bf2df35facdbdfe6e3.zip | |
mavlink: Optimize to native types where possible, move things to optimize alignment
Diffstat (limited to 'src/modules/mavlink/mavlink_mission.h')
| -rw-r--r-- | src/modules/mavlink/mavlink_mission.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/modules/mavlink/mavlink_mission.h b/src/modules/mavlink/mavlink_mission.h index 1964a45e8..f63c32f24 100644 --- a/src/modules/mavlink/mavlink_mission.h +++ b/src/modules/mavlink/mavlink_mission.h @@ -143,8 +143,6 @@ public: private: Mavlink* _mavlink; - mavlink_channel_t _channel; - uint8_t _comp_id; enum MAVLINK_WPM_STATES _state; ///< Current state @@ -153,7 +151,7 @@ private: uint32_t _action_timeout; uint32_t _retry_timeout; - unsigned _max_count; ///< Maximal count of mission items + unsigned _max_count; ///< Maximum number of mission items int _dataman_id; ///< Dataman storage ID for active mission unsigned _count; ///< Count of items in active mission @@ -163,8 +161,8 @@ private: unsigned _transfer_count; ///< Items count in current transmission unsigned _transfer_seq; ///< Item sequence in current transmission unsigned _transfer_current_seq; ///< Current item ID for current transmission (-1 means not initialized) - uint8_t _transfer_partner_sysid; ///< Partener SysID for current transmission - uint8_t _transfer_partner_compid; ///< Partner ComponentID for current transmission + unsigned _transfer_partner_sysid; ///< Partner system ID for current transmission + unsigned _transfer_partner_compid; ///< Partner component ID for current transmission int _offboard_mission_sub; int _mission_result_sub; @@ -173,4 +171,7 @@ private: MavlinkRateLimiter _slow_rate_limiter; bool _verbose; + + mavlink_channel_t _channel; + uint8_t _comp_id; }; |