X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftestclient%2Fmain.cpp;h=52a5af462b2becc356ca4ca5541e138c4e7bb711;hb=88f45c9b0ef4f03bf78ad3abc8996c0dcc95010b;hp=15a333d0f78f2f9a49ade060e3662ef68fadc0ac;hpb=825ddb962b0515e1efb06bb10a1cbb74cde803f8;p=deb_libcec.git diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp index 15a333d..52a5af4 100644 --- a/src/testclient/main.cpp +++ b/src/testclient/main.cpp @@ -31,20 +31,73 @@ */ #include "../../include/CECExports.h" -#include "../lib/util/threads.h" -#include "../lib/util/misc.h" +#include "../lib/platform/threads.h" #include "../lib/util/StdString.h" #include #include #include #include +#include using namespace CEC; using namespace std; -#define CEC_TEST_CLIENT_VERSION 2 +#define CEC_TEST_CLIENT_VERSION 5 -void flush_log(ICECDevice *cecParser) + +inline bool HexStrToInt(const std::string& data, uint8_t& value) +{ + int iTmp(0); + if (sscanf(data.c_str(), "%x", &iTmp) == 1) + { + if (iTmp > 256) + value = 255; + else if (iTmp < 0) + value = 0; + else + value = (uint8_t) iTmp; + + return true; + } + + return false; +} + +//get the first word (separated by whitespace) from string data and place that in word +//then remove that word from string data +bool GetWord(string& data, string& word) +{ + stringstream datastream(data); + string end; + + datastream >> word; + if (datastream.fail()) + { + data.clear(); + return false; + } + + size_t pos = data.find(word) + word.length(); + + if (pos >= data.length()) + { + data.clear(); + return true; + } + + data = data.substr(pos); + + datastream.clear(); + datastream.str(data); + + datastream >> end; + if (datastream.fail()) + data.clear(); + + return true; +} + +void flush_log(ICECAdapter *cecParser) { cec_log_message message; while (cecParser && cecParser->GetNextLogMessage(&message)) @@ -52,41 +105,42 @@ void flush_log(ICECDevice *cecParser) switch (message.level) { case CEC_LOG_ERROR: - cout << "ERROR: " << message.message.c_str() << endl; + cout << "ERROR: "; break; case CEC_LOG_WARNING: - cout << "WARNING: " << message.message.c_str() << endl; + cout << "WARNING: "; break; case CEC_LOG_NOTICE: - cout << "NOTICE: " << message.message.c_str() << endl; + cout << "NOTICE: "; break; case CEC_LOG_DEBUG: - cout << "DEBUG: " << message.message.c_str() << endl; + cout << "DEBUG: "; break; } + + CStdString strMessageTmp; + strMessageTmp.Format("[%16lld]\t%s", message.time, message.message); + cout << strMessageTmp.c_str() << endl; } } -void list_devices(ICECDevice *parser) +void list_devices(ICECAdapter *parser) { - cout << "Found devices: "; - vector devices; - int iDevicesFound = parser->FindDevices(devices); + cec_adapter *devices = new cec_adapter[10]; + uint8_t iDevicesFound = parser->FindAdapters(devices, 10, NULL); if (iDevicesFound <= 0) { -#ifdef __WINDOWS__ - cout << "Not supported yet, sorry!" << endl; -#else - cout << "NONE" << endl; -#endif + cout << "Found devices: NONE" << endl; } else { - cout << devices.size() << endl; - for (unsigned int iDevicePtr = 0; iDevicePtr < devices.size(); iDevicePtr++) + CStdString strLog; + strLog.Format("Found devices: %d", iDevicesFound); + cout << strLog.c_str() << endl; + for (unsigned int iDevicePtr = 0; iDevicePtr < iDevicesFound; iDevicePtr++) { CStdString strDevice; - strDevice.Format("device: %d\npath: %s\ncom port: %s", iDevicePtr, devices[iDevicePtr].path.c_str(), devices[0].comm.c_str()); + strDevice.Format("device: %d\npath: %s\ncom port: %s", iDevicePtr + 1, devices[iDevicePtr].path, devices[iDevicePtr].comm); cout << endl << strDevice.c_str() << endl; } } @@ -114,22 +168,28 @@ void show_console_help(void) "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 << - "am {ackmack} change the ackmask of the CEC adapter." << endl << - "[am 10] ackmask 0x10 (logical address 4)" << 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 << "[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[]) { - ICECDevice *parser = LoadLibCec("CEC Tester"); + ICECAdapter *parser = LoadLibCec("CECTester"); if (!parser && parser->GetMinVersion() > CEC_TEST_CLIENT_VERSION) { cout << "Unable to create parser. Is libcec.dll present?" << endl; @@ -150,8 +210,8 @@ int main (int argc, char *argv[]) if (argc < 2) { cout << "no serial port given. trying autodetect: "; - vector devices; - int iDevicesFound = parser->FindDevices(devices); + cec_adapter devices[10]; + uint8_t iDevicesFound = parser->FindAdapters(devices, 10, NULL); if (iDevicesFound <= 0) { cout << "FAILED" << endl; @@ -190,9 +250,8 @@ 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(); @@ -216,20 +275,39 @@ int main (int argc, char *argv[]) if (command == "tx") { string strvalue; - int ivalue; - vector bytes; + uint8_t ivalue; + cec_frame bytes; + bytes.clear(); + while (GetWord(input, strvalue) && HexStrToInt(strvalue, ivalue)) bytes.push_back(ivalue); parser->Transmit(bytes); } - else if (command == "am") + else if (command == "on") { - string strvalue; - int ackmask; - if (GetWord(input, strvalue) && HexStrToInt(strvalue, ackmask)) + string strValue; + uint8_t iValue = 0; + if (GetWord(input, strValue) && HexStrToInt(strValue, iValue) && iValue <= 0xF) + { + parser->PowerOnDevices((cec_logical_address) iValue); + } + else { - parser->SetAckMask(ackmask); + 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") @@ -242,12 +320,25 @@ int main (int argc, char *argv[]) } else if (command == "ping") { - parser->Ping(); + parser->PingAdapter(); } else if (command == "bl") { parser->StartBootloader(); } + else if (command == "r") + { + cout << "closing the connection" << endl; + parser->Close(); + flush_log(parser); + + cout << "opening a new connection" << endl; + parser->Open(strPort.c_str()); + flush_log(parser); + + cout << "setting active view" << endl; + parser->SetActiveView(); + } else if (command == "h" || command == "help") { show_console_help(); @@ -263,7 +354,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;