diff --git a/jsk_2016_01_baxter_apc/euslisp/main.l b/jsk_2016_01_baxter_apc/euslisp/main.l index 4da111378..7936bad2b 100755 --- a/jsk_2016_01_baxter_apc/euslisp/main.l +++ b/jsk_2016_01_baxter_apc/euslisp/main.l @@ -114,10 +114,12 @@ (send *ri* :move-arm-body->bin-overlook-pose arm target-bin) (send *ri* :wait-interpolation) (unix::sleep 6) - (ros::set-param - (format nil "~a_collect_sib_data/ready_to_save" (send *ri* :arm-symbol2str arm)) - t) - (unix::sleep 2) + (when (ros::get-param "~collect_data") + (ros::set-param + (format nil "~a_collect_sib_data/ready_to_save" (send *ri* :arm-symbol2str arm)) + t) + (unix::sleep 2) + ) (ros::ros-info "[main] Segmentating objects in bin" target-bin) (send *ri* :recognize-objects-segmentation-in-bin arm target-bin :stamp (ros::time-now)) diff --git a/jsk_2016_01_baxter_apc/launch/collect_sib_data.launch b/jsk_2016_01_baxter_apc/launch/include/collect_sib_data.launch similarity index 74% rename from jsk_2016_01_baxter_apc/launch/collect_sib_data.launch rename to jsk_2016_01_baxter_apc/launch/include/collect_sib_data.launch index 7714cc59c..538ef00dc 100644 --- a/jsk_2016_01_baxter_apc/launch/collect_sib_data.launch +++ b/jsk_2016_01_baxter_apc/launch/include/collect_sib_data.launch @@ -1,15 +1,16 @@ + - + - + diff --git a/jsk_2016_01_baxter_apc/launch/main.launch b/jsk_2016_01_baxter_apc/launch/main.launch index a9d1095c4..722354e8d 100644 --- a/jsk_2016_01_baxter_apc/launch/main.launch +++ b/jsk_2016_01_baxter_apc/launch/main.launch @@ -1,6 +1,7 @@ + @@ -81,11 +82,17 @@ args=""(progn (apc-init :larm-controller) (apc-mainloop :larm))"" respawn="true" output="screen"> + + collect_data: $(arg collect_data) + + + collect_data: $(arg collect_data) + @@ -97,4 +104,16 @@ + + + + + + + + + + + +