Skip to content

Commit

Permalink
create executable targets, update README
Browse files Browse the repository at this point in the history
* create executable targets for all cpp file under executables directory
* move control_kinova to executables dir
* explain where ABAG implementation comes from
  • Loading branch information
minhnh committed Jul 3, 2020
1 parent 419d320 commit 3ee01cc
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 6 deletions.
23 changes: 18 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ include_directories(
${PROJECT_SOURCE_DIR}/include
${PROJECT_SOURCE_DIR}/generated
)

list(APPEND control_kinova_SOURCES
${PROJECT_SOURCE_DIR}/generated/abag.c
${PROJECT_SOURCE_DIR}/src/kinova_util.cpp
)
set_source_files_properties(generated/abag.c PROPERTIES LANGUAGE CXX)

link_libraries(
Expand All @@ -58,8 +63,16 @@ link_libraries(
pthread
)

add_executable(control_kinova
src/control_kinova.cpp
src/kinova_util.cpp
generated/abag.c
)
# find all CPP files in the ./executables directory and create a executable target
# for each of them
file(GLOB EXE_LIST RELATIVE ${PROJECT_SOURCE_DIR} "executables/*.cpp")
foreach ( SRC_FILE ${EXE_LIST} )
MESSAGE(${SRC_FILE})
string(REPLACE ".cpp" "" TARGET_EXE_NAME ${SRC_FILE})
string(REPLACE "executables/" "" TARGET_EXE_NAME ${TARGET_EXE_NAME})

MESSAGE("creating TARGET_EXE_NAME: '${TARGET_EXE_NAME}'")

add_executable(${TARGET_EXE_NAME} ${SRC_FILE} ${control_kinova_SOURCES})

endforeach()
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
# kinova_control_experiments

Simple impedance controller for Kinova Gen 3 arm which was tested on a real robot. This requries ROS to work because of
`kdl_parser` for URDF files.
`kdl_parser` for URDF files. The ABAG implementation is generated using Domain-Specific languages realized in
[Jetbrains MPS](https://www.jetbrains.com/mps/), which can be found at the
[`rosym-project/controller-dsl`](https://github.com/rosym-project/controller-dsl) and
[`rosym-project/algorithm-dsl`](https://github.com/rosym-project/algorithm-dsl) repositories.

## Contents

Expand Down
File renamed without changes.

0 comments on commit 3ee01cc

Please sign in to comment.