- May 13, 2020
-
-
Fabian Paus authored
-
- May 07, 2020
-
-
Christian Dreher authored
-
Raphael Grimm authored
-
Raphael Grimm authored
-
- May 06, 2020
-
-
Christian Dreher authored
-
Christian Dreher authored
-
Christian Dreher authored
-
Fabian Paus authored
-
Raphael Grimm authored
-
Fabian Tërnava authored
-
Raphael Grimm authored
-
Christian Dreher authored
-
Raphael Grimm authored
-
Raphael Grimm authored
-
Raphael Grimm authored
# Conflicts: # source/RobotAPI/interface/units/RobotUnit/NJointCartesianNaturalPositionController.ice # source/RobotAPI/interface/units/RobotUnit/NJointCartesianWaypointController.ice
-
Raphael Grimm authored
-
- May 05, 2020
-
-
Christian Dreher authored
-
Christian Dreher authored
-
Christian Dreher authored
-
Fabian Tërnava authored
-
Christian Dreher authored
-
ArmarX User authored
# Conflicts: # source/RobotAPI/libraries/DMPController/TaskSpaceDMPController.h # source/RobotAPI/libraries/RobotAPINJointControllers/CMakeLists.txt
-
Stefan Reither authored
-
ArmarX User authored
This reverts commit 563402a7, reversing changes made to e4ed6753.
-
Stefan Reither authored
-
ArmarX User authored
-
ArmarX User authored
-
Raphael Grimm authored
-
- May 04, 2020
-
-
Christian Dreher authored
-
Christian Dreher authored
-
Christian Dreher authored
-
ArmarX User authored
-
JeffGao authored
# Conflicts: # source/RobotAPI/libraries/ArmarXEtherCAT/EtherCAT.cpp # source/RobotAPI/libraries/ArmarXEtherCAT/EtherCAT.h # source/RobotAPI/libraries/ArmarXEtherCAT/EtherCATRTUnit.cpp # source/RobotAPI/libraries/ArmarXEtherCAT/EtherCATRTUnit.h # source/RobotAPI/libraries/DMPController/TaskSpaceDMPController.h # source/RobotAPI/libraries/RobotAPINJointControllers/CMakeLists.txt # source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTaskSpaceImpedanceDMPController.cpp
-
- Apr 30, 2020
-
-
Fabian Paus authored
# Conflicts: # data/RobotAPI/VariantInfo-RobotAPI.xml # source/RobotAPI/components/CMakeLists.txt # source/RobotAPI/libraries/RobotAPINJointControllers/CMakeLists.txt
-
Fabian Paus authored
# Conflicts: # data/RobotAPI/VariantInfo-RobotAPI.xml # source/RobotAPI/components/CMakeLists.txt # source/RobotAPI/libraries/RobotAPINJointControllers/BimanualForceControllers/NJointBimanualObjLevelController.cpp # source/RobotAPI/libraries/RobotAPINJointControllers/CMakeLists.txt
-
Rainer Kartmann authored
-
Rainer Kartmann authored
-
Rainer Kartmann authored
-
Rainer Kartmann authored
-
Christian Dreher authored
-