Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI
No related branches found
No related tags found
Showing
- CMakeLists.txt 9 additions, 3 deletionsCMakeLists.txt
- data/RobotAPI/VariantInfo-RobotAPI.xml 21 additions, 15 deletionsdata/RobotAPI/VariantInfo-RobotAPI.xml
- data/RobotAPI/robots/Armar3/ArmarIII.xml 33 additions, 0 deletionsdata/RobotAPI/robots/Armar3/ArmarIII.xml
- data/RobotAPI/sensors/OptoForceCalibration.xml 23 additions, 0 deletionsdata/RobotAPI/sensors/OptoForceCalibration.xml
- etc/cmake/ArmarXPackageVersion.cmake 1 addition, 1 deletionetc/cmake/ArmarXPackageVersion.cmake
- etc/cmake/FindOptoForceOMD.cmake 49 additions, 0 deletionsetc/cmake/FindOptoForceOMD.cmake
- etc/doxygen/images/ControllerDataFlow.svg 0 additions, 0 deletionsetc/doxygen/images/ControllerDataFlow.svg
- etc/doxygen/images/ControllerDataFlow.xml 0 additions, 0 deletionsetc/doxygen/images/ControllerDataFlow.xml
- etc/doxygen/images/LVL1ControllerAtomicDataFlow.svg 2 additions, 0 deletionsetc/doxygen/images/LVL1ControllerAtomicDataFlow.svg
- etc/doxygen/images/LVL1ControllerAtomicDataFlow.xml 1 addition, 0 deletionsetc/doxygen/images/LVL1ControllerAtomicDataFlow.xml
- etc/doxygen/images/LVL1ControllerGeneralDataFlow.svg 2 additions, 0 deletionsetc/doxygen/images/LVL1ControllerGeneralDataFlow.svg
- etc/doxygen/images/LVL1ControllerGeneralDataFlow.xml 1 addition, 0 deletionsetc/doxygen/images/LVL1ControllerGeneralDataFlow.xml
- etc/doxygen/images/LVL1ControllerTripleBufferDataFlow.svg 2 additions, 0 deletionsetc/doxygen/images/LVL1ControllerTripleBufferDataFlow.svg
- etc/doxygen/images/LVL1ControllerTripleBufferDataFlow.xml 1 addition, 0 deletionsetc/doxygen/images/LVL1ControllerTripleBufferDataFlow.xml
- etc/doxygen/images/LVL1ControllerWorkerThreadDataFlow.svg 2 additions, 0 deletionsetc/doxygen/images/LVL1ControllerWorkerThreadDataFlow.svg
- etc/doxygen/images/LVL1ControllerWorkerThreadDataFlow.xml 1 addition, 0 deletionsetc/doxygen/images/LVL1ControllerWorkerThreadDataFlow.xml
- etc/doxygen/pages/GuiPlugins.dox 2 additions, 0 deletionsetc/doxygen/pages/GuiPlugins.dox
- scenarios/Armar3Replay/Armar3Replay.scx 13 additions, 0 deletionsscenarios/Armar3Replay/Armar3Replay.scx
- scenarios/Armar3Replay/config/ConditionHandler.cfg 172 additions, 0 deletionsscenarios/Armar3Replay/config/ConditionHandler.cfg
- scenarios/Armar3Replay/config/DebugObserver.cfg 183 additions, 0 deletionsscenarios/Armar3Replay/config/DebugObserver.cfg
etc/cmake/FindOptoForceOMD.cmake
0 → 100644
File moved
File moved
This diff is collapsed.
scenarios/Armar3Replay/Armar3Replay.scx
0 → 100644
Please register or sign in to comment