Merge branch 'master' of gitlab.com:ArmarX/RobotAPI
Conflicts: source/RobotAPI/components/RobotState/RobotStateComponent.h
No related branches found
No related tags found
Showing
- scenarios/KinematicSimulationArmar3/CMakeLists.txt 0 additions, 8 deletionsscenarios/KinematicSimulationArmar3/CMakeLists.txt
- scenarios/KinematicSimulationArmar3/config/ConditionHandler.cfg 1 addition, 1 deletion...ios/KinematicSimulationArmar3/config/ConditionHandler.cfg
- scenarios/tests/StatechartProfilesTestArmar3Simulation/config/RobotControl.cfg 1 addition, 1 deletion...chartProfilesTestArmar3Simulation/config/RobotControl.cfg
- scenarios/tests/StatechartProfilesTestArmar3a/config/RobotControl.cfg 1 addition, 1 deletion...sts/StatechartProfilesTestArmar3a/config/RobotControl.cfg
- source/RobotAPI/components/RobotState/CMakeLists.txt 2 additions, 0 deletionssource/RobotAPI/components/RobotState/CMakeLists.txt
- source/RobotAPI/components/RobotState/RobotStateComponent.cpp 125 additions, 28 deletions...ce/RobotAPI/components/RobotState/RobotStateComponent.cpp
- source/RobotAPI/components/RobotState/RobotStateComponent.h 10 additions, 1 deletionsource/RobotAPI/components/RobotState/RobotStateComponent.h
- source/RobotAPI/components/RobotState/SharedRobotServants.h 3 additions, 3 deletionssource/RobotAPI/components/RobotState/SharedRobotServants.h
- source/RobotAPI/components/RobotState/test/CMakeLists.txt 4 additions, 0 deletionssource/RobotAPI/components/RobotState/test/CMakeLists.txt
- source/RobotAPI/components/RobotState/test/RobotStateTest.cpp 103 additions, 0 deletions...ce/RobotAPI/components/RobotState/test/RobotStateTest.cpp
- source/RobotAPI/components/units/ForceTorqueObserver.cpp 40 additions, 17 deletionssource/RobotAPI/components/units/ForceTorqueObserver.cpp
- source/RobotAPI/components/units/ForceTorqueObserver.h 3 additions, 3 deletionssource/RobotAPI/components/units/ForceTorqueObserver.h
- source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitConfigDialog.cpp 28 additions, 11 deletions...plugins/KinematicUnitPlugin/KinematicUnitConfigDialog.cpp
- source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitConfigDialog.h 4 additions, 0 deletions...i-plugins/KinematicUnitPlugin/KinematicUnitConfigDialog.h
- source/RobotAPI/interface/core/RobotState.ice 34 additions, 2 deletionssource/RobotAPI/interface/core/RobotState.ice
- source/RobotAPI/libraries/core/FramedPose.cpp 3 additions, 4 deletionssource/RobotAPI/libraries/core/FramedPose.cpp
- source/RobotAPI/libraries/core/remoterobot/RemoteRobot.cpp 40 additions, 0 deletionssource/RobotAPI/libraries/core/remoterobot/RemoteRobot.cpp
- source/RobotAPI/libraries/core/remoterobot/RemoteRobot.h 11 additions, 4 deletionssource/RobotAPI/libraries/core/remoterobot/RemoteRobot.h
- source/RobotAPI/statecharts/operations/RobotControl.cpp 1 addition, 1 deletionsource/RobotAPI/statecharts/operations/RobotControl.cpp
- source/RobotAPI/statecharts/operations/RobotControl.h 2 additions, 0 deletionssource/RobotAPI/statecharts/operations/RobotControl.h
Loading
Please register or sign in to comment