-
- Downloads
Merge remote-tracking branch 'origin/master' into RobotUnit_v3
Conflicts: source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTrajectoryController.cpp
No related branches found
No related tags found
Showing
- data/RobotAPI/VariantInfo-RobotAPI.xml 8 additions, 0 deletionsdata/RobotAPI/VariantInfo-RobotAPI.xml
- data/RobotAPI/robots/Armar3/ArmarIII.xml 19 additions, 1 deletiondata/RobotAPI/robots/Armar3/ArmarIII.xml
- scenarios/tests/statecharttestscenario/CMakeLists.txt 0 additions, 1 deletionscenarios/tests/statecharttestscenario/CMakeLists.txt
- scenarios/tests/statecharttestscenario/config/ConditionHandler.cfg 113 additions, 30 deletions.../tests/statecharttestscenario/config/ConditionHandler.cfg
- scenarios/tests/statecharttestscenario/config/RobotControl.cfg 0 additions, 93 deletions...rios/tests/statecharttestscenario/config/RobotControl.cfg
- scenarios/tests/statecharttestscenario/config/SystemObserver.cfg 126 additions, 19 deletions...os/tests/statecharttestscenario/config/SystemObserver.cfg
- scenarios/tests/statecharttestscenario/statecharttestscenario.scx 6 additions, 5 deletions...s/tests/statecharttestscenario/statecharttestscenario.scx
- source/RobotAPI/components/DebugDrawer/CMakeLists.txt 3 additions, 1 deletionsource/RobotAPI/components/DebugDrawer/CMakeLists.txt
- source/RobotAPI/components/DebugDrawer/DebugDrawerUtils.h 80 additions, 0 deletionssource/RobotAPI/components/DebugDrawer/DebugDrawerUtils.h
- source/RobotAPI/components/RobotState/RobotStateComponent.cpp 29 additions, 6 deletions...ce/RobotAPI/components/RobotState/RobotStateComponent.cpp
- source/RobotAPI/components/RobotState/RobotStateComponent.h 10 additions, 0 deletionssource/RobotAPI/components/RobotState/RobotStateComponent.h
- source/RobotAPI/components/units/PlatformUnitObserver.cpp 3 additions, 0 deletionssource/RobotAPI/components/units/PlatformUnitObserver.cpp
- source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTrajectoryController.cpp 22 additions, 15 deletions...obotUnit/NJointControllers/NJointTrajectoryController.cpp
- source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTrajectoryController.h 2 additions, 3 deletions.../RobotUnit/NJointControllers/NJointTrajectoryController.h
- source/RobotAPI/components/units/RobotUnit/Units/TrajectoryControllerSubUnit.cpp 20 additions, 5 deletions...nts/units/RobotUnit/Units/TrajectoryControllerSubUnit.cpp
- source/RobotAPI/interface/components/RobotNameServiceInterface.ice 2 additions, 4 deletions...botAPI/interface/components/RobotNameServiceInterface.ice
- source/RobotAPI/interface/core/RobotState.ice 17 additions, 2 deletionssource/RobotAPI/interface/core/RobotState.ice
- source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointBimanualCCDMPController.cpp 1 addition, 1 deletion...ntrollers/DMPController/NJointBimanualCCDMPController.cpp
- source/RobotAPI/libraries/RobotStatechartHelpers/CMakeLists.txt 7 additions, 2 deletions.../RobotAPI/libraries/RobotStatechartHelpers/CMakeLists.txt
- source/RobotAPI/libraries/RobotStatechartHelpers/KinematicUnitHelper.cpp 59 additions, 0 deletions.../libraries/RobotStatechartHelpers/KinematicUnitHelper.cpp
Loading
Please register or sign in to comment