Skip to content

Commit

Permalink
Modified interbotix_slate_driver to use trossen_slate (#60)
Browse files Browse the repository at this point in the history
* 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]>
  • Loading branch information
3 people committed Jan 29, 2025
1 parent bf127b4 commit aa33eea
Show file tree
Hide file tree
Showing 13 changed files with 118 additions and 455 deletions.
1 change: 1 addition & 0 deletions .github/workflows/slate-humble.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ jobs:
- uses: actions/checkout@v4
with:
path: src/interbotix_ros_core
submodules: recursive
- name: Prepare Workspace
run: |
rm src/interbotix_ros_core/interbotix_ros_slate/COLCON_IGNORE
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@
path = interbotix_ros_xseries/interbotix_xs_driver
url = https://github.com/Interbotix/interbotix_xs_driver.git
branch = v0.3.3
[submodule "interbotix_ros_slate/trossen_slate"]
path = interbotix_ros_slate/trossen_slate
url = https://github.com/Interbotix/trossen_slate.git
50 changes: 6 additions & 44 deletions interbotix_ros_slate/interbotix_slate_driver/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ endif()

set(CMAKE_BUILD_TYPE "Release")

set(serial_driver "chassis_driver")

find_package(ament_cmake REQUIRED)
find_package(geometry_msgs REQUIRED)
find_package(interbotix_slate_msgs REQUIRED)
Expand All @@ -23,6 +21,7 @@ find_package(std_msgs REQUIRED)
find_package(std_srvs REQUIRED)
find_package(tf2_geometry_msgs REQUIRED)
find_package(tf2_ros REQUIRED)
find_package(trossen_slate REQUIRED)

include_directories(include)

Expand All @@ -36,56 +35,19 @@ set(ROS_DEPENDENCIES
std_srvs
tf2_geometry_msgs
tf2_ros
)

if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64")
set(ARCH "x86_64")
elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")
set(ARCH "aarch64")
else()
message(FATAL_ERROR "Unknown System Architecture: ${CMAKE_SYSTEM_PROCESSOR}")
endif()

link_directories(${CMAKE_CURRENT_SOURCE_DIR}/lib/${ARCH})

add_library(slate_base
src/slate_base.cpp
src/base_driver.cpp
)

ament_target_dependencies(slate_base ${ROS_DEPENDENCIES})

target_link_libraries(slate_base
${serial_driver}
trossen_slate
)

add_executable(slate_base_node
src/slate_base_node.cpp
src/slate_base.cpp
)

target_link_libraries(slate_base_node
slate_base
)

install(
TARGETS slate_base
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
RUNTIME DESTINATION bin
)

install(
TARGETS
slate_base_node
RUNTIME DESTINATION
lib/${PROJECT_NAME}
)
ament_target_dependencies(slate_base_node ${ROS_DEPENDENCIES})

install(
FILES
${CMAKE_CURRENT_SOURCE_DIR}/lib/${ARCH}/lib${serial_driver}.so
DESTINATION
lib
TARGETS slate_base_node
DESTINATION lib/${PROJECT_NAME}
)

if(BUILD_TESTING)
Expand Down

This file was deleted.

This file was deleted.

Loading

0 comments on commit aa33eea

Please sign in to comment.