diff --git a/PAULs_LPPMON_PLUGINS.pro.user.orig b/PAULs_LPPMON_PLUGINS.pro.user.orig --- a/PAULs_LPPMON_PLUGINS.pro.user.orig +++ b/PAULs_LPPMON_PLUGINS.pro.user.orig @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget diff --git a/rmapplugin/rmapplugin.cpp b/rmapplugin/rmapplugin.cpp --- a/rmapplugin/rmapplugin.cpp +++ b/rmapplugin/rmapplugin.cpp @@ -245,7 +245,7 @@ void rmapplugin::receivePacketFromBridge preProcessPacket(packet); // Send the packet to the TM echo bridge for processing - this->UI->tmEchoBridge->sendTMPacket_v2(packet); + this->UI->tmEchoBridge->sendTMPacket(packet); //this->UI->tmEchoBridge->sendTMPacket_alternative(packet); this->generalCCSDSPacketStore.append(packet); diff --git a/rmapplugin/tmechobridge.cpp b/rmapplugin/tmechobridge.cpp --- a/rmapplugin/tmechobridge.cpp +++ b/rmapplugin/tmechobridge.cpp @@ -157,52 +157,6 @@ void TMEchoBridge::sendXML_GSE_HK() void TMEchoBridge::sendTMPacket(TMPacketToRead *tmPacketToRead) { - if (tmEchoBridgeSocket->state() == QAbstractSocket::ConnectedState) - { - // START DOCUMENT - //xmlWriter->writeStartDocument(); - - // - xmlWriter->writeStartElement("Event"); - - // - xmlWriter->writeStartElement("EventDate"); - xmlWriter->writeEndElement(); - - // - xmlWriter->writeStartElement("EventTime"); - xmlWriter->writeEndElement(); - - // - xmlWriter->writeStartElement("EventBinary"); - xmlWriter->writeCharacters( - QByteArray::fromRawData( (char*) tmPacketToRead->Value, tmPacketToRead->size).toHex() - ); - //tmEchoBridgeSocket->write(QByteArray::fromRawData( (char*) tmPacketToRead->Value, tmPacketToRead->size)); - xmlWriter->writeEndElement(); - - // - xmlWriter->writeEndElement(); - - // END DOCUMENT - xmlWriter->writeEndDocument(); - - tmEchoBridgeSocket->flush(); - - totalOfBytes = totalOfBytes + tmPacketToRead->size; - totalOfPackets = totalOfPackets + 1; - label_totalOfBytes->setText("Number of TM bytes sent: " + QString::number(totalOfBytes)); - label_totalOfPackets->setText("Number of TM packets sent: " + QString::number(totalOfPackets)); - } - else - { - totalOfPacketsDropped = totalOfPacketsDropped + 1; - label_totalOfPacketsDropped->setText("Number of TM packets dropped: " + QString::number(totalOfPacketsDropped)); - } -} - -void TMEchoBridge::sendTMPacket_v2(TMPacketToRead *tmPacketToRead) -{ QByteArray ccsdsArray; QTime echoBridgeTimeout; diff --git a/rmapplugin/tmechobridge.h b/rmapplugin/tmechobridge.h --- a/rmapplugin/tmechobridge.h +++ b/rmapplugin/tmechobridge.h @@ -32,7 +32,6 @@ public slots: void newConnectionOnTCServer(); void sendXML_GSE_HK(); void sendTMPacket(TMPacketToRead *tmPacketToRead); - void sendTMPacket_v2(TMPacketToRead *tmPacketToRead); void clearConsole(); void resetTMStatistics();