X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FAdapterCommunication.cpp;h=74ea9e3f33826363d4ab34e6caf50ff99a0ae2d9;hb=2dbd78f8f765f83e98190c01a123c569aea7c5b6;hp=9d62afef1049457225502000ebab854c4a66fb21;hpb=e41b06f9e1fc5c8af372eabf338dbb691ee7ac4c;p=deb_libcec.git

diff --git a/src/lib/AdapterCommunication.cpp b/src/lib/AdapterCommunication.cpp
index 9d62afe..74ea9e3 100644
--- a/src/lib/AdapterCommunication.cpp
+++ b/src/lib/AdapterCommunication.cpp
@@ -56,30 +56,36 @@ CCECAdapterMessage::CCECAdapterMessage(const cec_command &command)
 
   // add source and destination
   push_back(MSGSTART);
-  push_escaped(MSGCODE_TRANSMIT);
+  push_escaped(command.opcode_set == 0 ? (uint8_t)MSGCODE_TRANSMIT_EOM : (uint8_t)MSGCODE_TRANSMIT);
   push_back(((uint8_t)command.initiator << 4) + (uint8_t)command.destination);
   push_back(MSGEND);
 
   // add opcode
-  push_back(MSGSTART);
-  push_escaped(command.parameters.empty() ? (uint8_t)MSGCODE_TRANSMIT_EOM : (uint8_t)MSGCODE_TRANSMIT);
-  push_back((uint8_t) command.opcode);
-  push_back(MSGEND);
-
-  // add parameters
-  for (int8_t iPtr = 0; iPtr < command.parameters.size; iPtr++)
+  if (command.opcode_set == 1)
   {
     push_back(MSGSTART);
+    push_escaped(command.parameters.IsEmpty() ? (uint8_t)MSGCODE_TRANSMIT_EOM : (uint8_t)MSGCODE_TRANSMIT);
+    push_back((uint8_t) command.opcode);
+    push_back(MSGEND);
 
-    if (iPtr == command.parameters.size - 1)
-      push_escaped( MSGCODE_TRANSMIT_EOM);
-    else
-      push_escaped(MSGCODE_TRANSMIT);
+    // add parameters
+    for (int8_t iPtr = 0; iPtr < command.parameters.size; iPtr++)
+    {
+      push_back(MSGSTART);
 
-    push_escaped(command.parameters[iPtr]);
+      if (iPtr == command.parameters.size - 1)
+        push_escaped( MSGCODE_TRANSMIT_EOM);
+      else
+        push_escaped(MSGCODE_TRANSMIT);
 
-    push_back(MSGEND);
+      push_escaped(command.parameters[iPtr]);
+
+      push_back(MSGEND);
+    }
   }
+
+  // set timeout
+  transmit_timeout = command.transmit_timeout;
 }
 
 CCECAdapterMessage &CCECAdapterMessage::operator =(const CCECAdapterMessage &msg)
@@ -89,7 +95,7 @@ CCECAdapterMessage &CCECAdapterMessage::operator =(const CCECAdapterMessage &msg
   return *this;
 }
 
-CStdString CCECAdapterMessage::ToString(void) const
+CStdString CCECAdapterMessage::MessageCodeAsString(void) const
 {
   CStdString strMsg;
   switch (message())
@@ -101,31 +107,19 @@ CStdString CCECAdapterMessage::ToString(void) const
     strMsg = "PING";
     break;
   case MSGCODE_TIMEOUT_ERROR:
+    strMsg = "TIMEOUT";
+    break;
   case MSGCODE_HIGH_ERROR:
+    strMsg = "HIGH_ERROR";
+    break;
   case MSGCODE_LOW_ERROR:
-    {
-      if (message() == MSGCODE_TIMEOUT_ERROR)
-        strMsg = "TIMEOUT";
-      else if (message() == MSGCODE_HIGH_ERROR)
-        strMsg = "HIGH_ERROR";
-      else
-        strMsg = "LOW_ERROR";
-
-      int iLine      = (size() >= 3) ? (at(1) << 8) | at(2) : 0;
-      uint32_t iTime = (size() >= 7) ? (at(3) << 24) | (at(4) << 16) | (at(5) << 8) | at(6) : 0;
-      strMsg.AppendFormat(" line:%i", iLine);
-      strMsg.AppendFormat(" time:%u", iTime);
-    }
+    strMsg = "LOW_ERROR";
     break;
   case MSGCODE_FRAME_START:
     strMsg = "FRAME_START";
-    if (size() >= 2)
-      strMsg.AppendFormat(" initiator:%1x destination:%1x ack:%s %s", initiator(), destination(), ack() ? "high" : "low", eom() ? "eom" : "");
     break;
   case MSGCODE_FRAME_DATA:
     strMsg = "FRAME_DATA";
-    if (size() >= 2)
-      strMsg.AppendFormat(" %02x %s", at(1), eom() ? "eom" : "");
     break;
   case MSGCODE_RECEIVE_FAILED:
     strMsg = "RECEIVE_FAILED";
@@ -186,6 +180,38 @@ CStdString CCECAdapterMessage::ToString(void) const
   return strMsg;
 }
 
+CStdString CCECAdapterMessage::ToString(void) const
+{
+  CStdString strMsg;
+  strMsg = MessageCodeAsString();
+
+  switch (message())
+  {
+  case MSGCODE_TIMEOUT_ERROR:
+  case MSGCODE_HIGH_ERROR:
+  case MSGCODE_LOW_ERROR:
+    {
+      int iLine      = (size() >= 3) ? (at(1) << 8) | at(2) : 0;
+      uint32_t iTime = (size() >= 7) ? (at(3) << 24) | (at(4) << 16) | (at(5) << 8) | at(6) : 0;
+      strMsg.AppendFormat(" line:%i", iLine);
+      strMsg.AppendFormat(" time:%u", iTime);
+    }
+    break;
+  case MSGCODE_FRAME_START:
+    if (size() >= 2)
+      strMsg.AppendFormat(" initiator:%1x destination:%1x ack:%s %s", initiator(), destination(), ack() ? "high" : "low", eom() ? "eom" : "");
+    break;
+  case MSGCODE_FRAME_DATA:
+    if (size() >= 2)
+      strMsg.AppendFormat(" %02x %s", at(1), eom() ? "eom" : "");
+    break;
+  default:
+    break;
+  }
+
+  return strMsg;
+}
+
 bool CCECAdapterMessage::is_error(void) const
 {
   cec_adapter_messagecode code = message();
@@ -201,15 +227,15 @@ bool CCECAdapterMessage::is_error(void) const
     code == MSGCODE_TRANSMIT_FAILED_TIMEOUT_LINE);
 }
 
-void CCECAdapterMessage::push_escaped(int16_t byte)
+void CCECAdapterMessage::push_escaped(uint8_t byte)
 {
   if (byte >= MSGESC && byte != MSGSTART)
   {
     push_back(MSGESC);
-    push_back((uint8_t) (byte - ESCOFFSET));
+    push_back(byte - ESCOFFSET);
   }
   else
-    push_back((uint8_t) byte);
+    push_back(byte);
 }
 
 CAdapterCommunication::CAdapterCommunication(CLibCEC *controller) :
@@ -256,7 +282,7 @@ bool CAdapterCommunication::Open(const char *strPort, uint16_t iBaudRate /* = 38
 
   //clear any input bytes
   uint8_t buff[1024];
-  m_port->Read(buff, sizeof(buff), 500);
+  while (m_port->Read(buff, sizeof(buff), 500) > 0) {}
 
   if (CreateThread())
   {
@@ -290,8 +316,8 @@ void *CAdapterCommunication::Process(void)
   while (!IsStopped())
   {
     ReadFromDevice(500);
-    WriteNextCommand();
     Sleep(5);
+    WriteNextCommand();
   }
 
   return NULL;
@@ -329,7 +355,7 @@ void CAdapterCommunication::AddData(uint8_t *data, uint8_t iLen)
 
 void CAdapterCommunication::WriteNextCommand(void)
 {
-  CCECAdapterMessagePtr msg;
+  CCECAdapterMessage *msg;
   if (m_outBuffer.Pop(msg))
   {
     CLockObject lock(&msg->mutex);
@@ -343,14 +369,14 @@ void CAdapterCommunication::WriteNextCommand(void)
     else
     {
       m_controller->AddLog(CEC_LOG_DEBUG, "command sent");
-      CCondition::Sleep((uint32_t) msg->size() * (uint32_t)24 /*data*/ + (uint32_t)5 /*start bit (4.5 ms)*/);
+      CCondition::Sleep((uint32_t) msg->size() * 24 /*data*/ + 5 /*start bit (4.5 ms)*/ + 10);
       msg->state = ADAPTER_MESSAGE_STATE_SENT;
     }
     msg->condition.Signal();
   }
 }
 
-bool CAdapterCommunication::Write(CCECAdapterMessagePtr data)
+bool CAdapterCommunication::Write(CCECAdapterMessage *data)
 {
   data->state = ADAPTER_MESSAGE_STATE_WAITING;
   m_outBuffer.Push(data);
@@ -418,73 +444,45 @@ std::string CAdapterCommunication::GetError(void) const
 
 bool CAdapterCommunication::StartBootloader(void)
 {
+  bool bReturn(false);
   if (!IsRunning())
-    return false;
+    return bReturn;
 
   m_controller->AddLog(CEC_LOG_DEBUG, "starting the bootloader");
-  CCECAdapterMessagePtr output(new CCECAdapterMessage);
+  CCECAdapterMessage *output = new CCECAdapterMessage;
 
   output->push_back(MSGSTART);
   output->push_escaped(MSGCODE_START_BOOTLOADER);
   output->push_back(MSGEND);
 
-  if (!Write(output))
-  {
+  if ((bReturn = Write(output)) == false)
     m_controller->AddLog(CEC_LOG_ERROR, "could not start the bootloader");
-    return false;
-  }
-  m_controller->AddLog(CEC_LOG_DEBUG, "bootloader start command transmitted");
-  return true;
-}
-
-bool CAdapterCommunication::SetAckMask(uint16_t iMask)
-{
-  if (!IsRunning())
-    return false;
-
-  CStdString strLog;
-  strLog.Format("setting ackmask to %2x", iMask);
-  m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str());
 
-  CCECAdapterMessagePtr output(new CCECAdapterMessage);
+  delete output;
 
-  output->push_back(MSGSTART);
-  output->push_escaped(MSGCODE_SET_ACK_MASK);
-  output->push_escaped(iMask >> 8);
-  output->push_escaped((uint8_t)iMask);
-  output->push_back(MSGEND);
-
-  if (!Write(output))
-  {
-    m_controller->AddLog(CEC_LOG_ERROR, "could not set the ackmask");
-    return false;
-  }
-
-  return true;
+  return bReturn;
 }
 
 bool CAdapterCommunication::PingAdapter(void)
 {
+  bool bReturn(false);
   if (!IsRunning())
-    return false;
+    return bReturn;
 
   m_controller->AddLog(CEC_LOG_DEBUG, "sending ping");
-  CCECAdapterMessagePtr output(new CCECAdapterMessage);
+  CCECAdapterMessage *output = new CCECAdapterMessage;
 
   output->push_back(MSGSTART);
   output->push_escaped(MSGCODE_PING);
   output->push_back(MSGEND);
 
-  if (!Write(output))
-  {
+  if ((bReturn = Write(output)) == false)
     m_controller->AddLog(CEC_LOG_ERROR, "could not send ping command");
-    return false;
-  }
-
-  m_controller->AddLog(CEC_LOG_DEBUG, "ping tranmitted");
 
   // TODO check for pong
-  return true;
+  delete output;
+
+  return bReturn;
 }
 
 bool CAdapterCommunication::IsOpen(void) const