updated to reflect refactoring of ValidateReferenceList to ValidateRe…

…ferenceArray
ctu-mrs · Sep 25, 2024 · 21327d6 · 21327d6
1 parent 9660f3d
commit 21327d6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/include/mrs_uav_testing/test_generic.h b/include/mrs_uav_testing/test_generic.h
@@ -36,7 +36,7 @@
 #include <mrs_msgs/VelocityReferenceSrv.h>
 #include <mrs_msgs/ReferenceStampedSrv.h>
 #include <mrs_msgs/ValidateReference.h>
-#include <mrs_msgs/ValidateReferenceList.h>
+#include <mrs_msgs/ValidateReferenceArray.h>
 #include <mrs_msgs/TransformReferenceSrv.h>
 #include <mrs_msgs/TransformVector3Srv.h>
 #include <mrs_msgs/TransformPoseSrv.h>
@@ -132,7 +132,7 @@ class UAVHandler {
 
   tuple<bool, string> validateReference(const mrs_msgs::ReferenceStamped &msg);
 
-  tuple<bool, std::optional<mrs_msgs::ValidateReferenceList::Response>> validateReferenceList(const mrs_msgs::ValidateReferenceList::Request &request);
+  tuple<bool, std::optional<mrs_msgs::ValidateReferenceArray::Response>> validateReferenceArray(const mrs_msgs::ValidateReferenceArray::Request &request);
 
   std::tuple<bool, std::optional<std::string>, std::optional<geometry_msgs::PoseStamped>> transformPose(const geometry_msgs::PoseStamped &msg,
                                                                                                         std::string                       target_frame);
@@ -181,7 +181,7 @@ class UAVHandler {
   mrs_lib::ServiceClientHandler<std_srvs::Trigger> sch_goto_trajectory_start_;
 
   mrs_lib::ServiceClientHandler<mrs_msgs::ValidateReference>     sch_validate_reference_;
-  mrs_lib::ServiceClientHandler<mrs_msgs::ValidateReferenceList> sch_validate_reference_list_;
+  mrs_lib::ServiceClientHandler<mrs_msgs::ValidateReferenceArray> sch_validate_reference_array_;
 
   mrs_lib::ServiceClientHandler<mrs_msgs::TransformReferenceSrv> sch_tranform_reference_;
   mrs_lib::ServiceClientHandler<mrs_msgs::TransformVector3Srv>   sch_tranform_vector3_;

diff --git a/src/test_generic.cpp b/src/test_generic.cpp
@@ -68,8 +68,8 @@ void UAVHandler::initialize(std::string uav_name, std::shared_ptr<mrs_lib::Subsc
   sch_get_path_ = mrs_lib::ServiceClientHandler<mrs_msgs::GetPathSrv>(nh_, "/" + _uav_name_ + "/trajectory_generation/get_path");
 
   sch_validate_reference_ = mrs_lib::ServiceClientHandler<mrs_msgs::ValidateReference>(nh_, "/" + _uav_name_ + "/control_manager/validate_reference");
-  sch_validate_reference_list_ =
-      mrs_lib::ServiceClientHandler<mrs_msgs::ValidateReferenceList>(nh_, "/" + _uav_name_ + "/control_manager/validate_reference_list");
+  sch_validate_reference_array_ =
+      mrs_lib::ServiceClientHandler<mrs_msgs::ValidateReferenceArray>(nh_, "/" + _uav_name_ + "/control_manager/validate_reference_array");
 
   sch_tranform_reference_ = mrs_lib::ServiceClientHandler<mrs_msgs::TransformReferenceSrv>(nh_, "/" + _uav_name_ + "/control_manager/transform_reference");
   sch_tranform_vector3_   = mrs_lib::ServiceClientHandler<mrs_msgs::TransformVector3Srv>(nh_, "/" + _uav_name_ + "/control_manager/transform_vector3");
@@ -1594,22 +1594,22 @@ std::tuple<bool, std::optional<std::string>, std::optional<geometry_msgs::Vector
 
 //}
 
-/* validateReferenceList() //{ */
+/* ValidateReferenceArray() //{ */
 
-tuple<bool, std::optional<mrs_msgs::ValidateReferenceList::Response>> UAVHandler::validateReferenceList(
-    const mrs_msgs::ValidateReferenceList::Request &request) {
+tuple<bool, std::optional<mrs_msgs::ValidateReferenceArray::Response>> UAVHandler::validateReferenceArray(
+    const mrs_msgs::ValidateReferenceArray::Request &request) {
 
   auto res = checkPreconditions();
 
   if (!(std::get<0>(res))) {
     return {false, {}};
   }
 
-  mrs_msgs::ValidateReferenceList srv;
+  mrs_msgs::ValidateReferenceArray srv;
   srv.request = request;
 
   {
-    bool service_call = sch_validate_reference_list_.call(srv);
+    bool service_call = sch_validate_reference_array_.call(srv);
 
     if (!service_call) {
       return {false, srv.response};