Merge pull request #46 from PaulBouchier/groovy-devel

Groovy devel
ros-drivers · Apr 18, 2013 · 2696eac · 2696eac
2 parents 7f3a321 + 3596582
commit 2696eac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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")