diff --git a/scenarios/MovePlatformTest/configs/RobotStateComponent.cfg b/scenarios/MovePlatformTest/configs/RobotStateComponent.cfg deleted file mode 100644 index a8bebf523bce918dc1322f5955994f3cf93eb95b..0000000000000000000000000000000000000000 --- a/scenarios/MovePlatformTest/configs/RobotStateComponent.cfg +++ /dev/null @@ -1,91 +0,0 @@ -setting colored console to deactivated -# ================================================================== -# ArmarX properties -# ================================================================== - -# ArmarX.CachePath: Path for cache files -# Attributes: -# - Default: .cache -# - Case sensitivity: no -# - Required: no -# ArmarX.CachePath = .cache - - -# ArmarX.DataPath: Semicolon-separated search list for data files -# Attributes: -# - Default: "" -# - Case sensitivity: no -# - Required: no -# ArmarX.DataPath = "" - - -# ArmarX.Verbosity: Global logging level for whole application -# Attributes: -# - Default: Verbose -# - Case sensitivity: no -# - Required: no -# - Possible values: {Debug, Error, Fatal, Important, Info, Undefined, Verbose, Warning} -# ArmarX.Verbosity = Verbose - - -# ArmarX.DisableLogging: Turn logging off in whole application -# Attributes: -# - Default: 0 -# - Case sensitivity: no -# - Required: no -# - Possible values: {0, 1, false, no, true, yes} -# ArmarX.DisableLogging = 0 - - -# ArmarX.ApplicationName: Application name -# Attributes: -# - Default: "" -# - Case sensitivity: no -# - Required: no -# ArmarX.ApplicationName = "" - - -# ArmarX.Config: Comma-separated list of configuration files -# Attributes: -# - Default: "" -# - Case sensitivity: no -# - Required: no -# ArmarX.Config = "" - - -# ================================================================== -# ArmarX.RobotStateComponent properties -# ================================================================== - -# ArmarX.RobotStateComponent.RobotFileName: Filename of VirtualRobot robot model (e.g. robot_model.xml) -# Attributes: -# - Case sensitivity: no -# - Required: yes -ArmarX.RobotStateComponent.RobotFileName =Armar3/data/robotmodel/ArmarIII.xml - - -# ArmarX.RobotStateComponent.RobotNodeSetName: Set of nodes that is controlled by the KinematicUnit -# Attributes: -# - Case sensitivity: no -# - Required: yes -ArmarX.RobotStateComponent.RobotNodeSetName =Robot - - -# ArmarX.RobotStateComponent.MinimumLoggingLevel: Local logging level only for this component -# Attributes: -# - Default: Undefined -# - Case sensitivity: no -# - Required: no -# - Possible values: {Error, Fatal, Info, Undefined, Verbose, Warning} -# ArmarX.RobotStateComponent.MinimumLoggingLevel = Undefined - - -# ArmarX.RobotStateComponent.ObjectName: Name of IceGrid well-known object -# Attributes: -# - Default: "" -# - Case sensitivity: no -# - Required: no -# ArmarX.RobotStateComponent.ObjectName = "" - - - diff --git a/scenarios/MovePlatformTest/startCompleteScenario.sh b/scenarios/MovePlatformTest/startCompleteScenario.sh deleted file mode 100755 index 1db6ae44d9d5a535ba1f35880f882cd9370a0e42..0000000000000000000000000000000000000000 --- a/scenarios/MovePlatformTest/startCompleteScenario.sh +++ /dev/null @@ -1,25 +0,0 @@ - -export CORE_PATH=../../../Core -export GUI_PATH=../../../Gui -export VISIONX_PATH=../..././VisionX -export ARMAR4_PATH=../../../Armar4 -export HUMANOIDROBOTAPI_PATH=../../../RobotAPI -export SCRIPT_PATH=$CORE_PATH/build/bin -export SIMULATION_PATH=../../../SimulationX - -export CORE_BIN_PATH=$CORE_PATH/build/bin -export GUI_BIN_PATH=$GUI_PATH/build/bin -export VISIONX_BIN_PATH=$VISIONX_PATH/build/bin -export ARMAR4_BIN_PATH=$ARMAR4_PATH/build/bin -export HUMANOIDROBOTAPI_BIN_PATH=$HUMANOIDROBOTAPI_PATH/build/bin - -export GLOBAL_CONFIG=./configs/Global.cfg - -# armarx components -$SIMULATION_PATH/scenarios/startScenario.sh -$SCRIPT_PATH/startApplication.sh $CORE_BIN_PATH/PlatformUnitObserverRun --Ice.Config=$GLOBAL_CONFIG,./configs/PlatformUnitObserver.cfg & -$SCRIPT_PATH/startApplication.sh $CORE_BIN_PATH/SystemObserverRun --Ice.Config=$GLOBAL_CONFIG & -$SCRIPT_PATH/startApplication.sh $CORE_BIN_PATH/RobotStateComponentRun --Ice.Config=$SIMULATION_PATH/scenarios/SimulatorGui/configs/Armar3KinematicUnit.cfg,./configs/RobotStateComponent.cfg & -$SCRIPT_PATH/startApplication.sh $CORE_BIN_PATH/RobotControlRun --Ice.Config=$GLOBAL_CONFIG & -$SCRIPT_PATH/startApplication.sh $CORE_BIN_PATH/ConditionHandlerRun --Ice.Config=$GLOBAL_CONFIG & -$SCRIPT_PATH/startApplication.sh $HUMANOIDROBOTAPI_BIN_PATH/MovePlatformAppRun --Ice.Config=$GLOBAL_CONFIG & diff --git a/scenarios/MovePlatformTest/startScenario.sh b/scenarios/MovePlatformTest/startScenario.sh index 692d33539515cc31b7d07eff47102d9205058f78..a9dfbe953ea8140302671f234bbd15014873d5c7 100755 --- a/scenarios/MovePlatformTest/startScenario.sh +++ b/scenarios/MovePlatformTest/startScenario.sh @@ -18,7 +18,6 @@ export GLOBAL_CONFIG=./configs/Global.cfg # armarx components $SCRIPT_PATH/startApplication.sh $CORE_BIN_PATH/PlatformUnitObserverRun --Ice.Config=$GLOBAL_CONFIG,./configs/PlatformUnitObserver.cfg & $SCRIPT_PATH/startApplication.sh $CORE_BIN_PATH/SystemObserverRun --Ice.Config=$GLOBAL_CONFIG & -$SCRIPT_PATH/startApplication.sh $CORE_BIN_PATH/RobotStateComponentRun --Ice.Config=$SIMULATION_PATH/scenarios/SimulatorGui/configs/Armar3KinematicUnit.cfg,./configs/RobotStateComponent.cfg & $SCRIPT_PATH/startApplication.sh $CORE_BIN_PATH/RobotControlRun --Ice.Config=$GLOBAL_CONFIG & $SCRIPT_PATH/startApplication.sh $CORE_BIN_PATH/ConditionHandlerRun --Ice.Config=$GLOBAL_CONFIG & $SCRIPT_PATH/startApplication.sh $HUMANOIDROBOTAPI_BIN_PATH/MovePlatformAppRun --Ice.Config=$GLOBAL_CONFIG & diff --git a/scenarios/MovePlatformTest/start_the_scenario_in_SimulatorGui_first b/scenarios/MovePlatformTest/start_the_scenario_in_SimulatorGui_first new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/scenarios/MovePlatformTest/stopCompleteScenario.sh b/scenarios/MovePlatformTest/stopCompleteScenario.sh deleted file mode 100755 index 724fb3e6881ab9a7738a054f07ceb348eed54593..0000000000000000000000000000000000000000 --- a/scenarios/MovePlatformTest/stopCompleteScenario.sh +++ /dev/null @@ -1,33 +0,0 @@ - -skill () -{ - STR=`ps aux | grep -re "$1 --Ice.Default" | grep -v grep | awk '{print $2}'` - if [ ${#STR} == 0 ] - then - echo skipping $1 - else - echo killing $1 - kill -s $2 `ps aux | grep -re "$1 --Ice.Default" | grep -v grep | awk '{print $2}'` - fi -} - -echo SENDING SIGINT TO ALL PROCESSES -../../../SimulationX/scenarios/stopScenario.sh -skill PlatformUnitObserverRun 2 -skill SystemObserverRun 2 -skill ConditionHandlerRun 2 -skill RobotStateComponentRun 2 -skill RobotControlRun 2 - -skill MovePlatformAppRun 2 - -sleep 1 - -echo SENDING SIGKILL TO ALL PROCESSES -skill PlatformUnitObserverRun 9 -skill SystemObserverRun 9 -skill ConditionHandlerRun 9 -skill RobotStateComponentRun 9 -skill RobotControlRun 9 - -skill MovePlatformAppRun 9 diff --git a/scenarios/MovePlatformTest/stopScenario.sh b/scenarios/MovePlatformTest/stopScenario.sh index dd06a410998e787e6c1a81a07d7305642043572d..a6cd5c051416fd4383a943bdc1178d459753f7f9 100755 --- a/scenarios/MovePlatformTest/stopScenario.sh +++ b/scenarios/MovePlatformTest/stopScenario.sh @@ -15,7 +15,6 @@ echo SENDING SIGINT TO ALL PROCESSES skill PlatformUnitObserverRun 2 skill SystemObserverRun 2 skill ConditionHandlerRun 2 -skill RobotStateComponentRun 2 skill RobotControlRun 2 skill MovePlatformAppRun 2 @@ -26,7 +25,6 @@ echo SENDING SIGKILL TO ALL PROCESSES skill PlatformUnitObserverRun 9 skill SystemObserverRun 9 skill ConditionHandlerRun 9 -skill RobotStateComponentRun 9 skill RobotControlRun 9 skill MovePlatformAppRun 9