X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftestclient%2Fmain.cpp;h=b06ef1dffc886f9194eef2fe3047e2aa4aa35b46;hb=45de9d9fb1cdefce6ecb53f372a9947480046bba;hp=be3018c68646a66bfa58361984e1d3f1c0d342f9;hpb=e6d2161b7bc5fdfedccee261eb3a4e657d02fbda;p=deb_libcec.git diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp index be3018c..b06ef1d 100644 --- a/src/testclient/main.cpp +++ b/src/testclient/main.cpp @@ -44,11 +44,14 @@ 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; -ofstream g_logOutput; + +int g_cecLogLevel = CEC_LOG_ALL; +ofstream g_logOutput; +bool g_bShortLog = false; +CStdString g_strPort; inline bool HexStrToInt(const std::string& data, uint8_t& value) { @@ -102,7 +105,7 @@ bool GetWord(string& data, string& word) return true; } -void flush_log(ICECAdapter *cecParser) +void FlushLog(ICECAdapter *cecParser) { cec_log_message message; while (cecParser && cecParser->GetNextLogMessage(&message)) @@ -131,17 +134,22 @@ void flush_log(ICECAdapter *cecParser) break; } - CStdString strMessageTmp; - strMessageTmp.Format("[%16lld]\t%s", message.time, message.message); - cout << strLevel.c_str() << strMessageTmp.c_str() << endl; + CStdString strFullLog; + strFullLog.Format("%s[%16lld]\t%s", strLevel.c_str(), message.time, message.message); + cout << strFullLog.c_str() << endl; if (g_logOutput.is_open()) - g_logOutput << strLevel.c_str() << strMessageTmp.c_str() << endl; + { + if (g_bShortLog) + g_logOutput << message.message << endl; + else + g_logOutput << strFullLog.c_str() << endl; + } } } } -void list_devices(ICECAdapter *parser) +void ListDevices(ICECAdapter *parser) { cec_adapter *devices = new cec_adapter[10]; uint8_t iDevicesFound = parser->FindAdapters(devices, 10, NULL); @@ -163,28 +171,58 @@ void list_devices(ICECAdapter *parser) } } -void show_help(const char* strExec) +void ShowHelpCommandLine(const char* strExec) { cout << endl << strExec << " {-h|--help|-l|--list-devices|[COM PORT]}" << endl << endl << "parameters:" << endl << - "\t-h --help Shows this help text" << endl << - "\t-l --list-devices List all devices on this system" << endl << - "\t-f --log-file {file} Writes all libCEC log message to a file" << 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 << + " -h --help Shows this help text" << endl << + " -l --list-devices List all devices on this system" << endl << + " -t --type {p|r|t|a} The device type to use. More than one is possible." << endl << + " -p --physical {hex-address} The physical address to use for the primary logical device." << 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 << + " -s --single-command Execute a single command and exit. Does not power" << endl << + " on devices on startup and power them off on exit." << 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 << endl << - "Type 'h' or 'help' and press enter after starting the client to display all available commands" << endl; + "Type 'h' or 'help' and press enter after starting the client to display all " << endl << + "available commands" << endl; } -void show_console_help(void) +ICECAdapter *CreateParser(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 ShowHelpConsole(void) { cout << endl << "================================================================================" << endl << "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 << @@ -202,6 +240,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 << @@ -216,8 +269,146 @@ void show_console_help(void) int main (int argc, char *argv[]) { - ICECAdapter *parser = LoadLibCec("CECTester"); - if (!parser || parser->GetMinVersion() > CEC_TEST_CLIENT_VERSION) + int iPhysicalAddress = -1; + cec_device_type_list typeList; + typeList.Clear(); + + int iArgPtr = 1; + bool bSingleCommand(false); + while (iArgPtr < argc) + { + if (argc >= iArgPtr + 1) + { + if (!strcmp(argv[iArgPtr], "-f") || + !strcmp(argv[iArgPtr], "--log-file") || + !strcmp(argv[iArgPtr], "-sf") || + !strcmp(argv[iArgPtr], "--short-log-file")) + { + if (argc >= iArgPtr + 2) + { + g_logOutput.open(argv[iArgPtr + 1]); + g_bShortLog = (!strcmp(argv[iArgPtr], "-sf") || !strcmp(argv[iArgPtr], "--short-log-file")); + iArgPtr += 2; + } + 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; + if (!bSingleCommand) + 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], "-t") || + !strcmp(argv[iArgPtr], "--type")) + { + if (argc >= iArgPtr + 2) + { + if (!strcmp(argv[iArgPtr + 1], "p")) + { + if (!bSingleCommand) + cout << "== using device type 'playback device'" << endl; + typeList.Add(CEC_DEVICE_TYPE_PLAYBACK_DEVICE); + } + else if (!strcmp(argv[iArgPtr + 1], "r")) + { + if (!bSingleCommand) + cout << "== using device type 'recording device'" << endl; + typeList.Add(CEC_DEVICE_TYPE_RECORDING_DEVICE); + } + else if (!strcmp(argv[iArgPtr + 1], "t")) + { + if (!bSingleCommand) + cout << "== using device type 'tuner'" << endl; + typeList.Add(CEC_DEVICE_TYPE_TUNER); + } + else if (!strcmp(argv[iArgPtr + 1], "a")) + { + if (!bSingleCommand) + cout << "== using device type 'audio system'" << endl; + typeList.Add(CEC_DEVICE_TYPE_AUDIO_SYSTEM); + } + else + { + cout << "== skipped invalid device type '" << argv[iArgPtr + 1] << "'" << endl; + } + ++iArgPtr; + } + ++iArgPtr; + } + else if (!strcmp(argv[iArgPtr], "--list-devices") || + !strcmp(argv[iArgPtr], "-l")) + { + ICECAdapter *parser = CreateParser(typeList); + if (parser) + { + ListDevices(parser); + UnloadLibCec(parser); + } + return 0; + } + else if (!strcmp(argv[iArgPtr], "--single-command") || + !strcmp(argv[iArgPtr], "-s")) + { + bSingleCommand = true; + ++iArgPtr; + } + else if (!strcmp(argv[iArgPtr], "--help") || + !strcmp(argv[iArgPtr], "-h")) + { + ShowHelpCommandLine(argv[0]); + return 0; + } + else if (!strcmp(argv[iArgPtr], "-p") || + !strcmp(argv[iArgPtr], "--physical")) + { + if (argc >= iArgPtr + 2) + { + if (sscanf(argv[iArgPtr + 1], "%x", &iPhysicalAddress)) + cout << "using physical address '" << std::hex << iPhysicalAddress << "'" << endl; + else + cout << "== skipped physical address parameter: invalid physical address '" << argv[iArgPtr + 1] << "' ==" << endl; + ++iArgPtr; + } + ++iArgPtr; + } + else + { + g_strPort = argv[iArgPtr++]; + } + } + } + + if (typeList.IsEmpty()) + { + if (!bSingleCommand) + 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; @@ -226,89 +417,84 @@ int main (int argc, char *argv[]) #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 - string strPort; - int iArgPtr = 0; - if (argc >= 3) + if (!bSingleCommand) { - if (!strcmp(argv[1], "-f")) - { - g_logOutput.open(argv[2]); - iArgPtr = 2; - } - else if (!strcmp(argv[1], "--file")) - { - g_logOutput.open(argv[2]); - iArgPtr = 2; - } + 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 (argc < 2 + iArgPtr) + if (g_strPort.IsEmpty()) { - cout << "no serial port given. trying autodetect: "; + if (!bSingleCommand) + cout << "no serial port given. trying autodetect: "; cec_adapter devices[10]; uint8_t iDevicesFound = parser->FindAdapters(devices, 10, NULL); if (iDevicesFound <= 0) { + if (bSingleCommand) + cout << "autodetect "; cout << "FAILED" << endl; UnloadLibCec(parser); return 1; } else { - cout << endl << " path: " << devices[0].path << endl << - " com port: " << devices[0].comm << endl << endl; - strPort = devices[0].comm; + if (!bSingleCommand) + { + cout << endl << " path: " << devices[0].path << endl << + " com port: " << devices[0].comm << endl << endl; + } + g_strPort = devices[0].comm; } } - else if (!strcmp(argv[1 + iArgPtr], "--list-devices") || !strcmp(argv[1 + iArgPtr], "-l")) - { - list_devices(parser); - UnloadLibCec(parser); - return 0; - } - else if (!strcmp(argv[1 + iArgPtr], "--help") || !strcmp(argv[1 + iArgPtr], "-h")) - { - show_help(argv[0]); - return 0; - } - else - { - strPort = argv[1 + iArgPtr]; - } - - if (!parser->Open(strPort.c_str())) + if (!parser->Open(g_strPort.c_str())) { - cout << "unable to open the device on port " << strPort << endl; - flush_log(parser); + cout << "unable to open the device on port " << g_strPort << endl; + FlushLog(parser); UnloadLibCec(parser); return 1; } - cout << "cec device opened" << endl; + if (!bSingleCommand) + { + cout << "cec device opened" << endl; + + if (-1 != iPhysicalAddress) + { + parser->SetPhysicalAddress(iPhysicalAddress); + FlushLog(parser); + } + + parser->PowerOnDevices(CECDEVICE_TV); + FlushLog(parser); - parser->PowerOnDevices(CECDEVICE_TV); - flush_log(parser); + parser->SetActiveSource(); + FlushLog(parser); - parser->SetActiveView(); - flush_log(parser); + cout << "waiting for input" << endl; + } bool bContinue(true); - cout << "waiting for input" << endl; while (bContinue) { - flush_log(parser); + if (bSingleCommand) + bContinue = false; + + FlushLog(parser); + + /* just ignore the command buffer and clear it */ + cec_command dummy; + while (parser && parser->GetNextCommand(&dummy)) {} string input; getline(cin, input); @@ -324,12 +510,15 @@ int main (int argc, char *argv[]) string strvalue; uint8_t ivalue; cec_command bytes; - bytes.clear(); + bytes.Clear(); while (GetWord(input, strvalue) && HexStrToInt(strvalue, ivalue)) - bytes.push_back(ivalue); + bytes.PushBack(ivalue); - parser->Transmit(bytes, command == "tx"); + if (command == "txn") + bytes.transmit_timeout = 0; + + parser->Transmit(bytes); } else if (command == "on") { @@ -357,6 +546,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; @@ -411,22 +616,115 @@ 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; parser->Close(); - flush_log(parser); + FlushLog(parser); cout << "opening a new connection" << endl; - parser->Open(strPort.c_str()); - flush_log(parser); + parser->Open(g_strPort.c_str()); + FlushLog(parser); - cout << "setting active view" << endl; - parser->SetActiveView(); + cout << "setting active source" << endl; + parser->SetActiveSource(); } else if (command == "h" || command == "help") { - show_console_help(); + ShowHelpConsole(); } else if (command == "q" || command == "quit") { @@ -449,12 +747,16 @@ int main (int argc, char *argv[]) if (bContinue) cout << "waiting for input" << endl; } - CCondition::Sleep(50); + + if (bContinue) + CCondition::Sleep(50); } - parser->StandbyDevices(CECDEVICE_BROADCAST); + if (!bSingleCommand) + parser->StandbyDevices(CECDEVICE_BROADCAST); + parser->Close(); - flush_log(parser); + FlushLog(parser); UnloadLibCec(parser); if (g_logOutput.is_open())