Adds immediate migration results in progress

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_serial.cpp

@@ -14,15 +14,14 @@
 namespace EffectShowClient
 {
 
-ConnectionHandlerSerial::ConnectionHandlerSerial(QObject *parent)
-  : QObject(parent)
+ConnectionHandlerSerial::ConnectionHandlerSerial(QObject *parent) : QObject(parent)
   , m_spQuerry(new LtsSerialPortQuerry::LtsSerialPortQuerry(this))
   , m_serialPort(nullptr)
   , m_receiveTimeoutTimer(new QTimer(this))
   , m_currentDataRead(QByteArray())
   , m_portName(QStringLiteral("COM5"))
-  , m_readBuffer(new QByteArray())
-{
+  , m_readBuffer(new QByteArray()),
+    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
   m_receiveTimeoutTimer->setInterval(1700);
   connect(m_spQuerry, &LtsSerialPortQuerry::LtsSerialPortQuerry::connectionEstablished, this, &ConnectionHandlerSerial::open);
   m_spQuerry->restartQuerry();
@@ -33,7 +32,7 @@ ConnectionHandlerSerial::ConnectionHandlerSerial(QObject *parent)
 
 ConnectionHandlerSerial::~ConnectionHandlerSerial()
 {
-  DEBUG_LOG() << "ConnectionHandlerSerial::~ConnectionHandlerSerial";
+  DEBUG_LOG(m_logger) << "ConnectionHandlerSerial::~ConnectionHandlerSerial";
 }
 
 bool ConnectionHandlerSerial::init()
@@ -47,35 +46,35 @@ bool ConnectionHandlerSerial::send(const QByteArray &binaryData)
 
   if (!m_serialPort)
   {
-    DEBUG_LOG() << "Port is not initialized!";
+    DEBUG_LOG(m_logger) << "Port is not initialized!";
     return false;
   }
 
   if (!m_serialPort->isOpen())
   {
-    DEBUG_LOG() << "Port is not opened!";
+    DEBUG_LOG(m_logger) << "Port is not opened!";
     return false;
   }
 
   // Sending data ---------------------------------------------
 
   const QByteArray writeThis = LtsUtils::byteStreamFromEscMessage(binaryData);
-  DEBUG_LOG() << "Send HEX:" << writeThis.toHex(' ');
+  DEBUG_LOG(m_logger) << "Send HEX:" << writeThis.toHex(' ');
   qint64 byteswritten = m_serialPort->write(writeThis);
-  DEBUG_LOG() << "Binary data:" << binaryData.size();
-  DEBUG_LOG() << "Try sending: " << writeThis.size();
+  DEBUG_LOG(m_logger) << "Binary data:" << binaryData.size();
+  DEBUG_LOG(m_logger) << "Try sending: " << writeThis.size();
 
 
   // Check for errors ---------------------------------------------
 
   if (byteswritten == -1)
   {
-    DEBUG_LOG() << "Failed to write data to port " << m_serialPort->portName() << " error: " << m_serialPort->errorString();
+    DEBUG_LOG(m_logger) << "Failed to write data to port " << m_serialPort->portName() << " error: " << m_serialPort->errorString();
     return false;
   }
   else if (byteswritten != writeThis.size())
   {
-    DEBUG_LOG() << "Failed to write all data to port " << m_serialPort->portName() << " error: " << m_serialPort->errorString();
+    DEBUG_LOG(m_logger) << "Failed to write all data to port " << m_serialPort->portName() << " error: " << m_serialPort->errorString();
     return false;
   }
 
@@ -89,7 +88,7 @@ bool ConnectionHandlerSerial::open()
 
   m_currentDataRead.clear();
   m_receiveTimeoutTimer->start();
-  DEBUG_LOG() << "(Re)openend serial port " << m_serialPort->portName() << " baudrate: " << m_serialPort->baudRate();
+  DEBUG_LOG(m_logger) << "(Re)openend serial port " << m_serialPort->portName() << " baudrate: " << m_serialPort->baudRate();
 
   emit connectedToSerialConverter();
   return true;
@@ -105,8 +104,8 @@ void ConnectionHandlerSerial::read()
   const QByteArray ba = m_serialPort->readAll();
   m_currentDataRead.append(ba);
 
-  //DEBUG_LOG() << "Binary data from sfm: " << ba.toHex(' ');
-  DEBUG_LOG() << "Data size" << ba.size();
+  //DEBUG_LOG(m_logger) << "Binary data from sfm: " << ba.toHex(' ');
+  DEBUG_LOG(m_logger) << "Data size" << ba.size();
   int idxStart = -1;
   int idxEnd = -1;
   while ((idxStart = m_currentDataRead.indexOf(0x02)) >= 0 &&
@@ -118,27 +117,27 @@ void ConnectionHandlerSerial::read()
 
     QByteArray message = m_currentDataRead.mid(idxStart, (idxEnd - idxStart) + 1);
     m_currentDataRead = m_currentDataRead.mid(idxEnd + 1);
-    DEBUG_LOG() << "Data Message found: " << message.toHex(' ');
+    DEBUG_LOG(m_logger) << "Data Message found: " << message.toHex(' ');
     message = LtsUtils::byteStreamToEscMessage(message);
 
     if (message.size() > 2)
     {
-      ERROR_LOG() << "Message to long: " << message.size();
+      ERROR_LOG(m_logger) << "Message to long: " << message.size();
       continue;
     }
 
-    DEBUG_LOG() << "Frame from sfm as binary " << message.toHex();
+    DEBUG_LOG(m_logger) << "Frame from sfm as binary " << message.toHex();
     //got message now remove frame
 
 
     unsigned int byte = 0;
     byte = message.at(0) & 0xFF;
-    DEBUG_LOG() << "ConnectionHandlerSerial::read var byte is" << byte;
+    DEBUG_LOG(m_logger) << "ConnectionHandlerSerial::read var byte is" << byte;
 
 
     if (!isValidCommandByte(byte))
     {
-      ERROR_LOG() << "ConnectionHandlerSerial::read Commandbyte is invalid. Returning";
+      ERROR_LOG(m_logger) << "ConnectionHandlerSerial::read Commandbyte is invalid. Returning";
       return;
     }
 
@@ -149,30 +148,30 @@ void ConnectionHandlerSerial::read()
       if (message.size() > 1 &&
           !isValidPayloadByte(message.at(1)))
       {
-        ERROR_LOG() << "ConnectionHandlerSerial::read Payloadbyte is invalid. Returning";
+        ERROR_LOG(m_logger) << "ConnectionHandlerSerial::read Payloadbyte is invalid. Returning";
         continue;
       }
     }
 
     if (message.size() != 2)
     {
-      ERROR_LOG() << "ConnectionHandlerSerial::read No 2nd byte was appended (QByteArray has bad size). Returning.";
+      ERROR_LOG(m_logger) << "ConnectionHandlerSerial::read No 2nd byte was appended (QByteArray has bad size). Returning.";
       continue;
     }
 
-    DEBUG_LOG() << "Binary data from serial port: " << message.toHex(' ');
+    DEBUG_LOG(m_logger) << "Binary data from serial port: " << message.toHex(' ');
     m_receiveTimeoutTimer->start();
 
     emit received(message);
   }
 
   if (m_serialPort->bytesAvailable() > 0)
-    DEBUG_LOG() << "Still " << m_serialPort->bytesAvailable() << " available to be read";
+    DEBUG_LOG(m_logger) << "Still " << m_serialPort->bytesAvailable() << " available to be read";
 }
 
 bool ConnectionHandlerSerial::isValidCommandByte(const unsigned char command)
 {
-  DEBUG_LOG() << "ConnectionHandlerSerial::isValidCommandByte" << command << (command == 192 ||
+  DEBUG_LOG(m_logger) << "ConnectionHandlerSerial::isValidCommandByte" << command << (command == 192 ||
                                                                                       command == 240 ||
                                                                                       command == 244 ||
                                                                                       command == 255 ||