diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-07-10 14:08:09 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-07-10 14:08:09 +0200 |
| commit | 9b2d444cc56eaaedcf271f200b93dcca94623209 (patch) | |
| tree | ae338f718dd6d02032840b93c95b717082e84704 /src/modules/mavlink/mavlink_mission.cpp | |
| parent | a29f7cad395ce53b74500a0dc03214186c679378 (diff) | |
| download | px4-firmware-9b2d444cc56eaaedcf271f200b93dcca94623209.tar.gz px4-firmware-9b2d444cc56eaaedcf271f200b93dcca94623209.tar.bz2 px4-firmware-9b2d444cc56eaaedcf271f200b93dcca94623209.zip | |
dataman: use DM_KEY_WAYPOINTS_OFFBOARD() macro everywhere
Diffstat (limited to 'src/modules/mavlink/mavlink_mission.cpp')
| -rw-r--r-- | src/modules/mavlink/mavlink_mission.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/mavlink/mavlink_mission.cpp b/src/modules/mavlink/mavlink_mission.cpp index b2288469c..0dda2337e 100644 --- a/src/modules/mavlink/mavlink_mission.cpp +++ b/src/modules/mavlink/mavlink_mission.cpp @@ -216,7 +216,7 @@ MavlinkMissionManager::send_mission_count(uint8_t sysid, uint8_t compid, uint16_ void MavlinkMissionManager::send_mission_item(uint8_t sysid, uint8_t compid, uint16_t seq) { - dm_item_t dm_item = _dataman_id == 0 ? DM_KEY_WAYPOINTS_OFFBOARD_0 : DM_KEY_WAYPOINTS_OFFBOARD_1; + dm_item_t dm_item = DM_KEY_WAYPOINTS_OFFBOARD(_dataman_id); struct mission_item_s mission_item; if (dm_read(dm_item, seq, &mission_item, sizeof(struct mission_item_s)) == sizeof(struct mission_item_s)) { @@ -650,7 +650,7 @@ MavlinkMissionManager::handle_mission_item(const mavlink_message_t *msg) return; } - dm_item_t dm_item = _transfer_dataman_id == 0 ? DM_KEY_WAYPOINTS_OFFBOARD_0 : DM_KEY_WAYPOINTS_OFFBOARD_1; + dm_item_t dm_item = DM_KEY_WAYPOINTS_OFFBOARD(_transfer_dataman_id); if (dm_write(dm_item, wp.seq, DM_PERSIST_POWER_ON_RESET, &mission_item, sizeof(struct mission_item_s)) != sizeof(struct mission_item_s)) { if (_verbose) { warnx("WPM: MISSION_ITEM ERROR: error writing seq %u to dataman ID %i", wp.seq, _transfer_dataman_id); } |