Skip to content

Commit

Permalink
AP_DDS: Fix merge on domain ID changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Ryanf55 committed Aug 26, 2024
1 parent dc6bd29 commit 30db0f3
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions libraries/AP_DDS/AP_DDS_Client.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -768,9 +768,9 @@ bool AP_DDS_Client::create()
.id = 0x01,
.type = UXR_PARTICIPANT_ID
};
const char* participant_name = "ardupilot_dds";
const auto participant_req_id = uxr_buffer_create_participant_bin(&session, reliable_out, participant_id,
static_cast<uint16_t>(domain_id), participant_name, UXR_REPLACE);
const char* participant_ref = "participant_profile";
const auto participant_req_id = uxr_buffer_create_participant_ref(&session, reliable_out, participant_id,
static_cast<uint16_t>(domain_id), participant_ref, UXR_REPLACE);

//Participant requests
constexpr uint8_t nRequestsParticipant = 1;
Expand Down

0 comments on commit 30db0f3

Please sign in to comment.