Merge branch 'master' of https://i61wiki.itec.uka.de/git/robot-api
Conflicts: source/RobotAPI/applications/CMakeLists.txt
No related branches found
No related tags found
Showing
- etc/doxygen/pages/remoterobot.dox 79 additions, 0 deletionsetc/doxygen/pages/remoterobot.dox
- source/RobotAPI/CMakeLists.txt 1 addition, 0 deletionssource/RobotAPI/CMakeLists.txt
- source/RobotAPI/applications/CMakeLists.txt 1 addition, 1 deletionsource/RobotAPI/applications/CMakeLists.txt
- source/RobotAPI/applications/HandUnitObserver/CMakeLists.txt 16 additions, 0 deletionssource/RobotAPI/applications/HandUnitObserver/CMakeLists.txt
- source/RobotAPI/applications/HandUnitObserver/HandUnitObserverApp.h 54 additions, 0 deletions...otAPI/applications/HandUnitObserver/HandUnitObserverApp.h
- source/RobotAPI/applications/HandUnitObserver/main.cpp 33 additions, 0 deletionssource/RobotAPI/applications/HandUnitObserver/main.cpp
- source/RobotAPI/core/RobotStatechartContext.cpp 29 additions, 5 deletionssource/RobotAPI/core/RobotStatechartContext.cpp
- source/RobotAPI/core/RobotStatechartContext.h 3 additions, 1 deletionsource/RobotAPI/core/RobotStatechartContext.h
- source/RobotAPI/interface/units/HandUnitInterface.ice 26 additions, 1 deletionsource/RobotAPI/interface/units/HandUnitInterface.ice
- source/RobotAPI/robotstate/remote/CMakeLists.txt 2 additions, 1 deletionsource/RobotAPI/robotstate/remote/CMakeLists.txt
- source/RobotAPI/robotstate/remote/LinkedPose.cpp 2 additions, 0 deletionssource/RobotAPI/robotstate/remote/LinkedPose.cpp
- source/RobotAPI/robotstate/remote/RobotStateObjectFactories.cpp 27 additions, 0 deletions.../RobotAPI/robotstate/remote/RobotStateObjectFactories.cpp
- source/RobotAPI/robotstate/remote/RobotStateObjectFactories.h 1 addition, 1 deletion...ce/RobotAPI/robotstate/remote/RobotStateObjectFactories.h
- source/RobotAPI/statecharts/GraspingWithTorques/GraspingWithTorques.cpp 18 additions, 5 deletions...I/statecharts/GraspingWithTorques/GraspingWithTorques.cpp
- source/RobotAPI/statecharts/GraspingWithTorques/GraspingWithTorques.h 1 addition, 1 deletion...API/statecharts/GraspingWithTorques/GraspingWithTorques.h
- source/RobotAPI/units/CMakeLists.txt 2 additions, 0 deletionssource/RobotAPI/units/CMakeLists.txt
- source/RobotAPI/units/HandUnit.cpp 37 additions, 1 deletionsource/RobotAPI/units/HandUnit.cpp
- source/RobotAPI/units/HandUnit.h 11 additions, 1 deletionsource/RobotAPI/units/HandUnit.h
- source/RobotAPI/units/HandUnitObserver.cpp 121 additions, 0 deletionssource/RobotAPI/units/HandUnitObserver.cpp
- source/RobotAPI/units/HandUnitObserver.h 77 additions, 0 deletionssource/RobotAPI/units/HandUnitObserver.h
Loading
Please register or sign in to comment