Changeset 14316

Timestamp:

08/06/12 22:16:25 (12 years ago)

Author:

neise

Message:

step by step ... going to test it

File:

• trunk/FACT++/src/agilentctrl.cc (modified) (12 diffs)

trunk/FACT++/src/agilentctrl.cc

@@ -31 +31 @@
     ofstream fDumpStream;
     int fState;
+    float fMeasuredVoltage;
+    float fMeasuredCurrent;
     
 
@@ -72 +74 @@
 
         fCheckStatusTimer.expires_from_now(boost::posix_time::seconds(60));
-        fCheckStatusTimer.async_wait(boost::bind(&ConnectionWeather::HandleRequest,
+        fCheckStatusTimer.async_wait(boost::bind(&ConnectionAgilent::HandleRequest,
                                           this, bapla::error));
     }
@@ -101 +103 @@
         // may have moved the deadline before this actor had a chance
         // to run.
-        if (fKeepAlive.expires_at() > ba::deadline_timer::traits_type::now())
+        if (fCheckStatusTimer.expires_at() > ba::deadline_timer::traits_type::now())
             return;
 
@@ -112 +114 @@
     void ReceivedStatusHandler(const bs::error_code& err, size_t bytes_received, int /*type*/)
     {
-        float measured_voltage;
-        float measured_current;
         
         // Do not schedule a new read if the connection failed.
@@ -137 +137 @@
         if (fIsVerbose)
            Out() << kBold << "Received (" << bytes_received << " bytes):" << endl;
+        /*
         if (fDump)
         {
@@ -143 +144 @@
             Dump(msg.str());
         }
-
+*/
         istream is(&fBuffer);
         // data should contain two floats:
@@ -162 +163 @@
         {
             // this should be a float containing the measured voltage
-            is >> measured_voltage;
-            data.push_back(measured_voltage);
-            Out() << "voltage: " << measured_voltage << endl;
+            is >> fMeasuredVoltage;
+            data.push_back(fMeasuredVoltage);
+            Out() << "voltage: " << fMeasuredVoltage << endl;
         }
         else if (fLineCounter >= 3)
         {
             // this should be a float containing the measured voltage
-            is >> measured_current;
-            data.push_back(measured_current);
-            Out() << "current: " << measured_current << endl;
+            is >> fMeasuredCurrent;
+            data.push_back(fMeasuredCurrent);
+            Out() << "current: " << fMeasuredCurrent << endl;
             fLineCounter = 0;
-            fSendRequest = true;
-        }
-        
-        if (measured_voltage > 1.0)
+        }
+       
+        // read the buffer empty ...
+        // FIXME: I surely misunderstand that damn fBuffer thing.
+        // I thought it should be emtpy by now...
+        string buffer;
+        while (getline(is,buffer, '\n'))
+        {
+            buffer = Tools::Trim(buffer);
+            if (buffer.empty()) continue;
+        }
+
+
+        if (fMeasuredVoltage > 1.0)
         {
             fState = State::kVoltage_On;
@@ -206 +217 @@
         fState = State::kConnected;
         Start_async_read_until();
-        PostStatusRequest();
+        RequestStatus();
         
         fLineCounter = 0;
@@ -216 +227 @@
     ConnectionAgilent(ba::io_service& ioservice, MessageImp &imp) : Connection(ioservice, imp()),
         fIsVerbose(true),
-        fCheckStatusTimer(ioservice),
-        fDump(true)
+        fDump(true),
+        fCheckStatusTimer(ioservice)
     {
         SetLogStream(&imp);
         fState = State::kDisconnected;
+        fMeasuredVoltage=-1;
+        fMeasuredCurrent=-1;
     }
 
@@ -335 +348 @@
         
         if ( fAgilent.IsConnected() )
-            return fWeather.GetState();
+            return fAgilent.GetState();
         else
             return State::kDisconnected;
@@ -381 +394 @@
     }
 
-    int Identify()
-    {
-        fAgilent.Identify();
-        return T::GetCurrentState();
-    }
 
 public:
@@ -437 +445 @@
             ("set output on or off"
              "|[state][boolean]: output setting (1;0 or 'on';'off')");
-
-        T::AddEvent("IDENTIFY", State::kConnected)
-            (bind(&StateMachineAgilent::Identify, this))
-            ("Request Agilent ID");
 
         fAgilent.StartConnect();