diff --git a/hrpsys_choreonoid/launch/ros_bridge_choreonoid.launch b/hrpsys_choreonoid/launch/ros_bridge_choreonoid.launch index e04cffda..086f3a75 100644 --- a/hrpsys_choreonoid/launch/ros_bridge_choreonoid.launch +++ b/hrpsys_choreonoid/launch/ros_bridge_choreonoid.launch @@ -6,6 +6,7 @@ + @@ -28,6 +29,7 @@ + diff --git a/hrpsys_choreonoid/launch/run_choreonoid.sh b/hrpsys_choreonoid/launch/run_choreonoid.sh index a9ac3acc..cdbbdd38 100755 --- a/hrpsys_choreonoid/launch/run_choreonoid.sh +++ b/hrpsys_choreonoid/launch/run_choreonoid.sh @@ -3,18 +3,18 @@ ### choose choreonoid binary choreonoid_exe='choreonoid' -if [ "$(pgrep -x ${choreonoid_exe} | wc -l)" != 0 ]; then - pkill -9 ${choreonoid_exe} - echo "****************************************************" 1>&2 - echo "* *" 1>&2 - echo "* *" 1>&2 - echo "* Old choreonoid process was found. *" 1>&2 - echo "* Process has been killed, please start again. *" 1>&2 - echo "* *" 1>&2 - echo "* *" 1>&2 - echo "****************************************************" 1>&2 - exit 1 -fi +# if [ "$(pgrep -x ${choreonoid_exe} | wc -l)" != 0 ]; then +# pkill -9 ${choreonoid_exe} +# echo "****************************************************" 1>&2 +# echo "* *" 1>&2 +# echo "* *" 1>&2 +# echo "* Old choreonoid process was found. *" 1>&2 +# echo "* Process has been killed, please start again. *" 1>&2 +# echo "* *" 1>&2 +# echo "* *" 1>&2 +# echo "****************************************************" 1>&2 +# exit 1 +# fi cnoid_proj="" if [ "$(echo $1 | grep \.cnoid$ | wc -l)" == 1 ]; then diff --git a/hrpsys_choreonoid/launch/startup_choreonoid.launch b/hrpsys_choreonoid/launch/startup_choreonoid.launch index 8618abf5..f80c566e 100644 --- a/hrpsys_choreonoid/launch/startup_choreonoid.launch +++ b/hrpsys_choreonoid/launch/startup_choreonoid.launch @@ -12,6 +12,7 @@ + @@ -36,6 +37,7 @@ + diff --git a/hrpsys_choreonoid_tutorials/launch/chidori_choreonoid.launch b/hrpsys_choreonoid_tutorials/launch/chidori_choreonoid.launch index f3f48767..f885c92c 100644 --- a/hrpsys_choreonoid_tutorials/launch/chidori_choreonoid.launch +++ b/hrpsys_choreonoid_tutorials/launch/chidori_choreonoid.launch @@ -5,9 +5,12 @@ + + + @@ -33,6 +36,8 @@ + + @@ -48,33 +53,23 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - diff --git a/hrpsys_choreonoid_tutorials/launch/jaxon_blue_choreonoid.launch b/hrpsys_choreonoid_tutorials/launch/jaxon_blue_choreonoid.launch index e4741b50..3b1f59ac 100644 --- a/hrpsys_choreonoid_tutorials/launch/jaxon_blue_choreonoid.launch +++ b/hrpsys_choreonoid_tutorials/launch/jaxon_blue_choreonoid.launch @@ -8,12 +8,15 @@ + + + + + @@ -62,39 +67,46 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - + + + + + + + + + + + + + + + - + + + diff --git a/hrpsys_choreonoid_tutorials/launch/jaxon_red_choreonoid.launch b/hrpsys_choreonoid_tutorials/launch/jaxon_red_choreonoid.launch index da777105..701b758b 100644 --- a/hrpsys_choreonoid_tutorials/launch/jaxon_red_choreonoid.launch +++ b/hrpsys_choreonoid_tutorials/launch/jaxon_red_choreonoid.launch @@ -8,11 +8,14 @@ + + + + + @@ -66,39 +71,49 @@ - - - - - - - - - - - - - - - + - - - - + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + - diff --git a/hrpsys_choreonoid_tutorials/launch/jaxon_red_vision_connect.launch b/hrpsys_choreonoid_tutorials/launch/jaxon_red_vision_connect.launch index 86109627..5afb7948 100644 --- a/hrpsys_choreonoid_tutorials/launch/jaxon_red_vision_connect.launch +++ b/hrpsys_choreonoid_tutorials/launch/jaxon_red_vision_connect.launch @@ -3,9 +3,10 @@ + - +