Skip to content

Topic/device urdfdom #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 47 commits into
base: devel
Choose a base branch
from
Open

Topic/device urdfdom #136

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
82bae54
[Device] First draft removing integration and using urdf/yaml files
Jul 31, 2019
ead4cf9
[Device] Change parsing of yaml according to the config files
Aug 7, 2019
2b0d6cc
[Device] Add dependencies to yaml-cpp and urdfdom. Remove the pinocch…
Aug 7, 2019
f90a96f
[Device] Correction of the unitTest of device to respect yaml config
Aug 7, 2019
080aff1
[Device] Remove useless signal, add check torque limits
Aug 19, 2019
4a7bc9e
[Device] Add check on torque limits in unit test
Aug 20, 2019
a16fa19
[Device] Add boost::bind to the signals SOUT_
Aug 23, 2019
ac954e3
[Device] Add entry signals position, velocity, torque and current
Sep 3, 2019
9975708
[Device] Format files using google style
Sep 3, 2019
92220ee
[Device] Change name to generic-device
Nov 5, 2019
1b90fa8
Merge branch 'devel' into topic/device-urdfdom
May 11, 2020
dcd574f
Merge remote-tracking branch 'origin/devel' into topic/device-urdfdom
May 11, 2020
c239120
At initialization read /robot_description model
olivier-stasse Jun 23, 2020
6093490
Clean up code, add exception-tools and take dt as an input for init_s…
olivier-stasse Jun 24, 2020
e5b7857
Add virtual destructor and simplify the code.
olivier-stasse Jun 24, 2020
a9294b7
Revert "Add virtual destructor and simplify the code."
olivier-stasse Jul 2, 2020
61c35e7
Revert "Clean up code, add exception-tools and take dt as an input fo…
olivier-stasse Jul 2, 2020
9109cd8
Revert "At initialization read /robot_description model"
olivier-stasse Jul 2, 2020
beeb05d
[cmake] Add target_include_directories for Boost.
olivier-stasse Jun 16, 2020
b62848e
[cmake] Fix target_link_libraries to fix the link dependencies and in…
olivier-stasse Jun 16, 2020
4a53404
[cmake] Remove useless dependency to Boost_LIBRARIES
olivier-stasse Jun 16, 2020
d7ccb2e
[cmake] Link is made PUBLIC.
olivier-stasse Jun 16, 2020
9dbda56
Put template feature-pose in hxx file.
olivier-stasse Jun 26, 2020
9d9004a
[feature-pose] Reorganize such that feature-pose.hxx is not in featur…
olivier-stasse Jul 2, 2020
362af03
Fix usage of explicit instantiation
jmirabel Jul 2, 2020
fbbf38c
[feature-pose] Make it work on clang.
olivier-stasse Jul 2, 2020
b052916
[feature-pose] Fix the namespace problem.
olivier-stasse Jul 2, 2020
f7cbede
[tests] Fix namespace problem for test_feature_generic
olivier-stasse Jul 2, 2020
468cac4
Remove definition of dg across various class.
olivier-stasse Jul 6, 2020
d59eb72
Fix dg namespace pb.
olivier-stasse Jul 6, 2020
b54f6da
Fix dg namespace pb.
olivier-stasse Jul 6, 2020
83e88f5
Revert "Fix dg namespace pb."
olivier-stasse Jul 12, 2020
49a57bb
Revert "Fix dg namespace pb."
olivier-stasse Jul 12, 2020
d1212e5
Revert "Remove definition of dg across various class."
olivier-stasse Jul 12, 2020
4b75a97
Revert "[tests] Fix namespace problem for test_feature_generic"
olivier-stasse Jul 12, 2020
8c4e6ce
Revert "[feature-pose] Fix the namespace problem."
olivier-stasse Jul 12, 2020
db79299
Revert "[feature-pose] Make it work on clang."
olivier-stasse Jul 12, 2020
ca802b8
Revert "Fix usage of explicit instantiation"
olivier-stasse Jul 12, 2020
f161b98
Revert "[feature-pose] Reorganize such that feature-pose.hxx is not i…
olivier-stasse Jul 12, 2020
fa01a4c
Revert "Put template feature-pose in hxx file."
olivier-stasse Jul 12, 2020
f8be8eb
Revert "[cmake] Link is made PUBLIC."
olivier-stasse Jul 12, 2020
f90ea7a
Revert "[cmake] Remove useless dependency to Boost_LIBRARIES"
olivier-stasse Jul 12, 2020
a211f6e
Revert "[cmake] Fix target_link_libraries to fix the link dependencie…
olivier-stasse Jul 12, 2020
7ddb972
Revert "[cmake] Add target_include_directories for Boost."
olivier-stasse Jul 12, 2020
2ccf06c
Merge tag 'v4.10.0'
nim65s Jul 24, 2020
7f6b421
Merge branch 'devel' into topic/device-urdfdom
Jul 31, 2020
1b7e086
[generic-device] Take remarks into account
Jul 31, 2020
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
12 changes: 11 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ OPTION(INSTALL_PYTHON_INTERFACE_ONLY "Install *ONLY* the python bindings" OFF)
OPTION(SUFFIX_SO_VERSION "Suffix library name with its version" ON)

# Project configuration
SET(CMAKE_CXX_STANDARD 11)
IF(NOT INSTALL_PYTHON_INTERFACE_ONLY)
SET(PROJECT_USE_CMAKE_EXPORT TRUE)
ENDIF(NOT INSTALL_PYTHON_INTERFACE_ONLY)
Expand All @@ -39,6 +40,8 @@ ADD_PROJECT_DEPENDENCY(example-robot-data)
SET(BOOST_COMPONENTS filesystem system thread program_options
unit_test_framework regex)

ADD_REQUIRED_DEPENDENCY("yaml-cpp")

IF(BUILD_PYTHON_INTERFACE)
FINDPYTHON()
STRING(REGEX REPLACE "-" "_" PYTHON_DIR ${CUSTOM_HEADER_DIR})
Expand Down Expand Up @@ -167,11 +170,18 @@ SET(${PROJECT_NAME}_SOURCES
src/utils/stop-watch
)

IF (YAML_CPP_FOUND)
Copy link
Contributor

@nim65s nim65s May 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if yaml-cpp is required (and I think it should be), this IF is useless

Copy link
Contributor Author

@NoelieRamuzat NoelieRamuzat May 12, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes I agree I will remove it.

SET(${PROJECT_NAME}_HEADERS ${${PROJECT_NAME}_HEADERS}
include/${CUSTOM_HEADER_DIR}/generic-device.hh )
SET(${PROJECT_NAME}_SOURCES ${${PROJECT_NAME}_SOURCES}
src/tools/generic-device.cpp )
ENDIF ()

ADD_LIBRARY(${PROJECT_NAME} SHARED
${${PROJECT_NAME}_SOURCES} ${${PROJECT_NAME}_HEADERS})
TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} PUBLIC $<INSTALL_INTERFACE:include>)
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${Boost_LIBRARIES}
dynamic-graph::dynamic-graph pinocchio::pinocchio)
dynamic-graph::dynamic-graph pinocchio::pinocchio yaml-cpp)

IF(SUFFIX_SO_VERSION)
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION})
Expand Down
2 changes: 1 addition & 1 deletion include/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
# Copyright 2010, François Bleibel, Olivier Stasse, JRL, CNRS/AIST
# Copyright 2010, François Bleibel, Olivier Stasse, JRL, CNRS/AIST
2 changes: 1 addition & 1 deletion include/sot/core/device.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,4 +175,4 @@ private:
} // namespace sot
} // namespace dynamicgraph

#endif /* #ifndef SOT_DEVICE_HH */
#endif /* #ifndef SOT_DEVICE_HH */
Loading