Skip to content

Commit

Permalink
Merge pull request #280 from ipa-vsp/fix/yaml-build-error
Browse files Browse the repository at this point in the history
Fix undefined reference to yaml library
  • Loading branch information
ipa-vsp authored Apr 20, 2024
2 parents 5dcebad + af30d24 commit 893079d
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 5 deletions.
1 change: 0 additions & 1 deletion .github/workflows/rolling.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,4 @@ jobs:
AFTER_BUILD_TARGET_WORKSPACE: 'set +u && COLCON_TRACE=0 AMENT_TRACE_SETUP_FILES=0 source /root/target_ws/install/setup.bash && set -u'
ROS_DISTRO: ${{ matrix.ROS_DISTRO }}
ROS_REPO: ${{ matrix.ROS_REPO }}
OS_CODE_NAME: jammy
PRERELEASE: false
2 changes: 1 addition & 1 deletion canopen/sphinx/user-guide/configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ device.
software_version; The expected software version (default: 0x00000000, see object 1F55).
configuration_file; The name of the file containing the configuration (default: "<dcf_path>/<name>.bin" (where <name> is the section name), see object 1F22).
restore_configuration; The sub-index of object 1011 to be used when restoring the configuration (default: 0x00).
sdo_timeout_ms; The timeout to use for SDO reads/writes to this device. (default: 20ms)
sdo_timeout_ms; The timeout to use for SDO reads/writes to this device. (default: 20ms)
sdo; Additional SDO requests to be sent during configuration (see below).


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ class LelyDriverBridge : public canopen::FiberDriver

uint8_t nodeid;
std::string name_;

std::chrono::milliseconds sdo_timeout;

std::function<void()> on_sync_function_;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ void NodeCanopenBaseDriver<rclcpp_lifecycle::LifecycleNode>::configure(bool call
{
sdo_timeout_ms = std::optional(this->config_["sdo_timeout_ms"].as<int>());
}
catch(...)
catch (...)
{
}
sdo_timeout_ms_ = sdo_timeout_ms.value_or(20);
Expand Down Expand Up @@ -181,7 +181,7 @@ void NodeCanopenBaseDriver<rclcpp::Node>::configure(bool called_from_base)
{
sdo_timeout_ms = std::optional(this->config_["sdo_timeout_ms"].as<int>());
}
catch(...)
catch (...)
{
}
sdo_timeout_ms_ = sdo_timeout_ms.value_or(20);
Expand Down
1 change: 1 addition & 0 deletions canopen_core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ ament_target_dependencies(device_container
target_link_libraries(device_container
node_canopen_master
node_canopen_driver
yaml-cpp
)

add_executable(device_container_node
Expand Down
7 changes: 7 additions & 0 deletions canopen_core/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ target_include_directories(test_node_canopen_driver PUBLIC
)
target_link_libraries(test_node_canopen_driver
node_canopen_driver
yaml-cpp
)

ament_add_gmock(test_node_canopen_master
Expand All @@ -30,6 +31,7 @@ target_include_directories(test_node_canopen_master PUBLIC
)
target_link_libraries(test_node_canopen_master
node_canopen_master
yaml-cpp
)

# Temporary fixing ci build stability
Expand All @@ -49,6 +51,7 @@ target_link_libraries(test_device_container
device_container
)
endif()

file(COPY bus_configs DESTINATION ${CMAKE_CURRENT_BINARY_DIR})

ament_add_gmock(test_canopen_driver
Expand All @@ -62,6 +65,7 @@ target_include_directories(test_canopen_driver PUBLIC
)
target_link_libraries(test_canopen_driver
node_canopen_driver
yaml-cpp
)

ament_add_gmock(test_lifecycle_canopen_driver
Expand All @@ -75,6 +79,7 @@ target_include_directories(test_lifecycle_canopen_driver PUBLIC
)
target_link_libraries(test_lifecycle_canopen_driver
node_canopen_driver
yaml-cpp
)

ament_add_gmock(test_canopen_master
Expand All @@ -88,6 +93,7 @@ target_include_directories(test_canopen_master PUBLIC
)
target_link_libraries(test_canopen_master
node_canopen_master
yaml-cpp
)

ament_add_gmock(test_lifecycle_canopen_master
Expand All @@ -101,6 +107,7 @@ target_include_directories(test_lifecycle_canopen_master PUBLIC
)
target_link_libraries(test_lifecycle_canopen_master
node_canopen_master
yaml-cpp
)

ament_add_gmock(test_lifecycle_manager
Expand Down

0 comments on commit 893079d

Please sign in to comment.