##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » SOLO_LFR » LPPMON_PLUGINS_PAUL
RSS

Clone from http://pc-instru.lpp.polytechnique.fr:5000/LPPMON_GROUP/LPPMON_PLUGINS_PAUL

Merge
admin@pc-p-leroy3.LAB-LPP.LOCAL -
r36:74a76c9f112c merge default
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,6 +1,6
1 <?xml version="1.0" encoding="UTF-8"?>
1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE QtCreatorProject>
2 <!DOCTYPE QtCreatorProject>
3 <!-- Written by Qt Creator 2.4.1, 2013-04-11T17:17:11. -->
3 <!-- Written by Qt Creator 2.4.1, 2013-07-03T17:10:59. -->
4 <qtcreator>
4 <qtcreator>
5 <data>
5 <data>
6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
Show file before | Show file after | Hide comments
@@ -245,7 +245,7 void rmapplugin::receivePacketFromBridge
245 preProcessPacket(packet);
245 preProcessPacket(packet);
246
246
247 // Send the packet to the TM echo bridge for processing
247 // Send the packet to the TM echo bridge for processing
248 this->UI->tmEchoBridge->sendTMPacket_v2(packet);
248 this->UI->tmEchoBridge->sendTMPacket(packet);
249 //this->UI->tmEchoBridge->sendTMPacket_alternative(packet);
249 //this->UI->tmEchoBridge->sendTMPacket_alternative(packet);
250
250
251 this->generalCCSDSPacketStore.append(packet);
251 this->generalCCSDSPacketStore.append(packet);
Show file before | Show file after | Hide comments
@@ -157,52 +157,6 void TMEchoBridge::sendXML_GSE_HK()
157
157
158 void TMEchoBridge::sendTMPacket(TMPacketToRead *tmPacketToRead)
158 void TMEchoBridge::sendTMPacket(TMPacketToRead *tmPacketToRead)
159 {
159 {
160 if (tmEchoBridgeSocket->state() == QAbstractSocket::ConnectedState)
161 {
162 // START DOCUMENT
163 //xmlWriter->writeStartDocument();
164
165 // <Event>
166 xmlWriter->writeStartElement("Event");
167
168 // <EventDate>
169 xmlWriter->writeStartElement("EventDate");
170 xmlWriter->writeEndElement();
171
172 // <Event Time>
173 xmlWriter->writeStartElement("EventTime");
174 xmlWriter->writeEndElement();
175
176 // <EventBinary>
177 xmlWriter->writeStartElement("EventBinary");
178 xmlWriter->writeCharacters(
179 QByteArray::fromRawData( (char*) tmPacketToRead->Value, tmPacketToRead->size).toHex()
180 );
181 //tmEchoBridgeSocket->write(QByteArray::fromRawData( (char*) tmPacketToRead->Value, tmPacketToRead->size));
182 xmlWriter->writeEndElement();
183
184 // </Event>
185 xmlWriter->writeEndElement();
186
187 // END DOCUMENT
188 xmlWriter->writeEndDocument();
189
190 tmEchoBridgeSocket->flush();
191
192 totalOfBytes = totalOfBytes + tmPacketToRead->size;
193 totalOfPackets = totalOfPackets + 1;
194 label_totalOfBytes->setText("Number of TM bytes sent: " + QString::number(totalOfBytes));
195 label_totalOfPackets->setText("Number of TM packets sent: " + QString::number(totalOfPackets));
196 }
197 else
198 {
199 totalOfPacketsDropped = totalOfPacketsDropped + 1;
200 label_totalOfPacketsDropped->setText("Number of TM packets dropped: " + QString::number(totalOfPacketsDropped));
201 }
202 }
203
204 void TMEchoBridge::sendTMPacket_v2(TMPacketToRead *tmPacketToRead)
205 {
206 QByteArray ccsdsArray;
160 QByteArray ccsdsArray;
207 QTime echoBridgeTimeout;
161 QTime echoBridgeTimeout;
208
162
Show file before | Show file after | Hide comments
@@ -32,7 +32,6 public slots:
32 void newConnectionOnTCServer();
32 void newConnectionOnTCServer();
33 void sendXML_GSE_HK();
33 void sendXML_GSE_HK();
34 void sendTMPacket(TMPacketToRead *tmPacketToRead);
34 void sendTMPacket(TMPacketToRead *tmPacketToRead);
35 void sendTMPacket_v2(TMPacketToRead *tmPacketToRead);
36 void clearConsole();
35 void clearConsole();
37 void resetTMStatistics();
36 void resetTMStatistics();
38
37
General Comments 0
You need to be logged in to leave comments. Login now