Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI
No related branches found
No related tags found
Showing
- CMakeLists.txt 6 additions, 1 deletionCMakeLists.txt
- data/RobotAPI/VariantInfo-RobotAPI.xml 8 additions, 0 deletionsdata/RobotAPI/VariantInfo-RobotAPI.xml
- data/RobotAPI/robots/Armar3/ArmarIII-Head.xml 1 addition, 1 deletiondata/RobotAPI/robots/Armar3/ArmarIII-Head.xml
- data/RobotAPI/robots/Armar3/ArmarIII-RightArm.xml 1 addition, 1 deletiondata/RobotAPI/robots/Armar3/ArmarIII-RightArm.xml
- source/RobotAPI/components/DebugDrawer/CMakeLists.txt 1 addition, 1 deletionsource/RobotAPI/components/DebugDrawer/CMakeLists.txt
- source/RobotAPI/components/DebugDrawer/DebugDrawerComponent.cpp 17 additions, 15 deletions.../RobotAPI/components/DebugDrawer/DebugDrawerComponent.cpp
- source/RobotAPI/components/RobotState/CMakeLists.txt 1 addition, 2 deletionssource/RobotAPI/components/RobotState/CMakeLists.txt
- source/RobotAPI/components/units/ForceTorqueObserver.cpp 68 additions, 29 deletionssource/RobotAPI/components/units/ForceTorqueObserver.cpp
- source/RobotAPI/components/units/ForceTorqueObserver.h 4 additions, 0 deletionssource/RobotAPI/components/units/ForceTorqueObserver.h
- source/RobotAPI/components/units/HapticObserver.cpp 7 additions, 1 deletionsource/RobotAPI/components/units/HapticObserver.cpp
- source/RobotAPI/components/units/HeadIKUnit.cpp 3 additions, 2 deletionssource/RobotAPI/components/units/HeadIKUnit.cpp
- source/RobotAPI/components/units/HeadIKUnit.h 1 addition, 0 deletionssource/RobotAPI/components/units/HeadIKUnit.h
- source/RobotAPI/components/units/PlatformUnitObserver.h 2 additions, 2 deletionssource/RobotAPI/components/units/PlatformUnitObserver.h
- source/RobotAPI/components/units/PlatformUnitSimulation.h 2 additions, 2 deletionssource/RobotAPI/components/units/PlatformUnitSimulation.h
- source/RobotAPI/components/units/TCPControlUnit.cpp 4 additions, 3 deletionssource/RobotAPI/components/units/TCPControlUnit.cpp
- source/RobotAPI/components/units/TCPControlUnit.h 1 addition, 0 deletionssource/RobotAPI/components/units/TCPControlUnit.h
- source/RobotAPI/gui-plugins/HapticUnitPlugin/MatrixDatafieldDisplayWidget.h 2 additions, 2 deletions...i-plugins/HapticUnitPlugin/MatrixDatafieldDisplayWidget.h
- source/RobotAPI/interface/speech/SpeechInterface.ice 3 additions, 1 deletionsource/RobotAPI/interface/speech/SpeechInterface.ice
- source/RobotAPI/libraries/core/RobotStatechartContext.cpp 2 additions, 2 deletionssource/RobotAPI/libraries/core/RobotStatechartContext.cpp
- source/RobotAPI/libraries/core/RobotStatechartContext.h 2 additions, 0 deletionssource/RobotAPI/libraries/core/RobotStatechartContext.h
Loading
Please register or sign in to comment