Skip to content

Commit

Permalink
Merge pull request #103 from dmronga/drop_kdl
Browse files Browse the repository at this point in the history
Remove KDL robot model, it lacks too many features compared to RBDL a…
  • Loading branch information
dmronga authored Jun 7, 2024
2 parents be4a9ef + aa59d6f commit 3d440c7
Show file tree
Hide file tree
Showing 13 changed files with 21 additions and 1,182 deletions.
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ set(API_VERSION ${PROJECT_VERSION})
list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)

option(ROBOT_MODEL_RBDL "Also build the RBDL-based robot model, by default only pinocchio is built" OFF)
option(ROBOT_MODEL_KDL "Also build the KDL-based robot model, by default only pinocchio is built" OFF)
option(ROBOT_MODEL_HYRODYN "Also build the HyRoDyn-based robot model, by default only pinocchio is built" OFF)
option(SOLVER_PROXQP "Build the ProxQP-based solver, by default only hls and qpoases are built" OFF)
option(SOLVER_EIQUADPROG "Build the Eiquadprog-based solver, by default only hls and qpoases are built" OFF)
Expand Down
21 changes: 2 additions & 19 deletions scripts/full_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ make -j8 && sudo make install && cd ../..
# URDF
sudo apt-get -y install liburdfdom-headers-dev liburdfdom-dev

# Clone WBC repo to have the patches for KDL and qpOASES
# Clone WBC repo to have the patches
git clone https://github.com/ARC-OPT/wbc.git

# RBDL
Expand All @@ -31,30 +31,13 @@ mkdir build && cd build
cmake .. -DRBDL_BUILD_ADDON_URDFREADER=ON
make -j8 && sudo make install && cd ../..

# KDL
git clone https://github.com/orocos/orocos_kinematics_dynamics.git -b v1.5.1
mkdir orocos_kinematics_dynamics/orocos_kdl/build
cd orocos_kinematics_dynamics/orocos_kdl/build
cmake ..
make -j8 && sudo make install && cd ../../..

# Pinocchio
git clone --branch v2.6.8 --recurse-submodules https://github.com/stack-of-tasks/pinocchio.git
cd pinocchio
mkdir build && cd build
cmake .. -DBUILD_PYTHON_INTERFACE=OFF -DBUILD_UNIT_TESTS=OFF
make -j8 && sudo make install && cd ../..

# KDL parser
sudo apt-get -y install libtinyxml2-dev
git clone https://github.com/ros/kdl_parser.git -b 1.14.1
cd kdl_parser/kdl_parser
mkdir patches && cp ../../wbc/patches/kdl_parser.patch patches
git apply patches/kdl_parser.patch
mkdir build && cd build
cmake ..
make -j8 && sudo make install && cd ../../..

# If not done yet, setup a ssh key pair using the command `ssh-keygen` and add the
# key from `~/.ssh/id_rsa.pub `to the keys in your Gitlab account.

Expand Down Expand Up @@ -103,7 +86,7 @@ make -j8 && sudo make install && cd ../..

# WBC
mkdir wbc/build && cd wbc/build
cmake .. -DROBOT_MODEL_RBDL=ON -DROBOT_MODEL_KDL=ON -DSOLVER_PROXQP=ON -DSOLVER_EIQUADPROG=ON -DSOLVER_QPSWIFT=ON -DSOLVER_OSQP=ON -DCMAKE_BUILD_TYPE=RELEASE
cmake .. -DROBOT_MODEL_RBDL=ON -DSOLVER_PROXQP=ON -DSOLVER_EIQUADPROG=ON -DSOLVER_QPSWIFT=ON -DSOLVER_OSQP=ON -DCMAKE_BUILD_TYPE=RELEASE
make -j8 && sudo make install && cd ..

sudo ldconfig
4 changes: 0 additions & 4 deletions src/robot_models/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,3 @@ endif()
if(ROBOT_MODEL_HYRODYN)
add_subdirectory(hyrodyn)
endif()
if(ROBOT_MODEL_KDL)
add_subdirectory(kdl)
endif()

28 changes: 0 additions & 28 deletions src/robot_models/kdl/CMakeLists.txt

This file was deleted.

110 changes: 0 additions & 110 deletions src/robot_models/kdl/KinematicChainKDL.cpp

This file was deleted.

76 changes: 0 additions & 76 deletions src/robot_models/kdl/KinematicChainKDL.hpp

This file was deleted.

Loading

0 comments on commit 3d440c7

Please sign in to comment.