Merge branch 'master' of gitlab.com:ArmarX/RobotAPI
Conflicts: source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModulePublisher.cpp
No related branches found
No related tags found
Showing
- data/RobotAPI/VariantInfo-RobotAPI.xml 8 additions, 0 deletionsdata/RobotAPI/VariantInfo-RobotAPI.xml
- scenarios/CyberGloveObserver/CyberGloveObserver.scx 5 additions, 0 deletionsscenarios/CyberGloveObserver/CyberGloveObserver.scx
- scenarios/CyberGloveObserver/config/CyberGloveObserverApp.cfg 199 additions, 0 deletions...arios/CyberGloveObserver/config/CyberGloveObserverApp.cfg
- scenarios/CyberGloveObserver/config/global.cfg 7 additions, 0 deletionsscenarios/CyberGloveObserver/config/global.cfg
- scenarios/KITProstheticHand/KITProstheticHand.scx 6 additions, 0 deletionsscenarios/KITProstheticHand/KITProstheticHand.scx
- scenarios/KITProstheticHand/config/ExternalApplicationManager.cfg 270 additions, 0 deletions...s/KITProstheticHand/config/ExternalApplicationManager.cfg
- scenarios/KITProstheticHand/config/ProsthesisObserverApp.cfg 175 additions, 0 deletionsscenarios/KITProstheticHand/config/ProsthesisObserverApp.cfg
- scenarios/KITProstheticHand/config/global.cfg 7 additions, 0 deletionsscenarios/KITProstheticHand/config/global.cfg
- scenarios/RobotHealthTest/RobotHealthTest.scx 7 additions, 0 deletionsscenarios/RobotHealthTest/RobotHealthTest.scx
- scenarios/RobotHealthTest/config/RobotHealthApp.cfg 215 additions, 0 deletionsscenarios/RobotHealthTest/config/RobotHealthApp.cfg
- scenarios/RobotHealthTest/config/RobotHealthDummyApp.HealthDummy1.cfg 175 additions, 0 deletions...botHealthTest/config/RobotHealthDummyApp.HealthDummy1.cfg
- scenarios/RobotHealthTest/config/RobotHealthDummyApp.HealthDummy2.cfg 175 additions, 0 deletions...botHealthTest/config/RobotHealthDummyApp.HealthDummy2.cfg
- scenarios/RobotHealthTest/config/global.cfg 7 additions, 0 deletionsscenarios/RobotHealthTest/config/global.cfg
- source/RobotAPI/applications/CMakeLists.txt 5 additions, 1 deletionsource/RobotAPI/applications/CMakeLists.txt
- source/RobotAPI/applications/CyberGloveObserver/CMakeLists.txt 20 additions, 0 deletions...e/RobotAPI/applications/CyberGloveObserver/CMakeLists.txt
- source/RobotAPI/applications/CyberGloveObserver/main.cpp 32 additions, 0 deletionssource/RobotAPI/applications/CyberGloveObserver/main.cpp
- source/RobotAPI/applications/ProsthesisObserver/CMakeLists.txt 20 additions, 0 deletions...e/RobotAPI/applications/ProsthesisObserver/CMakeLists.txt
- source/RobotAPI/applications/ProsthesisObserver/main.cpp 32 additions, 0 deletionssource/RobotAPI/applications/ProsthesisObserver/main.cpp
- source/RobotAPI/applications/RobotHealth/CMakeLists.txt 20 additions, 0 deletionssource/RobotAPI/applications/RobotHealth/CMakeLists.txt
- source/RobotAPI/applications/RobotHealth/main.cpp 32 additions, 0 deletionssource/RobotAPI/applications/RobotHealth/main.cpp
Loading
Please register or sign in to comment