Changeset 18909

Timestamp:

09/18/17 16:43:32 (7 years ago)

Author:

tbretz

Message:

Moved setting connection parameters from a global variable (without setter) to the connection call.

Location:

trunk/FACT++/src

Files:

• ConnectionUSB.cc (modified) (4 diffs)
• ConnectionUSB.h (modified) (2 diffs)

trunk/FACT++/src/ConnectionUSB.cc

@@ -270 +270 @@
 }
 
-void ConnectionUSB::Connect()
+void ConnectionUSB::Connect(int _baud_rate, int _character_size,
+                            parity::type _parity, stop_bits::type _stop_bits,
+                            flow_control::type _flow_control)
 {
     fConnectionStatus = kConnecting;
@@ -292 +294 @@
     try
     {
+        set_option(baud_rate(_baud_rate));
+        set_option(character_size(_character_size));
+        set_option(parity(_parity));
+        set_option(stop_bits(_stop_bits));
+        set_option(flow_control(_flow_control));
+/*
         Info("Setting Baud Rate");
         set_option(fBaudRate);
@@ -302 +310 @@
         Info("Setting Flow control");
         set_option(fFlowControl);
+        */
     }
     catch (const bs::system_error &erc)
@@ -327 +336 @@
 ConnectionUSB::ConnectionUSB(ba::io_service& ioservice, ostream &out) :
 MessageImp(out), ba::serial_port(ioservice), fLog(0),
-fBaudRate(115200),
+/*
+ fBaudRate(115200),
 fCharacterSize(8), fParity(parity::none), fStopBits(stop_bits::one),
 fFlowControl(flow_control::none),
+*/
 fInTimeout(ioservice), fOutTimeout(ioservice), fConnectTimeout(ioservice),
 fQueueSize(0), fConnectionStatus(kDisconnected)

trunk/FACT++/src/ConnectionUSB.h

@@ -18 +18 @@
 
     std::string fAddress;
-
-    boost::asio::serial_port_base::baud_rate      fBaudRate;      // unisgned int
-    boost::asio::serial_port_base::character_size fCharacterSize; // unisgned int
-    boost::asio::serial_port_base::parity         fParity;        // unisgned int
-    boost::asio::serial_port_base::stop_bits      fStopBits;      // unisgned int
-    boost::asio::serial_port_base::flow_control   fFlowControl;   // unisgned int
 
     enum ConnectionStatus_t
@@ -76 +70 @@
     void SetEndpoint(const std::string &addr);
 
-    void Connect();
+    void Connect(int baud_rate=115200,
+                 int character_size=8,
+                 boost::asio::serial_port_base::parity::type parity=boost::asio::serial_port_base::parity::none,
+                 boost::asio::serial_port_base::stop_bits::type stop_bits=boost::asio::serial_port_base::stop_bits::one,
+                 boost::asio::serial_port_base::flow_control::type flow_control=boost::asio::serial_port_base::flow_control::hardware);
+
+    void ConfigureConnection();
 
     // ------------------------ close --------------------------