X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftestclient%2Fmain.cpp;h=b13f446860c2b743e4d36c06e99f82a75c5cf6a1;hb=6a69ddf2f8b32b7d66be1dffafa78fd2af219749;hp=deabed74e54d81594857696a7e13b35cdb101486;hpb=8829d291b150bb34c24deb5ff745c374fba17f7a;p=deb_libcec.git diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp index deabed7..b13f446 100644 --- a/src/testclient/main.cpp +++ b/src/testclient/main.cpp @@ -30,21 +30,76 @@ * http://www.pulse-eight.net/ */ -#include "../../include/CECExports.h" -#include "../lib/util/threads.h" -#include "../lib/util/misc.h" -#include "../lib/util/StdString.h" +#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 2 +#define CEC_TEST_CLIENT_VERSION 8 + +#include + +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; +} -void flush_log(ICECDevice *cecParser) +//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 +107,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; } } @@ -112,27 +168,45 @@ 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 << - "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 << + "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 << "[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"); - if (!parser && parser->GetMinVersion() > CEC_TEST_CLIENT_VERSION) + ICECAdapter *parser = LoadLibCec("CECTester"); + 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; @@ -150,8 +224,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,7 +264,6 @@ int main (int argc, char *argv[]) } cout << "cec device opened" << endl; - usleep(CEC_SETTLE_DOWN_TIME); parser->PowerOnDevices(CECDEVICE_TV); flush_log(parser); @@ -213,23 +286,42 @@ int main (int argc, char *argv[]) string command; if (GetWord(input, command)) { - if (command == "tx") + if (command == "tx" || command == "txn") { string strvalue; - int ivalue; - vector bytes; + uint8_t ivalue; + 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 == "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 + { + 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 { - parser->SetAckMask(ackmask); + cout << "invalid destination" << endl; } } else if (command == "la") @@ -240,14 +332,65 @@ 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->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(); } + 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 +406,8 @@ int main (int argc, char *argv[]) CCondition::Sleep(50); } - parser->PowerOffDevices(CECDEVICE_TV); + parser->StandbyDevices(CECDEVICE_BROADCAST); + parser->Close(); flush_log(parser); UnloadLibCec(parser); return 0;