Changeset 18718

Timestamp:

01/06/17 16:03:47 (8 years ago)

Author:

(none)

Message:

1st functional version

File:

• branches/FACT++_lidctrl_usb/src/lidctrl.cc (modified) (8 diffs)

branches/FACT++_lidctrl_usb/src/lidctrl.cc

@@ -1 +1 @@
 #include <functional>
-
 #include <boost/bind.hpp>
+#include <cstdlib>
 
 #include "Dim.h"
@@ -30 +30 @@
 class ConnectionLid : public ConnectionUSB
 {
-    vector<uint8_t> fRecievedBytes;
-    DimDescribedService fDimLid;
+    vector<char> fRecievedBytes;
+
+    State::states_t state;
 private:
 
@@ -37 +38 @@
     void HandleReceivedData(const boost::system::error_code&, size_t bytes_received, int type, int counter)
     {
-        Out() << fRecievedBytes;
-        AsyncRead(ba::buffer(fRecievedBytes, 100), 0, 0);
-
+        string search_string("system_state=");
+        string s(fRecievedBytes.begin(), fRecievedBytes.end());
+        Out() << s << endl << endl;
+        int pos=s.find(search_string);
+        string part = s.substr(pos + search_string.size(), 1);
+        int state_number = atoi(part.c_str());        
+        Out() << "system state = " << state_number << endl;
+        if (state_number == 0)
+        {
+            state = State::kClosed;
+        }
+        if (state_number == 4)
+        {
+            state = State::kOpen;
+        }
+        AsyncRead(ba::buffer(fRecievedBytes, 1024), 0, 0);
     }
 
@@ -46 +60 @@
     void ConnectionEstablished()
     {
-        AsyncRead(ba::buffer(fRecievedBytes, 100), 0, 0);
+        AsyncRead(ba::buffer(fRecievedBytes, 1024), 0, 0);
     }
 
@@ -54 +68 @@
         ConnectionUSB(ioservice, imp()),
         fRecievedBytes(1024),
-        fDimLid("LID_CTRL_USB/STUFF", "S:1","|Stuff[foo]:some text.")
+        state(State::kOpen)
     {
         SetLogStream(&imp);
@@ -61 +75 @@
     State::states_t GetStatus()
     {
-        return State::kOpen;
+        return state;
     }
 };
@@ -95 +109 @@
     S fLid;
 
-    int Disconnect()
-    {
-        fLid.PostClose(-1);
+    int Execute()
+    {
+        return fLid.GetStatus();
+    }
+
+
+    int Open()
+    {
+        std::array<char, 1> cmd = {{'o'}};
+        fLid.PostMessage(cmd);
         return T::GetCurrentState();
     }
-
-    int Reconnect(const EventImp &evt)
-    {
-        fLid.PostClose(-1);
-        ba::io_service::poll();
-        fLid.PostClose(0);
+    
+    int Close()
+    {
+        std::array<char, 1> cmd = {{'c'}};
+        fLid.PostMessage(cmd);
         return T::GetCurrentState();
-    }
-
-    int Execute()
-    {
-        const int state = fLid.GetStatus();
-        return state;
     }
 
@@ -156 +170 @@
     control.add_options()
         ("no-dim,d",        po_bool(),  "Disable dim services")
-        ("dev",             var<string>(),       "Device address of USB port to lid-arduino")
+        ("dev",             var<string>("lid-arduino"),       "Device address of USB port to lid-arduino")
         ("quiet,q",         po_bool(true),       "Disable printing contents of all received messages (except dynamic data) in clear text.")
         ;