Menu
▾
▴
personalrobots-commit
|
From: <goo...@us...> - 2009-07-22 04:44:18
|
Revision: 19382
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=19382&view=rev
Author: goodfellow
Date: 2009-07-22 04:44:17 +0000 (Wed, 22 Jul 2009)
Log Message:
-----------
Checked in launch files I forgot to svn add before
Added Paths:
-----------
pkg/trunk/sandbox/person_data/data_collector_record.launch
pkg/trunk/sandbox/person_data/person_data.launch
pkg/trunk/sandbox/person_data/truly_passive.launch
Added: pkg/trunk/sandbox/person_data/data_collector_record.launch
===================================================================
--- pkg/trunk/sandbox/person_data/data_collector_record.launch (rev 0)
+++ pkg/trunk/sandbox/person_data/data_collector_record.launch 2009-07-22 04:44:17 UTC (rev 19382)
@@ -0,0 +1,22 @@
+<launch>
+ <include file="$(find pr2_alpha)/$(env ROBOT).machine" />
+
+
+ <node pkg="rosrecord" type="rosrecord" machine="four" args="-f /bags/person_data/wide_stereo_ /wide_stereo/raw_stereo_muxed"/>
+ <node pkg="rosrecord" type="rosrecord" machine="four" args="-f /bags/person_data/narrow_stereo_ /narrow_stereo/raw_stereo_muxed"/>
+
+<node pkg="rosrecord" type="rosrecord" machine="two" args="-f /bags/person_data/tf_ /tf_message_muxed"/>
+
+
+ <node pkg="rosrecord" type="rosrecord" machine="two" args="-f /bags/person_data/tf_ /tf_message_muxed"/>
+
+ <node pkg="rosrecord" type="rosrecord" machine="two" args="-f /bags/person_data/mech_state /mechanism_state_muxed"/>
+
+ <node pkg="rosrecord" type="rosrecord" machine="two" args="-f /bags/person_data/laser_ /base_scan_muxed /tilt_scan_muxed /laser_tilt_controller/laser_scanner_signal_muxed "/>
+
+ <node pkg="rosrecord" type="rosrecord" machine="two" args="-f /bags/person_data/state_ /odom_muxed "/>
+
+ <node pkg="rosrecord" type="rosrecord" machine="two" args="-f /bags/person_data/actionstate /wait_k_messages_action/feedback_muxed /move_head2/wait_k_messages_action/feedback_muxed /move_head/wait_k_messages_action/feedback_muxed /head_controller/set_command_array_muxed "/>
+
+
+</launch>
Added: pkg/trunk/sandbox/person_data/person_data.launch
===================================================================
--- pkg/trunk/sandbox/person_data/person_data.launch (rev 0)
+++ pkg/trunk/sandbox/person_data/person_data.launch 2009-07-22 04:44:17 UTC (rev 19382)
@@ -0,0 +1,7 @@
+<launch>
+
+<include file="$(find person_data)/data_collector_record.launch" />
+<include file="$(find person_data)/truly_passive.launch" />
+<include file="$(find pr2_alpha)/teleop_joystick.launch" />
+
+</launch>
Added: pkg/trunk/sandbox/person_data/truly_passive.launch
===================================================================
--- pkg/trunk/sandbox/person_data/truly_passive.launch (rev 0)
+++ pkg/trunk/sandbox/person_data/truly_passive.launch 2009-07-22 04:44:17 UTC (rev 19382)
@@ -0,0 +1,32 @@
+<launch>
+ <include file="$(find pr2_alpha)/$(env ROBOT).machine" />
+
+
+<!-- perception-->
+ <include file="$(find person_data)/config/perception.xml" />
+
+
+<!-- Safety -->
+ <node machine="four" pkg="safety_core" type="run_detect_plug_on_base" output="screen" respawn="false" />
+ <node machine="four" pkg="safety_core" type="run_tuck_arms" output="screen" respawn="true" />
+
+
+
+
+<!-- Robot pose ekf -->
+ <node pkg="robot_pose_ekf" type="robot_pose_ekf" args="robot_pose_ekf" machine="four" name="robot_pose_ekf">
+ <param name="freq" value="30.0"/>
+ <param name="sensor_timeout" value="1.0"/>
+ <param name="odom_used" value="true"/>
+ <param name="imu_used" value="true"/>
+ <param name="vo_used" value="false"/>
+ </node>
+
+ <node pkg="tf" machine="two" type="change_notifier"/>
+
+
+
+
+
+
+</launch>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <goo...@us...> - 2009-07-22 04:56:59
|
Revision: 19383
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=19383&view=rev
Author: goodfellow
Date: 2009-07-22 04:56:50 +0000 (Wed, 22 Jul 2009)
Log Message:
-----------
Added more files I overlooked before
Added Paths:
-----------
pkg/trunk/sandbox/person_data/launch.sh
pkg/trunk/sandbox/person_data/test.py
Added: pkg/trunk/sandbox/person_data/launch.sh
===================================================================
--- pkg/trunk/sandbox/person_data/launch.sh (rev 0)
+++ pkg/trunk/sandbox/person_data/launch.sh 2009-07-22 04:56:50 UTC (rev 19383)
@@ -0,0 +1,9 @@
+python checkrobot.py ${ROBOT} || exit
+
+ssh ${ROBOT}2 mkdir -p /bags/person_data
+
+ssh ${ROBOT}3 mkdir -p /bags/person_data
+
+ssh ${ROBOT}4 mkdir -p /bags/person_data
+
+namedlaunch person_data.launch
Added: pkg/trunk/sandbox/person_data/test.py
===================================================================
--- pkg/trunk/sandbox/person_data/test.py (rev 0)
+++ pkg/trunk/sandbox/person_data/test.py 2009-07-22 04:56:50 UTC (rev 19383)
@@ -0,0 +1 @@
+SystemExit(-1);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <goo...@us...> - 2009-07-22 16:16:47
|
Revision: 19406
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=19406&view=rev
Author: goodfellow
Date: 2009-07-22 16:16:44 +0000 (Wed, 22 Jul 2009)
Log Message:
-----------
Got tilt laser working
Added muxes to record file
Modified Paths:
--------------
pkg/trunk/sandbox/person_data/data_collector_record.launch
pkg/trunk/sandbox/person_data/truly_passive.launch
Modified: pkg/trunk/sandbox/person_data/data_collector_record.launch
===================================================================
--- pkg/trunk/sandbox/person_data/data_collector_record.launch 2009-07-22 15:30:10 UTC (rev 19405)
+++ pkg/trunk/sandbox/person_data/data_collector_record.launch 2009-07-22 16:16:44 UTC (rev 19406)
@@ -1,22 +1,24 @@
<launch>
<include file="$(find pr2_alpha)/$(env ROBOT).machine" />
+ <node pkg="topic_tools" type="mux" args="/wide_stereo/raw_stereo_muxed /wide_stereo/raw_stereo" machine="four"/>
+ <node pkg="rosrecord" type="rosrecord" machine="four" args="-f /bags/person_data/wide_stereo_ /wide_stereo/raw_stereo_muxed"/>
- <node pkg="rosrecord" type="rosrecord" machine="four" args="-f /bags/person_data/wide_stereo_ /wide_stereo/raw_stereo_muxed"/>
+ <node pkg="topic_tools" type="mux" args="/narrow_stereo/raw_stereo_muxed /narrow_stereo/raw_stereo" machine="four"/>
<node pkg="rosrecord" type="rosrecord" machine="four" args="-f /bags/person_data/narrow_stereo_ /narrow_stereo/raw_stereo_muxed"/>
+<node pkg="topic_tools" type="mux" args="/tf_message_muxed /tf_message" machine="two"/>
<node pkg="rosrecord" type="rosrecord" machine="two" args="-f /bags/person_data/tf_ /tf_message_muxed"/>
-
- <node pkg="rosrecord" type="rosrecord" machine="two" args="-f /bags/person_data/tf_ /tf_message_muxed"/>
-
+ <node pkg="topic_tools" type="mux" machine="two" args="/mechanism_state_muxed /mechanism_state"/>
<node pkg="rosrecord" type="rosrecord" machine="two" args="-f /bags/person_data/mech_state /mechanism_state_muxed"/>
- <node pkg="rosrecord" type="rosrecord" machine="two" args="-f /bags/person_data/laser_ /base_scan_muxed /tilt_scan_muxed /laser_tilt_controller/laser_scanner_signal_muxed "/>
+ <node pkg="topic_tools" type="mux" machine="two" args="/base_scan_muxed /base_scan"/>
+ <node pkg="topic_tools" type="mux" machine="two" args="/tilt_scan_muxed /tilt_scan"/>
+ <node pkg="topic_tools" type="mux" machine="two" args="/laser_tilt_controller/laser_scanner_signal_muxed /laser_tilt_controller/laser_scanner_signal"/>
+ <node pkg="rosrecord" type="rosrecord" machine="two" args="-f /bags/person_data/laser_ /base_scan_muxed /tilt_scan_muxed /laser_tilt_controller/laser_scanner_signal"/>
+ <node pkg="topic_tools" type="mux" machine="two" args="/odom_muxed /odom">
<node pkg="rosrecord" type="rosrecord" machine="two" args="-f /bags/person_data/state_ /odom_muxed "/>
- <node pkg="rosrecord" type="rosrecord" machine="two" args="-f /bags/person_data/actionstate /wait_k_messages_action/feedback_muxed /move_head2/wait_k_messages_action/feedback_muxed /move_head/wait_k_messages_action/feedback_muxed /head_controller/set_command_array_muxed "/>
-
-
</launch>
Modified: pkg/trunk/sandbox/person_data/truly_passive.launch
===================================================================
--- pkg/trunk/sandbox/person_data/truly_passive.launch 2009-07-22 15:30:10 UTC (rev 19405)
+++ pkg/trunk/sandbox/person_data/truly_passive.launch 2009-07-22 16:16:44 UTC (rev 19406)
@@ -1,6 +1,8 @@
<launch>
<include file="$(find pr2_alpha)/$(env ROBOT).machine" />
+<!-- controllers-->
+ <include file="$(find person_data)/config/controllers.xml" />
<!-- perception-->
<include file="$(find person_data)/config/perception.xml" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <goo...@us...> - 2009-07-22 18:07:53
|
Revision: 19414
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=19414&view=rev
Author: goodfellow
Date: 2009-07-22 18:07:45 +0000 (Wed, 22 Jul 2009)
Log Message:
-----------
Wrote "debugger" listener node since ROS_INFO doesn't work
added launch files to switch the muxes
Modified Paths:
--------------
pkg/trunk/sandbox/person_data/CMakeLists.txt
pkg/trunk/sandbox/person_data/data_collector_record.launch
pkg/trunk/sandbox/person_data/person_data.launch
pkg/trunk/sandbox/person_data/src/joylistener.cpp
pkg/trunk/sandbox/person_data/startRecording.sh
pkg/trunk/sandbox/person_data/stopRecording.sh
Added Paths:
-----------
pkg/trunk/sandbox/person_data/src/debugger.cpp
pkg/trunk/sandbox/person_data/startRecording.launch
pkg/trunk/sandbox/person_data/stopRecording.launch
Removed Paths:
-------------
pkg/trunk/sandbox/person_data/src/listener.cpp
Modified: pkg/trunk/sandbox/person_data/CMakeLists.txt
===================================================================
--- pkg/trunk/sandbox/person_data/CMakeLists.txt 2009-07-22 17:15:37 UTC (rev 19413)
+++ pkg/trunk/sandbox/person_data/CMakeLists.txt 2009-07-22 18:07:45 UTC (rev 19414)
@@ -30,5 +30,5 @@
#target_link_libraries(example ${PROJECT_NAME})
rospack_add_executable(talker src/talker.cpp)
-rospack_add_executable(listener src/listener.cpp)
+rospack_add_executable(debugger src/debugger.cpp)
rospack_add_executable(joylistener src/joylistener.cpp)
Modified: pkg/trunk/sandbox/person_data/data_collector_record.launch
===================================================================
--- pkg/trunk/sandbox/person_data/data_collector_record.launch 2009-07-22 17:15:37 UTC (rev 19413)
+++ pkg/trunk/sandbox/person_data/data_collector_record.launch 2009-07-22 18:07:45 UTC (rev 19414)
@@ -18,7 +18,7 @@
<node pkg="topic_tools" type="mux" machine="two" args="/laser_tilt_controller/laser_scanner_signal_muxed /laser_tilt_controller/laser_scanner_signal"/>
<node pkg="rosrecord" type="rosrecord" machine="two" args="-f /bags/person_data/laser_ /base_scan_muxed /tilt_scan_muxed /laser_tilt_controller/laser_scanner_signal"/>
- <node pkg="topic_tools" type="mux" machine="two" args="/odom_muxed /odom">
+ <node pkg="topic_tools" type="mux" machine="two" args="/odom_muxed /odom"/>
<node pkg="rosrecord" type="rosrecord" machine="two" args="-f /bags/person_data/state_ /odom_muxed "/>
</launch>
Modified: pkg/trunk/sandbox/person_data/person_data.launch
===================================================================
--- pkg/trunk/sandbox/person_data/person_data.launch 2009-07-22 17:15:37 UTC (rev 19413)
+++ pkg/trunk/sandbox/person_data/person_data.launch 2009-07-22 18:07:45 UTC (rev 19414)
@@ -1,6 +1,7 @@
<launch>
+<node pkg="person_data" type="joylistener" output="screen"/>
-<include file="$(find person_data)/data_collector_record.launch" />
+<include file="$(find person_data)/data_collector_record.launch" />
<include file="$(find person_data)/truly_passive.launch" />
<include file="$(find pr2_alpha)/teleop_joystick.launch" />
Copied: pkg/trunk/sandbox/person_data/src/debugger.cpp (from rev 19406, pkg/trunk/sandbox/person_data/src/listener.cpp)
===================================================================
--- pkg/trunk/sandbox/person_data/src/debugger.cpp (rev 0)
+++ pkg/trunk/sandbox/person_data/src/debugger.cpp 2009-07-22 18:07:45 UTC (rev 19414)
@@ -0,0 +1,13 @@
+#include <ros/ros.h>
+#include <std_msgs/String.h>
+void chatterCallback(const std_msgs::StringConstPtr & msg)
+{
+ ROS_INFO("Received [%s]",msg->data.c_str());
+}
+int main(int argc, char ** argv)
+{
+ ros::init(argc, argv, "debugger");
+ ros::NodeHandle n;
+ ros::Subscriber chatter_sub = n.subscribe("ia3n_debug",100,chatterCallback);
+ ros::spin();
+}
Property changes on: pkg/trunk/sandbox/person_data/src/debugger.cpp
___________________________________________________________________
Added: svn:mergeinfo
+
Modified: pkg/trunk/sandbox/person_data/src/joylistener.cpp
===================================================================
--- pkg/trunk/sandbox/person_data/src/joylistener.cpp 2009-07-22 17:15:37 UTC (rev 19413)
+++ pkg/trunk/sandbox/person_data/src/joylistener.cpp 2009-07-22 18:07:45 UTC (rev 19414)
@@ -6,6 +6,7 @@
#include <ros/ros.h>
#include <std_msgs/String.h>
#include "joy/Joy.h"
+#include <string>
const static int headButton = 6;
const static int deadmanButton = 4;
@@ -16,7 +17,16 @@
static bool headButtonPressed = false;
static bool deadmanButtonPressed = false;
+ros::Publisher debug_pub;
+void IA3N_INFO(const char * msg)
+{
+ std_msgs::String rmsg;
+ rmsg.data = std::string(msg);
+ debug_pub.publish(rmsg);
+ ROS_INFO(msg);
+}
+
void startRecording()
{
FILE * result = popen("bash `rospack find person_data`/startRecording.sh","r");
@@ -31,43 +41,43 @@
recording = false;
}
+
+
void joyCallback(const joy::Joy::ConstPtr & msg)
{
+ IA3N_INFO("Received joystick message!");
+
int n = msg->get_buttons_size();
- if (headButton >= n || deadmanButton >= n || recordButton >= n || stopButton >= n)
- {
- ROS_INFO("Received message with too few buttons");
- return;
- }
+ //messages are sized so that they are just long enough to include the last 1
- if (msg->buttons[headButton])
+ if (headButton < n && msg->buttons[headButton])
{
- ROS_INFO("Head button pushed down");
+ IA3N_INFO("Head button pushed down");
headButtonPressed = true;
}
else
{
- ROS_INFO("Head button released");
+ IA3N_INFO("Head button released");
headButtonPressed = false;
}
- if (msg->buttons[deadmanButton])
+ if (deadmanButton < n && msg->buttons[deadmanButton])
{
- ROS_INFO("Deadman button pushed down");
+ IA3N_INFO("Deadman button pushed down");
deadmanButtonPressed = true;
}
else
{
- ROS_INFO("Deadman button released");
+ IA3N_INFO("Deadman button released");
deadmanButtonPressed = false;
}
if (headButtonPressed && ! deadmanButtonPressed)
{
- if (msg->buttons[recordButton])
+ if (recordButton < n && msg->buttons[recordButton])
{
if (!recording)
{
@@ -75,11 +85,11 @@
}
else
{
- ROS_INFO("You are already recording!");
+ IA3N_INFO("You are already recording!");
}
}
- if (msg->buttons[stopButton])
+ if (stopButton < n && msg->buttons[stopButton])
{
if (recording)
{
@@ -87,7 +97,7 @@
}
else
{
- ROS_INFO("You have already stopped recording");
+ IA3N_INFO("You have already stopped recording");
}
}
}
@@ -96,7 +106,7 @@
//for ( int i = 0; i < n; i++)
//{
// if (msg->buttons[i])
- // ROS_INFO("Button %d pressed",i);
+ // IA3N_INFO("Button %d pressed",i);
//}
}
@@ -104,6 +114,8 @@
{
ros::init(argc, argv, "joylistener");
ros::NodeHandle n;
+ debug_pub = n.advertise<std_msgs::String>("ia3n_debug",100);
ros::Subscriber chatter_sub = n.subscribe("joy",100,joyCallback);
+ IA3N_INFO("joylistener subscribed to joy");
ros::spin();
}
Deleted: pkg/trunk/sandbox/person_data/src/listener.cpp
===================================================================
--- pkg/trunk/sandbox/person_data/src/listener.cpp 2009-07-22 17:15:37 UTC (rev 19413)
+++ pkg/trunk/sandbox/person_data/src/listener.cpp 2009-07-22 18:07:45 UTC (rev 19414)
@@ -1,13 +0,0 @@
-#include <ros/ros.h>
-#include <std_msgs/String.h>
-void chatterCallback(const std_msgs::StringConstPtr & msg)
-{
- ROS_INFO("Received [%s]",msg->data.c_str());
-}
-int main(int argc, char ** argv)
-{
- ros::init(argc, argv, "listener");
- ros::NodeHandle n;
- ros::Subscriber chatter_sub = n.subscribe("chatter",100,chatterCallback);
- ros::spin();
-}
Added: pkg/trunk/sandbox/person_data/startRecording.launch
===================================================================
--- pkg/trunk/sandbox/person_data/startRecording.launch (rev 0)
+++ pkg/trunk/sandbox/person_data/startRecording.launch 2009-07-22 18:07:45 UTC (rev 19414)
@@ -0,0 +1,11 @@
+<launch>
+<include file="$(find pr2_alpha)/$(env ROBOT).machine" />
+<node pkg="topic_tools" type="switch_mux" args="/wide_stereo/raw_stereo_muxed /wide_stereo/raw_stereo" machine="four"/>
+<node pkg="topic_tools" type="switch_mux" args="/narrow_stereo/raw_stereo_muxed /narrow_stereo/raw_stereo" machine="four"/>
+<node pkg="topic_tools" type="switch_mux" args="/tf_message_muxed /tf_message" machine="two"/>
+<node pkg="topic_tools" type="switch_mux" machine="two" args="/mechanism_state_muxed /mechanism_state"/>
+<node pkg="topic_tools" type="switch_mux" machine="two" args="/base_scan_muxed /base_scan"/>
+<node pkg="topic_tools" type="switch_mux" machine="two" args="/tilt_scan_muxed /tilt_scan"/>
+<node pkg="topic_tools" type="switch_mux" machine="two" args="/laser_tilt_controller/laser_scanner_signal_muxed /laser_tilt_controller/laser_scanner_signal"/>
+<node pkg="topic_tools" type="switch_mux" machine="two" args="/odom_muxed /odom"/>
+</launch>
Modified: pkg/trunk/sandbox/person_data/startRecording.sh
===================================================================
--- pkg/trunk/sandbox/person_data/startRecording.sh 2009-07-22 17:15:37 UTC (rev 19413)
+++ pkg/trunk/sandbox/person_data/startRecording.sh 2009-07-22 18:07:45 UTC (rev 19414)
@@ -1 +1 @@
-echo "startRecording.sh doesn't do anything yet"
+roslaunch start_recording.launch
Added: pkg/trunk/sandbox/person_data/stopRecording.launch
===================================================================
--- pkg/trunk/sandbox/person_data/stopRecording.launch (rev 0)
+++ pkg/trunk/sandbox/person_data/stopRecording.launch 2009-07-22 18:07:45 UTC (rev 19414)
@@ -0,0 +1,10 @@
+<launch>
+<node pkg="topic_tools" type="switch_mux" args="/wide_stereo/raw_stereo_muxed /dummy" machine="four"/>
+<node pkg="topic_tools" type="switch_mux" args="/narrow_stereo/raw_stereo_muxed /dummy" machine="four"/>
+<node pkg="topic_tools" type="switch_mux" args="/tf_message_muxed /dummy" machine="two"/>
+<node pkg="topic_tools" type="switch_mux" machine="two" args="/mechanism_state_muxed /dummy"/>
+<node pkg="topic_tools" type="switch_mux" machine="two" args="/base_scan_muxed /dummy"/>
+<node pkg="topic_tools" type="switch_mux" machine="two" args="/tilt_scan_muxed /dummy"/>
+<node pkg="topic_tools" type="switch_mux" machine="two" args="/laser_tilt_controller/laser_scanner_signal_muxed /dummy"/>
+<node pkg="topic_tools" type="switch_mux" machine="two" args="/odom_muxed /dummy">
+</launch>
Modified: pkg/trunk/sandbox/person_data/stopRecording.sh
===================================================================
--- pkg/trunk/sandbox/person_data/stopRecording.sh 2009-07-22 17:15:37 UTC (rev 19413)
+++ pkg/trunk/sandbox/person_data/stopRecording.sh 2009-07-22 18:07:45 UTC (rev 19414)
@@ -1 +1 @@
-echo "stopRecording.sh doesn't do anything yet"
+roslaunch stopRecording.launch
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <goo...@us...> - 2009-07-23 21:08:53
|
Revision: 19526
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=19526&view=rev
Author: goodfellow
Date: 2009-07-23 21:08:43 +0000 (Thu, 23 Jul 2009)
Log Message:
-----------
Completed data collection setup
Added offline testing system to make sure recording stopping and starting work.
(Everything but the recording stopping/starting has been tested on the robot though)
Modified Paths:
--------------
pkg/trunk/sandbox/person_data/CMakeLists.txt
pkg/trunk/sandbox/person_data/person_data.launch
pkg/trunk/sandbox/person_data/src/joylistener.cpp
pkg/trunk/sandbox/person_data/startRecording.sh
pkg/trunk/sandbox/person_data/stopRecording.launch
pkg/trunk/sandbox/person_data/stopRecording.sh
Added Paths:
-----------
pkg/trunk/sandbox/person_data/data_collector_record_dummy.launch
pkg/trunk/sandbox/person_data/joylistener_dummy.cpp
pkg/trunk/sandbox/person_data/launch_dummy.sh
pkg/trunk/sandbox/person_data/person_data_dummy.launch
pkg/trunk/sandbox/person_data/src/headhack.cpp
pkg/trunk/sandbox/person_data/src/joyemu.cpp
pkg/trunk/sandbox/person_data/src/joylistener_dummy.cpp
pkg/trunk/sandbox/person_data/src/manual.cpp
pkg/trunk/sandbox/person_data/src/named.cpp
pkg/trunk/sandbox/person_data/startRecordingDummy.launch
pkg/trunk/sandbox/person_data/startRecordingDummy.sh
pkg/trunk/sandbox/person_data/stopRecordingDummy.launch
pkg/trunk/sandbox/person_data/stopRecordingDummy.sh
pkg/trunk/sandbox/person_data/teleop_joystick.launch
pkg/trunk/sandbox/person_data/test.launch
Modified: pkg/trunk/sandbox/person_data/CMakeLists.txt
===================================================================
--- pkg/trunk/sandbox/person_data/CMakeLists.txt 2009-07-23 21:03:45 UTC (rev 19525)
+++ pkg/trunk/sandbox/person_data/CMakeLists.txt 2009-07-23 21:08:43 UTC (rev 19526)
@@ -32,3 +32,8 @@
rospack_add_executable(talker src/talker.cpp)
rospack_add_executable(debugger src/debugger.cpp)
rospack_add_executable(joylistener src/joylistener.cpp)
+rospack_add_executable(joylistener_dummy src/joylistener_dummy.cpp)
+rospack_add_executable(manual src/manual.cpp)
+rospack_add_executable(named src/named.cpp)
+rospack_add_executable(headhack src/headhack.cpp)
+rospack_add_executable(joyemu src/joyemu.cpp)
Added: pkg/trunk/sandbox/person_data/data_collector_record_dummy.launch
===================================================================
--- pkg/trunk/sandbox/person_data/data_collector_record_dummy.launch (rev 0)
+++ pkg/trunk/sandbox/person_data/data_collector_record_dummy.launch 2009-07-23 21:08:43 UTC (rev 19526)
@@ -0,0 +1,4 @@
+<launch>
+ <node pkg="topic_tools" type="mux" args="/person_dummy_data_muxed /person_dummy_data"/>
+ <node pkg="rosrecord" type="rosrecord" args="-f /tmp/person_data_dummy /person_dummy_data_muxed"/>
+</launch>
Copied: pkg/trunk/sandbox/person_data/joylistener_dummy.cpp (from rev 19500, pkg/trunk/sandbox/person_data/src/joylistener.cpp)
===================================================================
--- pkg/trunk/sandbox/person_data/joylistener_dummy.cpp (rev 0)
+++ pkg/trunk/sandbox/person_data/joylistener_dummy.cpp 2009-07-23 21:08:43 UTC (rev 19526)
@@ -0,0 +1,122 @@
+//Author: Ian Goodfellow
+//When deadman switch is not pressed and head switch is pressed,
+//button 0 stops recording and button 2 starts recording
+//Assumes that recording is started initially
+
+#include <ros/ros.h>
+#include <std_msgs/String.h>
+#include "joy/Joy.h"
+#include <string>
+
+const static int headButton = 6;
+const static int deadmanButton = 4;
+const static int recordButton = 2;
+const static int stopButton = 0;
+
+static bool recording = true;
+static bool headButtonPressed = false;
+static bool deadmanButtonPressed = false;
+
+ros::Publisher debug_pub;
+
+void IA3N_INFO(const char * msg)
+{
+ //std_msgs::String rmsg;
+ //rmsg.data = std::string(msg);
+ //debug_pub.publish(rmsg);
+ ROS_INFO(msg);
+}
+
+void startRecording()
+{
+ FILE * result = popen("bash `rospack find person_data`/startRecording.sh","r");
+ fclose(result);
+ recording = true;
+}
+
+void stopRecording()
+{
+ FILE * result = popen("bash `rospack find person_data`/stopRecording.sh","r");
+ fclose(result);
+ recording = false;
+}
+
+
+
+void joyCallback(const joy::Joy::ConstPtr & msg)
+{
+ //IA3N_INFO("Received joystick message!");
+
+ int n = msg->get_buttons_size();
+
+ //messages are sized so that they are just long enough to include the last 1
+
+
+ if (headButton < n && msg->buttons[headButton])
+ {
+ //IA3N_INFO("Head button pushed down");
+ headButtonPressed = true;
+ }
+ else
+ {
+ //IA3N_INFO("Head button released");
+ headButtonPressed = false;
+ }
+
+ if (deadmanButton < n && msg->buttons[deadmanButton])
+ {
+ //IA3N_INFO("Deadman button pushed down");
+ deadmanButtonPressed = true;
+ }
+ else
+ {
+ //IA3N_INFO("Deadman button released");
+ deadmanButtonPressed = false;
+ }
+
+
+ if (headButtonPressed && ! deadmanButtonPressed)
+ {
+ if (recordButton < n && msg->buttons[recordButton])
+ {
+ if (!recording)
+ {
+ IA3N_INFO("Restarted recording");
+ startRecording();
+ }
+ else
+ {
+ IA3N_INFO("You are already recording!");
+ }
+ }
+
+ if (stopButton < n && msg->buttons[stopButton])
+ {
+ if (recording)
+ {
+ IA3N_INFO("Stopped recording");
+ stopRecording();
+ }
+ else
+ {
+ IA3N_INFO("You have already stopped recording");
+ }
+ }
+ }
+
+
+ //for ( int i = 0; i < n; i++)
+ //{
+ // if (msg->buttons[i])
+ // IA3N_INFO("Button %d pressed",i);
+ //}
+}
+
+int main(int argc, char ** argv)
+{
+ ros::init(argc, argv, "joylistener");
+ ros::NodeHandle n;
+ debug_pub = n.advertise<std_msgs::String>("ia3n_debug",100);
+ ros::Subscriber chatter_sub = n.subscribe("joy",100,joyCallback);
+ ros::spin();
+}
Property changes on: pkg/trunk/sandbox/person_data/joylistener_dummy.cpp
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/sandbox/person_data/src/joylistener.cpp:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Added: pkg/trunk/sandbox/person_data/launch_dummy.sh
===================================================================
--- pkg/trunk/sandbox/person_data/launch_dummy.sh (rev 0)
+++ pkg/trunk/sandbox/person_data/launch_dummy.sh 2009-07-23 21:08:43 UTC (rev 19526)
@@ -0,0 +1,2 @@
+#dummy version of launch.sh for offline testing
+namedlaunch person_data_dummy.launch
Modified: pkg/trunk/sandbox/person_data/person_data.launch
===================================================================
--- pkg/trunk/sandbox/person_data/person_data.launch 2009-07-23 21:03:45 UTC (rev 19525)
+++ pkg/trunk/sandbox/person_data/person_data.launch 2009-07-23 21:08:43 UTC (rev 19526)
@@ -1,8 +1,11 @@
<launch>
<node pkg="person_data" type="joylistener" output="screen"/>
+<node pkg ="person_data" type="headhack" output="screen" />
+<!-- for some reason putting joylistener after the other launch files broke it,
+and putting headhack after them makes roslaunch not find it! -->
<include file="$(find person_data)/data_collector_record.launch" />
<include file="$(find person_data)/truly_passive.launch" />
-<include file="$(find pr2_alpha)/teleop_joystick.launch" />
+<include file="$(find person_data)/teleop_joystick.launch" />
</launch>
Copied: pkg/trunk/sandbox/person_data/person_data_dummy.launch (from rev 19500, pkg/trunk/sandbox/person_data/person_data.launch)
===================================================================
--- pkg/trunk/sandbox/person_data/person_data_dummy.launch (rev 0)
+++ pkg/trunk/sandbox/person_data/person_data_dummy.launch 2009-07-23 21:08:43 UTC (rev 19526)
@@ -0,0 +1,11 @@
+<launch>
+<!-- dummy version of person_data.launch for offline testing -->
+<node pkg="person_data" type="joylistener_dummy" output="screen"/>
+
+<!-- for some reason putting joylistener after the other launch files broke it,
+and putting headhack after them makes roslaunch not find it! -->
+
+<node pkg="person_data" type="named" args="/person_dummy_data"/>
+<include file="$(find person_data)/data_collector_record_dummy.launch" />
+
+</launch>
Property changes on: pkg/trunk/sandbox/person_data/person_data_dummy.launch
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/sandbox/person_data/person_data.launch:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Added: pkg/trunk/sandbox/person_data/src/headhack.cpp
===================================================================
--- pkg/trunk/sandbox/person_data/src/headhack.cpp (rev 0)
+++ pkg/trunk/sandbox/person_data/src/headhack.cpp 2009-07-23 21:08:43 UTC (rev 19526)
@@ -0,0 +1,36 @@
+//pointhead.py doesn't seem to work from a launch file and only sends
+//one message, so I am writing a node that calls it repeatedly
+
+#include <ros/ros.h>
+#include <std_msgs/String.h>
+#include <sstream>
+#include <iostream>
+using namespace std;
+
+int main(int argc, char ** argv)
+{
+ ros::init(argc, argv, "headhack");
+ ros::NodeHandle n;
+ //ros::Publisher chatter_pub = n.advertise<std_msgs::String>("chatter",100);
+ ros::Rate loop_rate(1);
+
+
+ std::string command = "export PERSON_DATA=`rospack find person_data`; ";
+ command += "export POINT_HEAD=`rospack find pr2_mechanism_controllers`/scripts/pointhead.py; ";
+ command += "$POINT_HEAD `cat ${PERSON_DATA}/headpan.txt` `cat ${PERSON_DATA}/headtilt.txt`";
+
+ while (n.ok())
+ {
+ FILE * output = popen(command.c_str(), "r");
+ fclose(output);
+ //std::stringstream ss;
+ //ss << "Hello there! This is message [" << count << "]";
+ //std_msgs::String msg;
+ //msg.data = ss.str();
+ //chatter_pub.publish(msg);
+ //ROS_INFO("I published [%s]",ss.str().c_str());
+ //ros::spinOnce();
+ //loop_rate.sleep();
+ //++count;
+ }
+}
Added: pkg/trunk/sandbox/person_data/src/joyemu.cpp
===================================================================
--- pkg/trunk/sandbox/person_data/src/joyemu.cpp (rev 0)
+++ pkg/trunk/sandbox/person_data/src/joyemu.cpp 2009-07-23 21:08:43 UTC (rev 19526)
@@ -0,0 +1,52 @@
+//emulates the joystick for offline testing
+
+#include <ros/ros.h>
+#include <std_msgs/String.h>
+#include <sstream>
+#include "joy/Joy.h"
+#include <iostream>
+using namespace std;
+
+int main(int argc, char ** argv)
+{
+ ros::init(argc, argv, "joyemu");
+ ros::NodeHandle n;
+ ros::Publisher chatter_pub = n.advertise<joy::Joy>("joy",100);
+ ros::Rate loop_rate(5);
+
+
+ joy::Joy joy_msg;
+
+ joy_msg.set_buttons_size(100);
+
+ while (n.ok())
+ {
+ for (int i = 0; i < 100; i++)
+ joy_msg.buttons[i] = 0;
+
+ cout << "1. Send record stop" << endl;
+ cout << "2. Send record start" << endl;
+ cout << "3. Quit" << endl;
+
+ joy_msg.buttons[6] = 1; //press head button to enable record starting/stopping
+
+
+ int choice;
+ cin >> choice;
+
+ if (choice == 3)
+ return 0;
+
+ assert(choice == 1 || choice == 2);
+
+ if (choice == 1)
+ joy_msg.buttons[0] = 1;
+ else
+ joy_msg.buttons[2] = 1;
+
+
+ chatter_pub.publish(joy_msg);
+ ros::spinOnce();
+ loop_rate.sleep();
+ }
+}
Property changes on: pkg/trunk/sandbox/person_data/src/joyemu.cpp
___________________________________________________________________
Added: svn:mergeinfo
+
Modified: pkg/trunk/sandbox/person_data/src/joylistener.cpp
===================================================================
--- pkg/trunk/sandbox/person_data/src/joylistener.cpp 2009-07-23 21:03:45 UTC (rev 19525)
+++ pkg/trunk/sandbox/person_data/src/joylistener.cpp 2009-07-23 21:08:43 UTC (rev 19526)
@@ -21,9 +21,9 @@
void IA3N_INFO(const char * msg)
{
- std_msgs::String rmsg;
- rmsg.data = std::string(msg);
- debug_pub.publish(rmsg);
+ //std_msgs::String rmsg;
+ //rmsg.data = std::string(msg);
+ //debug_pub.publish(rmsg);
ROS_INFO(msg);
}
@@ -45,7 +45,7 @@
void joyCallback(const joy::Joy::ConstPtr & msg)
{
- IA3N_INFO("Received joystick message!");
+ //IA3N_INFO("Received joystick message!");
int n = msg->get_buttons_size();
@@ -54,23 +54,23 @@
if (headButton < n && msg->buttons[headButton])
{
- IA3N_INFO("Head button pushed down");
+ //IA3N_INFO("Head button pushed down");
headButtonPressed = true;
}
else
{
- IA3N_INFO("Head button released");
+ //IA3N_INFO("Head button released");
headButtonPressed = false;
}
if (deadmanButton < n && msg->buttons[deadmanButton])
{
- IA3N_INFO("Deadman button pushed down");
+ //IA3N_INFO("Deadman button pushed down");
deadmanButtonPressed = true;
}
else
{
- IA3N_INFO("Deadman button released");
+ //IA3N_INFO("Deadman button released");
deadmanButtonPressed = false;
}
@@ -81,6 +81,7 @@
{
if (!recording)
{
+ IA3N_INFO("Restarted recording");
startRecording();
}
else
@@ -93,6 +94,7 @@
{
if (recording)
{
+ IA3N_INFO("Stopped recording");
stopRecording();
}
else
@@ -116,6 +118,5 @@
ros::NodeHandle n;
debug_pub = n.advertise<std_msgs::String>("ia3n_debug",100);
ros::Subscriber chatter_sub = n.subscribe("joy",100,joyCallback);
- IA3N_INFO("joylistener subscribed to joy");
ros::spin();
}
Added: pkg/trunk/sandbox/person_data/src/joylistener_dummy.cpp
===================================================================
--- pkg/trunk/sandbox/person_data/src/joylistener_dummy.cpp (rev 0)
+++ pkg/trunk/sandbox/person_data/src/joylistener_dummy.cpp 2009-07-23 21:08:43 UTC (rev 19526)
@@ -0,0 +1,122 @@
+//Author: Ian Goodfellow
+//When deadman switch is not pressed and head switch is pressed,
+//button 0 stops recording and button 2 starts recording
+//Assumes that recording is started initially
+
+#include <ros/ros.h>
+#include <std_msgs/String.h>
+#include "joy/Joy.h"
+#include <string>
+
+const static int headButton = 6;
+const static int deadmanButton = 4;
+const static int recordButton = 2;
+const static int stopButton = 0;
+
+static bool recording = true;
+static bool headButtonPressed = false;
+static bool deadmanButtonPressed = false;
+
+ros::Publisher debug_pub;
+
+void IA3N_INFO(const char * msg)
+{
+ //std_msgs::String rmsg;
+ //rmsg.data = std::string(msg);
+ //debug_pub.publish(rmsg);
+ ROS_INFO(msg);
+}
+
+void startRecording()
+{
+ FILE * result = popen("bash `rospack find person_data`/startRecordingDummy.sh","r");
+ fclose(result);
+ recording = true;
+}
+
+void stopRecording()
+{
+ FILE * result = popen("bash `rospack find person_data`/stopRecordingDummy.sh","r");
+ fclose(result);
+ recording = false;
+}
+
+
+
+void joyCallback(const joy::Joy::ConstPtr & msg)
+{
+ //IA3N_INFO("Received joystick message!");
+
+ int n = msg->get_buttons_size();
+
+ //messages are sized so that they are just long enough to include the last 1
+
+
+ if (headButton < n && msg->buttons[headButton])
+ {
+ //IA3N_INFO("Head button pushed down");
+ headButtonPressed = true;
+ }
+ else
+ {
+ //IA3N_INFO("Head button released");
+ headButtonPressed = false;
+ }
+
+ if (deadmanButton < n && msg->buttons[deadmanButton])
+ {
+ //IA3N_INFO("Deadman button pushed down");
+ deadmanButtonPressed = true;
+ }
+ else
+ {
+ //IA3N_INFO("Deadman button released");
+ deadmanButtonPressed = false;
+ }
+
+
+ if (headButtonPressed && ! deadmanButtonPressed)
+ {
+ if (recordButton < n && msg->buttons[recordButton])
+ {
+ if (!recording)
+ {
+ IA3N_INFO("Restarted recording");
+ startRecording();
+ }
+ else
+ {
+ IA3N_INFO("You are already recording!");
+ }
+ }
+
+ if (stopButton < n && msg->buttons[stopButton])
+ {
+ if (recording)
+ {
+ IA3N_INFO("Stopped recording");
+ stopRecording();
+ }
+ else
+ {
+ IA3N_INFO("You have already stopped recording");
+ }
+ }
+ }
+
+
+ //for ( int i = 0; i < n; i++)
+ //{
+ // if (msg->buttons[i])
+ // IA3N_INFO("Button %d pressed",i);
+ //}
+}
+
+int main(int argc, char ** argv)
+{
+ ros::init(argc, argv, "joylistener");
+ ros::NodeHandle n;
+ debug_pub = n.advertise<std_msgs::String>("ia3n_debug",100);
+ ros::Subscriber chatter_sub = n.subscribe("joy",100,joyCallback);
+ ros::spin();
+}
Added: pkg/trunk/sandbox/person_data/src/manual.cpp
===================================================================
--- pkg/trunk/sandbox/person_data/src/manual.cpp (rev 0)
+++ pkg/trunk/sandbox/person_data/src/manual.cpp 2009-07-23 21:08:43 UTC (rev 19526)
@@ -0,0 +1,44 @@
+#include <ros/ros.h>
+#include <std_msgs/String.h>
+#include <sstream>
+#include <string>
+using namespace std;
+
+//first arg is name of topic
+//optional second arg is name of node
+
+int main(int argc, char ** argv)
+{
+ string topic;
+ string nodename;
+
+ if (argc >= 2)
+ topic = argv[1];
+
+ if (argc >= 3)
+ nodename = argv[2];
+ else
+ nodename = topic+"_publisher";
+
+ if (argc < 2 && argc > 3)
+ return -1;
+
+ ros::init(argc, argv, nodename.c_str());
+ ros::NodeHandle n;
+ ros::Publisher chatter_pub = n.advertise<std_msgs::String>(topic.c_str(),100);
+ ros::Rate loop_rate(5);
+ int count = 0;
+ while (n.ok())
+ {
+ assert(false); //todo-- get line of input from user and publish it. use this to test morgan's mux nodes
+ std::stringstream ss;
+ ss << "Hello there! This is message [" << count << "]";
+ std_msgs::String msg;
+ msg.data = ss.str();
+ chatter_pub.publish(msg);
+ ROS_INFO("I published [%s]",ss.str().c_str());
+ ros::spinOnce();
+ loop_rate.sleep();
+ ++count;
+ }
+}
Added: pkg/trunk/sandbox/person_data/src/named.cpp
===================================================================
--- pkg/trunk/sandbox/person_data/src/named.cpp (rev 0)
+++ pkg/trunk/sandbox/person_data/src/named.cpp 2009-07-23 21:08:43 UTC (rev 19526)
@@ -0,0 +1,44 @@
+#include <ros/ros.h>
+#include <std_msgs/String.h>
+#include <sstream>
+#include <string>
+using namespace std;
+
+//first arg is name of topic
+//optional second arg is name of node
+//similar to manual except it just spews dummy messages instead of requesting that you type them
+
+int main(int argc, char ** argv)
+{
+ string topic;
+ string nodename;
+
+ if (argc >= 2)
+ topic = argv[1];
+
+ if (argc >= 3)
+ nodename = argv[2];
+ else
+ nodename = topic+"_publisher";
+
+ if (argc < 2 && argc > 3)
+ return -1;
+
+ ros::init(argc, argv, nodename.c_str());
+ ros::NodeHandle n;
+ ros::Publisher chatter_pub = n.advertise<std_msgs::String>(topic.c_str(),100);
+ ros::Rate loop_rate(5);
+ int count = 0;
+ while (n.ok())
+ {
+ std::stringstream ss;
+ ss << "Hello there! This is message [" << count << "]";
+ std_msgs::String msg;
+ msg.data = ss.str();
+ chatter_pub.publish(msg);
+ ROS_INFO("I published [%s]",ss.str().c_str());
+ ros::spinOnce();
+ loop_rate.sleep();
+ ++count;
+ }
+}
Modified: pkg/trunk/sandbox/person_data/startRecording.sh
===================================================================
--- pkg/trunk/sandbox/person_data/startRecording.sh 2009-07-23 21:03:45 UTC (rev 19525)
+++ pkg/trunk/sandbox/person_data/startRecording.sh 2009-07-23 21:08:43 UTC (rev 19526)
@@ -1 +1 @@
-roslaunch start_recording.launch
+roslaunch `rospack find person_data`/startRecording.launch
Copied: pkg/trunk/sandbox/person_data/startRecordingDummy.launch (from rev 19500, pkg/trunk/sandbox/person_data/startRecording.launch)
===================================================================
--- pkg/trunk/sandbox/person_data/startRecordingDummy.launch (rev 0)
+++ pkg/trunk/sandbox/person_data/startRecordingDummy.launch 2009-07-23 21:08:43 UTC (rev 19526)
@@ -0,0 +1,3 @@
+<launch>
+<node pkg="topic_tools" type="switch_mux" args="/person_dummy_data_muxed /person_dummy_data"/>
+</launch>
Property changes on: pkg/trunk/sandbox/person_data/startRecordingDummy.launch
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/sandbox/person_data/startRecording.launch:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Copied: pkg/trunk/sandbox/person_data/startRecordingDummy.sh (from rev 19500, pkg/trunk/sandbox/person_data/startRecording.sh)
===================================================================
--- pkg/trunk/sandbox/person_data/startRecordingDummy.sh (rev 0)
+++ pkg/trunk/sandbox/person_data/startRecordingDummy.sh 2009-07-23 21:08:43 UTC (rev 19526)
@@ -0,0 +1 @@
+roslaunch `rospack find person_data`/startRecordingDummy.launch
Property changes on: pkg/trunk/sandbox/person_data/startRecordingDummy.sh
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/sandbox/person_data/startRecording.sh:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Modified: pkg/trunk/sandbox/person_data/stopRecording.launch
===================================================================
--- pkg/trunk/sandbox/person_data/stopRecording.launch 2009-07-23 21:03:45 UTC (rev 19525)
+++ pkg/trunk/sandbox/person_data/stopRecording.launch 2009-07-23 21:08:43 UTC (rev 19526)
@@ -1,10 +1,11 @@
<launch>
-<node pkg="topic_tools" type="switch_mux" args="/wide_stereo/raw_stereo_muxed /dummy" machine="four"/>
-<node pkg="topic_tools" type="switch_mux" args="/narrow_stereo/raw_stereo_muxed /dummy" machine="four"/>
-<node pkg="topic_tools" type="switch_mux" args="/tf_message_muxed /dummy" machine="two"/>
-<node pkg="topic_tools" type="switch_mux" machine="two" args="/mechanism_state_muxed /dummy"/>
-<node pkg="topic_tools" type="switch_mux" machine="two" args="/base_scan_muxed /dummy"/>
-<node pkg="topic_tools" type="switch_mux" machine="two" args="/tilt_scan_muxed /dummy"/>
-<node pkg="topic_tools" type="switch_mux" machine="two" args="/laser_tilt_controller/laser_scanner_signal_muxed /dummy"/>
-<node pkg="topic_tools" type="switch_mux" machine="two" args="/odom_muxed /dummy">
+<include file="$(find pr2_alpha)/$(env ROBOT).machine" />
+<node pkg="topic_tools" type="switch_mux" args="/wide_stereo/raw_stereo_muxed __none" machine="four"/>
+<node pkg="topic_tools" type="switch_mux" args="/narrow_stereo/raw_stereo_muxed __none" machine="four"/>
+<node pkg="topic_tools" type="switch_mux" args="/tf_message_muxed __none" machine="two"/>
+<node pkg="topic_tools" type="switch_mux" machine="two" args="/mechanism_state_muxed __none"/>
+<node pkg="topic_tools" type="switch_mux" machine="two" args="/base_scan_muxed __none"/>
+<node pkg="topic_tools" type="switch_mux" machine="two" args="/tilt_scan_muxed __none"/>
+<node pkg="topic_tools" type="switch_mux" machine="two" args="/laser_tilt_controller/laser_scanner_signal_muxed __none"/>
+<node pkg="topic_tools" type="switch_mux" machine="two" args="/odom_muxed __none"/>
</launch>
Modified: pkg/trunk/sandbox/person_data/stopRecording.sh
===================================================================
--- pkg/trunk/sandbox/person_data/stopRecording.sh 2009-07-23 21:03:45 UTC (rev 19525)
+++ pkg/trunk/sandbox/person_data/stopRecording.sh 2009-07-23 21:08:43 UTC (rev 19526)
@@ -1 +1 @@
-roslaunch stopRecording.launch
+roslaunch `rospack find person_data`/stopRecording.launch
Copied: pkg/trunk/sandbox/person_data/stopRecordingDummy.launch (from rev 19500, pkg/trunk/sandbox/person_data/stopRecording.launch)
===================================================================
--- pkg/trunk/sandbox/person_data/stopRecordingDummy.launch (rev 0)
+++ pkg/trunk/sandbox/person_data/stopRecordingDummy.launch 2009-07-23 21:08:43 UTC (rev 19526)
@@ -0,0 +1,3 @@
+<launch>
+<node pkg="topic_tools" type="switch_mux" args="/person_dummy_data_muxed __none"/>
+</launch>
Property changes on: pkg/trunk/sandbox/person_data/stopRecordingDummy.launch
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/sandbox/person_data/stopRecording.launch:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Copied: pkg/trunk/sandbox/person_data/stopRecordingDummy.sh (from rev 19500, pkg/trunk/sandbox/person_data/stopRecording.sh)
===================================================================
--- pkg/trunk/sandbox/person_data/stopRecordingDummy.sh (rev 0)
+++ pkg/trunk/sandbox/person_data/stopRecordingDummy.sh 2009-07-23 21:08:43 UTC (rev 19526)
@@ -0,0 +1 @@
+roslaunch `rospack find person_data`/stopRecordingDummy.launch
Property changes on: pkg/trunk/sandbox/person_data/stopRecordingDummy.sh
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/sandbox/person_data/stopRecording.sh:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Added: pkg/trunk/sandbox/person_data/teleop_joystick.launch
===================================================================
--- pkg/trunk/sandbox/person_data/teleop_joystick.launch (rev 0)
+++ pkg/trunk/sandbox/person_data/teleop_joystick.launch 2009-07-23 21:08:43 UTC (rev 19526)
@@ -0,0 +1,49 @@
+<launch>
+<!-- this is a fork of pr2_alpha/teleop_joystick. this version only allows
+the operator to teleop the base -->
+
+<param name="base_controller/odom_publish_rate" value="30.0"/>
+<param name="base_controller/autostart" value="true"/>
+<node pkg="mechanism_control" type="spawner.py" args="$(find pr2_default_controllers)/base_controller.xml" output="screen"/>
+
+<node pkg="mechanism_control" type="spawner.py" args="$(find pr2_default_controllers)/torso_lift_vel_controller.xml" output="screen" />
+
+
+<include file="$(find pr2_default_controllers)/head_position_controller.launch" />
+
+
+<!-- The robot pose EKF is launched with the base controller-->
+<include file="$(find robot_pose_ekf)/robot_pose_ekf.launch" />
+
+ <group name="wg">
+<param name="axis_vx" value="3" type="int"/>
+<param name="axis_vy" value="2" type="int"/>
+<param name="axis_vw" value="0" type="int"/>
+<param name="axis_pan" value="0" type="int"/>
+<param name="axis_tilt" value="3" type="int"/>
+
+<param name="max_vw" value="0.8" />
+<param name="max_vx" value="0.5" />
+<param name="max_vy" value="0.5" />
+<param name="max_vw_run" value="1.4" />
+<param name="max_vx_run" value="1.0" />
+<param name="max_vy_run" value="1.0" />
+<param name="tilt_step" value="0.1" />
+<param name="pan_step" value="0.1" />
+
+
+<param name="run_button" value="5" type="int" />
+<param name="torso_dn_button" value="500" type="int" />
+<param name="torso_up_button" value="500" type="int" />
+<param name="head_button" value="500" type="int" />
+
+<param name="deadman_button" value="4" type="int"/>
+<node pkg="teleop_pr2" type="teleop_pr2" output="screen" >
+<remap from="/head_controller/command" to="/davy_jones"/>
+</node>
+
+ </group>
+
+
+</launch>
+
Added: pkg/trunk/sandbox/person_data/test.launch
===================================================================
--- pkg/trunk/sandbox/person_data/test.launch (rev 0)
+++ pkg/trunk/sandbox/person_data/test.launch 2009-07-23 21:08:43 UTC (rev 19526)
@@ -0,0 +1,3 @@
+<launch>
+<node pkg="person_data" type="headhack" output="screen"/>
+</launch>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <goo...@us...> - 2009-07-24 14:57:33
|
Revision: 19575
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=19575&view=rev
Author: goodfellow
Date: 2009-07-24 14:57:26 +0000 (Fri, 24 Jul 2009)
Log Message:
-----------
Checked in some files I missed before
Added Paths:
-----------
pkg/trunk/sandbox/person_data/headpan.txt
pkg/trunk/sandbox/person_data/headtilt.txt
Added: pkg/trunk/sandbox/person_data/headpan.txt
===================================================================
--- pkg/trunk/sandbox/person_data/headpan.txt (rev 0)
+++ pkg/trunk/sandbox/person_data/headpan.txt 2009-07-24 14:57:26 UTC (rev 19575)
@@ -0,0 +1 @@
+0
Added: pkg/trunk/sandbox/person_data/headtilt.txt
===================================================================
--- pkg/trunk/sandbox/person_data/headtilt.txt (rev 0)
+++ pkg/trunk/sandbox/person_data/headtilt.txt 2009-07-24 14:57:26 UTC (rev 19575)
@@ -0,0 +1 @@
+0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <goo...@us...> - 2009-07-28 20:58:46
|
Revision: 19893
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=19893&view=rev
Author: goodfellow
Date: 2009-07-28 20:58:39 +0000 (Tue, 28 Jul 2009)
Log Message:
-----------
Modified Paths:
--------------
pkg/trunk/sandbox/person_data/person_data.launch
pkg/trunk/sandbox/person_data/src/named.cpp
Modified: pkg/trunk/sandbox/person_data/person_data.launch
===================================================================
--- pkg/trunk/sandbox/person_data/person_data.launch 2009-07-28 20:58:02 UTC (rev 19892)
+++ pkg/trunk/sandbox/person_data/person_data.launch 2009-07-28 20:58:39 UTC (rev 19893)
@@ -3,9 +3,8 @@
<node pkg ="person_data" type="headhack" output="screen" />
<!-- for some reason putting joylistener after the other launch files broke it,
and putting headhack after them makes roslaunch not find it! -->
-
+<!-- node pkg="pr2_default_controllers" type="tuckarm.py" args="r" -->
<include file="$(find person_data)/data_collector_record.launch" />
<include file="$(find person_data)/truly_passive.launch" />
<include file="$(find person_data)/teleop_joystick.launch" />
-
</launch>
Modified: pkg/trunk/sandbox/person_data/src/named.cpp
===================================================================
--- pkg/trunk/sandbox/person_data/src/named.cpp 2009-07-28 20:58:02 UTC (rev 19892)
+++ pkg/trunk/sandbox/person_data/src/named.cpp 2009-07-28 20:58:39 UTC (rev 19893)
@@ -32,7 +32,7 @@
while (n.ok())
{
std::stringstream ss;
- ss << "Hello there! This is message [" << count << "]";
+ ss << "Hello there! This is message [" << count << "] from "<<nodename<<" on "<<topic;
std_msgs::String msg;
msg.data = ss.str();
chatter_pub.publish(msg);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <goo...@us...> - 2009-07-28 22:49:31
|
Revision: 19912
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=19912&view=rev
Author: goodfellow
Date: 2009-07-28 22:49:23 +0000 (Tue, 28 Jul 2009)
Log Message:
-----------
Fixed the broken pipe messages
Added tuckarm to launch file
Modified Paths:
--------------
pkg/trunk/sandbox/person_data/person_data.launch
pkg/trunk/sandbox/person_data/src/joylistener.cpp
pkg/trunk/sandbox/person_data/src/joylistener_dummy.cpp
Modified: pkg/trunk/sandbox/person_data/person_data.launch
===================================================================
--- pkg/trunk/sandbox/person_data/person_data.launch 2009-07-28 22:48:48 UTC (rev 19911)
+++ pkg/trunk/sandbox/person_data/person_data.launch 2009-07-28 22:49:23 UTC (rev 19912)
@@ -1,6 +1,7 @@
<launch>
<node pkg="person_data" type="joylistener" output="screen"/>
<node pkg ="person_data" type="headhack" output="screen" />
+<node pkg ="pr2_default_controllers" type="tuckarm.py" args="r" output="screen" />
<!-- for some reason putting joylistener after the other launch files broke it,
and putting headhack after them makes roslaunch not find it! -->
<!-- node pkg="pr2_default_controllers" type="tuckarm.py" args="r" -->
Modified: pkg/trunk/sandbox/person_data/src/joylistener.cpp
===================================================================
--- pkg/trunk/sandbox/person_data/src/joylistener.cpp 2009-07-28 22:48:48 UTC (rev 19911)
+++ pkg/trunk/sandbox/person_data/src/joylistener.cpp 2009-07-28 22:49:23 UTC (rev 19912)
@@ -29,15 +29,13 @@
void startRecording()
{
- FILE * result = popen("bash `rospack find person_data`/startRecording.sh","r");
- fclose(result);
+ system("bash `rospack find person_data`/startRecording.sh >1 /dev/null 2>&1");
recording = true;
}
void stopRecording()
{
- FILE * result = popen("bash `rospack find person_data`/stopRecording.sh","r");
- fclose(result);
+ system("bash `rospack find person_data`/stopRecording.sh >1 /dev/null 2>&1");
recording = false;
}
Modified: pkg/trunk/sandbox/person_data/src/joylistener_dummy.cpp
===================================================================
--- pkg/trunk/sandbox/person_data/src/joylistener_dummy.cpp 2009-07-28 22:48:48 UTC (rev 19911)
+++ pkg/trunk/sandbox/person_data/src/joylistener_dummy.cpp 2009-07-28 22:49:23 UTC (rev 19912)
@@ -29,15 +29,14 @@
void startRecording()
{
- FILE * result = popen("bash `rospack find person_data`/startRecordingDummy.sh","r");
- fclose(result);
+ system("bash `rospack find person_data`/startRecordingDummy.sh 1> /dev/null 2>&1");
+ //pclose(result);
recording = true;
}
void stopRecording()
{
- FILE * result = popen("bash `rospack find person_data`/stopRecordingDummy.sh","r");
- fclose(result);
+ system("bash `rospack find person_data`/stopRecordingDummy.sh 1> /dev/null 2>&1");
recording = false;
}
@@ -114,7 +113,7 @@
int main(int argc, char ** argv)
{
- ros::init(argc, argv, "joylistener");
+ ros::init(argc, argv, "joylistener_dummy");
ros::NodeHandle n;
debug_pub = n.advertise<std_msgs::String>("ia3n_debug",100);
ros::Subscriber chatter_sub = n.subscribe("joy",100,joyCallback);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <goo...@us...> - 2009-08-05 00:47:03
|
Revision: 20734
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=20734&view=rev
Author: goodfellow
Date: 2009-08-05 00:46:56 +0000 (Wed, 05 Aug 2009)
Log Message:
-----------
Set narrow stereo to record on machine 3
Modified Paths:
--------------
pkg/trunk/sandbox/person_data/data_collector_record.launch
pkg/trunk/sandbox/person_data/startRecording.launch
pkg/trunk/sandbox/person_data/stopRecording.launch
Modified: pkg/trunk/sandbox/person_data/data_collector_record.launch
===================================================================
--- pkg/trunk/sandbox/person_data/data_collector_record.launch 2009-08-05 00:43:20 UTC (rev 20733)
+++ pkg/trunk/sandbox/person_data/data_collector_record.launch 2009-08-05 00:46:56 UTC (rev 20734)
@@ -4,8 +4,8 @@
<node pkg="topic_tools" type="mux" args="/wide_stereo/raw_stereo_muxed /wide_stereo/raw_stereo" machine="four"/>
<node pkg="rosrecord" type="rosrecord" machine="four" args="-f /bags/person_data/wide_stereo_ /wide_stereo/raw_stereo_muxed"/>
- <node pkg="topic_tools" type="mux" args="/narrow_stereo/raw_stereo_muxed /narrow_stereo/raw_stereo" machine="four"/>
- <node pkg="rosrecord" type="rosrecord" machine="four" args="-f /bags/person_data/narrow_stereo_ /narrow_stereo/raw_stereo_muxed"/>
+ <node pkg="topic_tools" type="mux" args="/narrow_stereo/raw_stereo_muxed /narrow_stereo/raw_stereo" machine="three"/>
+ <node pkg="rosrecord" type="rosrecord" machine="three" args="-f /bags/person_data/narrow_stereo_ /narrow_stereo/raw_stereo_muxed"/>
<node pkg="topic_tools" type="mux" args="/tf_message_muxed /tf_message" machine="two"/>
<node pkg="rosrecord" type="rosrecord" machine="two" args="-f /bags/person_data/tf_ /tf_message_muxed"/>
Modified: pkg/trunk/sandbox/person_data/startRecording.launch
===================================================================
--- pkg/trunk/sandbox/person_data/startRecording.launch 2009-08-05 00:43:20 UTC (rev 20733)
+++ pkg/trunk/sandbox/person_data/startRecording.launch 2009-08-05 00:46:56 UTC (rev 20734)
@@ -1,7 +1,7 @@
<launch>
<include file="$(find pr2_alpha)/$(env ROBOT).machine" />
<node pkg="topic_tools" type="switch_mux" args="/wide_stereo/raw_stereo_muxed /wide_stereo/raw_stereo" machine="four"/>
-<node pkg="topic_tools" type="switch_mux" args="/narrow_stereo/raw_stereo_muxed /narrow_stereo/raw_stereo" machine="four"/>
+<node pkg="topic_tools" type="switch_mux" args="/narrow_stereo/raw_stereo_muxed /narrow_stereo/raw_stereo" machine="three"/>
<node pkg="topic_tools" type="switch_mux" args="/tf_message_muxed /tf_message" machine="two"/>
<node pkg="topic_tools" type="switch_mux" machine="two" args="/mechanism_state_muxed /mechanism_state"/>
<node pkg="topic_tools" type="switch_mux" machine="two" args="/base_scan_muxed /base_scan"/>
Modified: pkg/trunk/sandbox/person_data/stopRecording.launch
===================================================================
--- pkg/trunk/sandbox/person_data/stopRecording.launch 2009-08-05 00:43:20 UTC (rev 20733)
+++ pkg/trunk/sandbox/person_data/stopRecording.launch 2009-08-05 00:46:56 UTC (rev 20734)
@@ -1,7 +1,7 @@
<launch>
<include file="$(find pr2_alpha)/$(env ROBOT).machine" />
<node pkg="topic_tools" type="switch_mux" args="/wide_stereo/raw_stereo_muxed __none" machine="four"/>
-<node pkg="topic_tools" type="switch_mux" args="/narrow_stereo/raw_stereo_muxed __none" machine="four"/>
+<node pkg="topic_tools" type="switch_mux" args="/narrow_stereo/raw_stereo_muxed __none" machine="three"/>
<node pkg="topic_tools" type="switch_mux" args="/tf_message_muxed __none" machine="two"/>
<node pkg="topic_tools" type="switch_mux" machine="two" args="/mechanism_state_muxed __none"/>
<node pkg="topic_tools" type="switch_mux" machine="two" args="/base_scan_muxed __none"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <goo...@us...> - 2009-08-26 20:23:38
|
Revision: 23017
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=23017&view=rev
Author: goodfellow
Date: 2009-08-26 20:23:30 +0000 (Wed, 26 Aug 2009)
Log Message:
-----------
Modified Paths:
--------------
pkg/trunk/sandbox/person_data/config/controllers.xml
pkg/trunk/sandbox/person_data/manifest.xml
pkg/trunk/sandbox/person_data/src/headhack.cpp
pkg/trunk/sandbox/person_data/src/joylistener.cpp
Added Paths:
-----------
pkg/trunk/sandbox/person_data/calibration_components/
pkg/trunk/sandbox/person_data/calibration_components/person_calibrate.launch
pkg/trunk/sandbox/person_data/common/
pkg/trunk/sandbox/person_data/common/checkrobot.py
pkg/trunk/sandbox/person_data/config/headpan.txt
pkg/trunk/sandbox/person_data/config/headtilt.txt
pkg/trunk/sandbox/person_data/data_collector_components/
pkg/trunk/sandbox/person_data/data_collector_components/2dnav_pr2.launch
pkg/trunk/sandbox/person_data/data_collector_components/base_odom.xml
pkg/trunk/sandbox/person_data/data_collector_components/data_collector_record.launch
pkg/trunk/sandbox/person_data/data_collector_components/data_collector_record_dummy.launch
pkg/trunk/sandbox/person_data/data_collector_components/person_data.launch
pkg/trunk/sandbox/person_data/data_collector_components/person_data_dummy.launch
pkg/trunk/sandbox/person_data/data_collector_components/startRecording.launch
pkg/trunk/sandbox/person_data/data_collector_components/startRecording.sh
pkg/trunk/sandbox/person_data/data_collector_components/startRecordingDummy.launch
pkg/trunk/sandbox/person_data/data_collector_components/startRecordingDummy.sh
pkg/trunk/sandbox/person_data/data_collector_components/stopRecording.launch
pkg/trunk/sandbox/person_data/data_collector_components/stopRecording.sh
pkg/trunk/sandbox/person_data/data_collector_components/stopRecordingDummy.launch
pkg/trunk/sandbox/person_data/data_collector_components/stopRecordingDummy.sh
pkg/trunk/sandbox/person_data/data_collector_components/teleop_joystick.launch
pkg/trunk/sandbox/person_data/data_collector_components/truly_passive.launch
pkg/trunk/sandbox/person_data/prf_person.launch
pkg/trunk/sandbox/person_data/scripts/calibrate.sh
pkg/trunk/sandbox/person_data/scripts/collect_data.sh
pkg/trunk/sandbox/person_data/scripts/collect_data_dummy.sh
Removed Paths:
-------------
pkg/trunk/sandbox/person_data/checkrobot.py
pkg/trunk/sandbox/person_data/data_collector_record.launch
pkg/trunk/sandbox/person_data/data_collector_record_dummy.launch
pkg/trunk/sandbox/person_data/headpan.txt
pkg/trunk/sandbox/person_data/headtilt.txt
pkg/trunk/sandbox/person_data/joylistener_dummy.cpp
pkg/trunk/sandbox/person_data/launch_dummy.sh
pkg/trunk/sandbox/person_data/person_data.launch
pkg/trunk/sandbox/person_data/person_data_dummy.launch
pkg/trunk/sandbox/person_data/prf.launch
pkg/trunk/sandbox/person_data/scripts/launch.sh
pkg/trunk/sandbox/person_data/startRecording.launch
pkg/trunk/sandbox/person_data/startRecording.sh
pkg/trunk/sandbox/person_data/startRecordingDummy.launch
pkg/trunk/sandbox/person_data/startRecordingDummy.sh
pkg/trunk/sandbox/person_data/stopRecording.launch
pkg/trunk/sandbox/person_data/stopRecording.sh
pkg/trunk/sandbox/person_data/stopRecordingDummy.launch
pkg/trunk/sandbox/person_data/stopRecordingDummy.sh
pkg/trunk/sandbox/person_data/teleop_joystick.launch
pkg/trunk/sandbox/person_data/test.launch
pkg/trunk/sandbox/person_data/test.py
pkg/trunk/sandbox/person_data/truly_passive.launch
Added: pkg/trunk/sandbox/person_data/calibration_components/person_calibrate.launch
===================================================================
--- pkg/trunk/sandbox/person_data/calibration_components/person_calibrate.launch (rev 0)
+++ pkg/trunk/sandbox/person_data/calibration_components/person_calibrate.launch 2009-08-26 20:23:30 UTC (rev 23017)
@@ -0,0 +1,11 @@
+<launch>
+<node pkg="person_data" type="joylistener" output="screen"/>
+<node pkg ="person_data" type="headhack" output="screen" />
+<node pkg ="pr2_default_controllers" type="tuckarm.py" args="r" output="screen" />
+<!-- for some reason putting joylistener after the other launch files broke it,
+and putting headhack after them makes roslaunch not find it! -->
+<!-- node pkg="pr2_default_controllers" type="tuckarm.py" args="r" -->
+<include file="$(find person_data)/data_collector_components/data_collector_record.launch" />
+<include file="$(find person_data)/data_collector_components/truly_passive.launch" />
+<include file="$(find person_data)/data_collector_components/teleop_joystick.launch" />
+</launch>
Property changes on: pkg/trunk/sandbox/person_data/calibration_components/person_calibrate.launch
___________________________________________________________________
Added: svn:mergeinfo
+
Deleted: pkg/trunk/sandbox/person_data/checkrobot.py
===================================================================
--- pkg/trunk/sandbox/person_data/checkrobot.py 2009-08-26 20:18:13 UTC (rev 23016)
+++ pkg/trunk/sandbox/person_data/checkrobot.py 2009-08-26 20:23:30 UTC (rev 23017)
@@ -1,16 +0,0 @@
-#Author: Ian Goodfellow
-#Pass it the ROBOT environment variable to see if it is OK
-
-import sys
-
-if len(sys.argv) != 2:
- for i in range(0,1000):
- print "Your ROBOT variable is not set"
- quit(-1)
-
-if sys.argv[1] != "prf" and sys.argv[1] != "prg":
- for i in range(0,1000):
- print "Your ROBOT variable is not set"
- quit(-1)
-
-quit(0)
Copied: pkg/trunk/sandbox/person_data/common/checkrobot.py (from rev 22692, pkg/trunk/sandbox/person_data/checkrobot.py)
===================================================================
--- pkg/trunk/sandbox/person_data/common/checkrobot.py (rev 0)
+++ pkg/trunk/sandbox/person_data/common/checkrobot.py 2009-08-26 20:23:30 UTC (rev 23017)
@@ -0,0 +1,17 @@
+#Author: Ian Goodfellow
+#Pass it the ROBOT environment variable to see if it is OK
+#TODO-- find out some way of bringing down the whole launch file
+
+import sys
+
+if len(sys.argv) != 2:
+ for i in range(0,1000):
+ print "Your ROBOT variable is not set"
+ quit(-1)
+
+if sys.argv[1] != "prf" and sys.argv[1] != "prg":
+ for i in range(0,1000):
+ print "Your ROBOT variable is not set"
+ quit(-1)
+
+quit(0)
Property changes on: pkg/trunk/sandbox/person_data/common/checkrobot.py
___________________________________________________________________
Added: svn:mergeinfo
+
Modified: pkg/trunk/sandbox/person_data/config/controllers.xml
===================================================================
--- pkg/trunk/sandbox/person_data/config/controllers.xml 2009-08-26 20:18:13 UTC (rev 23016)
+++ pkg/trunk/sandbox/person_data/config/controllers.xml 2009-08-26 20:23:30 UTC (rev 23017)
@@ -1,5 +1,7 @@
<launch>
+<!-- deleted stuff between lines 30 and 65 that pertained to r_arm, r_shoulder, etc. -->
+
<!-- action interface to switch controllers -->
<node pkg="mechanism_control" type="action_runner" output="screen" />
@@ -29,198 +31,13 @@
<node pkg="mechanism_control" type="spawner.py" args="--stopped $(find pr2_default_controllers)/r_gripper_position_controller.xml" />
<!-- Joint Trajectory controller -->
- <group ns="r_arm_joint_trajectory_controller" clear_params="true">
- <param name="velocity_scaling_factor" value="0.50" type="double" />
- <param name="trajectory_wait_timeout" value="10.0" type="double" />
-
- <param name="r_shoulder_pan_joint/goal_reached_threshold" value="0.25" type="double" />
- <param name="r_shoulder_lift_joint/goal_reached_threshold" value="0.25" type="double" />
- <param name="r_upper_arm_roll_joint/goal_reached_threshold" value="0.25" type="double" />
- <param name="r_elbow_flex_joint/goal_reached_threshold" value="0.25" type="double" />
- <param name="r_forearm_roll_joint/goal_reached_threshold" value="0.25" type="double" />
- <param name="r_wrist_flex_joint/goal_reached_threshold" value="0.25" type="double" />
- <param name="r_wrist_roll_joint/goal_reached_threshold" value="0.25" type="double" />
- </group>
- <node pkg="mechanism_control" type="spawner.py" args="$(find pr2_default_controllers)/r_arm_joint_trajectory_controller.xml" />
+ <node pkg="mechanism_control" type="spawner.py" args="--stopped $(find pr2_default_controllers)/r_arm_constraint_cartesian_wrench_controller.xml $(find pr2_default_controllers)/r_arm_constraint_cartesian_twist_controller.xml $(find pr2_default_controllers)/r_arm_constraint_cartesian_pose_controller.xml $(find pr2_default_controllers)/r_arm_constraint_cartesian_trajectory_controller.xml $(find pr2_default_controllers)/r_arm_cartesian_tff_controller.xml" output="screen" />
-<!-- Cartesian wrench controller -->
- <group ns="r_arm_cartesian_wrench_controller" clear_params="true">
- <param name="root_name" type="string" value="torso_lift_link" />
- <param name="tip_name" type="string" value="r_gripper_tool_frame" />
- </group>
-<!-- Constraint Cartesian wrench controller -->
- <group ns="r_arm_constraint_cartesian_wrench_controller" clear_params="true">
- <param name="root_name" type="string" value="torso_lift_link" />
- <param name="tip_name" type="string" value="r_gripper_tool_frame" />
- <param name="constraint/joint" type="int" value="0" />
- <param name="constraint/low_limit" type="double" value="-0.15" />
- <param name="constraint/high_limit" type="double" value="-0.35" />
- <param name="constraint/stiffness" type="double" value="30.0" />
- </group>
+ <node pkg="mechanism_control" type="spawner.py" args="--stopped $(find pr2_default_controllers)/r_arm_cartesian_wrench_controller.xml $(find pr2_default_controllers)/r_arm_cartesian_twist_controller.xml $(find pr2_default_controllers)/r_arm_cartesian_pose_controller.xml $(find pr2_default_controllers)/r_arm_cartesian_trajectory_controller.xml" output="screen" />
-<!-- Cartesian twist controller -->
- <group ns="r_arm_cartesian_twist_controller" clear_params="true">
- <param name="root_name" type="string" value="torso_lift_link" />
- <param name="tip_name" type="string" value="r_gripper_tool_frame" />
- <param name="output" type="string" value="r_arm_cartesian_wrench_controller" />
- <param name="ff_trans" value="0.0" />
- <param name="ff_rot" value="0.0" />
- <param name="fb_trans/p" value="20.0" />
- <param name="fb_trans/i" value="0.5" />
- <param name="fb_trans/d" value="0.0" />
- <param name="fb_trans/i_clamp" value="1.0" />
+ <node pkg="mechanism_control" type="spawner.py" args="--stopped $(find plug_in)/integration/r_arm_hybrid_controller.xml" />
- <param name="fb_rot/p" value="0.5" /> <param name="fb_rot/i" value="0.1" />
- <param name="fb_rot/d" value="0.0" />
- <param name="fb_rot/i_clamp" value="0.2" />
- </group>
-
-<!-- Constraint Cartesian twist controller -->
- <group ns="r_arm_constraint_cartesian_twist_controller" clear_params="true">
- <param name="root_name" type="string" value="torso_lift_link" />
- <param name="tip_name" type="string" value="r_gripper_tool_frame" />
- <param name="output" type="string" value="r_arm_constraint_cartesian_wrench_controller" />
-
- <param name="ff_trans" value="0.0" />
- <param name="ff_rot" value="0.0" />
-
- <param name="fb_trans/p" value="20.0" />
- <param name="fb_trans/i" value="0.5" />
- <param name="fb_trans/d" value="0.0" />
- <param name="fb_trans/i_clamp" value="1.0" />
-
- <param name="fb_rot/p" value="0.5" /> <param name="fb_rot/i" value="0.1" />
- <param name="fb_rot/d" value="0.0" />
- <param name="fb_rot/i_clamp" value="0.2" />
- </group>
-
-<!-- Cartesian pose controller -->
- <group ns="r_arm_cartesian_pose_controller" clear_params="true">
- <param name="root_name" type="string" value="torso_lift_link" />
- <param name="tip_name" type="string" value="r_gripper_tool_frame" />
- <param name="output" type="string" value="r_arm_cartesian_twist_controller" />
-
- <param name="p" value="20.0" />
- <param name="i" value="0.1" />
- <param name="d" value="0.0" />
- <param name="i_clamp" value="0.5" />
- </group>
-
-<!-- Constraint Cartesian pose controller -->
- <group ns="r_arm_constraint_cartesian_pose_controller" clear_params="true">
- <param name="root_name" type="string" value="torso_lift_link" />
- <param name="tip_name" type="string" value="r_gripper_tool_frame" />
- <param name="output" type="string" value="r_arm_constraint_cartesian_twist_controller" />
-
- <param name="p" value="20.0" />
- <param name="i" value="0.1" />
- <param name="d" value="0.0" />
- <param name="i_clamp" value="0.5" />
- </group>
-
-
-<!-- Cartesian trajectory controller -->
- <group ns="r_arm_cartesian_trajectory_controller" clear_params="true">
- <param name="root_name" type="string" value="torso_lift_link" />
- <param name="tip_name" type="string" value="r_gripper_tool_frame" />
- <param name="output" type="string" value="r_arm_cartesian_pose_controller" />
-
- <param name="max_vel_trans" value="0.15" />
- <param name="max_vel_rot" value="0.3" />
- <param name="max_acc_trans" value="0.4" />
- <param name="max_acc_rot" value="0.6" />
- </group>
-
-<!-- Cartesian constraint trajectory controller -->
- <group ns="r_arm_constraint_cartesian_trajectory_controller" clear_params="true">
- <param name="root_name" type="string" value="torso_lift_link" />
- <param name="tip_name" type="string" value="r_gripper_tool_frame" />
- <param name="output" type="string" value="r_arm_constraint_cartesian_pose_controller" />
-
- <param name="max_vel_trans" value="0.15" />
- <param name="max_vel_rot" value="0.3" />
- <param name="max_acc_trans" value="0.4" />
- <param name="max_acc_rot" value="0.6" />
- </group>
-
-
-<!-- Cartesian tff controller -->
- <group ns="r_arm_cartesian_tff_controller" clear_params="true">
- <param name="root_name" type="string" value="torso_lift_link" />
- <param name="tip_name" type="string" value="r_gripper_tool_frame" />
- <param name="output" type="string" value="r_arm_constraint_cartesian_wrench_controller" />
-
- <param name="twist_to_wrench_trans" value="10.0" />
- <param name="twist_to_wrench_rot" value="1.0" />
-
- <param name="vel_trans/p" value="2.0" />
- <param name="vel_trans/i" value="0.5" />
- <param name="vel_trans/d" value="0.0" />
- <param name="vel_trans/i_clamp" value="1.0" />
-
- <param name="vel_rot/p" value="0.3" />
- <param name="vel_rot/i" value="0.1" />
- <param name="vel_rot/d" value="0.0" />
- <param name="vel_rot/i_clamp" value="0.2" />
-
- <param name="pos_trans/p" value="10.0" />
- <param name="pos_trans/i" value="0.5" />
- <param name="pos_trans/d" value="0.0" />
- <param name="pos_trans/i_clamp" value="1.0" />
-
- <param name="pos_rot/p" value="0.5" />
- <param name="pos_rot/i" value="0.1" />
- <param name="pos_rot/d" value="0.0" />
- <param name="pos_rot/i_clamp" value="0.2" />
- </group>
-
-
- <node pkg="mechanism_control" type="spawner.py" args="--stopped $(find pr2_default_controllers)/r_arm_constraint_cartesian_wrench_controller.xml $(find pr2_default_controllers)/r_arm_constraint_cartesian_twist_controller.xml $(find pr2_default_controllers)/r_arm_constraint_cartesian_pose_controller.xml $(find pr2_default_controllers)/r_arm_constraint_cartesian_trajectory_controller.xml $(find pr2_default_controllers)/r_arm_cartesian_tff_controller.xml" output="screen" />
-
-
- <node pkg="mechanism_control" type="spawner.py" args="--stopped $(find pr2_default_controllers)/r_arm_cartesian_wrench_controller.xml $(find pr2_default_controllers)/r_arm_cartesian_twist_controller.xml $(find pr2_default_controllers)/r_arm_cartesian_pose_controller.xml $(find pr2_default_controllers)/r_arm_cartesian_trajectory_controller.xml" output="screen" />
-
-
-<!-- Cartesian Hybrid Controller -->
- <group ns="r_arm_hybrid_controller" clear_params="true">
- <param name="type" value="CartesianHybridControllerNode" />
- <param name="root_link" value="torso_lift_link" />
- <param name="tip_link" value="r_gripper_tool_frame" />
- <param name="initial_mode" value="3" />
- <group ns="pose">
- <group ns="fb_trans">
- <param name="p" value="400" />
- <param name="i" value="400" />
- <param name="d" value="15" />
- <param name="i_clamp" value="8" />
- </group>
- <group ns="fb_rot">
- <param name="p" value="15" />
- <param name="i" value="0" />
- <param name="d" value="1.2" />
- <param name="i_clamp" value="0" />
- </group>
- </group>
- <group ns="twist">
- <group ns="fb_trans">
- <param name="p" value="30" />
- <param name="i" value="0" />
- <param name="d" value="0" />
- <param name="i_clamp" value="0" />
- </group>
- <group ns="fb_rot">
- <param name="p" value="1.5" />
- <param name="i" value="0" />
- <param name="d" value="0" />
- <param name="i_clamp" value="0" />
- </group>
- </group>
- <param name="twist_filter" command="$(find plug_in)/make_lowpass.m twist_filter 0.1 " />
- <param name="saturated_velocity" value="-0.5" />
- </group>
- <node pkg="mechanism_control" type="spawner.py" args="--stopped $(find plug_in)/integration/r_arm_hybrid_controller.xml"/>
-
-</launch>
+ </launch>
Copied: pkg/trunk/sandbox/person_data/config/headpan.txt (from rev 22692, pkg/trunk/sandbox/person_data/headpan.txt)
===================================================================
--- pkg/trunk/sandbox/person_data/config/headpan.txt (rev 0)
+++ pkg/trunk/sandbox/person_data/config/headpan.txt 2009-08-26 20:23:30 UTC (rev 23017)
@@ -0,0 +1 @@
+0
Property changes on: pkg/trunk/sandbox/person_data/config/headpan.txt
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: pkg/trunk/sandbox/person_data/config/headtilt.txt (from rev 22692, pkg/trunk/sandbox/person_data/headtilt.txt)
===================================================================
--- pkg/trunk/sandbox/person_data/config/headtilt.txt (rev 0)
+++ pkg/trunk/sandbox/person_data/config/headtilt.txt 2009-08-26 20:23:30 UTC (rev 23017)
@@ -0,0 +1 @@
+ 0
Property changes on: pkg/trunk/sandbox/person_data/config/headtilt.txt
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: pkg/trunk/sandbox/person_data/data_collector_components/2dnav_pr2.launch (from rev 19500, pkg/trunk/demos/2dnav_pr2/move_base/2dnav_pr2.launch)
===================================================================
--- pkg/trunk/sandbox/person_data/data_collector_components/2dnav_pr2.launch (rev 0)
+++ pkg/trunk/sandbox/person_data/data_collector_components/2dnav_pr2.launch 2009-08-26 20:23:30 UTC (rev 23017)
@@ -0,0 +1,14 @@
+<launch>
+ <!-- This is a fork of 2dnav_pr2/move_base/2dnav_pr2.launch. It has been changed to include my own base_odom_teleop.xml. This is just so that it doesn't override my custom teleop -->
+ <group name="wg">
+ <include file="$(find pr2_alpha)/$(env ROBOT).machine" />
+ <include file="$(find 2dnav_pr2)/config/new_amcl_node.xml" />
+ <include file="$(find person_data)/data_collector_components/base_odom.xml" />
+ <include file="$(find 2dnav_pr2)/config/lasers_and_filters.xml" />
+ <include file="$(find 2dnav_pr2)/config/map_server.xml" />
+ <include file="$(find 2dnav_pr2)/config/ground_plane.xml" />
+
+ <!-- The naviagtion stack and associated parameters -->
+ <include file="$(find 2dnav_pr2)/move_base/move_base.xml" />
+ </group>
+</launch>
Property changes on: pkg/trunk/sandbox/person_data/data_collector_components/2dnav_pr2.launch
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/demos/2dnav_pr2/move_base/2dnav_pr2.launch:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Copied: pkg/trunk/sandbox/person_data/data_collector_components/base_odom.xml (from rev 19500, pkg/trunk/demos/2dnav_pr2/config/base_odom_teleop.xml)
===================================================================
--- pkg/trunk/sandbox/person_data/data_collector_components/base_odom.xml (rev 0)
+++ pkg/trunk/sandbox/person_data/data_collector_components/base_odom.xml 2009-08-26 20:23:30 UTC (rev 23017)
@@ -0,0 +1,22 @@
+<launch>
+<!-- This is a fork of 2dnav_pr2/config/base_odom_teleop.xml. It has been modified to remove the teleop portion, so that it will not override the person_data teleop -->
+
+<param name="base_controller/autostart" value="true"/>
+<node pkg="mechanism_control" type="spawner.py" args="$(find pr2_default_controllers)/base_controller.xml" output="screen"/>
+
+<node pkg="mechanism_control" type="spawner.py" args="$(find pr2_default_controllers)/torso_lift_vel_controller.xml" output="screen" />
+
+<node pkg="backup_safetysound" type="backingup.py" machine="four" />
+
+<!-- The robot pose EKF is launched with the base controller-->
+<node pkg="robot_pose_ekf" type="robot_pose_ekf" name="robot_pose_ekf">
+ <param name="freq" value="30.0"/>
+ <param name="sensor_timeout" value="1.0"/>
+ <param name="publish_tf" value="true"/>
+ <param name="odom_used" value="true"/>
+ <param name="imu_used" value="true"/>
+ <param name="vo_used" value="false"/>
+</node>
+
+
+</launch>
Property changes on: pkg/trunk/sandbox/person_data/data_collector_components/base_odom.xml
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/demos/2dnav_pr2/config/base_odom_teleop.xml:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Copied: pkg/trunk/sandbox/person_data/data_collector_components/data_collector_record.launch (from rev 22692, pkg/trunk/sandbox/person_data/data_collector_record.launch)
===================================================================
--- pkg/trunk/sandbox/person_data/data_collector_components/data_collector_record.launch (rev 0)
+++ pkg/trunk/sandbox/person_data/data_collector_components/data_collector_record.launch 2009-08-26 20:23:30 UTC (rev 23017)
@@ -0,0 +1,24 @@
+<launch>
+ <include file="$(find pr2_alpha)/$(env ROBOT).machine" />
+
+ <node output="screen" pkg="topic_tools" type="mux" args="/wide_stereo/raw_stereo_muxed /wide_stereo/raw_stereo" machine="four"/>
+ <node output="screen" pkg="rosrecord" type="rosrecord" machine="four" args="-f /bags/person_data/wide_stereo_ /wide_stereo/raw_stereo_muxed"/>
+
+ <node output="screen" pkg="topic_tools" type="mux" args="/narrow_stereo/raw_stereo_muxed /narrow_stereo/raw_stereo" machine="three"/>
+ <node output="screen" pkg="rosrecord" type="rosrecord" machine="three" args="-f /bags/person_data/narrow_stereo_ /narrow_stereo/raw_stereo_muxed"/>
+
+<node output="screen" pkg="topic_tools" type="mux" args="/tf_message_muxed /tf_message" machine="two"/>
+<node output="screen" pkg="rosrecord" type="rosrecord" machine="two" args="-f /bags/person_data/tf_ /tf_message_muxed"/>
+
+ <node output="screen" pkg="topic_tools" type="mux" machine="two" args="/mechanism_state_muxed /mechanism_state"/>
+ <node output="screen" pkg="rosrecord" type="rosrecord" machine="two" args="-f /bags/person_data/mech_state /mechanism_state_muxed"/>
+
+ <node output="screen" pkg="topic_tools" type="mux" machine="two" args="/base_scan_muxed /base_scan"/>
+ <node output="screen" pkg="topic_tools" type="mux" machine="two" args="/tilt_scan_muxed /tilt_scan"/>
+ <node output="screen" pkg="topic_tools" type="mux" machine="two" args="/laser_tilt_controller/laser_scanner_signal_muxed /laser_tilt_controller/laser_scanner_signal"/>
+ <node output="screen" pkg="rosrecord" type="rosrecord" machine="two" args="-f /bags/person_data/laser_ /base_scan_muxed /tilt_scan_muxed /laser_tilt_controller/laser_scanner_signal"/>
+
+ <node output="screen" pkg="topic_tools" type="mux" machine="two" args="/odom_muxed /odom"/>
+ <node output="screen" pkg="rosrecord" type="rosrecord" machine="two" args="-f /bags/person_data/state_ /odom_muxed "/>
+
+</launch>
Property changes on: pkg/trunk/sandbox/person_data/data_collector_components/data_collector_record.launch
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: pkg/trunk/sandbox/person_data/data_collector_components/data_collector_record_dummy.launch (from rev 22692, pkg/trunk/sandbox/person_data/data_collector_record_dummy.launch)
===================================================================
--- pkg/trunk/sandbox/person_data/data_collector_components/data_collector_record_dummy.launch (rev 0)
+++ pkg/trunk/sandbox/person_data/data_collector_components/data_collector_record_dummy.launch 2009-08-26 20:23:30 UTC (rev 23017)
@@ -0,0 +1,4 @@
+<launch>
+ <node pkg="topic_tools" type="mux" args="/person_dummy_data_muxed /person_dummy_data"/>
+ <node pkg="rosrecord" type="rosrecord" args="-f /tmp/person_data_dummy /person_dummy_data_muxed"/>
+</launch>
Property changes on: pkg/trunk/sandbox/person_data/data_collector_components/data_collector_record_dummy.launch
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: pkg/trunk/sandbox/person_data/data_collector_components/person_data.launch (from rev 22692, pkg/trunk/sandbox/person_data/person_data.launch)
===================================================================
--- pkg/trunk/sandbox/person_data/data_collector_components/person_data.launch (rev 0)
+++ pkg/trunk/sandbox/person_data/data_collector_components/person_data.launch 2009-08-26 20:23:30 UTC (rev 23017)
@@ -0,0 +1,15 @@
+<launch>
+<node pkg="person_data" type="joylistener" output="screen"/>
+<node pkg ="person_data" type="headhack" output="screen" />
+<node pkg ="pr2_default_controllers" type="tuckarm.py" args="r" output="screen" />
+
+<include file="$(find person_data)/data_collector_components/2dnav_pr2.launch" />
+
+
+<!-- for some reason putting joylistener after the other launch files broke it,
+and putting headhack after them makes roslaunch not find it! -->
+<!-- node pkg="pr2_default_controllers" type="tuckarm.py" args="r" -->
+<include file="$(find person_data)/data_collector_components/data_collector_record.launch" />
+<!-- include file="$(find person_data)/data_collector_components/truly_passive.launch" -->
+<include file="$(find person_data)/data_collector_components/teleop_joystick.launch" />
+</launch>
Property changes on: pkg/trunk/sandbox/person_data/data_collector_components/person_data.launch
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: pkg/trunk/sandbox/person_data/data_collector_components/person_data_dummy.launch (from rev 22692, pkg/trunk/sandbox/person_data/person_data_dummy.launch)
===================================================================
--- pkg/trunk/sandbox/person_data/data_collector_components/person_data_dummy.launch (rev 0)
+++ pkg/trunk/sandbox/person_data/data_collector_components/person_data_dummy.launch 2009-08-26 20:23:30 UTC (rev 23017)
@@ -0,0 +1,11 @@
+<launch>
+<!-- dummy version of person_data.launch for offline testing -->
+<node pkg="person_data" type="joylistener_dummy" output="screen"/>
+
+<!-- for some reason putting joylistener after the other launch files broke it,
+and putting headhack after them makes roslaunch not find it! -->
+
+<node pkg="person_data" type="named" args="/person_dummy_data"/>
+<include file="$(find person_data)/data_collector_record_dummy.launch" />
+
+</launch>
Copied: pkg/trunk/sandbox/person_data/data_collector_components/startRecording.launch (from rev 22692, pkg/trunk/sandbox/person_data/startRecording.launch)
===================================================================
--- pkg/trunk/sandbox/person_data/data_collector_components/startRecording.launch (rev 0)
+++ pkg/trunk/sandbox/person_data/data_collector_components/startRecording.launch 2009-08-26 20:23:30 UTC (rev 23017)
@@ -0,0 +1,11 @@
+<launch>
+<include file="$(find pr2_alpha)/$(env ROBOT).machine" />
+<node output="screen" pkg="topic_tools" type="switch_mux" args="/wide_stereo/raw_stereo_muxed /wide_stereo/raw_stereo" machine="four"/>
+<node output="screen" pkg="topic_tools" type="switch_mux" args="/narrow_stereo/raw_stereo_muxed /narrow_stereo/raw_stereo" machine="three"/>
+<node output="screen" pkg="topic_tools" type="switch_mux" args="/tf_message_muxed /tf_message" machine="two"/>
+<node output="screen" pkg="topic_tools" type="switch_mux" machine="two" args="/mechanism_state_muxed /mechanism_state"/>
+<node output="screen" pkg="topic_tools" type="switch_mux" machine="two" args="/base_scan_muxed /base_scan"/>
+<node output="screen" pkg="topic_tools" type="switch_mux" machine="two" args="/tilt_scan_muxed /tilt_scan"/>
+<node output="screen" pkg="topic_tools" type="switch_mux" machine="two" args="/laser_tilt_controller/laser_scanner_signal_muxed /laser_tilt_controller/laser_scanner_signal"/>
+<node output="screen" pkg="topic_tools" type="switch_mux" machine="two" args="/odom_muxed /odom"/>
+</launch>
Property changes on: pkg/trunk/sandbox/person_data/data_collector_components/startRecording.launch
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: pkg/trunk/sandbox/person_data/data_collector_components/startRecording.sh (from rev 22692, pkg/trunk/sandbox/person_data/startRecording.sh)
===================================================================
--- pkg/trunk/sandbox/person_data/data_collector_components/startRecording.sh (rev 0)
+++ pkg/trunk/sandbox/person_data/data_collector_components/startRecording.sh 2009-08-26 20:23:30 UTC (rev 23017)
@@ -0,0 +1 @@
+roslaunch `rospack find person_data`/data_collector_components/startRecording.launch
Property changes on: pkg/trunk/sandbox/person_data/data_collector_components/startRecording.sh
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: pkg/trunk/sandbox/person_data/data_collector_components/startRecordingDummy.launch (from rev 22692, pkg/trunk/sandbox/person_data/startRecordingDummy.launch)
===================================================================
--- pkg/trunk/sandbox/person_data/data_collector_components/startRecordingDummy.launch (rev 0)
+++ pkg/trunk/sandbox/person_data/data_collector_components/startRecordingDummy.launch 2009-08-26 20:23:30 UTC (rev 23017)
@@ -0,0 +1,3 @@
+<launch>
+<node pkg="topic_tools" type="switch_mux" args="/person_dummy_data_muxed /person_dummy_data"/>
+</launch>
Copied: pkg/trunk/sandbox/person_data/data_collector_components/startRecordingDummy.sh (from rev 22692, pkg/trunk/sandbox/person_data/startRecordingDummy.sh)
===================================================================
--- pkg/trunk/sandbox/person_data/data_collector_components/startRecordingDummy.sh (rev 0)
+++ pkg/trunk/sandbox/person_data/data_collector_components/startRecordingDummy.sh 2009-08-26 20:23:30 UTC (rev 23017)
@@ -0,0 +1 @@
+roslaunch `rospack find person_data`/data_collector_components/startRecordingDummy.launch
Copied: pkg/trunk/sandbox/person_data/data_collector_components/stopRecording.launch (from rev 22692, pkg/trunk/sandbox/person_data/stopRecording.launch)
===================================================================
--- pkg/trunk/sandbox/person_data/data_collector_components/stopRecording.launch (rev 0)
+++ pkg/trunk/sandbox/person_data/data_collector_components/stopRecording.launch 2009-08-26 20:23:30 UTC (rev 23017)
@@ -0,0 +1,11 @@
+<launch>
+<include file="$(find pr2_alpha)/$(env ROBOT).machine" />
+<node output="screen" pkg="topic_tools" type="switch_mux" args="/wide_stereo/raw_stereo_muxed __none" machine="four"/>
+<node output="screen" pkg="topic_tools" type="switch_mux" args="/narrow_stereo/raw_stereo_muxed __none" machine="three"/>
+<node output="screen" pkg="topic_tools" type="switch_mux" args="/tf_message_muxed __none" machine="two"/>
+<node output="screen" pkg="topic_tools" type="switch_mux" machine="two" args="/mechanism_state_muxed __none"/>
+<node output="screen" pkg="topic_tools" type="switch_mux" machine="two" args="/base_scan_muxed __none"/>
+<node output="screen" pkg="topic_tools" type="switch_mux" machine="two" args="/tilt_scan_muxed __none"/>
+<node output="screen" pkg="topic_tools" type="switch_mux" machine="two" args="/laser_tilt_controller/laser_scanner_signal_muxed __none"/>
+<node output="screen" pkg="topic_tools" type="switch_mux" machine="two" args="/odom_muxed __none"/>
+</launch>
Property changes on: pkg/trunk/sandbox/person_data/data_collector_components/stopRecording.launch
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: pkg/trunk/sandbox/person_data/data_collector_components/stopRecording.sh (from rev 22692, pkg/trunk/sandbox/person_data/stopRecording.sh)
===================================================================
--- pkg/trunk/sandbox/person_data/data_collector_components/stopRecording.sh (rev 0)
+++ pkg/trunk/sandbox/person_data/data_collector_components/stopRecording.sh 2009-08-26 20:23:30 UTC (rev 23017)
@@ -0,0 +1 @@
+roslaunch `rospack find person_data`/data_collector_components/stopRecording.launch
Property changes on: pkg/trunk/sandbox/person_data/data_collector_components/stopRecording.sh
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: pkg/trunk/sandbox/person_data/data_collector_components/stopRecordingDummy.launch (from rev 22692, pkg/trunk/sandbox/person_data/stopRecordingDummy.launch)
===================================================================
--- pkg/trunk/sandbox/person_data/data_collector_components/stopRecordingDummy.launch (rev 0)
+++ pkg/trunk/sandbox/person_data/data_collector_components/stopRecordingDummy.launch 2009-08-26 20:23:30 UTC (rev 23017)
@@ -0,0 +1,3 @@
+<launch>
+<node pkg="topic_tools" type="switch_mux" args="/person_dummy_data_muxed __none"/>
+</launch>
Copied: pkg/trunk/sandbox/person_data/data_collector_components/stopRecordingDummy.sh (from rev 22692, pkg/trunk/sandbox/person_data/stopRecordingDummy.sh)
===================================================================
--- pkg/trunk/sandbox/person_data/data_collector_components/stopRecordingDummy.sh (rev 0)
+++ pkg/trunk/sandbox/person_data/data_collector_components/stopRecordingDummy.sh 2009-08-26 20:23:30 UTC (rev 23017)
@@ -0,0 +1 @@
+roslaunch `rospack find person_data`/data_collector_components/stopRecordingDummy.launch
Copied: pkg/trunk/sandbox/person_data/data_collector_components/teleop_joystick.launch (from rev 22692, pkg/trunk/sandbox/person_data/teleop_joystick.launch)
===================================================================
--- pkg/trunk/sandbox/person_data/data_collector_components/teleop_joystick.launch (rev 0)
+++ pkg/trunk/sandbox/person_data/data_collector_components/teleop_joystick.launch 2009-08-26 20:23:30 UTC (rev 23017)
@@ -0,0 +1,49 @@
+<launch>
+<!-- this is a fork of pr2_alpha/teleop_joystick. this version only allows
+the operator to teleop the base -->
+
+<param name="base_controller/odom_publish_rate" value="30.0"/>
+<param name="base_controller/autostart" value="true"/>
+<node pkg="mechanism_control" type="spawner.py" args="$(find pr2_default_controllers)/base_controller.xml" output="screen"/>
+
+<node pkg="mechanism_control" type="spawner.py" args="$(find pr2_default_controllers)/torso_lift_vel_controller.xml" output="screen" />
+
+
+<include file="$(find pr2_default_controllers)/head_position_controller.launch" />
+
+
+<!-- The robot pose EKF is launched with the base controller-->
+<include file="$(find robot_pose_ekf)/robot_pose_ekf.launch" />
+
+ <group name="wg">
+<param name="axis_vx" value="3" type="int"/>
+<param name="axis_vy" value="2" type="int"/>
+<param name="axis_vw" value="0" type="int"/>
+<param name="axis_pan" value="0" type="int"/>
+<param name="axis_tilt" value="3" type="int"/>
+
+<param name="max_vw" value="0.8" />
+<param name="max_vx" value="0.5" />
+<param name="max_vy" value="0.5" />
+<param name="max_vw_run" value="1.4" />
+<param name="max_vx_run" value="1.0" />
+<param name="max_vy_run" value="1.0" />
+<param name="tilt_step" value="0.1" />
+<param name="pan_step" value="0.1" />
+
+
+<param name="run_button" value="5" type="int" />
+<param name="torso_dn_button" value="500" type="int" />
+<param name="torso_up_button" value="500" type="int" />
+<param name="head_button" value="500" type="int" />
+
+<param name="deadman_button" value="4" type="int"/>
+<node pkg="teleop_pr2" type="teleop_pr2" output="screen" >
+<remap from="/head_controller/command" to="/davy_jones"/>
+</node>
+
+ </group>
+
+
+</launch>
+
Property changes on: pkg/trunk/sandbox/person_data/data_collector_components/teleop_joystick.launch
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: pkg/trunk/sandbox/person_data/data_collector_components/truly_passive.launch (from rev 22692, pkg/trunk/sandbox/person_data/truly_passive.launch)
===================================================================
--- pkg/trunk/sandbox/person_data/data_collector_components/truly_passive.launch (rev 0)
+++ pkg/trunk/sandbox/person_data/data_collector_components/truly_passive.launch 2009-08-26 20:23:30 UTC (rev 23017)
@@ -0,0 +1,34 @@
+<launch>
+ <include file="$(find pr2_alpha)/$(env ROBOT).machine" />
+
+<!-- controllers-->
+ <include file="$(find person_data)/config/controllers.xml" />
+
+<!-- perception-->
+ <include file="$(find person_data)/config/perception.xml" />
+
+
+<!-- Safety -->
+ <node machine="four" pkg="safety_core" type="run_detect_plug_on_base" output="screen" respawn="false" />
+ <!-- node machine="four" pkg="safety_core" type="run_tuck_arms" output="screen" respawn="true" -->
+
+
+
+
+<!-- Robot pose ekf -->
+ <node pkg="robot_pose_ekf" type="robot_pose_ekf" args="robot_pose_ekf" machine="four" name="robot_pose_ekf">
+ <param name="freq" value="30.0"/>
+ <param name="sensor_timeout" value="1.0"/>
+ <param name="odom_used" value="true"/>
+ <param name="imu_used" value="true"/>
+ <param name="vo_used" value="false"/>
+ </node>
+
+ <!-- node pkg="tf" machine="two" type="change_notifier"-->
+
+
+
+
+
+
+</launch>
Property changes on: pkg/trunk/sandbox/person_data/data_collector_components/truly_passive.launch
___________________________________________________________________
Added: svn:mergeinfo
+
Deleted: pkg/trunk/sandbox/person_data/data_collector_record.launch
===================================================================
--- pkg/trunk/sandbox/person_data/data_collector_record.launch 2009-08-26 20:18:13 UTC (rev 23016)
+++ pkg/trunk/sandbox/person_data/data_collector_record.launch 2009-08-26 20:23:30 UTC (rev 23017)
@@ -1,24 +0,0 @@
-<launch>
- <include file="$(find pr2_alpha)/$(env ROBOT).machine" />
-
- <node pkg="topic_tools" type="mux" args="/wide_stereo/raw_stereo_muxed /wide_stereo/raw_stereo" machine="four"/>
- <node pkg="rosrecord" type="rosrecord" machine="four" args="-f /bags/person_data/wide_stereo_ /wide_stereo/raw_stereo_muxed"/>
-
- <node pkg="topic_tools" type="mux" args="/narrow_stereo/raw_stereo_muxed /narrow_stereo/raw_stereo" machine="three"/>
- <node pkg="rosrecord" type="rosrecord" machine="three" args="-f /bags/person_data/narrow_stereo_ /narrow_stereo/raw_stereo_muxed"/>
-
-<node pkg="topic_tools" type="mux" args="/tf_message_muxed /tf_message" machine="two"/>
-<node pkg="rosrecord" type="rosrecord" machine="two" args="-f /bags/person_data/tf_ /tf_message_muxed"/>
-
- <node pkg="topic_tools" type="mux" machine="two" args="/mechanism_state_muxed /mechanism_state"/>
- <node pkg="rosrecord" type="rosrecord" machine="two" args="-f /bags/person_data/mech_state /mechanism_state_muxed"/>
-
- <node pkg="topic_tools" type="mux" machine="two" args="/base_scan_muxed /base_scan"/>
- <node pkg="topic_tools" type="mux" machine="two" args="/tilt_scan_muxed /tilt_scan"/>
- <node pkg="topic_tools" type="mux" machine="two" args="/laser_tilt_controller/laser_scanner_signal_muxed /laser_tilt_controller/laser_scanner_signal"/>
- <node pkg="rosrecord" type="rosrecord" machine="two" args="-f /bags/person_data/laser_ /base_scan_muxed /tilt_scan_muxed /laser_tilt_controller/laser_scanner_signal"/>
-
- <node pkg="topic_tools" type="mux" machine="two" args="/odom_muxed /odom"/>
- <node pkg="rosrecord" type="rosrecord" machine="two" args="-f /bags/person_data/state_ /odom_muxed "/>
-
-</launch>
Deleted: pkg/trunk/sandbox/person_data/data_collector_record_dummy.launch
===================================================================
--- pkg/trunk/sandbox/person_data/data_collector_record_dummy.launch 2009-08-26 20:18:13 UTC (rev 23016)
+++ pkg/trunk/sandbox/person_data/data_collector_record_dummy.launch 2009-08-26 20:23:30 UTC (rev 23017)
@@ -1,4 +0,0 @@
-<launch>
- <node pkg="topic_tools" type="mux" args="/person_dummy_data_muxed /person_dummy_data"/>
- <node pkg="rosrecord" type="rosrecord" args="-f /tmp/person_data_dummy /person_dummy_data_muxed"/>
-</launch>
Deleted: pkg/trunk/sandbox/person_data/headpan.txt
===================================================================
--- pkg/trunk/sandbox/person_data/headpan.txt 2009-08-26 20:18:13 UTC (rev 23016)
+++ pkg/trunk/sandbox/person_data/headpan.txt 2009-08-26 20:23:30 UTC (rev 23017)
@@ -1 +0,0 @@
-0
Deleted: pkg/trunk/sandbox/person_data/headtilt.txt
===================================================================
--- pkg/trunk/sandbox/person_data/headtilt.txt 2009-08-26 20:18:13 UTC (rev 23016)
+++ pkg/trunk/sandbox/person_data/headtilt.txt 2009-08-26 20:23:30 UTC (rev 23017)
@@ -1 +0,0 @@
- 0
Deleted: pkg/trunk/sandbox/person_data/joylistener_dummy.cpp
===================================================================
--- pkg/trunk/sandbox/person_data/joylistener_dummy.cpp 2009-08-26 20:18:13 UTC (rev 23016)
+++ pkg/trunk/sandbox/person_data/joylistener_dummy.cpp 2009-08-26 20:23:30 UTC (rev 23017)
@@ -1,122 +0,0 @@
-//Author: Ian Goodfellow
-//When deadman switch is not pressed and head switch is pressed,
-//button 0 stops recording and button 2 starts recording
-//Assumes that recording is started initially
-
-#include <ros/ros.h>
-#include <std_msgs/String.h>
-#include "joy/Joy.h"
-#include <string>
-
-const static int headButton = 6;
-const static int deadmanButton = 4;
-const static int recordButton = 2;
-const static int stopButton = 0;
-
-static bool recording = true;
-static bool headButtonPressed = false;
-static bool deadmanButtonPressed = false;
-
-ros::Publisher debug_pub;
-
-void IA3N_INFO(const char * msg)
-{
- //std_msgs::String rmsg;
- //rmsg.data = std::string(msg);
- //debug_pub.publish(rmsg);
- ROS_INFO(msg);
-}
-
-void startRecording()
-{
- FILE * result = popen("bash `rospack find person_data`/startRecording.sh","r");
- fclose(result);
- recording = true;
-}
-
-void stopRecording()
-{
- FILE * result = popen("bash `rospack find person_data`/stopRecording.sh","r");
- fclose(result);
- recording = false;
-}
-
-
-
-void joyCallback(const joy::Joy::ConstPtr & msg)
-{
- //IA3N_INFO("Received joystick message!");
-
- int n = msg->get_buttons_size();
-
- //messages are sized so that they are just long enough to include the last 1
-
-
- if (headButton < n && msg->buttons[headButton])
- {
- //IA3N_INFO("Head button pushed down");
- headButtonPressed = true;
- }
- else
- {
- //IA3N_INFO("Head button released");
- headButtonPressed = false;
- }
-
- if (deadmanButton < n && msg->buttons[deadmanButton])
- {
- //IA3N_INFO("Deadman button pushed down");
- deadmanButtonPressed = true;
- }
- else
- {
- //IA3N_INFO("Deadman button released");
- deadmanButtonPressed = false;
- }
-
-
- if (headButtonPressed && ! deadmanButtonPressed)
- {
- if (recordButton < n && msg->buttons[recordButton])
- {
- if (!recording)
- {
- IA3N_INFO("Restarted recording");
- startRecording();
- }
- else
- {
- IA3N_INFO("You are already recording!");
- }
- }
-
- if (stopButton < n && msg->buttons[stopButton])
- {
- if (recording)
- {
- IA3N_INFO("Stopped recording");
- stopRecording();
- }
- else
- {
- IA3N_INFO("You have already stopped recording");
- }
- }
- }
-
-
- //for ( int i = 0; i < n; i++)
- //{
- // if (msg->buttons[i])
- // IA3N_INFO("Button %d pressed",i);
- //}
-}
-
-int main(int argc, char ** argv)
-{
- ros::init(argc, argv, "joylistener");
- ros::NodeHandle n;
- debug_pub = n.advertise<std_msgs::String>("ia3n_debug",100);
- ros::Subscriber chatter_sub = n.subscribe("joy",100,joyCallback);
- ros::spin();
-}
Deleted: pkg/trunk/sandbox/person_data/launch_dummy.sh
===================================================================
--- pkg/trunk/sandbox/person_data/launch_dummy.sh 2009-08-26 20:18:13 UTC (rev 23016)
+++ pkg/trunk/sandbox/person_data/launch_dummy.sh 2009-08-26 20:23:30 UTC (rev 23017)
@@ -1,2 +0,0 @@
-#dummy version of launch.sh for offline testing
-namedlaunch person_data_dummy.launch
Modified: pkg/trunk/sandbox/person_data/manifest.xml
===================================================================
--- pkg/trunk/sandbox/person_data/manifest.xml 2009-08-26 20:18:13 UTC (rev 23016)
+++ pkg/trunk/sandbox/person_data/manifest.xml 2009-08-26 20:23:30 UTC (rev 23017)
@@ -2,7 +2,7 @@
<description brief="person_data">
Tools for collecting and managing data for the indoor person detection and tracking dataset
These include:
- scripts/launch.sh: runs data collection system on the robot
+ scripts/collect_data.sh: runs data collection system on the robot
scripts/chop_bag.py: converts a collection of bags into a series of contiguous scenes, cutting wherever recording was paused
scripts/plot_bags.py: plots when each topic was present in a collection of bags (this is helpful for checking that no sensors died)
stereo_playback.launch: A launch file that uses environment variables to play video from a bag file
@@ -17,7 +17,11 @@
<depend package="roscpp"/>
<depend package="std_msgs"/>
<depend package="joy" />
-
+ <depend package="opencv_latest"/>
+ <depend package="sensor_msgs"/>
+ <depend package="topic_synchronizer"/>
+ <depend package="color_calib"/>
+ <depend package="stereo_utils"/>
</package>
Deleted: pkg/trunk/sandbox/person_data/person_data.launch
===================================================================
--- pkg/trunk/sandbox/person_data/person_data.launch 2009-08-26 20:18:13 UTC (rev 23016)
+++ pkg/trunk/sandbox/person_data/person_data.launch 2009-08-26 20:23:30 UTC (rev 23017)
@@ -1,11 +0,0 @@
-<launch>
-<node pkg="person_data" type="joylistener" output="screen"/>
-<node pkg ="person_data" type="headhack" output="screen" />
-<node pkg ="pr2_experimental_controllers" type="tuckarm.py" args="r" output="screen" />
-<!-- for some reason putting joylistener after the other launch files broke it,
-and putting headhack after them makes roslaunch not find it! -->
-<!-- node pkg="pr2_experimental_controllers" type="tuckarm.py" args="r" -->
-<include file="$(find person_data)/data_collector_record.launch" />
-<include file="$(find person_data)/truly_passive.launch" />
-<include file="$(find person_data)/teleop_joystick.launch" />
-</launch>
Deleted: pkg/trunk/sandbox/person_data/person_data_dummy.launch
===================================================================
--- pkg/trunk/sandbox/person_data/person_data_dummy.launch 2009-08-26 20:18:13 UTC (rev 23016)
+++ pkg/trunk/sandbox/person_data/person_data_dummy.launch 2009-08-26 20:23:30 UTC (rev 23017)
@@ -1,11 +0,0 @@
-<launch>
-<!-- dummy version of person_data.launch for offline testing -->
-<node pkg="person_data" type="joylistener_dummy" output="screen"/>
-
-<!-- for some reason putting joylistener after the other launch files broke it,
-and putting headhack after them makes roslaunch not find it! -->
-
-<node pkg="person_data" type="named" args="/person_dummy_data"/>
-<include file="$(find person_data)/data_collector_record_dummy.launch" />
-
-</launch>
Deleted: pkg/trunk/sandbox/person_data/prf.launch
===================================================================
--- pkg/trunk/sandbox/person_data/prf.launch 2009-08-26 20:18:13 UTC (rev 23016)
+++ pkg/trunk/sandbox/person_data/prf.launch 2009-08-26 20:23:30 UTC (rev 23017)
@@ -1,120 +0,0 @@
-<launch>
-
- <include file="$(find pr2_alpha)/prf.machine" />
- <include file="$(find pr2_alpha)/prf_ethercat_reset.launch" />
-
-<!-- Joystick -->
- <param name="joy/deadzone" value="5000"/>
- <node machine="four" pkg="joy" type="joy" respawn="true"/>
-
-<!-- Power Board Control Node -->
- <node pkg="pr2_power_board" type="power_node" respawn="true"/>
-
-<!-- Robot state publisher -->
- <node machine="two" pkg="robot_state_publisher" type="state_publisher" name="robot_state_publisher">
- <param name="publish_frequency" type="double" value="50.0" />
- <param name="tf_prefix" type="string" value="" />
- </node>
-
-<!-- Battery Monitor -->
- <node machine="two" pkg="ocean_battery_driver" type="monitor" respawn="true"/>
-<!-- Battery Assertions -->
- <include file="$(find ocean_battery_driver)/expected_batteries.launch"/>
-
-<!-- Base Laser -->
- <node machine="two" pkg="hokuyo_node" type="hokuyo_node" name="base_hokuyo_node" args="scan:=base_scan">
- <param name="port" type="string" value="/dev/ttyACM0" />
- <param name="frameid" type="string" value="base_laser" />
- <param name="min_ang_degrees" type="double" value="-130.0" />
- <param name="max_ang_degrees" type="double" value="130.0" />
- </node>
-
-<!-- Tilt Laser -->
- <node machine="three" pkg="hokuyo_node" type="hokuyo_node" name="tilt_hokuyo_node" args="scan:=tilt_scan">
- <param name="port" type="string" value="/dev/ttyACM0" />
- <param name="frameid" type="string" value="laser_tilt_link" />
- <param name="min_ang_degrees" type="double" value="-70.0" />
- <param name="max_ang_degrees" type="double" value="70.0" />
- <param name="skip" type="int" value="1" />
- <param name="intensity" value="true" />
- </node>
-
-<!-- imu -->
- <param name="imu/time_offset" value="-0.040" />
- <param name="imu/port" type="string" value="/dev/ttyUSB0" />
- <param name="imu/autostart" type="bool" value="true" />
- <param name="imu/frameid" type="string" value="imu" />
- <param name="imu/autocalibrate" type="bool" value="true" />
- <node machine="four" pkg="imu_node" type="imu_node" output="screen"/>
-
- <!-- Videre Stereo cam -->
- <!-- DEPRECATED include file="$(find pr2_alpha)/stereo.launch" /-->
-
- <!-- Prosilica camera setup, 7/14/09 -->
- <group ns="prosilica">
- <include file="$(find prosilica_cam)/cam_settings.xml"/>
- <param name="acquisition_mode" type="str" value="Triggered"/>
- <param name="ip_address" type="str" value="10.68.0.20"/>
- </group>
- <node machine="three" name="prosilica" pkg="prosilica_cam" type="prosilica_node" output="screen" respawn="true"/>
-
-<!-- Double stereo setup, 7/14/09 -->
- <!-- Wide is on robot right, goes to four -->
- <group ns="wide_stereo">
- <node machine="four" pkg="dcam" type="stereodcam" name="stereodcam" respawn="false" >
- <param name="videre_mode" type="str" value="none"/>
- <param name="fps" type="double" value="15.0"/>
- <param name="frame_id" type="string" value="double_stereo_wide_optical_frame"/>
- <param name="exposure_auto" type="bool" value="true"/>
- <param name="brightness_auto" type="bool" value="true"/>
- <param name="gain_auto" type="bool" value="true"/>
- </node>
- </group>
-
- <!-- Narrow is on robot left, goes to three -->
- <group ns="narrow_stereo">
- <node machine="three" pkg="dcam" type="stereodcam" name="stereodcam" respawn="false" >
- <param name="videre_mode" type="str" value="none"/>
- <param name="fps" type="double" value="30.0"/>
- <param name="frame_id" type="string" value="double_stereo_narrow_optical_frame"/>
- <param name="exposure_auto" type="bool" value="true"/>
- <param name="brightness_auto" type="bool" value="true"/>
- <param name="gain_auto" type="bool" value="true"/>
- </node>
- </group>
-
-<!-- Forearm Camera -->
- <include file="$(find forearm_cam)/prf_forearm_cam_config.launch"/>
- <node machine="three" name="forearm_cam_r" pkg="forearm_cam" type="forearm_node" respawn="false" output="screen"/>
-
-<!-- Sound -->
- <node pkg="sound_play" type="soundplay_node.py" machine="four" />
-
-<!-- Runtime Diagnostics Logging -->
- <node pkg="rosrecord" type="rosrecord" args="-f /hwlog/prf_runtime_automatic /diagnostics" />
-
-<!-- Joint Calibration Monitor -->
- <node pkg="joint_calibration_monitor" type="pr2_calibration_monitor_node.py" machine="two" />
-
-<!-- NTP monitoring script Warns to console if sync error -->
- <node pkg="pr2_computer_monitor" type="ntp_monitor.py" args="prf2" machine="realtime"/>
- <node pkg="pr2_computer_monitor" type="ntp_monitor.py" args="fw1 7000" machine="two"/>
- <node pkg="pr2_computer_monitor" type="ntp_monitor.py" args="prf2" machine="three"/>
- <node pkg="pr2_computer_monitor" type="ntp_monitor.py" args="prf2" machine="four"/>
-
-<!-- Disk, CPU monitoring scripts. -->
- <include file="$(find pr2_alpha)/pr2_monitors.launch" />
-
- <!-- Plug to chessboard offsets -->
- <group ns="plug_detector">
- <param name="plug_position_x" value="0.01" />
- <param name="plug_position_y" value="-0.005" />
- <param name="plug_position_z" value="0.016" />
- <param name="plug_orientation_x" value="0.71428" />
- <param name="plug_orientation_y" value="-0.69958" />
- <param name="plug_orientation_z" value="0.00588" />
- <param name="plug_orientation_w" value="0.01906" />
- </group>
-
-</launch>
-
Copied: pkg/trunk/sandbox/person_data/prf_person.launch (from rev 21037, pkg/trunk/sandbox/person_data/prf.launch)
===================================================================
--- pkg/trunk/sandbox/person_data/prf_person.launch (rev 0)
+++ pkg/trunk/sandbox/person_data/prf_person.launch 2009-08-26 20:23:30 UTC (rev 23017)
@@ -0,0 +1,121 @@
+<launch>
+ <!-- This is a branch of prf.launch that was modified to put the narrow stereo on auto exposure. The main prf.launch gave it a very low exposure value for use with the terminator light. -->
+
+ <include file="$(find pr2_alpha)/prf.machine" />
+ <include file="$(find pr2_alpha)/prf_ethercat_reset.launch" />
+
+<!-- Joystick -->
+ <param name="joy/deadzone" value="5000"/>
+ <node machine="four" pkg="joy" type="joy" respawn="true"/>
+
+<!-- Power Board Control Node -->
+ <node pkg="pr2_power_board" type="power_node" respawn="true"/>
+
+<!-- Robot state publisher -->
+ <node machine="two" pkg="robot_state_publisher" type="state_publisher" name="robot_state_publisher">
+ <param name="publish_frequency" type="double" value="50.0" />
+ <param name="tf_prefix" type="string" value="" />
+ </node>
+
+<!-- Battery Monitor -->
+ <node machine="two" pkg="ocean_battery_driver" type="monitor" respawn="true"/>
+<!-- Battery Assertions -->
+ <include file="$(find ocean_battery_driver)/expected_batteries.launch"/>
+
+<!-- Base Laser -->
+ <node machine="two" pkg="hokuyo_node" type="hokuyo_node" name="base_hokuyo_node" args="scan:=base_scan">
+ <param name="port" type="string" value="/dev/ttyACM0" />
+ <param name="frameid" type="string" value="base_laser" />
+ <param name="min_ang_degrees" type="double" value="-130.0" />
+ <param name="max_ang_degrees" type="double" value="130.0" />
+ </node>
+
+<!-- Tilt Laser -->
+ <node machine="three" pkg="hokuyo_node" type="hokuyo_node" name="tilt_hokuyo_node" args="scan:=tilt_scan">
+ <param name="port" type="string" value="/dev/ttyACM0" />
+ <param name="frameid" type="string" value="laser_tilt_link" />
+ <param name="min_ang_degrees" type="double" value="-70.0" />
+ <param name="max_ang_degrees" type="double" value="70.0" />
+ <param name="skip" type="int" value="1" />
+ <param name="intensity" value="true" />
+ </node>
+
+<!-- imu -->
+ <param name="imu/time_offset" value="-0.040" />
+ <param name="imu/port" type="string" value="/dev/ttyUSB0" />
+ <param name="imu/autostart" type="bool" value="true" />
+ <param name="imu/frameid" type="string" value="imu" />
+ <param name="imu/autocalibrate" type="bool" value="true" />
+ <node machine="four" pkg="imu_node" type="imu_node" output="screen"/>
+
+ <!-- Videre Stereo cam -->
+ <!-- DEPRECATED include file="$(find pr2_alpha)/stereo.launch" /-->
+
+ <!-- Prosilica camera setup, 7/14/09 -->
+ <group ns="prosilica">
+ <include file="$(find prosilica_cam)/cam_settings.xml"/>
+ <param name="acquisition_mode" type="str" value="Triggered"/>
+ <param name="ip_address" type="str" value="10.68.0.20"/>
+ </group>
+ <node machine="three" name="prosilica" pkg="prosilica_cam" type="prosilica_node" output="screen" respawn="true"/>
+
+<!-- Double stereo setup, 7/14/09 -->
+ <!-- Wide is on robot right, goes to four -->
+ <group ns="wide_stereo">
+ <node machine="four" pkg="dcam" type="stereodcam" name="stereodcam" respawn="false" >
+ <param name="videre_mode" type="str" value="none"/>
+ <param name="fps" type="double" value="15.0"/>
+ <param name="frame_id" type="string" value="double_stereo_wide_optical_frame"/>
+ <param name="exposure_auto" type="bool" value="true"/>
+ <param name="brightness_auto" type="bool" value="true"/>
+ <param name="gain_auto" type="bool" value="true"/>
+ </node>
+ </group>
+
+ <!-- Narrow is on robot left, goes to three -->
+ <group ns="narrow_stereo">
+ <node machine="three" pkg="dcam" type="stereodcam" name="stereodcam" respawn="false" >
+ <param name="videre_mode" type="str" value="none"/>
+ <param name="fps" type="double" value="30.0"/>
+ <param name="frame_id" type="string" value="double_stereo_narrow_optical_frame"/>
+ <param name="exposure_auto" type="bool" value="true"/>
+ <param name="brightness_auto" type="bool" value="true"/>
+ <param name="gain_auto" type="bool" value="true"/>
+ </node>
+ </group>
+
+<!-- Forearm Camera -->
+ <include file="$(find forearm_cam)/prf_forearm_cam_config.launch"/>
+ <node machine="three" name="forearm_cam_r" pkg="forearm_cam" type="forearm_node" respawn="false" output="screen"/>
+
+<!-- Sound -->
+ <node pkg="sound_play" type="soundplay_node.py" machine="four" />
+
+<!-- Runtime Diagnostics Logging -->
+ <node pkg="rosrecord" type="rosrecord" args="-f /hwlog/prf_runtime_automatic /diagnostics" />
+
+<!-- Joint Calibration Monitor -->
+ <node pkg="joint_calibration_monitor" type="pr2_calibration_monitor_node.py" machine="two" />
+
+<!-- NTP monitoring script Warns to console if sync error -->
+ <node pkg="pr2_computer_monitor" type="ntp_monitor.py" args="prf2" machine="realtime"/>
+ <node pkg="pr2_computer_monitor" type="ntp_monitor.py" args="fw1 7000" machine="two"/>
+ <node pkg="pr2_computer_monitor" type="ntp_monitor.py" args="prf2" machine="three"/>
+ <node pkg="pr2_computer_monitor" type="ntp_monitor.py" args="prf2" machine="four"/>
+
+<!-- Disk, CPU monitoring scripts. -->
+ <include file="$(find pr2_alpha)/pr2_monitors.launch" />
+
+ <!-- Plug to chessboard offsets -->
+ <group ns="plug_detector">
+ <param name="plug_position_x" value="0.01" />
+ <param name="plug_position_y" value="-0.005" />
+ <param name="plug_position_z" value="0.016" />
+ <param name="plug_orientation_x" value="0.71428" />
+ <param name="plug_orientation_y" value="-0.69958" />
+ <param name="plug_orientation_z" value="0.00588" />
+ <param name="plug_orientation_w" value="0.01906" />
+ </gro...
[truncated message content] |
|
From: <goo...@us...> - 2009-09-04 20:33:37
|
Revision: 23866
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=23866&view=rev
Author: goodfellow
Date: 2009-09-04 20:33:31 +0000 (Fri, 04 Sep 2009)
Log Message:
-----------
Modifications to make it work on pre
Modified Paths:
--------------
pkg/trunk/sandbox/person_data/calibration_components/person_calibrate.launch
pkg/trunk/sandbox/person_data/common/checkrobot.py
pkg/trunk/sandbox/person_data/data_collector_components/base_odom.xml
pkg/trunk/sandbox/person_data/data_collector_components/person_data.launch
pkg/trunk/sandbox/person_data/data_collector_components/truly_passive.launch
pkg/trunk/sandbox/person_data/scripts/collect_data.sh
Added Paths:
-----------
pkg/trunk/sandbox/person_data/NOTES
pkg/trunk/sandbox/person_data/config/machine1bagdir.txt
pkg/trunk/sandbox/person_data/config/machine2bagdir.txt
pkg/trunk/sandbox/person_data/real_make.sh
Added: pkg/trunk/sandbox/person_data/NOTES
===================================================================
--- pkg/trunk/sandbox/person_data/NOTES (rev 0)
+++ pkg/trunk/sandbox/person_data/NOTES 2009-09-04 20:33:31 UTC (rev 23866)
@@ -0,0 +1 @@
+Currently, there is no /bags directory on pre. Eric said to just put everything in the home directory on pre2.
Modified: pkg/trunk/sandbox/person_data/calibration_components/person_calibrate.launch
===================================================================
--- pkg/trunk/sandbox/person_data/calibration_components/person_calibrate.launch 2009-09-04 20:32:16 UTC (rev 23865)
+++ pkg/trunk/sandbox/person_data/calibration_components/person_calibrate.launch 2009-09-04 20:33:31 UTC (rev 23866)
@@ -1,7 +1,7 @@
<launch>
<node pkg="person_data" type="joylistener" output="screen"/>
<node pkg ="person_data" type="headhack" output="screen" />
-<node pkg ="pr2_default_controllers" type="tuckarm.py" args="r" output="screen" />
+<node pkg ="pr2_experimental_controllers" type="tuckarm.py" args="r" output="screen" />
<!-- for some reason putting joylistener after the other launch files broke it,
and putting headhack after them makes roslaunch not find it! -->
<!-- node pkg="pr2_default_controllers" type="tuckarm.py" args="r" -->
Modified: pkg/trunk/sandbox/person_data/common/checkrobot.py
===================================================================
--- pkg/trunk/sandbox/person_data/common/checkrobot.py 2009-09-04 20:32:16 UTC (rev 23865)
+++ pkg/trunk/sandbox/person_data/common/checkrobot.py 2009-09-04 20:33:31 UTC (rev 23866)
@@ -9,9 +9,9 @@
print "Your ROBOT variable is not set"
quit(-1)
-if sys.argv[1] != "prf" and sys.argv[1] != "prg":
- for i in range(0,1000):
- print "Your ROBOT variable is not set"
- quit(-1)
+#if sys.argv[1] != "prf" and sys.argv[1] != "prg":
+# for i in range(0,1000):
+## print "Your ROBOT variable is not a recognized robot"
+# quit(-1)
quit(0)
Added: pkg/trunk/sandbox/person_data/config/machine1bagdir.txt
===================================================================
--- pkg/trunk/sandbox/person_data/config/machine1bagdir.txt (rev 0)
+++ pkg/trunk/sandbox/person_data/config/machine1bagdir.txt 2009-09-04 20:33:31 UTC (rev 23866)
@@ -0,0 +1 @@
+/pr/2/`whoami`/bags
Added: pkg/trunk/sandbox/person_data/config/machine2bagdir.txt
===================================================================
--- pkg/trunk/sandbox/person_data/config/machine2bagdir.txt (rev 0)
+++ pkg/trunk/sandbox/person_data/config/machine2bagdir.txt 2009-09-04 20:33:31 UTC (rev 23866)
@@ -0,0 +1 @@
+/pr/2/`whoami`/bags
Modified: pkg/trunk/sandbox/person_data/data_collector_components/base_odom.xml
===================================================================
--- pkg/trunk/sandbox/person_data/data_collector_components/base_odom.xml 2009-09-04 20:32:16 UTC (rev 23865)
+++ pkg/trunk/sandbox/person_data/data_collector_components/base_odom.xml 2009-09-04 20:33:31 UTC (rev 23866)
@@ -9,14 +9,15 @@
<node pkg="backup_safetysound" type="backingup.py" machine="four" />
<!-- The robot pose EKF is launched with the base controller-->
-<node pkg="robot_pose_ekf" type="robot_pose_ekf" name="robot_pose_ekf">
+<!-- commented out because also present in truly_passive.launch
+node pkg="robot_pose_ekf" type="robot_pose_ekf" name="robot_pose_ekf">
<param name="freq" value="30.0"/>
<param name="sensor_timeout" value="1.0"/>
<param name="publish_tf" value="true"/>
<param name="odom_used" value="true"/>
<param name="imu_used" value="true"/>
<param name="vo_used" value="false"/>
-</node>
+</node -->
</launch>
Modified: pkg/trunk/sandbox/person_data/data_collector_components/person_data.launch
===================================================================
--- pkg/trunk/sandbox/person_data/data_collector_components/person_data.launch 2009-09-04 20:32:16 UTC (rev 23865)
+++ pkg/trunk/sandbox/person_data/data_collector_components/person_data.launch 2009-09-04 20:33:31 UTC (rev 23866)
@@ -1,7 +1,7 @@
<launch>
<node pkg="person_data" type="joylistener" output="screen"/>
<node pkg ="person_data" type="headhack" output="screen" />
-<node pkg ="pr2_default_controllers" type="tuckarm.py" args="r" output="screen" />
+<node pkg ="pr2_experimental_controllers" type="tuckarm.py" args="r" output="screen" />
<include file="$(find person_data)/data_collector_components/2dnav_pr2.launch" />
Modified: pkg/trunk/sandbox/person_data/data_collector_components/truly_passive.launch
===================================================================
--- pkg/trunk/sandbox/person_data/data_collector_components/truly_passive.launch 2009-09-04 20:32:16 UTC (rev 23865)
+++ pkg/trunk/sandbox/person_data/data_collector_components/truly_passive.launch 2009-09-04 20:33:31 UTC (rev 23866)
@@ -22,6 +22,7 @@
<param name="odom_used" value="true"/>
<param name="imu_used" value="true"/>
<param name="vo_used" value="false"/>
+ <param name="publish_tf" value="true"/>
</node>
<!-- node pkg="tf" machine="two" type="change_notifier"-->
Added: pkg/trunk/sandbox/person_data/real_make.sh
===================================================================
--- pkg/trunk/sandbox/person_data/real_make.sh (rev 0)
+++ pkg/trunk/sandbox/person_data/real_make.sh 2009-09-04 20:33:31 UTC (rev 23866)
@@ -0,0 +1,10 @@
+#Run this to actually make the realtime dependencies
+function rosmake-deps { \
+ #argument is name of launch file \
+ rosmake `roslaunch-deps $1`; \
+}
+
+
+rosmake-deps *.launch */*.launch
+rosmake-deps config/controllers.xml
+rosmake-deps config/perception.xml
Modified: pkg/trunk/sandbox/person_data/scripts/collect_data.sh
===================================================================
--- pkg/trunk/sandbox/person_data/scripts/collect_data.sh 2009-09-04 20:32:16 UTC (rev 23865)
+++ pkg/trunk/sandbox/person_data/scripts/collect_data.sh 2009-09-04 20:33:31 UTC (rev 23866)
@@ -1,10 +1,10 @@
#!/bin/bash
python `rospack find person_data`/common/checkrobot.py ${ROBOT} || exit
+export bagconfig=`rospack find person_data`/config/machine2bagdir.txt
+ssh ${ROBOT}2 mkdir -p `cat ${bagconfig}`
-ssh ${ROBOT}2 mkdir -p /bags/person_data
+#ssh ${ROBOT}3 mkdir -p /bags/person_data
-ssh ${ROBOT}3 mkdir -p /bags/person_data
+#ssh ${ROBOT}4 mkdir -p /bags/person_data
-ssh ${ROBOT}4 mkdir -p /bags/person_data
-
roslaunch `rospack find person_data`/data_collector_components/person_data.launch
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X