Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/rov/rov_bno085/jetgpio
Submodule jetgpio added at 51d7ac
1 change: 1 addition & 0 deletions src/rov/rov_bno085/sh2
Submodule sh2 added at b514b1
30 changes: 15 additions & 15 deletions src/rov/rov_pca9685/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_compile_options(-Wall -Wextra -Wpedantic)
endif()

if(DEBUG_OUTPUT)
add_compile_definitions(DEBUG_OUTPUT=true)
endif()

# find dependencies
find_package(ament_cmake REQUIRED)
# uncomment the following section in order to fill in
Expand All @@ -27,32 +23,36 @@ find_package(ament_cmake REQUIRED)
find_package(rov_interfaces REQUIRED)
find_package(rclcpp REQUIRED)

add_subdirectory(external/JHPWMPCA9685)
add_library(pca9685 src/PCA9685_Node.cpp src/ServoDriver.cpp)
target_include_directories(pca9685 PUBLIC JHPWMPCA9685_INCLUDE_DIRS)
add_executable(pca9685_node src/main.cpp)
add_library(pca9685 src/ServoDriver.cpp src/PCA9685.cpp)
add_executable(pca9685_node src/main.cpp src/PCA9685_Node.cpp)
add_executable(pca9685_interactive_test src/main_interactive.cpp)
target_include_directories(pca9685 PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>
)

target_link_libraries(pca9685 jhpwmpca9685)
target_link_libraries(pca9685_node pca9685)
target_link_libraries(pca9685_interactive_test pca9685)
target_include_directories(pca9685_node PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>
)

ament_target_dependencies(pca9685
rclcpp
rov_interfaces
)
ament_target_dependencies(pca9685_node
rclcpp
rov_interfaces
)

install(TARGETS pca9685_node pca9685 pca9685_interactive_test
target_link_libraries(pca9685 i2c)
target_link_libraries(pca9685_node i2c pca9685)
target_link_libraries(pca9685_interactive_test i2c pca9685)

install(TARGETS pca9685 pca9685_node pca9685_interactive_test
DESTINATION lib/${PROJECT_NAME})

install(DIRECTORY include/
DESTINATION include/)
install(DIRECTORY external/JHPWMPCA9685/include/
DESTINATION include/)

if(BUILD_TESTING)
find_package(ament_lint_auto REQUIRED)
Expand Down
4 changes: 0 additions & 4 deletions src/rov/rov_pca9685/external/JHPWMPCA9685/CMakeLists.txt

This file was deleted.

This file was deleted.

19 changes: 0 additions & 19 deletions src/rov/rov_pca9685/external/JHPWMPCA9685/license.txt

This file was deleted.

108 changes: 0 additions & 108 deletions src/rov/rov_pca9685/external/JHPWMPCA9685/src/JHPWMPCA9685.cpp

This file was deleted.

Loading
Loading