Skip to content

Commit c27fde6

Browse files
authored
Merge pull request #27 from iit-DLSLab/barebon_structure_update
Barebone structure and msg update
2 parents 42ac2fa + ed784ae commit c27fde6

5 files changed

Lines changed: 11 additions & 11 deletions

File tree

CMakeLists.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,14 @@ add_subdirectory(visualizers/rviz_interface)
2222
message(STATUS "Generating ROS2 messages from IDL files...")
2323
set (DLS2_ROS2_INTERFACE_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/dls2_ros2_interface/ros2_ws/src)
2424
set (DLS2_ROS2_INTERFACE_DIR ${DLS2_ROS2_INTERFACE_SRC_DIR}/dls2_interface)
25+
26+
27+
# remove .msg files from the ROS2 interface src directory to avoid conflicts with the newly generated ones
28+
file(GLOB DLS_MSG_FILES CONFIGURE_DEPENDS "${DLS2_ROS2_INTERFACE_DIR}/msg/*.msg")
29+
foreach(msg_file IN LISTS DLS_MSG_FILES)
30+
file(REMOVE ${msg_file})
31+
endforeach()
32+
2533
file(GLOB DLS_IDL_FILES CONFIGURE_DEPENDS "${DLS_MESSAGE_FOLDER}/idls/*.idl")
2634
foreach(idl_file IN LISTS DLS_IDL_FILES)
2735
execute_process(

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ This project is currently in **pre-release** and under active development.
1010

1111
# Repository Structure
1212

13-
| Component | Path | Description |
13+
| Component | Path | Description |
1414
|-----------|------|-------------|
1515
| **DLS2 Framework** | `dls2/` | Core control middleware. Contains modules for control, state estimation, messaging (DDS/IDL), plugins, state machines, signal handling, logging, and utilities. |
1616
| **Robotlib** | `robotlib/` | Generic C++ robot abstraction layer. Provides a common API (kinematics, dynamics, Jacobians, data structures) that controllers target, independent of any specific robot morphology. Uses a factory pattern with `dlopen` for runtime-loadable robot libraries. |

dls2_msgs

visualizers/rviz_interface/CMakeLists.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,6 @@ if (NOT TARGET dls_messages)
1010
find_package(dls_messages REQUIRED)
1111
endif()
1212

13-
14-
if(DEFINED DLS_MESSAGE_FOLDER)
15-
list(APPEND CMAKE_MODULE_PATH "${DLS_MESSAGE_FOLDER}/cmake")
16-
else()
17-
list(APPEND CMAKE_MODULE_PATH "/usr/include/dls_messages/cmake")
18-
endif()
19-
include(generate_msg_library)
20-
2113
# Set RELEASE as the default build type
2214
if(NOT CMAKE_BUILD_TYPE)
2315
set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type" FORCE)

0 commit comments

Comments
 (0)