Changeset 12213

Timestamp:

10/20/11 11:33:23 (13 years ago)

Author:

tbretz

Message:

Improved error messages; switched to hardware flow control -- does this make any sense?

File:

• trunk/FACT++/src/ConnectionUSB.cc (modified) (4 diffs)

trunk/FACT++/src/ConnectionUSB.cc

@@ -82 +82 @@
         if (ec)
             Error("Closing "+URL()+": "+ec.message());
-    }
-
-    // Reset the connection status
-    fConnectionStatus = kDisconnected;
+        else
+            Info("Connection closed succesfully.");
+    }
 
     // Stop deadline counters
     fInTimeout.cancel();
     fOutTimeout.cancel();
+
+    // Reset the connection status
+    fConnectionStatus = kDisconnected;
 
     // Empty output queue
@@ -244 +246 @@
     fConnectionStatus = kConnecting;
 
+    Info("Connecting to "+URL()+".");
+
     bs::error_code ec;
     open(URL(), ec);
 
-    ostringstream msg;
-    msg << "Connecting to " << URL() << "... ";
     if (ec)
-        msg << " " << ec.message() << " (" << ec << ")";
-    else
-        msg << "success.";
-
-    if (ec)
-    {
+    {
+        ostringstream msg;
+        msg << "Error opening " << URL() << "... " << ec.message() << " (" << ec << ")";
         Error(msg);
         fConnectionStatus = kDisconnected;
@@ -261 +260 @@
     }
 
-    Info(msg);
+    Info("Connection established.");
 
     try
@@ -296 +295 @@
 fBaudRate(115200),
 fCharacterSize(8), fParity(parity::none), fStopBits(stop_bits::one),
-fFlowControl(flow_control::none),
+fFlowControl(flow_control::hardware),
 fInTimeout(ioservice), fOutTimeout(ioservice), 
 fConnectionStatus(kDisconnected)