Changeset 12 for trunk/shared_serial/src

Timestamp:

08/29/12 16:52:22 (12 years ago)

Author:

wcaarls

Message:

Updated shared_serial to revision 1017

Location:

trunk/shared_serial/src

Files:

• LxSerial.cpp (modified) (1 diff)
• server.cpp (modified) (1 diff)

trunk/shared_serial/src/LxSerial.cpp

@@ -455 +455 @@
 LxSerial::~LxSerial()
 {
-        // Warn when you forgot to close the port before destruction.
-        // We CANNOT call port_close() here, because port_close is a virtual function
-        // and virtual functions cannot be called in constructors and destructors.
         if (hPort != INVALID_DEVICE_HANDLE)
-                printf("[LxSerial] Warning: you didn't call port_close before calling the destructor.\n");
-}
+                port_close();
+}

trunk/shared_serial/src/server.cpp

@@ -116 +116 @@
   ROS_ASSERT(nh_.getParam("port_type", port_type));
   ROS_ASSERT(nh_.getParam("baud_rate", baud_rate));
-  nh_.param<double>("watchdog_interval", watchdog_interval, 1);
+  nh_.param<double>("watchdog_interval", watchdog_interval, 10);
 
   if (port_type == "RS232")