X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftestclient%2Fmain.cpp;h=be3018c68646a66bfa58361984e1d3f1c0d342f9;hb=e6d2161b7bc5fdfedccee261eb3a4e657d02fbda;hp=c239d3b1d802312d9369bb79118e742ac4e94951;hpb=d54c6c91b8ee2eecf8db22080cfc3662e96bbfc0;p=deb_libcec.git diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp index c239d3b..be3018c 100644 --- a/src/testclient/main.cpp +++ b/src/testclient/main.cpp @@ -30,20 +30,25 @@ * http://www.pulse-eight.net/ */ -#include "../../include/CECExports.h" -#include "../lib/platform/threads.h" -#include "../lib/util/StdString.h" +#include + #include #include #include +#include #include #include +#include "../lib/platform/threads.h" +#include "../lib/util/StdString.h" using namespace CEC; using namespace std; -#define CEC_TEST_CLIENT_VERSION 5 +#define CEC_TEST_CLIENT_VERSION 8 +#include +int g_cecLogLevel = CEC_LOG_ALL; +ofstream g_logOutput; inline bool HexStrToInt(const std::string& data, uint8_t& value) { @@ -102,20 +107,36 @@ void flush_log(ICECAdapter *cecParser) cec_log_message message; while (cecParser && cecParser->GetNextLogMessage(&message)) { - switch (message.level) + if ((message.level & g_cecLogLevel) == message.level) { - case CEC_LOG_ERROR: - cout << "ERROR: " << message.message << endl; - break; - case CEC_LOG_WARNING: - cout << "WARNING: " << message.message << endl; - break; - case CEC_LOG_NOTICE: - cout << "NOTICE: " << message.message << endl; - break; - case CEC_LOG_DEBUG: - cout << "DEBUG: " << message.message << endl; - break; + CStdString strLevel; + switch (message.level) + { + case CEC_LOG_ERROR: + strLevel = "ERROR: "; + break; + case CEC_LOG_WARNING: + strLevel = "WARNING: "; + break; + case CEC_LOG_NOTICE: + strLevel = "NOTICE: "; + break; + case CEC_LOG_TRAFFIC: + strLevel = "TRAFFIC: "; + break; + case CEC_LOG_DEBUG: + strLevel = "DEBUG: "; + break; + default: + break; + } + + CStdString strMessageTmp; + strMessageTmp.Format("[%16lld]\t%s", message.time, message.message); + cout << strLevel.c_str() << strMessageTmp.c_str() << endl; + + if (g_logOutput.is_open()) + g_logOutput << strLevel.c_str() << strMessageTmp.c_str() << endl; } } } @@ -150,6 +171,7 @@ 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-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 << endl << "Type 'h' or 'help' and press enter after starting the client to display all available commands" << endl; @@ -162,24 +184,46 @@ 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 << "[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 << + "[on 5] power on a connected audio system" << endl << + endl << + "standby {address} put the device with the given address in standby mode." << endl << + "[standby 0] powers off the TV" << endl << + endl << "la {logical_address} change the logical address of the CEC adapter." << endl << "[la 4] logical address 4" << endl << endl << + "pa {physical_address} change the physical address of the CEC adapter." << endl << + "[pa 10 00] physical address 1.0.0.0" << endl << + endl << + "osd {addr} {string} set OSD message on the specified device." << endl << + "[osd 0 Test Message] displays 'Test Message' on 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 << - "[bl] to let the adapter enter the bootloader, to upgrade the flash rom." << endl << + "[bl] to let the adapter enter the bootloader, to upgrade" << endl << + " the flash rom." << endl << + "[r] reconnect to the CEC adapter." << 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 << + "[q] or [quit] to quit the CEC test client and switch off all" << endl << + " connected CEC devices." << endl << "================================================================================" << endl; } int main (int argc, char *argv[]) { ICECAdapter *parser = LoadLibCec("CECTester"); - if (!parser && parser->GetMinVersion() > CEC_TEST_CLIENT_VERSION) + if (!parser || parser->GetMinVersion() > CEC_TEST_CLIENT_VERSION) { - cout << "Unable to create parser. Is libcec.dll present?" << endl; +#ifdef __WINDOWS__ + cout << "Cannot load libcec.dll" << endl; +#else + cout << "Cannot load libcec.so" << endl; +#endif return 1; } CStdString strLog; @@ -194,7 +238,22 @@ int main (int argc, char *argv[]) #endif string strPort; - if (argc < 2) + int iArgPtr = 0; + if (argc >= 3) + { + 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; + } + } + + if (argc < 2 + iArgPtr) { cout << "no serial port given. trying autodetect: "; cec_adapter devices[10]; @@ -212,22 +271,23 @@ int main (int argc, char *argv[]) strPort = devices[0].comm; } } - else if (!strcmp(argv[1], "--list-devices") || !strcmp(argv[1], "-l")) + 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], "--help") || !strcmp(argv[1], "-h")) + else if (!strcmp(argv[1 + iArgPtr], "--help") || !strcmp(argv[1 + iArgPtr], "-h")) { show_help(argv[0]); return 0; } else { - strPort = argv[1]; + strPort = argv[1 + iArgPtr]; } + if (!parser->Open(strPort.c_str())) { cout << "unable to open the device on port " << strPort << endl; @@ -259,17 +319,43 @@ int main (int argc, char *argv[]) string command; if (GetWord(input, command)) { - if (command == "tx") + if (command == "tx" || command == "txn") { string strvalue; uint8_t ivalue; - cec_frame bytes; + cec_command bytes; bytes.clear(); while (GetWord(input, strvalue) && HexStrToInt(strvalue, ivalue)) - bytes.push_back(ivalue); + bytes.push_back(ivalue); - parser->Transmit(bytes); + parser->Transmit(bytes, command == "tx"); + } + else if (command == "on") + { + string strValue; + uint8_t iValue = 0; + if (GetWord(input, strValue) && HexStrToInt(strValue, iValue) && iValue <= 0xF) + { + parser->PowerOnDevices((cec_logical_address) iValue); + } + else + { + cout << "invalid destination" << endl; + } + } + else if (command == "standby") + { + string strValue; + uint8_t iValue = 0; + if (GetWord(input, strValue) && HexStrToInt(strValue, iValue) && iValue <= 0xF) + { + parser->StandbyDevices((cec_logical_address) iValue); + } + else + { + cout << "invalid destination" << endl; + } } else if (command == "la") { @@ -279,10 +365,48 @@ int main (int argc, char *argv[]) parser->SetLogicalAddress((cec_logical_address) atoi(strvalue.c_str())); } } + else if (command == "pa") + { + string strB1, strB2; + uint8_t iB1, iB2; + if (GetWord(input, strB1) && HexStrToInt(strB1, iB1) && + GetWord(input, strB2) && HexStrToInt(strB2, iB2)) + { + uint16_t iPhysicalAddress = ((uint16_t)iB1 << 8) + iB2; + parser->SetPhysicalAddress(iPhysicalAddress); + } + } + else if (command == "osd") + { + bool bFirstWord(false); + string strAddr, strMessage, strWord; + uint8_t iAddr; + if (GetWord(input, strAddr) && HexStrToInt(strAddr, iAddr) && iAddr < 0xF) + { + while (GetWord(input, strWord)) + { + if (bFirstWord) + { + bFirstWord = false; + strMessage.append(" "); + } + strMessage.append(strWord); + } + parser->SetOSDString((cec_logical_address) iAddr, CEC_DISPLAY_CONTROL_DISPLAY_FOR_DEFAULT_TIME, strMessage.c_str()); + } + } else if (command == "ping") { parser->PingAdapter(); } + else if (command == "mon") + { + CStdString strEnable; + if (GetWord(input, strEnable) && (strEnable.Equals("0") || strEnable.Equals("1"))) + { + parser->SwitchMonitoring(strEnable.Equals("1")); + } + } else if (command == "bl") { parser->StartBootloader(); @@ -308,6 +432,19 @@ int main (int argc, char *argv[]) { bContinue = false; } + else if (command == "log") + { + CStdString strLevel; + if (GetWord(input, strLevel)) + { + int iNewLevel = atoi(strLevel); + if (iNewLevel >= CEC_LOG_ERROR && iNewLevel <= CEC_LOG_ALL) + { + g_cecLogLevel = iNewLevel; + cout << "log level changed to " << strLevel.c_str() << endl; + } + } + } } if (bContinue) cout << "waiting for input" << endl; @@ -319,5 +456,9 @@ int main (int argc, char *argv[]) parser->Close(); flush_log(parser); UnloadLibCec(parser); + + if (g_logOutput.is_open()) + g_logOutput.close(); + return 0; }