#include "CECProcessor.h"
#include "AdapterCommunication.h"
-#include "CECBusDevice.h"
+#include "devices/CECBusDevice.h"
#include "LibCEC.h"
#include "util/StdString.h"
#include "platform/timeutils.h"
void CCECProcessor::LogOutput(const cec_command &data)
{
- CStdString txStr = "transmit ";
- txStr.AppendFormat(" %02x", ((uint8_t)data.initiator << 4) + (uint8_t)data.destination);
- txStr.AppendFormat(":%02x", (uint8_t)data.opcode);
+ CStdString strTx;
+ strTx.Format("<< %02x:%02x", ((uint8_t)data.initiator << 4) + (uint8_t)data.destination, (uint8_t)data.opcode);
for (uint8_t iPtr = 0; iPtr < data.parameters.size; iPtr++)
- txStr.AppendFormat(":%02x", data.parameters[iPtr]);
- m_controller->AddLog(CEC_LOG_DEBUG, txStr.c_str());
+ strTx.AppendFormat(":%02x", data.parameters[iPtr]);
+ m_controller->AddLog(CEC_LOG_TRAFFIC, strTx.c_str());
}
bool CCECProcessor::Transmit(const cec_command &data, bool bWaitForAck /* = true */)
return;
}
- uint32_t iVendorId = ((uint32_t)data[0] << 3) +
- ((uint32_t)data[1] << 2) +
- (uint32_t)data[2];
+ uint64_t iVendorId = ((uint64_t)data[0] << 3) +
+ ((uint64_t)data[1] << 2) +
+ (uint64_t)data[2];
m_busDevices[(uint8_t)device]->SetVendorId(iVendorId, data.size >= 4 ? data[3] : 0);
}
void CCECProcessor::ParseCommand(cec_command &command)
{
CStdString dataStr;
- dataStr.Format(">> received frame: %1x%1x:%02x", command.initiator, command.destination, command.opcode);
+ dataStr.Format(">> %1x%1x:%02x", command.initiator, command.destination, command.opcode);
for (uint8_t iPtr = 0; iPtr < command.parameters.size; iPtr++)
dataStr.AppendFormat(":%02x", (unsigned int)command.parameters[iPtr]);
- m_controller->AddLog(CEC_LOG_DEBUG, dataStr.c_str());
+ m_controller->AddLog(CEC_LOG_TRAFFIC, dataStr.c_str());
if (!m_bMonitor)
m_busDevices[(uint8_t)command.initiator]->HandleCommand(command);