fix fri client includes

kroshu · Nov 10, 2023 · 597f88c · 597f88c
1 parent ba9fbf0
commit 597f88c
Show file tree

Hide file tree

Showing 17 changed files with 45 additions and 47 deletions.
diff --git a/kuka_iiqka_eac_driver/CMakeLists.txt b/kuka_iiqka_eac_driver/CMakeLists.txt
@@ -84,7 +84,7 @@ add_executable(robot_manager_node
 ament_target_dependencies(robot_manager_node rclcpp kuka_drivers_core sensor_msgs controller_manager_msgs)
 target_link_libraries(robot_manager_node kuka_drivers_core::communication_helpers motion-services-ecs-proto-api-cpp)
 
-pluginlib_export_plugin_description_file(hardware_interface kuka_iiqka_eac_driver.xml)
+pluginlib_export_plugin_description_file(hardware_interface hardware_interface.xml)
 
 install(TARGETS kuka_iiqka_eac_driver robot_manager_node
   DESTINATION lib/${PROJECT_NAME})

diff --git a/kuka_kss_rsi_driver/CMakeLists.txt b/kuka_kss_rsi_driver/CMakeLists.txt
@@ -49,7 +49,7 @@ add_executable(robot_manager_node
 ament_target_dependencies(robot_manager_node rclcpp kuka_drivers_core sensor_msgs controller_manager_msgs)
 target_link_libraries(robot_manager_node kuka_drivers_core::communication_helpers)
 
-pluginlib_export_plugin_description_file(hardware_interface kuka_kss_rsi_driver.xml)
+pluginlib_export_plugin_description_file(hardware_interface hardware_interface.xml)
 
 install(TARGETS ${PROJECT_NAME} robot_manager_node
   DESTINATION lib/${PROJECT_NAME})

diff --git a/kuka_sunrise_fri_driver/CMakeLists.txt b/kuka_sunrise_fri_driver/CMakeLists.txt
@@ -40,33 +40,31 @@ target_link_libraries(fri_connection
 
 # Add the Fast Robot Interface libray
 add_library(fri_client_sdk SHARED
-    src/HWIFClientApplication.cpp
-    src/friClientApplication.cpp
-    src/friCommandMessageEncoder.cpp
-    src/friLBRClient.cpp
-    src/friLBRCommand.cpp
-    src/friLBRState.cpp
-    src/FRIMessages.pb.c
-    src/friMonitoringMessageDecoder.cpp
-    src/friTransformationClient.cpp
-    src/friUdpConnection.cpp
-    src/pb_frimessages_callbacks.c
+    src/fri_client_sdk/HWIFClientApplication.cpp
+    src/fri_client_sdk/friClientApplication.cpp
+    src/fri_client_sdk/friCommandMessageEncoder.cpp
+    src/fri_client_sdk/friLBRClient.cpp
+    src/fri_client_sdk/friLBRCommand.cpp
+    src/fri_client_sdk/friLBRState.cpp
+    src/fri_client_sdk/FRIMessages.pb.c
+    src/fri_client_sdk/friMonitoringMessageDecoder.cpp
+    src/fri_client_sdk/friTransformationClient.cpp
+    src/fri_client_sdk/friUdpConnection.cpp
+    src/fri_client_sdk/pb_frimessages_callbacks.c
 )
 
 file(GLOB private_headers
   LIST_DIRECTORIES FALSE
   RELATIVE "${PROJECT_SOURCE_DIR}"
-  src/friClientData.h
-  src/friCommandMessageEncoder.h
-  src/FRIMessages.pb.h
-  src/friMonitoringMessageDecoder.h
-  src/pb_frimessages_callbacks.h
+  src/fri_client_sdk/friClientData.h
+  src/fri_client_sdk/friCommandMessageEncoder.h
+  src/fri_client_sdk/FRIMessages.pb.h
+  src/fri_client_sdk/friMonitoringMessageDecoder.h
+  src/fri_client_sdk/pb_frimessages_callbacks.h
   )
 
 target_link_libraries(fri_client_sdk PRIVATE protobuf-nanopb)
 
-ament_export_targets(fri_client_sdk HAS_LIBRARY_TARGET)
-
 install(DIRECTORY include/fri_client_sdk DESTINATION include)
 install(FILES ${private_headers} DESTINATION include)
 

diff --git a/kuka_sunrise_fri_driver/include/fri_client_sdk/HWIFClientApplication.hpp b/kuka_sunrise_fri_driver/include/fri_client_sdk/HWIFClientApplication.hpp
@@ -3,10 +3,10 @@
 
 #include <string>
 
-#include <fri/friClientApplication.h>
-#include <fri/friConnectionIf.h>
-#include <fri/friClientIf.h>
-#include <fri/friTransformationClient.h>
+#include <fri_client_sdk/friClientApplication.h>
+#include <fri_client_sdk/friConnectionIf.h>
+#include <fri_client_sdk/friClientIf.h>
+#include <fri_client_sdk/friTransformationClient.h>
 #include <friClientData.h>
 
 

diff --git a/kuka_sunrise_fri_driver/include/fri_client_sdk/friLBRClient.h b/kuka_sunrise_fri_driver/include/fri_client_sdk/friLBRClient.h
@@ -60,9 +60,9 @@ cost of any service and repair.
 #ifndef _KUKA_FRI_LBR_CLIENT_H
 #define _KUKA_FRI_LBR_CLIENT_H
 
-#include <fri/friClientIf.h>
-#include <fri/friLBRState.h>
-#include <fri/friLBRCommand.h>
+#include <fri_client_sdk/friClientIf.h>
+#include <fri_client_sdk/friLBRState.h>
+#include <fri_client_sdk/friLBRCommand.h>
 
 /** Kuka namespace */
 namespace KUKA

diff --git a/kuka_sunrise_fri_driver/include/fri_client_sdk/friLBRState.h b/kuka_sunrise_fri_driver/include/fri_client_sdk/friLBRState.h
@@ -60,7 +60,7 @@ cost of any service and repair.
 #ifndef _KUKA_FRI_LBR_STATE_H
 #define _KUKA_FRI_LBR_STATE_H
 
-#include <fri/friClientIf.h>
+#include <fri_client_sdk/friClientIf.h>
 
 // forward declarations
 typedef struct _FRIMonitoringMessage FRIMonitoringMessage;

diff --git a/kuka_sunrise_fri_driver/include/fri_client_sdk/friTransformationClient.h b/kuka_sunrise_fri_driver/include/fri_client_sdk/friTransformationClient.h
@@ -61,7 +61,7 @@ cost of any service and repair.
 #define _KUKA_FRI_TRANSFORMATION_CLIENT_H
 
 #include <vector>
-#include <fri/friClientIf.h>
+#include <fri_client_sdk/friClientIf.h>
 
 /** Kuka namespace */
 namespace KUKA

diff --git a/kuka_sunrise_fri_driver/include/fri_client_sdk/friUdpConnection.h b/kuka_sunrise_fri_driver/include/fri_client_sdk/friUdpConnection.h
@@ -78,7 +78,7 @@ cost of any service and repair.
    #include <arpa/inet.h>
 #endif
 
-#include <fri/friConnectionIf.h>
+#include <fri_client_sdk/friConnectionIf.h>
 
 /** Kuka namespace */
 namespace KUKA

diff --git a/kuka_sunrise_fri_driver/include/kuka_sunrise_fri_driver/hardware_interface.hpp b/kuka_sunrise_fri_driver/include/kuka_sunrise_fri_driver/hardware_interface.hpp
@@ -27,10 +27,10 @@
 #include <hardware_interface/types/hardware_interface_type_values.hpp>
 
 #include "kuka_driver_interfaces/srv/set_int.hpp"
-#include "fri/friLBRClient.h"
-#include "fri/HWIFClientApplication.hpp"
-#include "fri/friUdpConnection.h"
-#include "fri/friClientIf.h"
+#include "fri_client_sdk/friLBRClient.h"
+#include "fri_client_sdk/HWIFClientApplication.hpp"
+#include "fri_client_sdk/friUdpConnection.h"
+#include "fri_client_sdk/friClientIf.h"
 
 
 #include "pluginlib/class_list_macros.hpp"

diff --git a/kuka_sunrise_fri_driver/src/fri_client_sdk/HWIFClientApplication.cpp b/kuka_sunrise_fri_driver/src/fri_client_sdk/HWIFClientApplication.cpp
@@ -1,4 +1,4 @@
-#include <fri/HWIFClientApplication.hpp>
+#include <fri_client_sdk/HWIFClientApplication.hpp>
 #include <iostream>
 
 

diff --git a/kuka_sunrise_fri_driver/src/fri_client_sdk/friClientApplication.cpp b/kuka_sunrise_fri_driver/src/fri_client_sdk/friClientApplication.cpp
@@ -59,12 +59,12 @@ cost of any service and repair.
 */
 #include <cstdio>
 #include <iostream>
-#include <fri/friClientApplication.h>
-#include <fri/friClientIf.h>
-#include <fri/friConnectionIf.h>
+#include <fri_client_sdk/friClientApplication.h>
+#include <fri_client_sdk/friClientIf.h>
+#include <fri_client_sdk/friConnectionIf.h>
 #include <friClientData.h>
 #include <FRIMessages.pb.h>
-#include <fri/friTransformationClient.h>
+#include <fri_client_sdk/friTransformationClient.h>
 
 using namespace KUKA::FRI;
 

diff --git a/kuka_sunrise_fri_driver/src/fri_client_sdk/friClientData.h b/kuka_sunrise_fri_driver/src/fri_client_sdk/friClientData.h
@@ -65,8 +65,8 @@ cost of any service and repair.
 #include <FRIMessages.pb.h>
 #include <friMonitoringMessageDecoder.h>
 #include <friCommandMessageEncoder.h>
-#include <fri/friClientIf.h>
-#include <fri/friException.h>
+#include <fri_client_sdk/friClientIf.h>
+#include <fri_client_sdk/friException.h>
 
 namespace KUKA
 {

diff --git a/kuka_sunrise_fri_driver/src/fri_client_sdk/friLBRClient.cpp b/kuka_sunrise_fri_driver/src/fri_client_sdk/friLBRClient.cpp
@@ -59,7 +59,7 @@ cost of any service and repair.
 */
 #include <cstdio>
 #include <iostream>
-#include <fri/friLBRClient.h>
+#include <fri_client_sdk/friLBRClient.h>
 #include <friClientData.h>
 
 using namespace KUKA::FRI;

diff --git a/kuka_sunrise_fri_driver/src/fri_client_sdk/friLBRCommand.cpp b/kuka_sunrise_fri_driver/src/fri_client_sdk/friLBRCommand.cpp
@@ -57,8 +57,8 @@ cost of any service and repair.
 \file
 \version {1.15}
 */
-#include <fri/friLBRState.h>
-#include <fri/friLBRCommand.h>
+#include <fri_client_sdk/friLBRState.h>
+#include <fri_client_sdk/friLBRCommand.h>
 #include <friClientData.h>
 #include <pb_frimessages_callbacks.h>
 

diff --git a/kuka_sunrise_fri_driver/src/fri_client_sdk/friLBRState.cpp b/kuka_sunrise_fri_driver/src/fri_client_sdk/friLBRState.cpp
@@ -57,7 +57,7 @@ cost of any service and repair.
 \file
 \version {1.15}
 */
-#include <fri/friLBRState.h>
+#include <fri_client_sdk/friLBRState.h>
 #include <friClientData.h>
 #include <pb_frimessages_callbacks.h>
 

diff --git a/kuka_sunrise_fri_driver/src/fri_client_sdk/friTransformationClient.cpp b/kuka_sunrise_fri_driver/src/fri_client_sdk/friTransformationClient.cpp
@@ -61,7 +61,7 @@ cost of any service and repair.
 #include <cstring>
 #include <cstdio>
 
-#include <fri/friTransformationClient.h>
+#include <fri_client_sdk/friTransformationClient.h>
 #include <friClientData.h>
 
 #include <FRIMessages.pb.h>

diff --git a/kuka_sunrise_fri_driver/src/fri_client_sdk/friUdpConnection.cpp b/kuka_sunrise_fri_driver/src/fri_client_sdk/friUdpConnection.cpp
@@ -63,7 +63,7 @@ cost of any service and repair.
 #include <unistd.h>
 #endif
 
-#include <fri/friUdpConnection.h>
+#include <fri_client_sdk/friUdpConnection.h>
 
 
 #ifdef WIN32