Skip to content

Commit aa33eea

Browse files
Modified interbotix_slate_driver to use trossen_slate (#60)
* Added new trossen_slate package and modified interbotix_slate_driver to use trossen_slate. * Modified interbotix_slate_driver to use trossen_slate. * Minor cleanup on formatting and unused variables. * Quick fix of RCLCPP logging. * Typo fix with logging. * Added COLCON_IGNORE, minor logging fixes, and added shutdown for slate_base node on init_base failure. * Added COLCON_IGNORE, minor logging fixes, and added shutdown for slate_base node on init_base failure. * Simplified CMakeLists.txt, added velocity timeout back, added timer for update method. * Simplified CMakeLists.txt, added velocity timeout back, added timer for update method. * Recursive submodule checkout * Minor formatting/comments changes. * Checked out trossen_slate submodule to most recent commit. * Added frequency parameter, removed shutdown because node isn't fully initialized anyway as it was being called in constructor. Basic typo fixes and comments. * Basic formatting on slate node * Update interbotix_ros_slate/interbotix_slate_driver/src/slate_base.cpp * Updated submodule for trossen_slate to use HTTPS URL --------- Co-authored-by: Luke Schmitt <[email protected]> Co-authored-by: lukeschmitt-tr <[email protected]>
1 parent bf127b4 commit aa33eea

File tree

13 files changed

+118
-455
lines changed

13 files changed

+118
-455
lines changed

.github/workflows/slate-humble.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
- uses: actions/checkout@v4
2525
with:
2626
path: src/interbotix_ros_core
27+
submodules: recursive
2728
- name: Prepare Workspace
2829
run: |
2930
rm src/interbotix_ros_core/interbotix_ros_slate/COLCON_IGNORE

.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@
66
path = interbotix_ros_xseries/interbotix_xs_driver
77
url = https://github.com/Interbotix/interbotix_xs_driver.git
88
branch = v0.3.3
9+
[submodule "interbotix_ros_slate/trossen_slate"]
10+
path = interbotix_ros_slate/trossen_slate
11+
url = https://github.com/Interbotix/trossen_slate.git

interbotix_ros_slate/interbotix_slate_driver/CMakeLists.txt

+6-44
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ endif()
1111

1212
set(CMAKE_BUILD_TYPE "Release")
1313

14-
set(serial_driver "chassis_driver")
15-
1614
find_package(ament_cmake REQUIRED)
1715
find_package(geometry_msgs REQUIRED)
1816
find_package(interbotix_slate_msgs REQUIRED)
@@ -23,6 +21,7 @@ find_package(std_msgs REQUIRED)
2321
find_package(std_srvs REQUIRED)
2422
find_package(tf2_geometry_msgs REQUIRED)
2523
find_package(tf2_ros REQUIRED)
24+
find_package(trossen_slate REQUIRED)
2625

2726
include_directories(include)
2827

@@ -36,56 +35,19 @@ set(ROS_DEPENDENCIES
3635
std_srvs
3736
tf2_geometry_msgs
3837
tf2_ros
39-
)
40-
41-
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64")
42-
set(ARCH "x86_64")
43-
elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")
44-
set(ARCH "aarch64")
45-
else()
46-
message(FATAL_ERROR "Unknown System Architecture: ${CMAKE_SYSTEM_PROCESSOR}")
47-
endif()
48-
49-
link_directories(${CMAKE_CURRENT_SOURCE_DIR}/lib/${ARCH})
50-
51-
add_library(slate_base
52-
src/slate_base.cpp
53-
src/base_driver.cpp
54-
)
55-
56-
ament_target_dependencies(slate_base ${ROS_DEPENDENCIES})
57-
58-
target_link_libraries(slate_base
59-
${serial_driver}
38+
trossen_slate
6039
)
6140

6241
add_executable(slate_base_node
6342
src/slate_base_node.cpp
43+
src/slate_base.cpp
6444
)
6545

66-
target_link_libraries(slate_base_node
67-
slate_base
68-
)
69-
70-
install(
71-
TARGETS slate_base
72-
ARCHIVE DESTINATION lib
73-
LIBRARY DESTINATION lib
74-
RUNTIME DESTINATION bin
75-
)
76-
77-
install(
78-
TARGETS
79-
slate_base_node
80-
RUNTIME DESTINATION
81-
lib/${PROJECT_NAME}
82-
)
46+
ament_target_dependencies(slate_base_node ${ROS_DEPENDENCIES})
8347

8448
install(
85-
FILES
86-
${CMAKE_CURRENT_SOURCE_DIR}/lib/${ARCH}/lib${serial_driver}.so
87-
DESTINATION
88-
lib
49+
TARGETS slate_base_node
50+
DESTINATION lib/${PROJECT_NAME}
8951
)
9052

9153
if(BUILD_TESTING)

interbotix_ros_slate/interbotix_slate_driver/include/interbotix_slate_driver/base_driver.hpp

-71
This file was deleted.

interbotix_ros_slate/interbotix_slate_driver/include/interbotix_slate_driver/serial_driver.hpp

-84
This file was deleted.

0 commit comments

Comments
 (0)