X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FAdapterCommunication.cpp;h=caa8442c1b59185dbf37e6ab52eb0c946ca38517;hb=11d13a028204b3ead4019292845e160a0edd5c52;hp=fc650f0651f82a986dd2cfe7df730d47dfa4b033;hpb=9902f4e81052ba0260c587a4b9309e1dd4c729db;p=deb_libcec.git diff --git a/src/lib/AdapterCommunication.cpp b/src/lib/AdapterCommunication.cpp index fc650f0..caa8442 100644 --- a/src/lib/AdapterCommunication.cpp +++ b/src/lib/AdapterCommunication.cpp @@ -43,6 +43,7 @@ using namespace CEC; CCECAdapterMessage::CCECAdapterMessage(const cec_command &command) { clear(); + maxTries = command.retries + 1; //set ack polarity to high when transmitting to the broadcast address //set ack polarity low when transmitting to any other address @@ -246,7 +247,8 @@ void CCECAdapterMessage::push_escaped(uint8_t byte) CAdapterCommunication::CAdapterCommunication(CCECProcessor *processor) : m_port(NULL), - m_processor(processor) + m_processor(processor), + m_iLineTimeout(0) { m_port = new CSerialPort; } @@ -288,7 +290,7 @@ bool CAdapterCommunication::Open(const char *strPort, uint16_t iBaudRate /* = 38 //clear any input bytes uint8_t buff[1024]; - while (m_port->Read(buff, sizeof(buff), 500) > 0) {} + while (m_port->Read(buff, sizeof(buff), 1000) > 0) {} if (CreateThread()) { @@ -495,6 +497,27 @@ bool CAdapterCommunication::PingAdapter(void) return bReturn; } +bool CAdapterCommunication::SetLineTimeout(uint8_t iTimeout) +{ + bool bReturn(m_iLineTimeout != iTimeout); + + if (!bReturn) + { + CCECAdapterMessage *output = new CCECAdapterMessage; + + output->push_back(MSGSTART); + output->push_escaped(MSGCODE_TRANSMIT_IDLETIME); + output->push_escaped(iTimeout); + output->push_back(MSGEND); + + if ((bReturn = Write(output)) == false) + m_processor->AddLog(CEC_LOG_ERROR, "could not set the idletime"); + delete output; + } + + return bReturn; +} + bool CAdapterCommunication::IsOpen(void) const { return !IsStopped() && m_port->IsOpen() && IsRunning();