From 24962a443b00b5275817c25b785db5b6ad4f04f6 Mon Sep 17 00:00:00 2001 From: Paul Bouchier Date: Fri, 22 Mar 2013 22:15:29 -0500 Subject: [PATCH 1/2] fix install rule for examples dir --- rosserial_embeddedlinux/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rosserial_embeddedlinux/CMakeLists.txt b/rosserial_embeddedlinux/CMakeLists.txt index 8e01dfa54..7cf902aa8 100644 --- a/rosserial_embeddedlinux/CMakeLists.txt +++ b/rosserial_embeddedlinux/CMakeLists.txt @@ -8,7 +8,7 @@ install(DIRECTORY src/ros_lib DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/src ) -install(DIRECTORY examples +install(DIRECTORY src/examples DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/src ) From 3596582dec9df07e234ac2ecad5567a0811dbe5a Mon Sep 17 00:00:00 2001 From: Paul Bouchier Date: Thu, 18 Apr 2013 00:11:38 -0500 Subject: [PATCH 2/2] fix private parameters - temporary fix breaks fork_server for tcp --- rosserial_python/nodes/serial_node.py | 6 +++--- rosserial_python/src/rosserial_python/SerialClient.py | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/rosserial_python/nodes/serial_node.py b/rosserial_python/nodes/serial_node.py index e344934c8..0f33e8c2e 100755 --- a/rosserial_python/nodes/serial_node.py +++ b/rosserial_python/nodes/serial_node.py @@ -43,10 +43,12 @@ if __name__=="__main__": + rospy.init_node("rosserial_node") + rospy.loginfo("ROS Serial Python Node") port_name = rospy.get_param('~port','/dev/ttyUSB0') baud = int(rospy.get_param('~baud','57600')) tcp_portnum = int(rospy.get_param('/rosserial_embeddedlinux/tcp_port', '11411')) - fork_server = rospy.get_param('/rosserial_embeddedlinux/fork_server', True) + fork_server = rospy.get_param('/rosserial_embeddedlinux/fork_server', False) sys.argv = rospy.myargv(argv=sys.argv) @@ -71,8 +73,6 @@ rospy.loginfo("All done") else : # Use serial port - rospy.init_node("serial_node") - rospy.loginfo("ROS Serial Python Node") rospy.loginfo("Connecting to %s at %d baud" % (port_name,baud) ) client = SerialClient(port_name, baud) try: diff --git a/rosserial_python/src/rosserial_python/SerialClient.py b/rosserial_python/src/rosserial_python/SerialClient.py index 1d01d220f..cf732f8ba 100644 --- a/rosserial_python/src/rosserial_python/SerialClient.py +++ b/rosserial_python/src/rosserial_python/SerialClient.py @@ -229,8 +229,6 @@ def listen(self): process.start() rospy.loginfo("launched startSocketServer") else: - rospy.init_node("serial_node") - rospy.loginfo("ROS Serial Python Node") rospy.loginfo("calling startSerialClient") self.startSerialClient() rospy.loginfo("startSerialClient() exited")