Fixed data reader creation return value handling

tiiuae · Jan 17, 2025 · 44fb97d · 44fb97d
1 parent a13f422
commit 44fb97d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/modules/uxrce_dds_client/dds_topics.h.em b/src/modules/uxrce_dds_client/dds_topics.h.em
@@ -157,7 +157,7 @@ bool RcvTopicsPubs::init(uxrSession *session, uxrStreamId reliable_out_stream_id
 @[    for idx, sub in enumerate(subscriptions)]@
 	{
 			uint16_t queue_depth = uORB::DefaultQueueSize<@(sub['simple_base_type'])_s>::value * 2; // use a bit larger queue size than internal
-			ret = create_data_reader(session, reliable_out_stream_id, best_effort_in_stream_id, participant_id, @(idx), client_namespace, "@(sub['topic_name'])", "@(sub['dds_type'])", queue_depth);
+			ret = ret & create_data_reader(session, reliable_out_stream_id, best_effort_in_stream_id, participant_id, @(idx), client_namespace, "@(sub['topic_name'])", "@(sub['dds_type'])", queue_depth);
 	}
 @[    end for]@
 

diff --git a/src/modules/uxrce_dds_client/utilities.hpp b/src/modules/uxrce_dds_client/utilities.hpp
@@ -160,6 +160,8 @@ static bool create_data_reader(uxrSession *session, uxrStreamId reliable_out_str
 		PX4_ERR("create entities failed: %s %i %i %i", topic_name,
 			status[0], status[1], status[2]);
 		return false;
+	} else {
+		PX4_INFO("successfully created %s data reader, topic id: %d", topic_name, topic_id.id);
 	}
 
 	uxrDeliveryControl delivery_control{};