Merge pull request start-jsk#71 from garaemon/one-launch-for-dashboard

Remove dashboard launch files and yaml files for each hrp2 and use one config file and one launch file
itohdak · Mar 16, 2015 · 4336d6d · 4336d6d
2 parents b501880 + 5f403b8
commit 4336d6d
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 61 deletions.
diff --git a/jsk_hrp2_ros_bridge/config/hrp2007_hrpsys_dashboard.yaml b/jsk_hrp2_ros_bridge/config/hrp2007_hrpsys_dashboard.yaml
diff --git a/jsk_hrp2_ros_bridge/config/hrp2008_hrpsys_dashboard.yaml b/jsk_hrp2_ros_bridge/config/hrp2008_hrpsys_dashboard.yaml
diff --git a/jsk_hrp2_ros_bridge/config/hrp2016_hrpsys_dashboard.yaml b/jsk_hrp2_ros_bridge/config/hrp2016_hrpsys_dashboard.yaml
diff --git a/jsk_hrp2_ros_bridge/config/hrp2017_hrpsys_dashboard.yaml b/jsk_hrp2_ros_bridge/config/hrp2017_hrpsys_dashboard.yaml
diff --git a/jsk_hrp2_ros_bridge/config/hrpsys_dashboard.yaml b/jsk_hrp2_ros_bridge/config/hrpsys_dashboard.yaml
@@ -0,0 +1,8 @@
+hrpsys_rtcd_start_command: "xterm -T \"RTCD\" -e '`rospack find jsk_hrp2_ros_bridge`/scripts/rtcd_start_command.sh --remote'"
+hrpsys_rtcd_stop_command: "xterm -e \"ssh grxuser@hrp$(expr $HRP2NO + 2000)c 'sudo pkill rtcd'\""
+
+hrpsys_servo_start_command: "xterm -T \"PowerServoOn\" -e \"ssh grxuser@hrp$(expr $HRP2NO + 2000)c 'export PS1=grxuser; source ~/.bashrc; python -i /home/grxuser/prog/rtmros_hrp2/jsk_hrp2_ros_bridge/scripts/hrp$(expr $HRP2NO + 2000)c_setup.py --servoOn | tee /tmp/servoOn.log'\""
+hrpsys_servo_stop_command: "xterm -T \"PowerServoOff\" -e \"ssh grxuser@hrp$(expr $HRP2NO + 2000)c 'export PS1=grxuser; source ~/.bashrc; python -i /home/grxuser/prog/rtmros_hrp2/jsk_hrp2_ros_bridge/scripts/hrp$(expr $HRP2NO + 2000)c_setup.py --servoOff | tee /tmp/servoOff.log'\""
+
+hrpsys_ros_bridge_start_command: "xterm -T \"Auditor\" -e \"export PS1=$USER && source ~/.$(basename $SHELL)rc && rossetmaster hrp$(expr $HRP2NO + 2000)v $(expr $HRP2NO + 10000) && rossetip && bash `rospack find jsk_hrp2_ros_bridge`/scripts/hrp2-launch-ros-bridge.sh\""
+hrpsys_ros_bridge_stop_command: "xterm -e \"ssh hrpuser@hrp$(expr $HRP2NO + 2000)v 'pgrep -f roslaunch.*hrp$(expr $HRP2NO + 2000).launch | xargs -n 1 kill'\"; pgrep -f roslaunch.*hrp$(expr $HRP2NO + 2000)_auditor.launch | xargs -n 1 kill"
diff --git a/jsk_hrp2_ros_bridge/desktop/Launch_Dashboard.desktop b/jsk_hrp2_ros_bridge/desktop/Launch_Dashboard.desktop
@@ -3,7 +3,7 @@ Version=1.0
 Encoding=UTF-8
 Name=Launch Dashboard
 Type=Application
-Exec=bash -c "export PS1=leus; source ~/.bashrc; rossetmaster hrp`expr $HRP2NO + 2000`v `expr $HRP2NO + 10000` ; rossetip ;roslaunch jsk_hrp2_ros_bridge hrp`expr $HRP2NO + 2000`_dashboard.launch"
+Exec=bash -c "export PS1=leus; source ~/.bashrc; rossetmaster hrp`expr $HRP2NO + 2000`v `expr $HRP2NO + 10000` ; rossetip ;roslaunch jsk_hrp2_ros_bridge hrp2_dashboard.launch"
 TryExec=
 Icon=ICON
 X-GNOME-DocPath=

diff --git a/jsk_hrp2_ros_bridge/launch/hrp2007_dashboard.launch b/jsk_hrp2_ros_bridge/launch/hrp2007_dashboard.launch
diff --git a/jsk_hrp2_ros_bridge/launch/hrp2008_dashboard.launch b/jsk_hrp2_ros_bridge/launch/hrp2008_dashboard.launch
diff --git a/jsk_hrp2_ros_bridge/launch/hrp2016_dashboard.launch b/jsk_hrp2_ros_bridge/launch/hrp2016_dashboard.launch
diff --git a/jsk_hrp2_ros_bridge/launch/hrp2017_dashboard.launch b/jsk_hrp2_ros_bridge/launch/hrp2017_dashboard.launch
diff --git a/jsk_hrp2_ros_bridge/launch/hrp2_dashboard.launch b/jsk_hrp2_ros_bridge/launch/hrp2_dashboard.launch
@@ -0,0 +1,7 @@
+<launch>
+
+  <rosparam file="$(find jsk_hrp2_ros_bridge)/config/hrpsys_dashboard.yaml" command="load" />
+
+  <node name="$(anon hrp2_dashboard)" pkg="jsk_hrp2_ros_bridge" type="jsk_hrp2_dashboard" />
+
+</launch>