Commits · 455322eaa90ac0ffdbdc95f65f36e6d692c43c52 · Florian Leander Singer / RobotAPI

Oct 18, 2019
- add setviapoint to jsdmp controller · 455322ea
  ArmarX User authored 5 years ago
  
  455322ea
Oct 11, 2019
- added runDMPwithTime function in tscontroller · f84523eb
  ArmarX User authored 5 years ago
  
  f84523eb
Oct 10, 2019
- fix joint position dmp when rt starts without setting a goal · a6d03d1b
  ArmarX User authored 5 years ago
  
  a6d03d1b
- ts dmp serialization returns default goal · fef0e04e
  ArmarX User authored 5 years ago
  
  fef0e04e
Oct 04, 2019
- add joint position njoint controller and fix dmp serialization · 5696d549
  ArmarX User authored 5 years ago
  
  5696d549
Oct 02, 2019

move gripper ethercat to imaginert · a04155bb
ArmarX User authored 5 years ago

a04155bb
fix merge · 9c9e96ca
ArmarX User authored 5 years ago

9c9e96ca

Merge branch 'master' into kitgripper · d19cdc17

ArmarX User authored 5 years ago

# Conflicts:
#	source/RobotAPI/components/units/RobotUnit/BasicControllers.cpp
#	source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.ipp
#	source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleLogging.cpp
#	source/RobotAPI/interface/CMakeLists.txt
#	source/RobotAPI/interface/units/RobotUnit/NJointTaskSpaceDMPController.ice
#	source/RobotAPI/libraries/RobotAPINJointControllers/CMakeLists.txt
#	source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointJSDMPController.cpp

d19cdc17

add dmp serialization · efa2917d
ArmarX User authored 5 years ago

efa2917d

Oct 01, 2019
- Merge branch 'kitgripper' of https://gitlab.com/ArmarX/RobotAPI into kitgripper · 27e361e4
  ArmarX User authored 5 years ago
  
  27e361e4
- fix pwm velocity controller · 07382b11
  ArmarX User authored 5 years ago
  
  07382b11
- fix dmp controller and add js dmp · f6126051
  ArmarX User authored 5 years ago
  
  f6126051
Sep 30, 2019
- Add option to optimize nullspace if target was reached to... · 4893ffdd
  Raphael Grimm authored 5 years ago
  
  Add option to optimize nullspace if target was reached to CartesianWaypointControlGuiWidgetController
  4893ffdd
- Improve NJointCartesianWaypointController (it optionally keeps optimizing the... · c7d3cf73
  Raphael Grimm authored 5 years ago
  
  Improve NJointCartesianWaypointController (it optionally keeps optimizing the Nullspace even if the target was reached) Also rename CartesianWaypointControllerConfigWithForceLimit to NJointCartesianWaypointControllerRuntimeConfig
  c7d3cf73
- Add timestamp to reportPlatformPose() · 82270151
  Fabian Paus authored 5 years ago and Stefan Reither committed 5 years ago
  
  82270151
- Add RobotUnit::createOrReplaceNJointController · 8273490c
  Raphael Grimm authored 5 years ago
  
  8273490c
- Fix unused variable · 14639381
  Raphael Grimm authored 5 years ago
  
  14639381
Sep 27, 2019
- Merge branch 'FrameTracking' into 'master' · e6af57d8
  Kevin Hitzler authored 5 years ago
  
  Frame tracking See merge request ArmarX/RobotAPI!54
  e6af57d8
- Fix FrameTracking component if the pc is under heavy load · 5a1ec6d3
  Adrian Knobloch authored 5 years ago
  
  5a1ec6d3
- Make FrameTrackingComponent visible for statecharts · 95a9d262
  Adrian Knobloch authored 5 years ago
  
  95a9d262
Sep 26, 2019
- Set default values for enumes (otherwise there will be marshaling errors if they are not set · 74d7368d
  Raphael Grimm authored 5 years ago
  
  74d7368d
Sep 25, 2019
- Merge branch 'master' of gitlab.com:ArmarX/RobotAPI · 16ad7f00
  Raphael Grimm authored 5 years ago
  
  16ad7f00
- Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI · 095cec73
  Kevin Hitzler authored 5 years ago
  
  095cec73
- Improve visualization capabilities of NJointCartesianWaypointController · e8ab2dde
  Kevin Hitzler authored 5 years ago
  
  The robot's global pose can be set manually
  e8ab2dde
Sep 23, 2019
- Add trace macro · 3a343b1e
  Raphael Grimm authored 5 years ago
  
  3a343b1e
Sep 20, 2019
- restored .gitkeep for build dir · 31d634c5
  Mirko Wächter authored 5 years ago
  
  31d634c5
Sep 18, 2019
- Merge branch 'master' of gitlab.com:ArmarX/RobotAPI · faafd33a
  Fabian Paus authored 5 years ago
  
  faafd33a
- Check for nullptr in NJointController list and skip it · 6b5bff1e
  Fabian Paus authored 5 years ago
  
  6b5bff1e
- Add NJointCartesianWaypointControllerConfig/RemoteGui.h · 76bd6f22
  Kevin Hitzler authored 5 years ago
  
  76bd6f22
Sep 17, 2019
- Return actually used timestamps · da091486
  Rainer Kartmann authored 5 years ago
  
  da091486
- Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI · b8589d76
  Kevin Hitzler authored 5 years ago
  
  b8589d76
- Added FrameTracking changes for ROBDEKON Demo · c13712fa
  Kevin Hitzler authored 5 years ago
  
  Added dynamic workspace limit check in NJointTaskSpaceDMPController
  c13712fa
- Merge branch 'master' of gitlab.com:ArmarX/RobotAPI · 396279b5
  Raphael Grimm authored 5 years ago
  
  396279b5
- Add check box to reverse the sequence · bde0cb4d
  Raphael Grimm authored 5 years ago
  
  bde0cb4d
Sep 16, 2019
- Missing update · 5d963b74
  Rainer Kartmann authored 5 years ago
  
  5d963b74
- Merge branch '13-robotstatetest-fails' into 'master' · 8c4abb3a
  Rainer Kartmann authored 5 years ago
  
  Resolve "RobotStateTest fails" Closes #13 See merge request ArmarX/RobotAPI!53
  8c4abb3a
- Revise test · e6e21aca
  Rainer Kartmann authored 5 years ago
  
  e6e21aca
- Fix wrong usage of std::prev() · ee0564ae
  Rainer Kartmann authored 5 years ago
  
  ee0564ae
- Merge branch 'master' of gitlab.com:ArmarX/RobotAPI · 87135c5d
  Raphael Grimm authored 5 years ago
  
  87135c5d
- RemoteRobot: add synchronizeLocalCloneToState · 36c7ef68
  Fabian Paus authored 5 years ago
  
  We can get the current robot state and save it. Later, we can sync a local robot to that saved state.
  36c7ef68