Changes in / [1:3]

Location:

/trunk/HarmonyHubControl

Files:

• README.txt (modified) (3 diffs)
• csocket.cpp (modified) (1 diff)
• HarmonyHubControl.cpp (modified) (10 diffs)

/trunk/HarmonyHubControl/README.txt

@@ -71 +71 @@
 The command line for HarmonyHubControl is as follows:
 
-    HarmonyHubControl.exe [email] [password] [harmony_ip] [command (optional)]\n");
+    HarmonyHubControl.exe [email] [password] [harmony_ip] [command (optional)] [primary_parameter (optional)] [secondary_parameter (optional)]\n");
     
 where the [email] and [password] parameters are the login credentials used to log 
@@ -86 +86 @@
     list_activities
     start_activity [ID]
+        issue_device_command [DEVICE_ID] [DEVICE_COMMAND]
     get_config
 
@@ -116 +117 @@
 --------------------
 
-Finish the "issue_command" interface to allow individual commands to be sent to devices.
 Re-organize the code into a library

/trunk/HarmonyHubControl/csocket.cpp

@@ -37 +37 @@
     }
      
-    m_socket = NULL;
+    m_socket = 0;
 }
 

/trunk/HarmonyHubControl/HarmonyHubControl.cpp

@@ -21 +21 @@
 #include <algorithm>
 #include <string>
+#include <iostream>
 #include <map>
 #include "csocket.h"
@@ -33 +34 @@
 #define CONNECTION_ID "12345678-1234-5678-1234-123456789012-1"
 
-#include <iostream>
+#ifdef WIN32
+#define sprintf sprintf_s
+#endif
+
 
 static const std::string base64_chars = 
@@ -340 +344 @@
 
 
-int submitCommand(csocket* commandcsocket, std::string& strAuthorizationToken, std::string strCommand, std::string strCommandParameter, std::string strCommandParameterTwo)
+int submitCommand(csocket* commandcsocket, std::string& strAuthorizationToken, std::string strCommand, std::string strCommandParameterPrimary, std::string strCommandParameterSecondary)
 {
     if(commandcsocket== NULL || strAuthorizationToken.length() == 0)
@@ -376 +380 @@
     {
         sendData.append("startactivity\">activityId=");
-        sendData.append(strCommandParameter.c_str());
+        sendData.append(strCommandParameterPrimary.c_str());
         sendData.append(":timestamp=0</oa></iq>");
     }
-    else if (lstrCommand == "issue_action")
+    else if (lstrCommand == "issue_device_command")
     {
         sendData.append("holdAction\">action={\"type\"::\"IRCommand\",\"deviceId\"::\"");
-        sendData.append(strCommandParameter.c_str());
+        sendData.append(strCommandParameterPrimary.c_str());
         sendData.append("\",\"command\"::\"");
-        sendData.append(strCommandParameterTwo.c_str());
+        sendData.append(strCommandParameterSecondary.c_str());
         sendData.append("\"}:status=press</oa></iq>");
     }
@@ -411 +415 @@
     }
 
-    if(strCommand != "issue_action")
+    if(strCommand != "issue_device_command")
     {
         while(bIsDataReadable)
@@ -451 +455 @@
         }
     }
-    else if (strCommand == "start_activity" || strCommand == "issue_action")
+    else if (strCommand == "start_activity" || strCommand == "issue_device_command")
     {
         resultString = "";
@@ -510 +514 @@
         printf("        get_current_activity_id\n");
         printf("        start_activity [ID]\n");
-        printf("        issue_action [deviceId] [command]\n");
+        printf("        issue_device_command [deviceId] [command]\n");
         printf("        list_devices\n");
         printf("        get_config\n");
@@ -521 +525 @@
     std::string strHarmonyIP = argv[3];
     std::string strCommand;
-    std::string strCommandParameter;
-    std::string strCommandParameterTwo;
+    std::string strCommandParameterPrimary;
+    std::string strCommandParameterSecondary;
     
     int harmonyPortNumber = HARMONY_COMMUNICATION_PORT;
@@ -533 +537 @@
     if(argc>=6)
     {
-        strCommandParameter = argv[5];
+        strCommandParameterPrimary = argv[5];
     }
 
     if(argc==7)
     {
-        strCommandParameterTwo = argv[6];
-    }
-
-    //QNetworkProxyFactory::setUseSystemConfiguration(true);
+        strCommandParameterSecondary = argv[6];
+    }
+
 
     printf("LOGITECH WEB SERVICE LOGIN     : ");
@@ -613 +616 @@
     }
 
-    if(submitCommand(&commandcsocket, strAuthorizationToken, lstrCommand, strCommandParameter, strCommandParameterTwo) == 1)
+    if(submitCommand(&commandcsocket, strAuthorizationToken, lstrCommand, strCommandParameterPrimary, strCommandParameterSecondary) == 1)
     {
         printf("FAILURE\n");