Commit aadb7b9c authored 9 years ago by Simon Ottenhaus

Merge branch 'StatechartProfiles'

parents abc7b085 3aebb5c0

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

scenarios/CMakeLists.txt 0 additions, 1 deletion

scenarios/CMakeLists.txt
scenarios/tests/CMakeLists.txt 2 additions, 0 deletions

scenarios/tests/CMakeLists.txt
scenarios/tests/StatechartProfilesTestArmar3Simulation/CMakeLists.txt 15 additions, 0 deletions

...sts/StatechartProfilesTestArmar3Simulation/CMakeLists.txt
scenarios/tests/StatechartProfilesTestArmar3Simulation/config/ConditionHandler.cfg 109 additions, 0 deletions

...tProfilesTestArmar3Simulation/config/ConditionHandler.cfg
scenarios/tests/StatechartProfilesTestArmar3Simulation/config/RobotControl.cfg 117 additions, 0 deletions

...chartProfilesTestArmar3Simulation/config/RobotControl.cfg
scenarios/tests/StatechartProfilesTestArmar3Simulation/config/SystemObserver.cfg 93 additions, 0 deletions

...artProfilesTestArmar3Simulation/config/SystemObserver.cfg
scenarios/tests/StatechartProfilesTestArmar3Simulation/config/XMLRemoteStateOfferer.StatechartProfilesTestGroup.cfg 108 additions, 0 deletions

...fig/XMLRemoteStateOfferer.StatechartProfilesTestGroup.cfg
scenarios/tests/StatechartProfilesTestArmar3a/CMakeLists.txt 15 additions, 0 deletions

scenarios/tests/StatechartProfilesTestArmar3a/CMakeLists.txt
scenarios/tests/StatechartProfilesTestArmar3a/config/ConditionHandler.cfg 109 additions, 0 deletions

...StatechartProfilesTestArmar3a/config/ConditionHandler.cfg
scenarios/tests/StatechartProfilesTestArmar3a/config/RobotControl.cfg 117 additions, 0 deletions

...sts/StatechartProfilesTestArmar3a/config/RobotControl.cfg
scenarios/tests/StatechartProfilesTestArmar3a/config/SystemObserver.cfg 93 additions, 0 deletions

...s/StatechartProfilesTestArmar3a/config/SystemObserver.cfg
scenarios/tests/StatechartProfilesTestArmar3a/config/XMLRemoteStateOfferer.StatechartProfilesTestGroup.cfg 108 additions, 0 deletions

...fig/XMLRemoteStateOfferer.StatechartProfilesTestGroup.cfg
source/RobotAPI/statecharts/CMakeLists.txt 2 additions, 1 deletion

source/RobotAPI/statecharts/CMakeLists.txt
source/RobotAPI/statecharts/StatechartProfilesTestGroup/CMakeLists.txt 48 additions, 0 deletions

...PI/statecharts/StatechartProfilesTestGroup/CMakeLists.txt
source/RobotAPI/statecharts/StatechartProfilesTestGroup/StatechartProfilesTestGroup.scgxml 6 additions, 0 deletions

...chartProfilesTestGroup/StatechartProfilesTestGroup.scgxml
source/RobotAPI/statecharts/StatechartProfilesTestGroup/StatechartProfilesTestGroupRemoteStateOfferer.cpp 66 additions, 0 deletions

...stGroup/StatechartProfilesTestGroupRemoteStateOfferer.cpp
source/RobotAPI/statecharts/StatechartProfilesTestGroup/StatechartProfilesTestGroupRemoteStateOfferer.h 54 additions, 0 deletions

...TestGroup/StatechartProfilesTestGroupRemoteStateOfferer.h
source/RobotAPI/statecharts/StatechartProfilesTestGroup/TestState.cpp 89 additions, 0 deletions

...API/statecharts/StatechartProfilesTestGroup/TestState.cpp
source/RobotAPI/statecharts/StatechartProfilesTestGroup/TestState.h 55 additions, 0 deletions

...otAPI/statecharts/StatechartProfilesTestGroup/TestState.h
source/RobotAPI/statecharts/StatechartProfilesTestGroup/TestState.xml 27 additions, 0 deletions

...API/statecharts/StatechartProfilesTestGroup/TestState.xml

with 1233 additions and 2 deletions

Please register or to comment