Changeset 14523

Timestamp:

10/24/12 21:56:06 (12 years ago)

Author:

tbretz

Message:

Added command discriptions - otherwise they are not displayed; the interlock arduino needs a GET-request, not a POST-request; the transmitted data needs to be URL-encoded.

File:

• trunk/FACT++/src/pwrctrl.cc (modified) (5 diffs)

trunk/FACT++/src/pwrctrl.cc

@@ -160 +160 @@
     boost::asio::deadline_timer fKeepAlive;
 
-    void PostRequest(string cmd, const string &args="")
-    {
-        cmd += " "+fSite+" HTTP/1.1\r\n"
-            //"Connection: Keep-Alive\r\n"
-            ;
-
-        ostringstream msg;
-        msg << args.length();
-
-        cmd += "Content-Length: ";
-        cmd += msg.str();
-        cmd += "\r\n";
-
-        if (args.length()>0)
-            cmd += "\r\n" + args + "\r\n";
-
-        cmd += "\r\n";
-
-        //cout << "Post: " << cmd << endl;
-        PostMessage(cmd);
-    }
-
     void HandleRequest(const bs::error_code &error)
     {
@@ -260 +238 @@
     void Request()
     {
-        PostRequest("POST", fNextCommand);
+        string cmd = "GET " + fSite;
+
+        if (!fNextCommand.empty())
+            cmd += "?" + fNextCommand;
+
+        cmd += " HTTP/1.1\r\n";
+        cmd += "\r\n";
+
+        PostMessage(cmd);
+
         fNextCommand = "";
 
@@ -393 +380 @@
 
         fLastCommand = Time();
-        fPower.Post(evt.GetBool() ? "cam_on=" : "cam_off=");
+        fPower.Post(evt.GetBool() ? "cam_on=Camera+ON" : "cam_off=Camera+OFF");
         return T::GetCurrentState();
     }
@@ -400 +387 @@
     {
         fLastCommand = Time();
-        fPower.Post("dt=");
+        fPower.Post("dt=Drive+ON%2FOFF");
         return T::GetCurrentState();
 
@@ -463 +450 @@
 
         // Verbosity commands
-        T::AddEvent("SET_VERBOSE", "B")
+        T::AddEvent("SET_VERBOSE", "B:1")
             (bind(&StateMachinePowerControl::SetVerbosity, this, placeholders::_1))
-            ("set verbosity state"
+            ("Set verbosity state"
              "|verbosity[bool]:disable or enable verbosity for interpreted data (yes/no)");
 
-        T::AddEvent("SET_DEBUG_RX", "B")
+        T::AddEvent("SET_DEBUG_RX", "B:1")
             (bind(&StateMachinePowerControl::SetDebugRx, this, placeholders::_1))
-            ("set debux-rx state"
+            ("Set debux-rx state"
              "|debug[bool]:dump received text and parsed text to console (yes/no)");
 
-        T::AddEvent("CAMERA_POWER", "B")
-            (bind(&StateMachinePowerControl::SetCameraPower, this, placeholders::_1));
+        T::AddEvent("CAMERA_POWER", "B:1")
+            (bind(&StateMachinePowerControl::SetCameraPower, this, placeholders::_1))
+            ("Switch camera power"
+             "|power[bool]:Switch camera power 'on' or 'off'");
 
         T::AddEvent("TOGGLE_DRIVE")
-            (bind(&StateMachinePowerControl::ToggleDrive, this));
+            (bind(&StateMachinePowerControl::ToggleDrive, this))
+            ("Toggle drive power");
 
         T::AddEvent("POST", "C")