HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/LPPMON_PLUGINS_PAUL Commit - r24:52cca9b26092

First version of gse_lesia functional, includung waveform display...

leroy -

r24:52cca9b26092 default

parent child

Context file:

r24:52cca9b26092

gse_lesia/lfrxmlparser.cpp created 644 +63 0

@@ -0,0 +1,63
	1	#include "lfrxmlparser.h"
	2
	3	LFRXmlParser::LFRXmlParser(QObject *parent) :
	4	QObject(parent)
	5	{
	6	}
	7
	8	void LFRXmlParser::processIncomingStr(QString incomingStr)
	9	{
	10	int indexOfStartStr;
	11	int indexOfStopStr;
	12	int result;
	13	QString eventBinaryStr;
	14	QString startStr = "<EventBinary>";
	15	QString stopStr = "</EventBinary>";
	16
	17	xmlBuffer.append(incomingStr);
	18
	19	result = findPattern( startStr, stopStr, &indexOfStartStr, &indexOfStopStr);
	20	while( result !=-1 )
	21	{
	22	eventBinaryStr = xmlBuffer.mid(
	23	indexOfStartStr + startStr.size(),
	24	indexOfStopStr - (indexOfStartStr + startStr.size() ) );
	25	processIncomingData( eventBinaryStr );
	26	xmlBuffer.remove(0, indexOfStopStr + stopStr.size());
	27	result = findPattern( startStr, stopStr, &indexOfStartStr, &indexOfStopStr);
	28	}
	29	}
	30
	31	int LFRXmlParser::findPattern(QString startStr, QString stopStr, int indexOfStartStr, int indexOfStopStr)
	32	{
	33	*indexOfStartStr = xmlBuffer.indexOf(startStr);
	34	*indexOfStopStr = xmlBuffer.indexOf(stopStr);
	35
	36	if ( (indexOfStartStr==-1) \| (indexOfStopStr==-1) \| (indexOfStartStr > indexOfStopStr) )
	37	{
	38	return -1;
	39	}
	40	else
	41	{
	42	return 0;
	43	}
	44	}
	45
	46	void LFRXmlParser::processIncomingData(const QString &ch)
	47	{
	48	QByteArray newdat;
	49	char *values;
	50	unsigned char *ccsdsData;
	51	unsigned int ccsdsSize = 0;
	52
	53	TMPacketToRead *incomingPacket;
	54
	55	newdat = QByteArray::fromHex(ch.toAscii());
	56
	57	values = (char*) newdat.data();
	58	ccsdsSize = newdat.size();
	59	ccsdsData = (unsigned char *) values;
	60
	61	incomingPacket = new TMPacketToRead(ccsdsData, ccsdsSize);
	62	emit sendPacket( incomingPacket );
	63	}

gse_lesia/lfrxmlparser.h created 644 +27 0

@@ -0,0 +1,27
	1	#ifndef LFRXMLPARSER_H
	2	#define LFRXMLPARSER_H
	3
	4	#include <QObject>
	5	#include <tmpackettoread.h>
	6
	7	class LFRXmlParser : public QObject
	8	{
	9	Q_OBJECT
	10	public:
	11	explicit LFRXmlParser(QObject *parent = 0);
	12	void processIncomingStr(QString incomingStr);
	13	int findPattern(QString startStr, QString stopStr, int indexOfStartStr, int indexOfStopStr);
	14	void processIncomingData(const QString &ch);
	15
	16	signals:
	17	void sendMessage(QString);
	18	void sendPacket(TMPacketToRead *incomingPacket);
	19
	20	public slots:
	21
	22	private:
	23	QString xmlBuffer;
	24
	25	};
	26
	27	#endif // LFRXMLPARSER_H

Makefile +3 -3

             #############################################################################
             # Makefile for building: PAULs_LPPMON_PLUGINS
-            # Generated by qmake (2.01a) (Qt 4.8.4) on: Wed May 22 07:43:41 2013
+            # Generated by qmake (2.01a) (Qt 4.8.4) on: Tue Jun 11 08:44:35 2013
             # Project:  PAULs_LPPMON_PLUGINS.pro
             # Template: subdirs
             # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile PAULs_LPPMON_PLUGINS.pro
             		/usr/lib64/qt4/mkspecs/common/g++-base.conf \
             		/usr/lib64/qt4/mkspecs/common/g++-unix.conf \
             		/usr/lib64/qt4/mkspecs/qconfig.pri \
-            		/usr/lib64/qt4/mkspecs/modules/qt_webkit_version.pri \
+            		/usr/lib64/qt4/mkspecs/modules/qt_webkit.pri \
             		/usr/lib64/qt4/mkspecs/features/qt_functions.prf \
             		/usr/lib64/qt4/mkspecs/features/qt_config.prf \
             		/usr/lib64/qt4/mkspecs/features/exclusive_builds.prf \
             /usr/lib64/qt4/mkspecs/common/g++-base.conf:
             /usr/lib64/qt4/mkspecs/common/g++-unix.conf:
             /usr/lib64/qt4/mkspecs/qconfig.pri:
-            /usr/lib64/qt4/mkspecs/modules/qt_webkit_version.pri:
+            /usr/lib64/qt4/mkspecs/modules/qt_webkit.pri:
             /usr/lib64/qt4/mkspecs/features/qt_functions.prf:
             /usr/lib64/qt4/mkspecs/features/qt_config.prf:
             /usr/lib64/qt4/mkspecs/features/exclusive_builds.prf:

PAULs_LPPMON_PLUGINS.pro.user +1 -1

             <?xml version="1.0" encoding="UTF-8"?>
             <!DOCTYPE QtCreatorProject>
-            <!-- Written by Qt Creator 2.4.1, 2013-06-04T16:00:09. -->
+            <!-- Written by Qt Creator 2.4.1, 2013-06-14T11:39:28. -->
             <qtcreator>
              <data>
               <variable>ProjectExplorer.Project.ActiveTarget</variable>

common_PLE/hkdisplay.cpp +199 0

@@ -3,4 +3,203
3	HKDisplay::HKDisplay(QWidget *parent) :	3	HKDisplay::HKDisplay(QWidget *parent) :
4	QWidget(parent)	4	QWidget(parent)
5	{	5	{
		6	mainLayout = new QGridLayout();
		7
		8	groupbox_lfrStatusWord = new QGroupBox("LFR Status Word");
		9	box_lfrStatusWord = new QVBoxLayout();
		10	hk_lfr_mode = new QLabel("hk_lfr_mode: -");
		11	hk_lfr_dpu_spw_enabled = new QLabel("hk_lfr_dpu_spw_enabled: -");
		12	hk_lfr_dpu_link_state = new QLabel("hk_lfr_dpu_link_state: -");
		13	sy_lfr_watchdog_enabled = new QLabel("sy_lfr_watchdog_enabled: -");
		14	hk_lfr_calib_enabled = new QLabel("hk_lfr_calib_enabled: -");
		15	hk_lfr_reset_cause = new QLabel("hk_lfr_reset_cause: -");
		16	box_lfrStatusWord->addWidget(hk_lfr_mode);
		17	box_lfrStatusWord->addWidget(hk_lfr_dpu_spw_enabled);
		18	box_lfrStatusWord->addWidget(hk_lfr_dpu_link_state);
		19	box_lfrStatusWord->addWidget(sy_lfr_watchdog_enabled);
		20	box_lfrStatusWord->addWidget(hk_lfr_calib_enabled);
		21	box_lfrStatusWord->addWidget(hk_lfr_reset_cause);
		22	box_lfrStatusWord->insertStretch(6);
		23	groupbox_lfrStatusWord->setLayout(box_lfrStatusWord);
		24
		25	groupbox_lfrSWVersion = new QGroupBox("LFR Software Version");
		26	box_lfrSWVersion = new QVBoxLayout();
		27	sy_lfr_sw_version_n1 = new QLabel("sy_lfr_sw_version_n1: -");
		28	sy_lfr_sw_version_n2 = new QLabel("sy_lfr_sw_version_n2: -");
		29	sy_lfr_sw_version_n3 = new QLabel("sy_lfr_sw_version_n3: -");
		30	sy_lfr_sw_version_n4 = new QLabel("sy_lfr_sw_version_n4: -");
		31	box_lfrSWVersion->addWidget(sy_lfr_sw_version_n1);
		32	box_lfrSWVersion->addWidget(sy_lfr_sw_version_n2);
		33	box_lfrSWVersion->addWidget(sy_lfr_sw_version_n3);
		34	box_lfrSWVersion->addWidget(sy_lfr_sw_version_n4);
		35	box_lfrSWVersion->insertStretch(4);
		36	groupbox_lfrSWVersion->setLayout(box_lfrSWVersion);
		37
		38	groupbox_tcStatistics = new QGroupBox("TC Statistics");
		39	box_tcStatistics = new QVBoxLayout();
		40	hk_lfr_update_info_tc_cnt = new QLabel("hk_lfr_update_info_tc_cnt: -");
		41	hk_lfr_update_time_tc_cnt = new QLabel("hk_lfr_update_time_tc_cnt: -");
		42	hk_dpu_exe_tc_lfr_cnt = new QLabel("hk_dpu_exe_tc_lfr_cnt: -");
		43	hk_dpu_rej_tc_lfr_cnt = new QLabel("hk_dpu_rej_tc_lfr_cnt: -");
		44	hk_lfr_last_exe_tc_id = new QLabel("hk_lfr_last_exe_tc_id: -");
		45	hk_lfr_last_exe_tc_type = new QLabel("hk_lfr_last_exe_tc_type: -");
		46	hk_lfr_last_exe_tc_subtype = new QLabel("hk_lfr_last_exe_tc_subtype: -");
		47	hk_lfr_last_exe_tc_time = new QLabel("hk_lfr_last_exe_tc_time: -");
		48	hk_lfr_last_rej_tc_id = new QLabel("hk_lfr_last_rej_tc_id: -");
		49	hk_lfr_last_rej_tc_type = new QLabel("hk_lfr_last_rej_tc_type: -");
		50	hk_lfr_last_rej_tc_subtype = new QLabel("hk_lfr_last_rej_tc_subtype: -");
		51	hk_lfr_last_rej_tc_time = new QLabel("hk_lfr_last_rej_tc_time: -");
		52	box_tcStatistics->addWidget(hk_lfr_update_info_tc_cnt);
		53	box_tcStatistics->addWidget(hk_lfr_update_time_tc_cnt);
		54	box_tcStatistics->addWidget(hk_dpu_exe_tc_lfr_cnt);
		55	box_tcStatistics->addWidget(hk_dpu_rej_tc_lfr_cnt);
		56	box_tcStatistics->addWidget(hk_lfr_last_exe_tc_id);
		57	box_tcStatistics->addWidget(hk_lfr_last_exe_tc_type);
		58	box_tcStatistics->addWidget(hk_lfr_last_exe_tc_subtype);
		59	box_tcStatistics->addWidget(hk_lfr_last_exe_tc_time);
		60	box_tcStatistics->addWidget(hk_lfr_last_rej_tc_id);
		61	box_tcStatistics->addWidget(hk_lfr_last_rej_tc_type);
		62	box_tcStatistics->addWidget(hk_lfr_last_rej_tc_subtype);
		63	box_tcStatistics->addWidget(hk_lfr_last_rej_tc_time);
		64	box_tcStatistics->insertStretch(12, 1);
		65	groupbox_tcStatistics->setLayout(box_tcStatistics);
		66
		67	groupbox_anomalyStatistics = new QGroupBox("Anomaly Statistics");
		68	box_anomalyStatistics = new QVBoxLayout();
		69	hk_lfr_le_cnt = new QLabel("hk_lfr_le_cnt: -");
		70	hk_lfr_me_cnt = new QLabel("hk_lfr_me_cnt: -");
		71	hk_lfr_he_cnt = new QLabel("hk_lfr_he_cnt: -");
		72	hk_lfr_last_er_rid = new QLabel("hk_lfr_last_er_rid: -");
		73	hk_lfr_last_er_code = new QLabel("hk_lfr_last_er_code: -");
		74	hk_lfr_last_er_time = new QLabel("hk_lfr_last_er_time: -");
		75	box_anomalyStatistics->addWidget(hk_lfr_le_cnt);
		76	box_anomalyStatistics->addWidget(hk_lfr_me_cnt);
		77	box_anomalyStatistics->addWidget(hk_lfr_he_cnt);
		78	box_anomalyStatistics->addWidget(hk_lfr_last_er_rid);
		79	box_anomalyStatistics->addWidget(hk_lfr_last_er_code);
		80	box_anomalyStatistics->addWidget(hk_lfr_last_er_time);
		81	box_anomalyStatistics->insertStretch(6, 1);
		82	groupbox_anomalyStatistics->setLayout(box_anomalyStatistics);
		83
		84	mainLayout->addWidget(groupbox_lfrStatusWord, 0,0,1,1);
		85	mainLayout->addWidget(groupbox_lfrSWVersion, 0,1,1,1);
		86	mainLayout->addWidget(groupbox_tcStatistics, 1,0,1,1);
		87	mainLayout->addWidget(groupbox_anomalyStatistics, 1,1,1,1);
		88
		89	this->setLayout(mainLayout);
6	}	90	}
		91
		92	void HKDisplay::displayPacket(TMPacketToRead *tmPacketToRead)
		93	{
		94	Packet_TM_LFR_HK_t *housekeepingPacket;
		95	if (tmPacketToRead->size != HK_PACKET_SIZE) {
		96	emit displayMessage("in displayPacket *** HK packet size is "
		97	+ QString::number(tmPacketToRead->size)
		98	+ " instead of "
		99	+ QString::number(HK_PACKET_SIZE));
		100	}
		101	else {
		102	housekeepingPacket = (Packet_TM_LFR_HK_t *) tmPacketToRead->Value;
		103
		104	updateLFRMode(housekeepingPacket);
		105
		106	updateSWVersion(housekeepingPacket);
		107
		108	updateTCStatistics(housekeepingPacket);
		109	}
		110	}
		111
		112	void HKDisplay::updateLFRMode(Packet_TM_LFR_HK_t *housekeepingPacket)
		113	{
		114	hk_lfr_mode->setText("hk_lfr_mode: "
		115	+QString::number( ( (housekeepingPacket->lfr_status_word[0] & 0x70) >> 4 ) )
		116	);
		117
		118	}
		119
		120	void HKDisplay::updateSWVersion(Packet_TM_LFR_HK_t *housekeepingPacket)
		121	{
		122	sy_lfr_sw_version_n1->setText("sy_lfr_sw_version_n1: "
		123	+QString::number( housekeepingPacket->lfr_sw_version[0] )
		124	);
		125	sy_lfr_sw_version_n2->setText("sy_lfr_sw_version_n2: "
		126	+QString::number( housekeepingPacket->lfr_sw_version[1] )
		127	);
		128	sy_lfr_sw_version_n3->setText("sy_lfr_sw_version_n3: "
		129	+QString::number( housekeepingPacket->lfr_sw_version[2] )
		130	);
		131	sy_lfr_sw_version_n4->setText("sy_lfr_sw_version_n4: "
		132	+QString::number( housekeepingPacket->lfr_sw_version[3] )
		133	);
		134	}
		135
		136	void HKDisplay::updateTCStatistics(Packet_TM_LFR_HK_t *housekeepingPacket)
		137	{
		138	// TC Statistics
		139	hk_lfr_update_info_tc_cnt->setText("hk_lfr_update_info_tc_cnt: "
		140	+ QString::number(
		141	housekeepingPacket->hk_lfr_update_info_tc_cnt[0] * 256
		142	+ housekeepingPacket->hk_lfr_update_info_tc_cnt[1])
		143	);
		144	hk_lfr_update_time_tc_cnt->setText("hk_lfr_update_time_tc_cnt: "
		145	+ QString::number(
		146	housekeepingPacket->hk_lfr_update_time_tc_cnt[0] * 256
		147	+ housekeepingPacket->hk_lfr_update_time_tc_cnt[1])
		148	);
		149	hk_dpu_exe_tc_lfr_cnt->setText("hk_dpu_exe_tc_lfr_cnt: "
		150	+ QString::number(
		151	housekeepingPacket->hk_dpu_exe_tc_lfr_cnt[0] * 256
		152	+ housekeepingPacket->hk_dpu_exe_tc_lfr_cnt[1])
		153	);
		154	hk_dpu_rej_tc_lfr_cnt->setText("hk_dpu_rej_tc_lfr_cnt: "
		155	+ QString::number(
		156	housekeepingPacket->hk_dpu_rej_tc_lfr_cnt[0] * 256
		157	+ housekeepingPacket->hk_dpu_rej_tc_lfr_cnt[1])
		158	);
		159	hk_lfr_last_exe_tc_id->setText("hk_lfr_last_exe_tc_id: "
		160	+ QString::number(
		161	housekeepingPacket->hk_lfr_last_exe_tc_id[0] * 256
		162	+ housekeepingPacket->hk_lfr_last_exe_tc_id[1], 16)
		163	);
		164	hk_lfr_last_exe_tc_type->setText("hk_lfr_last_exe_tc_type: "
		165	+ QString::number(
		166	housekeepingPacket->hk_lfr_last_exe_tc_type[0] * 256
		167	+ housekeepingPacket->hk_lfr_last_exe_tc_type[1])
		168	);
		169	hk_lfr_last_exe_tc_subtype->setText("hk_lfr_last_exe_tc_subtype: "
		170	+ QString::number(
		171	housekeepingPacket->hk_lfr_last_exe_tc_subtype[0] * 256
		172	+ housekeepingPacket->hk_lfr_last_exe_tc_subtype[1])
		173	);
		174	hk_lfr_last_exe_tc_time->setText("hk_lfr_last_exe_tc_time: "
		175	+ QString::number(
		176	(housekeepingPacket->hk_lfr_last_exe_tc_time[0] << 24)
		177	+ (housekeepingPacket->hk_lfr_last_exe_tc_time[1] << 16)
		178	+ (housekeepingPacket->hk_lfr_last_exe_tc_time[2] << 8)
		179	+ (housekeepingPacket->hk_lfr_last_exe_tc_time[3]), 16
		180	)
		181	);
		182	hk_lfr_last_rej_tc_id->setText("hk_lfr_last_rej_tc_id: "
		183	+ QString::number(
		184	housekeepingPacket->hk_lfr_last_rej_tc_id[0] * 256
		185	+ housekeepingPacket->hk_lfr_last_rej_tc_id[1], 16)
		186	);
		187	hk_lfr_last_rej_tc_type->setText("hk_lfr_last_rej_tc_type: "
		188	+ QString::number(
		189	housekeepingPacket->hk_lfr_last_rej_tc_type[0] * 256
		190	+ housekeepingPacket->hk_lfr_last_rej_tc_type[1])
		191	);
		192	hk_lfr_last_rej_tc_subtype->setText("hk_lfr_last_rej_tc_subtype: "
		193	+ QString::number(
		194	housekeepingPacket->hk_lfr_last_rej_tc_subtype[0] * 256
		195	+ housekeepingPacket->hk_lfr_last_rej_tc_subtype[1])
		196	);
		197	hk_lfr_last_rej_tc_time->setText("hk_lfr_last_rej_tc_time: "
		198	+ QString::number(
		199	(housekeepingPacket->hk_lfr_last_rej_tc_time[0] << 24)
		200	+ (housekeepingPacket->hk_lfr_last_rej_tc_time[1] << 16)
		201	+ (housekeepingPacket->hk_lfr_last_rej_tc_time[2] << 8)
		202	+ (housekeepingPacket->hk_lfr_last_rej_tc_time[3]), 16
		203	)
		204	);
		205	}

common_PLE/hkdisplay.h +42 -1

@@ -3,21 +3,60
3		3
4	#include <QWidget>	4	#include <QWidget>
5	#include <QLabel>	5	#include <QLabel>
		6	#include <QGroupBox>
		7	#include <QVBoxLayout>
		8	#include <QGridLayout>
		9	#include "tmpackettoread.h"
		10	#include "ccsds_types.h"
		11
		12	#define HK_PACKET_SIZE 126 + 4
6		13
7	class HKDisplay : public QWidget	14	class HKDisplay : public QWidget
8	{	15	{
9	Q_OBJECT	16	Q_OBJECT
10	public:	17	public:
11	explicit HKDisplay(QWidget *parent = 0);	18	explicit HKDisplay(QWidget *parent = 0);
		19	void displayPacket(TMPacketToRead *tmPacketToRead);
		20	void updateLFRMode(Packet_TM_LFR_HK_t *housekeepingPacket);
		21	void updateSWVersion(Packet_TM_LFR_HK_t *housekeepingPacket);
		22	void updateTCStatistics(Packet_TM_LFR_HK_t *housekeepingPacket);
12		23
13	signals:	24	signals:
		25	void displayMessage(QString message);
14		26
15	public slots:	27	public slots:
16		28
17	private:	29	private:
		30	QGroupBox *groupbox_lfrStatusWord;
		31	QGroupBox *groupbox_lfrSWVersion;
		32	QGroupBox *groupbox_tcStatistics;
		33	QGroupBox *groupbox_anomalyStatistics;
		34	//***********************************
		35	//***********************************
		36	QGroupBox *groupbox_vhdlBlockStatus;
		37	QGroupBox *groupbox_spacewireIFStatisctics;
		38	QGroupBox *groupbox_ahbErrorStatistics;
		39	QGroupBox *groupbox_temperatures;
		40	QGroupBox *groupbox_errorCountersSpaceWire;
		41	QGroupBox *groupbox_errorCountersTime;
		42
		43	QGridLayout *mainLayout;
		44	QVBoxLayout *box_lfrStatusWord;
		45	QVBoxLayout *box_lfrSWVersion;
		46	QVBoxLayout *box_tcStatistics;
		47	QVBoxLayout *box_anomalyStatistics;
		48	//***********************************
		49	//***********************************
		50	QVBoxLayout *box_vhdlBlockStatus;
		51	QVBoxLayout *box_spacewireIFStatisctics;
		52	QVBoxLayout *box_ahbErrorStatistics;
		53	QVBoxLayout *box_temperatures;
		54	QVBoxLayout *box_errorCountersSpaceWire;
		55	QVBoxLayout *box_errorCountersTime;
		56
18	QLabel *hk_lfr_mode;	57	QLabel *hk_lfr_mode;
19	QLabel *hk_lfr_dpu_spw_enabled;	58	QLabel *hk_lfr_dpu_spw_enabled;
20	QLabel *hk_lfr_dpu__link_state;	59	QLabel *hk_lfr_dpu_link_state;
21	QLabel *sy_lfr_watchdog_enabled;	60	QLabel *sy_lfr_watchdog_enabled;
22	QLabel *hk_lfr_calib_enabled;	61	QLabel *hk_lfr_calib_enabled;
23	QLabel *hk_lfr_reset_cause;	62	QLabel *hk_lfr_reset_cause;
@@ -48,6 +87,8 private:
48	QLabel *hk_lfr_last_er_rid;	87	QLabel *hk_lfr_last_er_rid;
49	QLabel *hk_lfr_last_er_code;	88	QLabel *hk_lfr_last_er_code;
50	QLabel *hk_lfr_last_er_time;	89	QLabel *hk_lfr_last_er_time;
		90	//***********************************
		91	//***********************************
51	//hk_lfr_vhdl_	92	//hk_lfr_vhdl_
52	QLabel *hk_lfr_vhdl_aa;	93	QLabel *hk_lfr_vhdl_aa;
53	QLabel *hk_lfr_vhdl_sm;	94	QLabel *hk_lfr_vhdl_sm;

gse_lesia/Makefile +42 -13

             #############################################################################
             # Makefile for building: gselesia
-            # Generated by qmake (2.01a) (Qt 4.8.4) on: Tue Jun 4 14:34:14 2013
+            # Generated by qmake (2.01a) (Qt 4.8.4) on: Mon Jun 17 13:07:45 2013
             # Project:  gselesia.pro
             # Template: app
             # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile gselesia.pro
             DEFINES       = -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
             CFLAGS        = -pipe -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -O2 -Wall -W -D_REENTRANT $(DEFINES)
             CXXFLAGS      = -pipe -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -O2 -Wall -W -D_REENTRANT $(DEFINES)
-            INCPATH       = -I/usr/lib64/qt4/mkspecs/linux-g++ -I. -I/usr/include/QtCore -I/usr/include/QtNetwork -I/usr/include/QtGui -I/usr/include/QtXml -I/usr/include -I. -I../common_PLE -I../rmapplugin -I/usr/include/lppmon/common -I/usr/include/lppmon/wfdisplay -I.
+            INCPATH       = -I/usr/lib64/qt4/mkspecs/linux-g++ -I. -I/usr/include/QtCore -I/usr/include/QtNetwork -I/usr/include/QtGui -I/usr/include/QtXml -I/usr/include -I. -I../common_PLE -I../rmapplugin -I../../DEV_PLE/header -I/usr/include/lppmon/common -I/usr/include/lppmon/wfdisplay -I.
             LINK          = g++
             LFLAGS        = -Wl,-O1 -Wl,-z,relro
             LIBS          = $(SUBLIBS)  -L/usr/lib64 -llppmoncommon -lwfdisplay -lQtXml -lQtGui -lQtNetwork -lQtCore -lpthread
             		lfrxmlwriter.cpp \
             		../rmapplugin/tmstatistics.cpp \
             		../rmapplugin/tmpackettoread.cpp \
-            		../rmapplugin/wfpacket.cpp moc_mainwindow.cpp \
+            		../rmapplugin/wfpacket.cpp \
+            		../common_PLE/hkdisplay.cpp \
+            		lfrxmlparser.cpp moc_mainwindow.cpp \
             		moc_mainwindowui.cpp \
             		moc_qipdialogbox.cpp \
             		moc_lfrxmlhandler.cpp \
             		moc_lfrxmlwriter.cpp \
             		moc_tmstatistics.cpp \
             		moc_tmpackettoread.cpp \
-            		moc_wfpacket.cpp
+            		moc_wfpacket.cpp \
+            		moc_hkdisplay.cpp \
+            		moc_lfrxmlparser.cpp
             OBJECTS       = main.o \
             		mainwindow.o \
             		mainwindowui.o \
             		tmstatistics.o \
             		tmpackettoread.o \
             		wfpacket.o \
+            		hkdisplay.o \
+            		lfrxmlparser.o \
             		moc_mainwindow.o \
             		moc_mainwindowui.o \
             		moc_qipdialogbox.o \
             		moc_lfrxmlwriter.o \
             		moc_tmstatistics.o \
             		moc_tmpackettoread.o \
-            		moc_wfpacket.o
+            		moc_wfpacket.o \
+            		moc_hkdisplay.o \
+            		moc_lfrxmlparser.o
             DIST          = /usr/lib64/qt4/mkspecs/common/unix.conf \
             		/usr/lib64/qt4/mkspecs/common/linux.conf \
             		/usr/lib64/qt4/mkspecs/common/gcc-base.conf \
             		/usr/lib64/qt4/mkspecs/common/g++-base.conf \
             		/usr/lib64/qt4/mkspecs/common/g++-unix.conf \
             		/usr/lib64/qt4/mkspecs/qconfig.pri \
-            		/usr/lib64/qt4/mkspecs/modules/qt_webkit_version.pri \
+            		/usr/lib64/qt4/mkspecs/modules/qt_webkit.pri \
             		/usr/lib64/qt4/mkspecs/features/qt_functions.prf \
             		/usr/lib64/qt4/mkspecs/features/qt_config.prf \
             		/usr/lib64/qt4/mkspecs/features/exclusive_builds.prf \
             		/usr/lib64/qt4/mkspecs/common/g++-base.conf \
             		/usr/lib64/qt4/mkspecs/common/g++-unix.conf \
             		/usr/lib64/qt4/mkspecs/qconfig.pri \
-            		/usr/lib64/qt4/mkspecs/modules/qt_webkit_version.pri \
+            		/usr/lib64/qt4/mkspecs/modules/qt_webkit.pri \
             		/usr/lib64/qt4/mkspecs/features/qt_functions.prf \
             		/usr/lib64/qt4/mkspecs/features/qt_config.prf \
             		/usr/lib64/qt4/mkspecs/features/exclusive_builds.prf \
             /usr/lib64/qt4/mkspecs/common/g++-base.conf:
             /usr/lib64/qt4/mkspecs/common/g++-unix.conf:
             /usr/lib64/qt4/mkspecs/qconfig.pri:
-            /usr/lib64/qt4/mkspecs/modules/qt_webkit_version.pri:
+            /usr/lib64/qt4/mkspecs/modules/qt_webkit.pri:
             /usr/lib64/qt4/mkspecs/features/qt_functions.prf:
             /usr/lib64/qt4/mkspecs/features/qt_config.prf:
             /usr/lib64/qt4/mkspecs/features/exclusive_builds.prf:
             dist:
             	@$(CHK_DIR_EXISTS) .tmp/gselesia1.0.0 || $(MKDIR) .tmp/gselesia1.0.0
-            	$(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/gselesia1.0.0/ && $(COPY_FILE) --parents mainwindow.h mainwindowui.h ../common_PLE/qipdialogbox.h lfrxmlhandler.h lfrxmlwriter.h ../rmapplugin/tmstatistics.h ../rmapplugin/tmpackettoread.h ../rmapplugin/wfpacket.h .tmp/gselesia1.0.0/ && $(COPY_FILE) --parents main.cpp mainwindow.cpp mainwindowui.cpp ../common_PLE/qipdialogbox.cpp lfrxmlhandler.cpp lfrxmlwriter.cpp ../rmapplugin/tmstatistics.cpp ../rmapplugin/tmpackettoread.cpp ../rmapplugin/wfpacket.cpp .tmp/gselesia1.0.0/ && (cd `dirname .tmp/gselesia1.0.0` && $(TAR) gselesia1.0.0.tar gselesia1.0.0 && $(COMPRESS) gselesia1.0.0.tar) && $(MOVE) `dirname .tmp/gselesia1.0.0`/gselesia1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/gselesia1.0.0
+            	$(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/gselesia1.0.0/ && $(COPY_FILE) --parents mainwindow.h mainwindowui.h ../common_PLE/qipdialogbox.h lfrxmlhandler.h lfrxmlwriter.h ../rmapplugin/tmstatistics.h ../rmapplugin/tmpackettoread.h ../rmapplugin/wfpacket.h ../common_PLE/hkdisplay.h ../rmapplugin/params.h ../../DEV_PLE/header/ccsds_types.h lfrxmlparser.h .tmp/gselesia1.0.0/ && $(COPY_FILE) --parents main.cpp mainwindow.cpp mainwindowui.cpp ../common_PLE/qipdialogbox.cpp lfrxmlhandler.cpp lfrxmlwriter.cpp ../rmapplugin/tmstatistics.cpp ../rmapplugin/tmpackettoread.cpp ../rmapplugin/wfpacket.cpp ../common_PLE/hkdisplay.cpp lfrxmlparser.cpp .tmp/gselesia1.0.0/ && (cd `dirname .tmp/gselesia1.0.0` && $(TAR) gselesia1.0.0.tar gselesia1.0.0 && $(COMPRESS) gselesia1.0.0.tar) && $(MOVE) `dirname .tmp/gselesia1.0.0`/gselesia1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/gselesia1.0.0
             clean:compiler_clean
             mocables: compiler_moc_header_make_all compiler_moc_source_make_all
-            compiler_moc_header_make_all: moc_mainwindow.cpp moc_mainwindowui.cpp moc_qipdialogbox.cpp moc_lfrxmlhandler.cpp moc_lfrxmlwriter.cpp moc_tmstatistics.cpp moc_tmpackettoread.cpp moc_wfpacket.cpp
+            compiler_moc_header_make_all: moc_mainwindow.cpp moc_mainwindowui.cpp moc_qipdialogbox.cpp moc_lfrxmlhandler.cpp moc_lfrxmlwriter.cpp moc_tmstatistics.cpp moc_tmpackettoread.cpp moc_wfpacket.cpp moc_hkdisplay.cpp moc_lfrxmlparser.cpp
             compiler_moc_header_clean:
-            	-$(DEL_FILE) moc_mainwindow.cpp moc_mainwindowui.cpp moc_qipdialogbox.cpp moc_lfrxmlhandler.cpp moc_lfrxmlwriter.cpp moc_tmstatistics.cpp moc_tmpackettoread.cpp moc_wfpacket.cpp
+            	-$(DEL_FILE) moc_mainwindow.cpp moc_mainwindowui.cpp moc_qipdialogbox.cpp moc_lfrxmlhandler.cpp moc_lfrxmlwriter.cpp moc_tmstatistics.cpp moc_tmpackettoread.cpp moc_wfpacket.cpp moc_hkdisplay.cpp moc_lfrxmlparser.cpp
             moc_mainwindow.cpp: lfrxmlhandler.h \
             		lfrxmlwriter.h \
             		mainwindowui.h \
+            		lfrxmlparser.h \
             		mainwindow.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) mainwindow.h -o moc_mainwindow.cpp
             moc_wfpacket.cpp: ../rmapplugin/wfpacket.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) ../rmapplugin/wfpacket.h -o moc_wfpacket.cpp
+            moc_hkdisplay.cpp: ../common_PLE/hkdisplay.h
+            	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) ../common_PLE/hkdisplay.h -o moc_hkdisplay.cpp
+            moc_lfrxmlparser.cpp: lfrxmlparser.h
+            	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) lfrxmlparser.h -o moc_lfrxmlparser.cpp
             compiler_rcc_make_all:
             compiler_rcc_clean:
             compiler_image_collection_make_all: qmake_image_collection.cpp
             main.o: main.cpp mainwindow.h \
             		lfrxmlhandler.h \
             		lfrxmlwriter.h \
-            		mainwindowui.h
+            		mainwindowui.h \
+            		lfrxmlparser.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
             mainwindow.o: mainwindow.cpp mainwindow.h \
             		lfrxmlhandler.h \
             		lfrxmlwriter.h \
-            		mainwindowui.h
+            		mainwindowui.h \
+            		lfrxmlparser.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwindow.o mainwindow.cpp
             mainwindowui.o: mainwindowui.cpp mainwindowui.h
             wfpacket.o: ../rmapplugin/wfpacket.cpp ../rmapplugin/wfpacket.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o wfpacket.o ../rmapplugin/wfpacket.cpp
+            hkdisplay.o: ../common_PLE/hkdisplay.cpp ../common_PLE/hkdisplay.h
+            	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o hkdisplay.o ../common_PLE/hkdisplay.cpp
+            lfrxmlparser.o: lfrxmlparser.cpp lfrxmlparser.h
+            	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o lfrxmlparser.o lfrxmlparser.cpp
             moc_mainwindow.o: moc_mainwindow.cpp
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mainwindow.o moc_mainwindow.cpp
             moc_wfpacket.o: moc_wfpacket.cpp
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_wfpacket.o moc_wfpacket.cpp
+            moc_hkdisplay.o: moc_hkdisplay.cpp
+            	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_hkdisplay.o moc_hkdisplay.cpp
+            moc_lfrxmlparser.o: moc_lfrxmlparser.cpp
+            	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_lfrxmlparser.o moc_lfrxmlparser.cpp
             ####### Install
             install:   FORCE

gse_lesia/gselesia binary modified 0 0

NO CONTENT: modified file, binary diff hidden

gse_lesia/gselesia.pro +9 -2

                     $${PWD} \
                     ../common_PLE \
                     ../rmapplugin \
+                    ../../DEV_PLE/header \
                     $$[QT_INSTALL_HEADERS]/lppmon/common \
                     $$[QT_INSTALL_HEADERS]/lppmon/wfdisplay
                 lfrxmlwriter.cpp \
                 ../rmapplugin/tmstatistics.cpp \
                 ../rmapplugin/tmpackettoread.cpp \
-                ../rmapplugin/wfpacket.cpp
+                ../rmapplugin/wfpacket.cpp \
+                ../common_PLE/hkdisplay.cpp \
+                lfrxmlparser.cpp
             HEADERS  += mainwindow.h \
                 mainwindowui.h \
                 lfrxmlwriter.h \
                 ../rmapplugin/tmstatistics.h \
                 ../rmapplugin/tmpackettoread.h \
-                ../rmapplugin/wfpacket.h
+                ../rmapplugin/wfpacket.h \
+                ../common_PLE/hkdisplay.h \
+                ../rmapplugin/params.h \
+                ../../DEV_PLE/header/ccsds_types.h \
+                lfrxmlparser.h

gse_lesia/gselesia.pro.user +1 -1

             <?xml version="1.0" encoding="UTF-8"?>
             <!DOCTYPE QtCreatorProject>
-            <!-- Written by Qt Creator 2.4.1, 2013-06-04T16:00:06. -->
+            <!-- Written by Qt Creator 2.4.1, 2013-06-17T15:56:30. -->
             <qtcreator>
              <data>
               <variable>ProjectExplorer.Project.ActiveTarget</variable>

gse_lesia/lfrxmlwriter.cpp 0 -1

                 xmlWriter->writeEndElement();
             }
             void LFRXmlWriter::sendXML_GSE_HK()
             {
                 xmlWriter->writeStartElement("TM");

gse_lesia/mainwindow.cpp +58 -43

             MainWindow::MainWindow(QWidget *parent)
                 : QWidget(parent)
             {
+                parsingContinue = false;
                 totalOfBytes = 0;
+                totalOfPackets = 0;
                 analyserSGSEServerTC = new QTcpServer();
                 analyserSGSEServerTM = new QTcpServer();
                 socketTM = NULL;
                 socketEchoServer = new QTcpSocket();
-                sourceTC = new QXmlInputSource();
+                //****
-                sourceTMechoBridge = new QXmlInputSource();
+                // XML
+                // xml handlers
                 xmlHandler = new LFRXmlHandler();
+                // xml sources
+                sourceTC = new QXmlInputSource();
+                // xml writer
                 lfrXmlWriter = new LFRXmlWriter();
+                // setup xml parser for the echo bridge
+                lfrXmlParser = new LFRXmlParser();
                 UI = new MainWindowUI();
                 connect(this->UI->button_TCAcknowledgement, SIGNAL(clicked()), this->lfrXmlWriter, SLOT(sendXML_TC_Acknowledgment()));
                 connect(this->UI->button_TCRejection, SIGNAL(clicked()), this->lfrXmlWriter, SLOT(sendXML_TC_rejection()));
                 connect(this->UI->button_GSEHK, SIGNAL(clicked()), this->lfrXmlWriter, SLOT(sendXML_GSE_HK()));
+                // socket echo server
                 connect(this->socketEchoServer, SIGNAL(stateChanged(QAbstractSocket::SocketState)),
                         this, SLOT(socket_TMEcho_ServerHasChanged()));
                 connect(this->socketEchoServer, SIGNAL(readyRead()),
                         this, SLOT(readDataOnSocketEchoServer()));
+                // display on console
+                connect(this->xmlHandler, SIGNAL(displayMessage(QString)),
+                        this, SLOT(displayOnConsole(QString)));
+                connect(this->UI->hkDisplay, SIGNAL(displayMessage(QString)),
+                        this, SLOT(displayOnConsole(QString)));
+                connect(this->lfrXmlParser, SIGNAL(sendMessage(QString)),
+                        this, SLOT(displayOnConsole(QString)));
                 //
-                connect(this->xmlHandler, SIGNAL(displayMessage(QString)), this, SLOT(displayOnConsole(QString)));
+                connect(this->lfrXmlParser, SIGNAL(sendPacket(TMPacketToRead*)),
+                        this, SLOT(processIncomingPacket(TMPacketToRead*)));
+                //
+                connect(this->UI->button_resetStatistics, SIGNAL(clicked()),
+                        this, SLOT(resetStatistics()));
                 displayNetworkInterfaces();
                 this->xmlHandler->packetStoreHasChanged(&generalCCSDSPacketStore);
+            };
             MainWindow::~MainWindow()
             {
             void MainWindow::readDataOnSocketEchoServer()
             {
-                int nbBytesAvailable = 0;
+                QString dataString;
-                nbBytesAvailable = socketEchoServer->bytesAvailable();
-                buffer = (char *) malloc(nbBytesAvailable);
-                socketEchoServer->read(buffer, nbBytesAvailable);
-                totalOfBytes = totalOfBytes + nbBytesAvailable;
+                dataArray.append(socketEchoServer->readAll());
-                this->UI->totalOfBytesHasChanged(totalOfBytes);
+                dataString = QString::fromAscii(dataArray);
+                this->lfrXmlParser->processIncomingStr(dataString);
-                processIncomingData(buffer, nbBytesAvailable);
+                dataArray.clear();
-                free(buffer);
             }
-            void MainWindow::processIncomingData(char *data, unsigned int size)
+            void MainWindow::processIncomingData(const QString &ch)
             {
                 QByteArray newdat;
-                int index;
                 char *values;
                 unsigned char *ccsdsData;
                 unsigned int ccsdsSize = 0;
-                unsigned char sizeByte1 = 0;
-                unsigned char sizeByte0 = 0;
                 TMPacketToRead *incomingPacket;
-                newdat = QByteArray::fromRawData( data, size);
+                newdat = QByteArray::fromHex(ch.toAscii());
-                index = newdat.indexOf("<EventBinary>") + 13;
-                values = (char*) (newdat.data() + index);
+                values = (char*) newdat.data();
-                sizeByte0 = fromAsciiToChar(values[ 8*2 ])*16 + fromAsciiToChar(values[ 8*2+1 ]);
+                ccsdsSize = newdat.size();
-                sizeByte1 = fromAsciiToChar(values[ 9*2 ])*16 + fromAsciiToChar(values[ 9*2+1 ]);
+                ccsdsData = (unsigned char *) values;
-                ccsdsSize = sizeByte0*256 + sizeByte1;
-                ccsdsData = (unsigned char*) malloc(ccsdsSize + 1 + 10);
-                for (unsigned int i=0; i<ccsdsSize; i++)
-                    ccsdsData[i] = fromAsciiToChar(values[ i*2 ])*16 + fromAsciiToChar(values[ i*2+1 ]);
                 incomingPacket = new TMPacketToRead(ccsdsData, ccsdsSize);
-                generalCCSDSPacketStore.append(incomingPacket);
+                processIncomingPacket( incomingPacket );
-                preProcessPacket(incomingPacket);
-                free(ccsdsData);
             }
             void MainWindow::displayOnConsole(QString message)
                 this->UI->tmStatistics->updateStatistics(pid, cat, typ, sub, sid, length, coarse_t, fine_t);
+                //***************************************************
+                // if the packet is an HK packet, display its content
+                if ( (typ == TYPE_HK) & (sub == SUBTYPE_HK) )
+                {
+                    this->UI->hkDisplay->displayPacket(packet);
+                }
                 //****************************************
                 // if the packet is a waveform, display it
                 if ( (typ == 21) & (sub == 3) )
                 }
             }
-            char MainWindow::fromAsciiToChar(char value)
+            void MainWindow::processIncomingPacket(TMPacketToRead *packet)
             {
-                char ret = -1;
+                totalOfBytes = totalOfBytes + packet->size;
-                if (value > 'a')
+                totalOfPackets = totalOfPackets + 1;
+                this->UI->totalOfBytesHasChanged(totalOfBytes);
-                    ret = value - 'a' + 10;
+                this->UI->totalOfPacketsHasChanged(totalOfPackets);
+                preProcessPacket(packet);
+                packet->deleteLater();
             }
-                else
+            void MainWindow::resetStatistics()
             {
-                    ret = value - '0';
+                totalOfBytes = 0;
+                totalOfPackets = 0;
+                this->UI->totalOfBytesHasChanged(totalOfBytes);
+                this->UI->totalOfPacketsHasChanged(totalOfPackets);
             }
-                return ret;

gse_lesia/mainwindow.h +10 -3

             #include <mainwindowui.h>
             #include "tmpackettoread.h"
             #include "wfpacket.h"
+            #include "lfrxmlparser.h"
             class MainWindow : public QWidget
             {
                 ~MainWindow();
                 void displayNetworkInterfaces();
-                void processIncomingData(char *data, unsigned int size);
+                void processIncomingData(const QString &ch);
                 void initSocketStatesList();
                 void preProcessPacket(TMPacketToRead *packet);
                 void buildWFAndDisplay(TMPacketToRead *packet, WFPacket *wfPacket, unsigned char num_page);
-                char fromAsciiToChar(char value);
             private:
+                QByteArray dataArray;
                 QList<TMPacketToRead*> generalCCSDSPacketStore;
                 QTcpServer *analyserSGSEServerTC;
                 QTcpSocket *socketEchoServer;
                 unsigned int totalOfBytes;
+                unsigned int totalOfPackets;
                 QXmlSimpleReader xmlReader;
                 QXmlInputSource *sourceTC;
-                QXmlInputSource *sourceTMechoBridge;
                 LFRXmlHandler *xmlHandler;
+                LFRXmlParser *lfrXmlParser;
                 QList<QString> socketStates;
                 WFPacket wfPacketNormal[4];
+                bool parsingContinue;
             signals:
                 void socketTMHasChanged(QTcpSocket *socket);
                 void readDataOnSocketEchoServer();
                 void openEchoServer();
                 void socket_TMEcho_ServerHasChanged();
+                void processIncomingPacket(TMPacketToRead *packet);
+                void resetStatistics();
             };
             #endif // MAINWINDOW_H

gse_lesia/mainwindowui.cpp +15 0

                 label_currentTCTMServer = new QLabel(tr("Current IP address:"));
                 label_currentTCTMServerIP = new QLabel(tr("-"));
                 label_totalOfBytes = new QLabel(tr("Received Bytes: -"));
+                label_totalOfPackets = new QLabel(tr("Received Packets: -"));
                 console = new QTextEdit();
                 tmStatistics = new TMStatistics;
                 wfDisplay = new WFDisplay;
+                hkDisplay = new HKDisplay;
                 spinbox_TMServerPort = new QSpinBox();
                 spinbox_TCServerPort = new QSpinBox();
                 button_TCRejection = new QPushButton(tr("send TC rejection"));
                 button_GSEHK = new QPushButton(tr("send GSE HK"));
                 button_clearConsole = new QPushButton(tr("Clear console"));
+                button_resetStatistics = new QPushButton(tr("Reset statistics"));
                 serverTMEchoDialogBox = new QIPDialogBox();
                 serverTMEchoDialogBox->setIP(127, 0, 0, 1);
                 layout_TMEcho->addWidget(label_serverTMEchoPort);
                 layout_TMEcho->addWidget(spinbox_serverTMEchoPort);
                 layout_TMEcho->addWidget(button_openSocketEchoServer);
+                layout_TMEcho->addWidget(label_totalOfPackets);
                 layout_TMEcho->addWidget(label_totalOfBytes);
+                layout_TMEcho->addWidget(button_resetStatistics);
                 groupbox_TMEcho->setLayout(layout_TMEcho);
                 layout_ports->addWidget(label_TMServerPort, 0, 0, 1, 1);
                 spwTabWidget->addTab(spwTabWidgetPage0, tr("Connection"));
                 spwTabWidget->addTab(spwTabWidgetPage1, tr("TM Statistics"));
+                spwTabWidget->addTab(spwTabWidgetPage3, tr("HK"));
                 spwTabWidget->addTab(spwTabWidgetPage2, tr("Waveforms"));
                 spwTabWidgetPage0->setLayout(mainLayout);
                 spwTabWidgetPage1->setLayout(tmStatistics->layout());
                 spwTabWidgetPage2->setLayout(wfDisplay->layout());
+                spwTabWidgetPage3->setLayout(hkDisplay->layout());
                 layout_overallLayout->addWidget(spwTabWidget);
                             "Received Bytes: "
                             + QString::number(nbBytes));
             }
+            void MainWindowUI::totalOfPacketsHasChanged(unsigned int nbPackets)
+            {
+                label_totalOfPackets->setText(
+                            "Received Packets: "
+                            + QString::number(nbPackets));
+            }

gse_lesia/mainwindowui.h +5 0

             #include <QTabWidget>
             #include "tmstatistics.h"
             #include "wfdisplay.h"
+            #include "hkdisplay.h"
             class MainWindowUI : public QWidget
             {
                 TMStatistics* tmStatistics;
                 WFDisplay* wfDisplay;
+                HKDisplay* hkDisplay;
                 QPushButton *button_openServerTCTM;
                 QPushButton *button_testServerTCTM;
                 QPushButton *button_TCRejection;
                 QPushButton *button_GSEHK;
                 QPushButton *button_clearConsole;
+                QPushButton *button_resetStatistics;
                 QIPDialogBox *serverTMEchoDialogBox;
             public slots:
                 void clearConsole();
                 void totalOfBytesHasChanged(unsigned int nbBytes);
+                void totalOfPacketsHasChanged(unsigned int nbPackets);
             private:
                 QLabel *label_serverTMEcho;
                 QLabel *label_currentTCTMServer;
                 QLabel *label_currentTCTMServerIP;
                 QLabel *label_totalOfBytes;
+                QLabel *label_totalOfPackets;
                 QTextEdit *console;

rmapplugin/Makefile +12 -6

             #############################################################################
             # Makefile for building: librmapplugin.so.1.0.0
-            # Generated by qmake (2.01a) (Qt 4.8.4) on: Thu May 30 11:18:09 2013
+            # Generated by qmake (2.01a) (Qt 4.8.4) on: Tue Jun 11 08:44:36 2013
             # Project:  rmapplugin.pro
             # Template: lib
             # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile rmapplugin.pro
             		/usr/lib64/qt4/mkspecs/common/g++-base.conf \
             		/usr/lib64/qt4/mkspecs/common/g++-unix.conf \
             		/usr/lib64/qt4/mkspecs/qconfig.pri \
-            		/usr/lib64/qt4/mkspecs/modules/qt_webkit_version.pri \
+            		/usr/lib64/qt4/mkspecs/modules/qt_webkit.pri \
             		/usr/lib64/qt4/mkspecs/features/qt_functions.prf \
             		/usr/lib64/qt4/mkspecs/features/qt_config.prf \
             		/usr/lib64/qt4/mkspecs/features/exclusive_builds.prf \
             		/usr/lib64/qt4/mkspecs/common/g++-base.conf \
             		/usr/lib64/qt4/mkspecs/common/g++-unix.conf \
             		/usr/lib64/qt4/mkspecs/qconfig.pri \
-            		/usr/lib64/qt4/mkspecs/modules/qt_webkit_version.pri \
+            		/usr/lib64/qt4/mkspecs/modules/qt_webkit.pri \
             		/usr/lib64/qt4/mkspecs/features/qt_functions.prf \
             		/usr/lib64/qt4/mkspecs/features/qt_config.prf \
             		/usr/lib64/qt4/mkspecs/features/exclusive_builds.prf \
             /usr/lib64/qt4/mkspecs/common/g++-base.conf:
             /usr/lib64/qt4/mkspecs/common/g++-unix.conf:
             /usr/lib64/qt4/mkspecs/qconfig.pri:
-            /usr/lib64/qt4/mkspecs/modules/qt_webkit_version.pri:
+            /usr/lib64/qt4/mkspecs/modules/qt_webkit.pri:
             /usr/lib64/qt4/mkspecs/features/qt_functions.prf:
             /usr/lib64/qt4/mkspecs/features/qt_config.prf:
             /usr/lib64/qt4/mkspecs/features/exclusive_builds.prf:
             		wfplot.h \
             		wfpage.h \
             		tmstatistics.h \
+            		tmechobridge.h \
             		rmappluginui.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) rmappluginui.h -o moc/moc_rmappluginui.cpp
             		wfplot.h \
             		wfpage.h \
             		tmstatistics.h \
+            		tmechobridge.h \
             		wfpacket.h \
             		rmapplugin.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) rmapplugin.h -o moc/moc_rmapplugin.cpp
             		wfpacket.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) wfpacket.h -o moc/moc_wfpacket.cpp
-            moc/moc_tmechobridge.cpp: tmechobridge.h
+            moc/moc_tmechobridge.cpp: tmpackettoread.h \
+            		tmechobridge.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) tmechobridge.h -o moc/moc_tmechobridge.cpp
             moc/moc_genericPySysdriver.cpp: /usr/include/lppmon/genericPySysdriver.h
             		wfplot.h \
             		wfpage.h \
             		tmstatistics.h \
+            		tmechobridge.h \
             		wfpacket.h \
             		rmappluginpythonwrapper.h \
             		tcpackettosend.h
             		wfplot.h \
             		wfpage.h \
             		tmstatistics.h \
+            		tmechobridge.h \
             		wfpacket.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/rmappluginui.o rmappluginui.cpp
             		params.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/wfpacket.o wfpacket.cpp
-            obj/tmechobridge.o: tmechobridge.cpp tmechobridge.h
+            obj/tmechobridge.o: tmechobridge.cpp tmechobridge.h \
+            		tmpackettoread.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/tmechobridge.o tmechobridge.cpp
             obj/lppmonplugininterface.o: /usr/include/lppmon/pluginsInterface/lppmonplugininterface.cpp /usr/include/lppmon/pluginsInterface/lppmonplugininterface.h \

rmapplugin/params.h +4 0

             #define SID_SBM2_BP1_F1 30
             #define SID_SBM2_BP2_F1 33
+            #define TYPE_HK 3
+            #define SUBTYPE_HK 25
             //*****
             // RMAP
             #define DEFAULT_DESTINATION_KEY 2

rmapplugin/rmapplugin.cpp +2 -1

                 preProcessPacket(packet);
                 // Send the packet to the TM echo bridge for processing
-                this->UI->tmEchoBridge->sendTMPacket(packet);
+                this->UI->tmEchoBridge->sendTMPacket_v2(packet);
+                //this->UI->tmEchoBridge->sendTMPacket_alternative(packet);
                 this->generalCCSDSPacketStore.append(packet);
                 this->UI->nbPacketInStore->setText("nb packets in store: " + QString::number(generalCCSDSPacketStore.size()));

rmapplugin/tmechobridge.cpp +77 -7

                 QWidget(parent)
             {
                 totalOfBytes = 0;
+                totalOfPackets = 0;
+                totalOfPacketsDropped = 0;
                 tmEchoBridgeServer = new QTcpServer();
                 tmEchoBridgeSocket = new QTcpSocket();
                 label_TMServerPort = new QLabel(tr("TM Server Port:"));
                 label_totalOfBytes = new QLabel(tr("Number of TM bytes sent: -"));
+                label_totalOfPackets = new QLabel(tr("Number of TM packets sent: -"));
+                label_totalOfPacketsDropped = new QLabel(tr("Number of TM packets dropped: -"));
                 spinbox_TMServerPort = new QSpinBox();
                 spinbox_TMServerPort->setRange(59002, 65535);
                 button_testServerTCTM = new QPushButton(tr("Test Port"));
                 button_sendTestPacket = new QPushButton(tr("Send a test packet"));
                 button_clearConsole = new QPushButton(tr("Clear console"));
+                button_resetTMStatistics = new QPushButton(tr("Reset TM Statistics"));
                 groupbox_ports = new QGroupBox(tr("Port of the TM Echo Bridge"));
                 layout_ports->addWidget(button_openServerTCTM, 2, 0, 1, 2);
                 layout_ports->addWidget(button_testServerTCTM, 3, 0, 1, 2);
                 layout_ports->addWidget(button_sendTestPacket, 4, 0, 1, 2);
-                layout_ports->addWidget(label_totalOfBytes, 5, 0, 1, 2);
+                layout_ports->addWidget(label_totalOfPackets, 5, 0, 1, 2);
-                layout_ports->setRowStretch(6, 1);
+                layout_ports->addWidget(label_totalOfBytes, 6, 0, 1, 2);
+                layout_ports->addWidget(label_totalOfPacketsDropped, 7, 0, 1, 2);
+                layout_ports->addWidget(button_resetTMStatistics, 8, 0, 1, 2);
+                layout_ports->setRowStretch(9, 1);
                 layout_ports->setColumnStretch(2, 1);
                 groupbox_ports->setLayout(layout_ports);
                 connect(this->button_testServerTCTM, SIGNAL(clicked()), this, SLOT(testTMEchoBridgePort()));
                 connect(this->button_sendTestPacket, SIGNAL(clicked()), this, SLOT(sendXML_GSE_HK()));
                 connect(this->button_clearConsole, SIGNAL(clicked()), this, SLOT(clearConsole()));
+                connect(this->button_resetTMStatistics, SIGNAL(clicked()), this, SLOT(resetTMStatistics()));
             }
             void TMEchoBridge::listenOnTMEchoBridgePort()
                 }
                 if (tmEchoBridgeSocket->state() == QAbstractSocket::ConnectedState)
                 {
+                    xmlWriter->writeStartDocument();
                     xmlWriter->writeStartElement("Event");
                     // EventDate
                     xmlWriter->writeEndElement();
                     xmlWriter->writeEndElement();
+                    xmlWriter->writeEndDocument();
                 }
                 else
                 {
             {
                 if (tmEchoBridgeSocket->state() == QAbstractSocket::ConnectedState)
                 {
+                    // START DOCUMENT
+                    //xmlWriter->writeStartDocument();
                     // <Event>
                     xmlWriter->writeStartElement("Event");
-                    // EventDate
+                    // <EventDate>
                     xmlWriter->writeStartElement("EventDate");
                     xmlWriter->writeEndElement();
-                    // Event Time
+                    // <Event Time>
                     xmlWriter->writeStartElement("EventTime");
                     xmlWriter->writeEndElement();
-                    // EventBinary
+                    // <EventBinary>
                     xmlWriter->writeStartElement("EventBinary");
                     xmlWriter->writeCharacters(
                                 QByteArray::fromRawData( (char*) tmPacketToRead->Value, tmPacketToRead->size).toHex()
                     //tmEchoBridgeSocket->write(QByteArray::fromRawData( (char*) tmPacketToRead->Value, tmPacketToRead->size));
                     xmlWriter->writeEndElement();
-                    // </event>
+                    // </Event>
                     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
                 {
-                    this->displayOnConsole("TM socket *** " + socketStates.at(tmEchoBridgeSocket->state()) );
+                    totalOfPacketsDropped = totalOfPacketsDropped + 1;
+                    label_totalOfPackets->setText("Number of TM packets dropped: " + QString::number(totalOfPacketsDropped));
+                }
+            }
+            void TMEchoBridge::sendTMPacket_v2(TMPacketToRead *tmPacketToRead)
+            {
+                QByteArray ccsdsArray;
+                QTime echoBridgeTimeout;
+                if (tmEchoBridgeSocket->state() == QAbstractSocket::ConnectedState)
+                {
+                    ccsdsArray.append("<Event>");
+                    ccsdsArray.append("<EventDate>");
+                    ccsdsArray.append("</EventDate>");
+                    ccsdsArray.append("<EventTime>");
+                    ccsdsArray.append("</EventTime>");
+                    ccsdsArray.append("<EventBinary>");
+                    ccsdsArray.append(QByteArray::fromRawData( (char*) tmPacketToRead->Value, tmPacketToRead->size).toHex());
+                    ccsdsArray.append("</EventBinary>");
+                    ccsdsArray.append("</Event>");
+                    tmEchoBridgeSocket->write(ccsdsArray);
+                    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_totalOfPackets->setText("Number of TM packets dropped: " + QString::number(totalOfPacketsDropped));
                 }
             }
             {
                 this->console->clear();
             }
+            void TMEchoBridge::resetTMStatistics()
+            {
+                label_totalOfBytes->setText("Number of TM bytes sent: -");
+                label_totalOfPackets->setText("Number of TM packets sent: -");
+                label_totalOfPacketsDropped->setText("Number of TM packets dropped: -");
+                totalOfBytes = 0;
+                totalOfPackets = 0;
+                totalOfPacketsDropped = 0;
+            }

rmapplugin/tmechobridge.h +8 0

             #include <QGridLayout>
             #include <QTextEdit>
             #include <QXmlStreamWriter>
+            #include <QTime>
             #include "tmpackettoread.h"
             class TMEchoBridge : public QWidget
                 void newConnectionOnTCServer();
                 void sendXML_GSE_HK();
                 void sendTMPacket(TMPacketToRead *tmPacketToRead);
+                void sendTMPacket_v2(TMPacketToRead *tmPacketToRead);
                 void clearConsole();
+                void resetTMStatistics();
             private:
                 QList<QString> socketStates;
                 unsigned int totalOfBytes;
+                unsigned int totalOfPackets;
+                unsigned int totalOfPacketsDropped;
                 QTcpServer *tmEchoBridgeServer;
                 QTcpSocket *tmEchoBridgeSocket;
                 QLabel *label_TMServerPort;
                 QLabel *label_totalOfBytes;
+                QLabel *label_totalOfPackets;
+                QLabel *label_totalOfPacketsDropped;
                 QSpinBox *spinbox_TMServerPort;
                 QPushButton *button_testServerTCTM;
                 QPushButton *button_sendTestPacket;
                 QPushButton *button_clearConsole;
+                QPushButton *button_resetTMStatistics;
                 QGroupBox *groupbox_ports;

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages