aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_DDS: use msg_prefix in GCS_SEND_TEXT

Browse Source 
Signed-off-by: Rhys Mainwaring <rhys.mainwaring@me.com>
This commit is contained in:
Rhys Mainwaring 2024-01-29 13:37:45 +00:00 committed by Randy Mackay
parent ed0a7d5e6e
commit 1110dd7a7b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/AP_DDS/AP_DDS_Client.cpp
View File

@ -611,7 +611,7 @@ void AP_DDS_Client::main_loop(void)
//! @todo check for request to stop task //! @todo check for request to stop task
while (true) { while (true) {
if (comm == nullptr) { if (comm == nullptr) {
GCS_SEND_TEXT(MAV_SEVERITY_ERROR, "DDS Client: transport invalid, exiting"); GCS_SEND_TEXT(MAV_SEVERITY_ERROR, "%s transport invalid, exiting", msg_prefix);
return; return;
} }
@ -619,17 +619,17 @@ void AP_DDS_Client::main_loop(void)
const uint64_t ping_timeout_ms{1000}; const uint64_t ping_timeout_ms{1000};
const uint8_t ping_max_attempts{10}; const uint8_t ping_max_attempts{10};
if (!uxr_ping_agent_attempts(comm, ping_timeout_ms, ping_max_attempts)) { if (!uxr_ping_agent_attempts(comm, ping_timeout_ms, ping_max_attempts)) {
GCS_SEND_TEXT(MAV_SEVERITY_ERROR, "DDS Client: No ping response, exiting"); GCS_SEND_TEXT(MAV_SEVERITY_ERROR, "%s No ping response, exiting", msg_prefix);
return; return;
} }
// create session // create session
if (!init_session() || !create()) { if (!init_session() || !create()) {
GCS_SEND_TEXT(MAV_SEVERITY_ERROR, "DDS Client: Creation Requests failed"); GCS_SEND_TEXT(MAV_SEVERITY_ERROR, "%s Creation Requests failed", msg_prefix);
return; return;
} }
connected = true; connected = true;
GCS_SEND_TEXT(MAV_SEVERITY_INFO, "DDS Client: Initialization passed"); GCS_SEND_TEXT(MAV_SEVERITY_INFO, "%s Initialization passed", msg_prefix);
populate_static_transforms(tx_static_transforms_topic); populate_static_transforms(tx_static_transforms_topic);
write_static_transforms(); write_static_transforms();
@ -668,7 +668,7 @@ void AP_DDS_Client::main_loop(void)
if (num_pings_missed > 2) { if (num_pings_missed > 2) {
GCS_SEND_TEXT(MAV_SEVERITY_ERROR, GCS_SEND_TEXT(MAV_SEVERITY_ERROR,
"DDS Client: No ping response, disconnecting"); "%s No ping response, disconnecting", msg_prefix);
connected = false; connected = false;
} }
} }