[Personalrobots-commit] SF.net SVN: personalrobots:[19912] pkg/trunk/sandbox/person_data

[<goo...@us...>]

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.