equal
deleted
inserted
replaced
634 |
634 |
635 private: |
635 private: |
636 void readMessages(); |
636 void readMessages(); |
637 |
637 |
638 QByteArray m_trkReadBuffer; |
638 QByteArray m_trkReadBuffer; |
|
639 bool linkEstablishmentMode; |
639 }; |
640 }; |
640 |
641 |
641 ReaderThreadBase::ReaderThreadBase(const QSharedPointer<DeviceContext> &context) : |
642 ReaderThreadBase::ReaderThreadBase(const QSharedPointer<DeviceContext> &context) : |
642 m_context(context) |
643 m_context(context), linkEstablishmentMode(true) |
643 { |
644 { |
644 static const int trkResultMetaId = qRegisterMetaType<trk::TrkResult>(); |
645 static const int trkResultMetaId = qRegisterMetaType<trk::TrkResult>(); |
645 Q_UNUSED(trkResultMetaId) |
646 Q_UNUSED(trkResultMetaId) |
646 } |
647 } |
647 |
648 |
660 |
661 |
661 void ReaderThreadBase::readMessages() |
662 void ReaderThreadBase::readMessages() |
662 { |
663 { |
663 TrkResult r; |
664 TrkResult r; |
664 QByteArray rawData; |
665 QByteArray rawData; |
665 while (extractResult(&m_trkReadBuffer, m_context->serialFrame, &r, &rawData)) { |
666 while (extractResult(&m_trkReadBuffer, m_context->serialFrame, &r, linkEstablishmentMode, &rawData)) { |
666 emit messageReceived(r, rawData); |
667 emit messageReceived(r, rawData); |
667 } |
668 } |
668 } |
669 } |
669 |
670 |
670 #ifdef Q_OS_WIN |
671 #ifdef Q_OS_WIN |