return 0;
}
-void EnableCallbacks(ICECAdapter *adapter)
+int CecAlert(void *UNUSED(cbParam), const libcec_alert type, const libcec_parameter &UNUSED(param))
{
- g_callbacks.CBCecLogMessage = &CecLogMessage;
- g_callbacks.CBCecKeyPress = &CecKeyPress;
- g_callbacks.CBCecCommand = &CecCommand;
- g_callbacks.CBCecConfigurationChanged = NULL;
- adapter->EnableCallbacks(NULL, &g_callbacks);
+ switch (type)
+ {
+ case CEC_ALERT_CONNECTION_LOST:
+ PrintToStdOut("Connection lost - exiting\n");
+ g_bExit = true;
+ break;
+ default:
+ break;
+ }
+ return 0;
}
void ListDevices(ICECAdapter *parser)
}
else
{
- PrintToStdOut("Found devices: %d\n", iDevicesFound);
+ CStdString strDeviceInfo;
+ strDeviceInfo.Format("Found devices: %d\n\n", iDevicesFound);
+
for (int8_t iDevicePtr = 0; iDevicePtr < iDevicesFound; iDevicePtr++)
- PrintToStdOut("device: %d\npath: %s\ncom port: %s\n", iDevicePtr + 1, devices[iDevicePtr].path, devices[iDevicePtr].comm);
+ {
+ strDeviceInfo.AppendFormat("device: %d\ncom port: %s\n", iDevicePtr + 1, devices[iDevicePtr].comm);
+ libcec_configuration config;
+ config.Clear();
+
+ if (!parser->GetDeviceInformation(devices[iDevicePtr].comm, &config))
+ PrintToStdOut("WARNING: unable to open the device on port %s", devices[iDevicePtr].comm);
+ else
+ {
+ strDeviceInfo.AppendFormat("firmware version: %d\n", config.iFirmwareVersion);
+
+ if (config.iFirmwareBuildDate != CEC_DEFAULT_FIRMWARE_BUILD_DATE)
+ {
+ time_t buildTime = (time_t)config.iFirmwareBuildDate;
+ strDeviceInfo.AppendFormat("firmware build date: %s", asctime(gmtime(&buildTime)));
+ strDeviceInfo = strDeviceInfo.Left((int)strDeviceInfo.length() - 1); // strip \n added by asctime
+ strDeviceInfo.append(" +0000");
+ }
+ }
+ strDeviceInfo.append("\n");
+ }
+ PrintToStdOut(strDeviceInfo.c_str());
}
}
" -b --base {int} The logical address of the device to with this " << endl <<
" adapter is connected." << endl <<
" -f --log-file {file} Writes all libCEC log message to a file" << endl <<
+ " -r --rom Read persisted settings from the EEPROM" << 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 <<
+ " -o --osd-name {osd name} Use a custom osd name." << 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 <<
if (GetWord(arguments, strAddress))
{
sscanf(strAddress.c_str(), "%x", &iAddress);
- if (iAddress >= 0 && iAddress <= 0xFFFF)
+ if (iAddress >= 0 && iAddress <= CEC_INVALID_PHYSICAL_ADDRESS)
parser->SetStreamPath((uint16_t)iAddress);
return true;
}
{
if (command == "as")
{
- parser->SetActiveView();
+ parser->SetActiveSource();
return true;
}
{
if (command == "scan")
{
- PrintToStdOut("CEC bus information");
- PrintToStdOut("===================");
+ CStdString strLog;
+ PrintToStdOut("requesting CEC bus information ...");
+
+ strLog.append("CEC bus information\n===================\n");
cec_logical_addresses addresses = parser->GetActiveDevices();
for (uint8_t iPtr = 0; iPtr < 16; iPtr++)
{
if (addresses[iPtr])
{
- CStdString strLog;
uint64_t iVendorId = parser->GetDeviceVendorId((cec_logical_address)iPtr);
bool bActive = parser->IsActiveSource((cec_logical_address)iPtr);
uint16_t iPhysicalAddress = parser->GetDevicePhysicalAddress((cec_logical_address)iPtr);
strLog.AppendFormat("power status: %s\n", parser->ToString(power));
if ((uint8_t)lang.device == iPtr)
strLog.AppendFormat("language: %s\n", lang.language);
- strLog.append("\n");
- PrintToStdOut(strLog);
+ strLog.append("\n\n");
}
}
+
+ cec_logical_address activeSource = parser->GetActiveSource();
+ strLog.AppendFormat("currently active source: %s (%d)", parser->ToString(activeSource), (int)activeSource);
+
+ PrintToStdOut(strLog);
return true;
}
}
bReturn = false;
}
+ else if (!strcmp(argv[iArgPtr], "--bootloader"))
+ {
+ LibCecBootloader();
+ bReturn = false;
+ }
else if (!strcmp(argv[iArgPtr], "--single-command") ||
!strcmp(argv[iArgPtr], "-s"))
{
{
if (argc >= iArgPtr + 2)
{
- g_config.iHDMIPort = (int8_t)atoi(argv[iArgPtr + 1]);
+ uint8_t hdmiport = (int8_t)atoi(argv[iArgPtr + 1]);
+ if (hdmiport < 1)
+ hdmiport = 1;
+ if (hdmiport > 15)
+ hdmiport = 15;
+ g_config.iHDMIPort = hdmiport;
cout << "using HDMI port '" << (int)g_config.iHDMIPort << "'" << endl;
++iArgPtr;
}
++iArgPtr;
}
+ else if (!strcmp(argv[iArgPtr], "-r") ||
+ !strcmp(argv[iArgPtr], "--rom"))
+ {
+ cout << "using settings from EEPROM" << endl;
+ g_config.bGetSettingsFromROM = 1;
+ ++iArgPtr;
+ }
+ else if (!strcmp(argv[iArgPtr], "-o") ||
+ !strcmp(argv[iArgPtr], "--osd-name"))
+ {
+ if (argc >= iArgPtr + 2)
+ {
+ snprintf(g_config.strDeviceName, 13, "%s", argv[iArgPtr + 1]);
+ cout << "using osd name " << g_config.strDeviceName << endl;
+ ++iArgPtr;
+ }
+ ++iArgPtr;
+ }
else
{
g_strPort = argv[iArgPtr++];
{
g_config.Clear();
snprintf(g_config.strDeviceName, 13, "CECTester");
- g_config.callbackParam = NULL;
- g_config.clientVersion = CEC_CLIENT_VERSION_1_5_0;
- g_callbacks.CBCecLogMessage = &CecLogMessage;
- g_callbacks.CBCecKeyPress = &CecKeyPress;
- g_callbacks.CBCecCommand = &CecCommand;
- g_config.callbacks = &g_callbacks;
+ g_config.clientVersion = CEC_CLIENT_VERSION_1_6_2;
+ g_config.bActivateSource = 0;
+ g_callbacks.CBCecLogMessage = &CecLogMessage;
+ g_callbacks.CBCecKeyPress = &CecKeyPress;
+ g_callbacks.CBCecCommand = &CecCommand;
+ g_callbacks.CBCecAlert = &CecAlert;
+ g_config.callbacks = &g_callbacks;
if (!ProcessCommandLineArguments(argc, argv))
return 0;