X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftestclient%2Fmain.cpp;h=f16bcbf0404eb8baaacec0cef18662af921530a5;hb=f8513317a5f4bb2d9d0843193c3c98eca19f8e8a;hp=9cb32bf167849d06a829aa5256a421a8ff31629b;hpb=8d84e2c0857878d0391aee40190919cf57d689e7;p=deb_libcec.git diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp index 9cb32bf..f16bcbf 100644 --- a/src/testclient/main.cpp +++ b/src/testclient/main.cpp @@ -44,12 +44,11 @@ using namespace CEC; using namespace std; -#define CEC_TEST_CLIENT_VERSION 8 +#define CEC_TEST_CLIENT_VERSION 1 #include int g_cecLogLevel = CEC_LOG_ALL; -int g_iLogicalAddress = CECDEVICE_PLAYBACKDEVICE1; ofstream g_logOutput; bool g_bShortLog = false; CStdString g_strPort; @@ -180,7 +179,7 @@ void show_help(const char* strExec) "parameters:" << endl << " -h --help Shows this help text" << endl << " -l --list-devices List all devices on this system" << endl << - " -la --logical-address {a} The logical address to use." << endl << + " -t --type {p|r|t|a} The device type to use. More than one is possible." << endl << " -f --log-file {file} Writes all libCEC log message to a file" << endl << " -sf --short-log-file {file} Writes all libCEC log message without timestamps" << endl << " and log levels to a file." << endl << @@ -193,6 +192,26 @@ void show_help(const char* strExec) "available commands" << endl; } +ICECAdapter *create_parser(cec_device_type_list typeList) +{ + ICECAdapter *parser = LibCecInit("CECTester", typeList); + if (!parser || parser->GetMinLibVersion() > CEC_TEST_CLIENT_VERSION) + { + #ifdef __WINDOWS__ + cout << "Cannot load libcec.dll" << endl; + #else + cout << "Cannot load libcec.so" << endl; + #endif + return NULL; + } + + CStdString strLog; + strLog.Format("CEC Parser created - libcec version %d.%d", parser->GetLibVersionMajor(), parser->GetLibVersionMinor()); + cout << strLog.c_str() << endl; + + return parser; +} + void show_console_help(void) { cout << endl << @@ -200,7 +219,7 @@ void show_console_help(void) "Available commands:" << endl << endl << "tx {bytes} transfer bytes over the CEC line." << endl << - "txn {bytes} transfer bytes and don't wait for an ACK reply." << endl << + "txn {bytes} transfer bytes but don't wait for transmission ACK." << endl << "[tx 40 00 FF 11 22 33] sends bytes 0x40 0x00 0xFF 0x11 0x22 0x33" << endl << endl << "on {address} power on the device with the given logical address." << endl << @@ -218,6 +237,21 @@ void show_console_help(void) "osd {addr} {string} set OSD message on the specified device." << endl << "[osd 0 Test Message] displays 'Test Message' on the TV" << endl << endl << + "ver {addr} get the CEC version of the specified device." << endl << + "[ver 0] get the CEC version of the TV" << endl << + endl << + "ven {addr} get the vendor ID of the specified device." << endl << + "[ven 0] get the vendor ID of the TV" << endl << + endl << + "lang {addr} get the menu language of the specified device." << endl << + "[lang 0] get the menu language of the TV" << endl << + endl << + "pow {addr} get the power status of the specified device." << endl << + "[pow 0] get the power status of the TV" << endl << + endl << + "poll {addr} poll the specified device." << endl << + "[poll 0] sends a poll message to the TV" << endl << + endl << "[mon] {1|0} enable or disable CEC bus monitoring." << endl << "[log] {1 - 31} change the log level. see cectypes.h for values." << endl << "[ping] send a ping command to the CEC adapter." << endl << @@ -232,26 +266,8 @@ void show_console_help(void) int main (int argc, char *argv[]) { - ICECAdapter *parser = LoadLibCec("CECTester"); - if (!parser || parser->GetMinVersion() > CEC_TEST_CLIENT_VERSION) - { -#ifdef __WINDOWS__ - cout << "Cannot load libcec.dll" << endl; -#else - cout << "Cannot load libcec.so" << endl; -#endif - return 1; - } - CStdString strLog; - strLog.Format("CEC Parser created - libcec version %d", parser->GetLibVersion()); - cout << strLog.c_str() << endl; - - //make stdin non-blocking -#ifndef __WINDOWS__ - int flags = fcntl(0, F_GETFL, 0); - flags |= O_NONBLOCK; - fcntl(0, F_SETFL, flags); -#endif + cec_device_type_list typeList; + typeList.clear(); int iArgPtr = 1; while (iArgPtr < argc) @@ -298,41 +314,54 @@ int main (int argc, char *argv[]) ++iArgPtr; } } - else if (!strcmp(argv[iArgPtr], "-la") || - !strcmp(argv[iArgPtr], "--logical-address")) + else if (!strcmp(argv[iArgPtr], "-t") || + !strcmp(argv[iArgPtr], "--type")) { if (argc >= iArgPtr + 2) { - int iNewAddress = atoi(argv[iArgPtr + 1]); - if (iNewAddress >= 0 && iNewAddress <= 15) + if (!strcmp(argv[iArgPtr + 1], "p")) + { + cout << "== using device type 'playback device'" << endl; + typeList.add(CEC_DEVICE_TYPE_PLAYBACK_DEVICE); + } + else if (!strcmp(argv[iArgPtr + 1], "r")) + { + cout << "== using device type 'recording device'" << endl; + typeList.add(CEC_DEVICE_TYPE_RECORDING_DEVICE); + } + else if (!strcmp(argv[iArgPtr + 1], "t")) { - g_iLogicalAddress = iNewAddress; - cout << "logical address set to " << argv[iArgPtr + 1] << endl; + cout << "== using device type 'tuner'" << endl; + typeList.add(CEC_DEVICE_TYPE_TUNER); + } + else if (!strcmp(argv[iArgPtr + 1], "a")) + { + cout << "== using device type 'audio system'" << endl; + typeList.add(CEC_DEVICE_TYPE_AUDIO_SYSTEM); } else { - cout << "== skipped logical-address parameter: invalid address '" << argv[iArgPtr + 1] << "' ==" << endl; + cout << "== skipped invalid device type '" << argv[iArgPtr + 1] << "'" << endl; } - iArgPtr += 2; - } - else - { - cout << "== skipped logical-address parameter: no address given ==" << endl; ++iArgPtr; } + ++iArgPtr; } else if (!strcmp(argv[iArgPtr], "--list-devices") || !strcmp(argv[iArgPtr], "-l")) { - list_devices(parser); - UnloadLibCec(parser); + ICECAdapter *parser = create_parser(typeList); + if (parser) + { + list_devices(parser); + UnloadLibCec(parser); + } return 0; } else if (!strcmp(argv[iArgPtr], "--help") || !strcmp(argv[iArgPtr], "-h")) { show_help(argv[0]); - UnloadLibCec(parser); return 0; } else @@ -342,6 +371,33 @@ int main (int argc, char *argv[]) } } + if (typeList.empty()) + { + cout << "No device type given. Using 'playback device'" << endl; + typeList.add(CEC_DEVICE_TYPE_PLAYBACK_DEVICE); + } + + ICECAdapter *parser = LibCecInit("CECTester", typeList); + if (!parser || parser->GetMinLibVersion() > CEC_TEST_CLIENT_VERSION) + { +#ifdef __WINDOWS__ + cout << "Cannot load libcec.dll" << endl; +#else + cout << "Cannot load libcec.so" << endl; +#endif + return 1; + } + CStdString strLog; + strLog.Format("CEC Parser created - libcec version %d.%d", parser->GetLibVersionMajor(), parser->GetLibVersionMinor()); + cout << strLog.c_str() << endl; + + //make stdin non-blocking +#ifndef __WINDOWS__ + int flags = fcntl(0, F_GETFL, 0); + flags |= O_NONBLOCK; + fcntl(0, F_SETFL, flags); +#endif + if (g_strPort.IsEmpty()) { cout << "no serial port given. trying autodetect: "; @@ -361,8 +417,6 @@ int main (int argc, char *argv[]) } } - parser->SetLogicalAddress((cec_logical_address) g_iLogicalAddress); - if (!parser->Open(g_strPort.c_str())) { cout << "unable to open the device on port " << g_strPort << endl; @@ -385,6 +439,10 @@ int main (int argc, char *argv[]) { flush_log(parser); + /* just ignore the command buffer and clear it */ + cec_command dummy; + while (parser && parser->GetNextCommand(&dummy)) {} + string input; getline(cin, input); cin.clear(); @@ -405,7 +463,7 @@ int main (int argc, char *argv[]) bytes.push_back(ivalue); if (command == "txn") - bytes.ack_timeout = 0; + bytes.transmit_timeout = 0; parser->Transmit(bytes); } @@ -435,6 +493,22 @@ int main (int argc, char *argv[]) cout << "invalid destination" << endl; } } + else if (command == "poll") + { + string strValue; + uint8_t iValue = 0; + if (GetWord(input, strValue) && HexStrToInt(strValue, iValue) && iValue <= 0xF) + { + if (parser->PollDevice((cec_logical_address) iValue)) + cout << "POLL message sent" << endl; + else + cout << "POLL message not sent" << endl; + } + else + { + cout << "invalid destination" << endl; + } + } else if (command == "la") { string strvalue; @@ -489,6 +563,99 @@ int main (int argc, char *argv[]) { parser->StartBootloader(); } + else if (command == "lang") + { + CStdString strDev; + if (GetWord(input, strDev)) + { + int iDev = atoi(strDev); + if (iDev >= 0 && iDev < 15) + { + CStdString strLog; + cec_menu_language language; + if (parser->GetDeviceMenuLanguage((cec_logical_address) iDev, &language)) + strLog.Format("menu language '%s'", language.language); + else + strLog = "failed!"; + cout << strLog.c_str() << endl; + } + } + } + else if (command == "ven") + { + CStdString strDev; + if (GetWord(input, strDev)) + { + int iDev = atoi(strDev); + if (iDev >= 0 && iDev < 15) + { + uint64_t iVendor = parser->GetDeviceVendorId((cec_logical_address) iDev); + CStdString strLog; + strLog.Format("vendor id: %06x", iVendor); + cout << strLog.c_str() << endl; + } + } + } + else if (command == "ver") + { + CStdString strDev; + if (GetWord(input, strDev)) + { + int iDev = atoi(strDev); + if (iDev >= 0 && iDev < 15) + { + cec_version iVersion = parser->GetDeviceCecVersion((cec_logical_address) iDev); + switch (iVersion) + { + case CEC_VERSION_1_2: + cout << "CEC version 1.2" << endl; + break; + case CEC_VERSION_1_2A: + cout << "CEC version 1.2a" << endl; + break; + case CEC_VERSION_1_3: + cout << "CEC version 1.3" << endl; + break; + case CEC_VERSION_1_3A: + cout << "CEC version 1.3a" << endl; + break; + default: + cout << "unknown CEC version" << endl; + break; + } + } + } + } + else if (command == "pow") + { + CStdString strDev; + if (GetWord(input, strDev)) + { + int iDev = atoi(strDev); + if (iDev >= 0 && iDev < 15) + { + cec_power_status iPower = parser->GetDevicePowerStatus((cec_logical_address) iDev); + switch (iPower) + { + case CEC_POWER_STATUS_ON: + cout << "powered on" << endl; + break; + case CEC_POWER_STATUS_IN_TRANSITION_ON_TO_STANDBY: + cout << "on -> standby" << endl; + break; + case CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON: + cout << "standby -> on" << endl; + break; + case CEC_POWER_STATUS_STANDBY: + cout << "standby" << endl; + break; + default: + cout << "unknown power status" << endl; + break; + } + } + } + } else if (command == "r") { cout << "closing the connection" << endl;