X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=inline;f=src%2Ftestclient%2Fmain.cpp;h=8efffedc4165c47fa01c7d57a747a76cdad765ad;hb=e6e63f5d844124caa7bb47f2ac96e9cbc66ee1fc;hp=dcbd0c00584c3ba096b69d65e5948859e5a29f02;hpb=3d0dca16aebce0c4bd125a05acf28d340138d874;p=deb_libcec.git diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp index dcbd0c0..8efffed 100644 --- a/src/testclient/main.cpp +++ b/src/testclient/main.cpp @@ -44,11 +44,12 @@ 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; @@ -179,9 +180,11 @@ 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 << " -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 << + " -d --log-level {level} Sets the log level. See cectypes.h for values." << endl << " [COM PORT] The com port to connect to. If no COM" << endl << " port is given, the client tries to connect to the" << endl << " first device that is detected." << endl << @@ -197,7 +200,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 << @@ -215,6 +218,18 @@ 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 << "[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 << @@ -230,7 +245,7 @@ void show_console_help(void) int main (int argc, char *argv[]) { ICECAdapter *parser = LoadLibCec("CECTester"); - if (!parser || parser->GetMinVersion() > CEC_TEST_CLIENT_VERSION) + if (!parser || parser->GetMinLibVersion() > CEC_TEST_CLIENT_VERSION) { #ifdef __WINDOWS__ cout << "Cannot load libcec.dll" << endl; @@ -240,7 +255,7 @@ int main (int argc, char *argv[]) return 1; } CStdString strLog; - strLog.Format("CEC Parser created - libcec version %d", parser->GetLibVersion()); + strLog.Format("CEC Parser created - libcec version %d.%d", parser->GetLibVersionMajor(), parser->GetLibVersionMinor()); cout << strLog.c_str() << endl; //make stdin non-blocking @@ -268,6 +283,53 @@ int main (int argc, char *argv[]) } else { + cout << "== skipped log-file parameter: no file given ==" << endl; + ++iArgPtr; + } + } + else if (!strcmp(argv[iArgPtr], "-d") || + !strcmp(argv[iArgPtr], "--log-level")) + { + if (argc >= iArgPtr + 2) + { + int iNewLevel = atoi(argv[iArgPtr + 1]); + if (iNewLevel >= CEC_LOG_ERROR && iNewLevel <= CEC_LOG_ALL) + { + g_cecLogLevel = iNewLevel; + cout << "log level set to " << argv[iArgPtr + 1] << endl; + } + else + { + cout << "== skipped log-level parameter: invalid level '" << argv[iArgPtr + 1] << "' ==" << endl; + } + iArgPtr += 2; + } + else + { + cout << "== skipped log-level parameter: no level given ==" << endl; + ++iArgPtr; + } + } + else if (!strcmp(argv[iArgPtr], "-la") || + !strcmp(argv[iArgPtr], "--logical-address")) + { + if (argc >= iArgPtr + 2) + { + int iNewAddress = atoi(argv[iArgPtr + 1]); + if (iNewAddress >= 0 && iNewAddress <= 15) + { + g_iLogicalAddress = iNewAddress; + cout << "logical address set to " << argv[iArgPtr + 1] << endl; + } + else + { + cout << "== skipped logical-address parameter: invalid address '" << argv[iArgPtr + 1] << "' ==" << endl; + } + iArgPtr += 2; + } + else + { + cout << "== skipped logical-address parameter: no address given ==" << endl; ++iArgPtr; } } @@ -311,6 +373,8 @@ 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; @@ -333,6 +397,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(); @@ -352,7 +420,10 @@ int main (int argc, char *argv[]) while (GetWord(input, strvalue) && HexStrToInt(strvalue, ivalue)) bytes.push_back(ivalue); - parser->Transmit(bytes, command == "tx"); + if (command == "txn") + bytes.transmit_timeout = 0; + + parser->Transmit(bytes); } else if (command == "on") { @@ -434,6 +505,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;