cec: split up CEC processing and the public interface. removed obsolete methods from...

[deb_libcec.git] / src / testclient / main.cpp

diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp
index 0edf5cd9bb8fbde6b8e538e04e24b44c4befd58f..90158edbec031ac5fb0ef0dc4fefe28d9b27e4eb 100644 (file)
--- a/src/testclient/main.cpp
+++ b/src/testclient/main.cpp
@@ -42,9 +42,9 @@
 using namespace CEC;
 using namespace std;
 
-#define CEC_TEST_CLIENT_VERSION 1
+#define CEC_TEST_CLIENT_VERSION 3
 
-void flush_log(ICECDevice *cecParser)
+void flush_log(ICECAdapter *cecParser)
 {
   cec_log_message message;
   while (cecParser && cecParser->GetNextLogMessage(&message))
@@ -67,11 +67,11 @@ void flush_log(ICECDevice *cecParser)
   }
 }
 
-void list_devices(ICECDevice *parser)
+void list_devices(ICECAdapter *parser)
 {
   cout << "Found devices: ";
-  vector<cec_device> devices;
-  int iDevicesFound = parser->FindDevices(devices);
+  vector<cec_adapter> devices;
+  int iDevicesFound = parser->FindAdapters(devices);
   if (iDevicesFound <= 0)
   {
 #ifdef __WINDOWS__
@@ -100,12 +100,33 @@ void show_help(const char* strExec)
       "parameters:" << endl <<
       "\t-h --help            Shows this help text" << endl <<
       "\t-l --list-devices    List all devices on this system" << endl <<
-      "\t[COM PORT]           The com port to connect to. If no COM port is given, the client tries to connect to the first device that is detected" << endl;
+      "\t[COM PORT]           The com port to connect to. If no COM port is given, the client tries to connect to the first device that is detected" << endl <<
+      endl <<
+      "Type 'h' or 'help' and press enter after starting the client to display all available commands" << endl;
+}
+
+void show_console_help(void)
+{
+  cout << endl <<
+  "================================================================================" << endl <<
+  "Available commands:" << endl <<
+  endl <<
+  "tx {bytes}                transfer bytes over the CEC line." << endl <<
+  "[tx 40 00 FF 11 22 33]    sends bytes 0x40 0x00 0xFF 0x11 0x22 0x33" << endl <<
+  endl <<
+  "la {logical_address}      change the logical address of the CEC adapter." << endl <<
+  "[la 4]                    logical address 4" << endl <<
+  endl <<
+  "[ping]                    send a ping command to the CEC adapter." << endl <<
+  "[bl]                      to let the adapter enter the bootloader, to upgrade the flash rom." << endl <<
+  "[h] or [help]             show this help." << endl <<
+  "[q] or [quit]             to quit the CEC test client and switch off all connected CEC devices." << endl <<
+  "================================================================================" << endl;
 }
 
 int main (int argc, char *argv[])
 {
-  ICECDevice *parser = LoadLibCec("CEC Tester");
+  ICECAdapter *parser = LoadLibCec("CEC Tester");
   if (!parser && parser->GetMinVersion() > CEC_TEST_CLIENT_VERSION)
   {
     cout << "Unable to create parser. Is libcec.dll present?" << endl;
@@ -126,8 +147,8 @@ int main (int argc, char *argv[])
   if (argc < 2)
   {
     cout << "no serial port given. trying autodetect: ";
-    vector<cec_device> devices;
-    int iDevicesFound = parser->FindDevices(devices);
+    vector<cec_adapter> devices;
+    int iDevicesFound = parser->FindAdapters(devices);
     if (iDevicesFound <= 0)
     {
       cout << "FAILED" << endl;
@@ -168,7 +189,7 @@ int main (int argc, char *argv[])
   cout << "cec device opened" << endl;
   usleep(CEC_SETTLE_DOWN_TIME);
 
-  parser->PowerOnDevices();
+  parser->PowerOnDevices(CECDEVICE_TV);
   flush_log(parser);
 
   parser->SetActiveView();
@@ -199,24 +220,26 @@ int main (int argc, char *argv[])
 
           parser->Transmit(bytes);
         }
-        else if (command == "am")
+        else if (command == "la")
         {
           string strvalue;
-          int    ackmask;
-          vector<uint8_t> bytes;
-          if (GetWord(input, strvalue) && HexStrToInt(strvalue, ackmask))
+          if (GetWord(input, strvalue))
           {
-            parser->SetAckMask((cec_logical_address) ackmask);
+            parser->SetLogicalAddress((cec_logical_address) atoi(strvalue.c_str()));
           }
         }
         else if (command == "ping")
         {
-          parser->Ping();
+          parser->PingAdapter();
         }
         else if (command == "bl")
         {
           parser->StartBootloader();
         }
+        else if (command == "h" || command == "help")
+        {
+          show_console_help();
+        }
         else if (command == "q" || command == "quit")
         {
           bContinue = false;
@@ -228,7 +251,8 @@ int main (int argc, char *argv[])
     CCondition::Sleep(50);
   }
 
-  parser->PowerOffDevices();
+  parser->StandbyDevices(CECDEVICE_BROADCAST);
+  parser->Close();
   flush_log(parser);
   UnloadLibCec(parser);
   return 0;