HG_REPOSITORIES/LPP/INSTRUMENTATION/SocExplorerPlugins Commit - r40:cda6b4e8adc1

Functions added to the plugin to get the number of CCSDS packets...

paul -

parent child

Context file:

r40:cda6b4e8adc1

Collapse all files

spwplugin/incomingtcparser.cpp created 644 +43 0

@@ -0,0 +1,43
	1	#include "incomingtcparser.h"
	2
	3	IncomingTCParser::IncomingTCParser(QObject *parent) :
	4	QObject(parent)
	5	{
	6	incompleteData = false;
	7	localDataArray.clear();
	8	}
	9
	10	void IncomingTCParser::processIncomingQByteArray(QByteArray incomingQByteArray)
	11	{
	12	int ccsdsSize;
	13	bool keepParsing;
	14	QByteArray tcPacket;
	15
	16	keepParsing = true;
	17
	18	localDataArray.append( incomingQByteArray );
	19
	20	if (localDataArray.size() >= 4 )
	21	{
	22	while(keepParsing == true)
	23	{
	24	ccsdsSize = ( (unsigned char) localDataArray[1] ) * 256 * 256
	25	+ ( (unsigned char) localDataArray[2] ) * 256
	26	+ ( (unsigned char) localDataArray[3] );
	27
	28	if (localDataArray.size() < (ccsdsSize+4) ) keepParsing = false;
	29	else
	30	{
	31	tcPacket = QByteArray( localDataArray );
	32	tcPacket.resize( ccsdsSize + 4 );
	33
	34	emit sendPacketUsingSpaceWire( tcPacket );
	35
	36	localDataArray.remove(0, ccsdsSize + 4);
	37	}
	38
	39	if (localDataArray.size() >= 4 ) keepParsing = true;
	40	else keepParsing = false;
	41	}
	42	}
	43	}

spwplugin/incomingtcparser.h created 644 +26 0

@@ -0,0 +1,26
	1	#ifndef INCOMINGTCPARSER_H
	2	#define INCOMINGTCPARSER_H
	3
	4	#include <QObject>
	5
	6	class IncomingTCParser : public QObject
	7	{
	8	Q_OBJECT
	9	public:
	10	explicit IncomingTCParser(QObject *parent = 0);
	11
	12	void processIncomingQByteArray(QByteArray incomingQByteArray);
	13
	14	signals:
	15	void sendMessage( QString );
	16	void sendPacketUsingSpaceWire( QByteArray packet );
	17
	18	public slots:
	19
	20	private:
	21	QByteArray localDataArray;
	22	bool incompleteData;
	23
	24	};
	25
	26	#endif // INCOMINGTCPARSER_H

spwplugin/SpwTcpPacketServer/spwtcppacketserver.cpp +42 -1

@@ -31,11 +31,16 SpwTcpPacketServer::SpwTcpPacketServer(Q
31	ui->setupUi(this);	31	ui->setupUi(this);
32	this->p_bridge = NULL;	32	this->p_bridge = NULL;
33	this->p_server = new QTcpServer();	33	this->p_server = new QTcpServer();
		34	this->incomingTCParser = new IncomingTCParser();
		35
34	connect(this->ui->startServeQpb,SIGNAL(clicked(bool)),SLOT(toggleServer()));	36	connect(this->ui->startServeQpb,SIGNAL(clicked(bool)),SLOT(toggleServer()));
35	updateHostIP();	37	updateHostIP();
36	this->ui->PortLineEdit->setText("2200");	38	this->ui->PortLineEdit->setText("2200");
37	connect(this->p_server,SIGNAL(newConnection()),this,SLOT(newConnection()));	39	connect(this->p_server,SIGNAL(newConnection()),this,SLOT(newConnection()));
38	resetStatististics();	40	resetStatististics();
		41
		42	connect( this->incomingTCParser, SIGNAL(sendPacketUsingSpaceWire(QByteArray)),
		43	this, SLOT(sendTCUsingSpaceWire(QByteArray)));
39	}	44	}
40		45
41	SpwTcpPacketServer::~SpwTcpPacketServer()	46	SpwTcpPacketServer::~SpwTcpPacketServer()
@@ -120,7 +125,43 void SpwTcpPacketServer::newConnection()
120	QTcpSocket* soc=this->p_server->nextPendingConnection();	125	QTcpSocket* soc=this->p_server->nextPendingConnection();
121	this->connectedClients.append(soc);	126	this->connectedClients.append(soc);
122	this->ui->listWidget->addItem(this->connectedClients.last()->peerAddress().toString());	127	this->ui->listWidget->addItem(this->connectedClients.last()->peerAddress().toString());
123	connect(soc,SIGNAL(readyRead()),this,SLOT(~~readReady~~()));	128	connect(soc,SIGNAL(readyRead()),this,SLOT(parseIncomingTC()));
		129	}
		130
		131	void SpwTcpPacketServer::parseIncomingTC()
		132	{
		133	for(int i=0;i<connectedClients.count();i++)
		134	{
		135	QTcpSocket* soc=connectedClients.at(i);
		136	if(soc->state()!=QAbstractSocket::ConnectedState)
		137	{
		138	connectedClients.removeAt(i);
		139	delete soc;
		140	}
		141	else
		142	{
		143	if(soc->bytesAvailable()!=0)
		144	{
		145	do
		146	{
		147	QByteArray data = soc->readAll();
		148	incomingTCParser->processIncomingQByteArray( data );
		149	}while(soc->bytesAvailable()!=0);
		150	}
		151	}
		152	}
		153	}
		154
		155	void SpwTcpPacketServer::sendTCUsingSpaceWire(QByteArray data)
		156	{
		157	onePacketReceived();
		158	if(data[0]==0) // Protocole = 0 => Host to SpaceWire packet transmission
		159	{
		160	int size = (data[1]256256) + (data[2]*256) + data[3];
		161	char* SPWpacket = (char*)malloc(size);
		162	memcpy(SPWpacket,data.data()+4,size); // 4 bytes will be added later to the packet
		163	emit sendSPWPacket(SPWpacket,size);
		164	}
124	}	165	}
125		166
126	void SpwTcpPacketServer::readReady()	167	void SpwTcpPacketServer::readReady()

spwplugin/SpwTcpPacketServer/spwtcppacketserver.h +4 0

             #include <QTcpServer>
             #include <QList>
             #include <QTcpSocket>
+            #include <incomingtcparser.h>
             namespace Ui {
             class SpwTcpPacketServer;
                 void setServerPort(qint32 port);
                 void setServerSetIP(QString ip);
                 void newConnection();
+                void parseIncomingTC();
+                void sendTCUsingSpaceWire(QByteArray data );
                 void readReady();
                 void resetStatististics();
             private:
                 QList<QTcpSocket*> connectedClients;
                 unsigned int receivedPackets;
                 unsigned int transmittedPackets;
+                IncomingTCParser *incomingTCParser;
             };
             #endif // SPWTCPPACKETSERVER_H

spwplugin/StarDundee/stardundeegui.cpp +16 0

@@ -254,6 +254,7 void StarDundeeGUI::resetBytesPacketsSta
254	nbBytesTransmittedToSpw = 0;	254	nbBytesTransmittedToSpw = 0;
255	nbPacketsReceivedFromSpw = 0;	255	nbPacketsReceivedFromSpw = 0;
256	nbPacketsTransmittedToSpw = 0;	256	nbPacketsTransmittedToSpw = 0;
		257	nbCCSDSPacketsTransmittedToSpw = 0;
257	}	258	}
258		259
259	void StarDundeeGUI::resetStatistics( void )	260	void StarDundeeGUI::resetStatistics( void )
@@ -286,3 +287,18 void StarDundeeGUI::updateNbTransmittedB
286	this->ui->starDundeeTransmittedBytes->setText( QString::number(nbBytesTransmittedToSpw) );	287	this->ui->starDundeeTransmittedBytes->setText( QString::number(nbBytesTransmittedToSpw) );
287	this->ui->starDundeeTransmittedPackets->setText( QString::number(nbPacketsTransmittedToSpw) );	288	this->ui->starDundeeTransmittedPackets->setText( QString::number(nbPacketsTransmittedToSpw) );
288	}	289	}
		290
		291	void StarDundeeGUI::updateCCSDSPacketTransmittedToSpw( void )
		292	{
		293	nbCCSDSPacketsTransmittedToSpw = nbCCSDSPacketsTransmittedToSpw + 1;
		294	}
		295
		296	unsigned int StarDundeeGUI::getNbCCSDSPacketsTransmittedToSpw(void)
		297	{
		298	return this->nbCCSDSPacketsTransmittedToSpw;
		299	}
		300
		301	unsigned int StarDundeeGUI::getNbPacketsTransmittedToSpw()
		302	{
		303	return this->nbPacketsTransmittedToSpw;
		304	}

spwplugin/StarDundee/stardundeegui.h +4 0

                 void resetStatistics( void );
                 void updateNbReceivedBytesFromSpw( unsigned int nbBytes);
                 void updateNbTransmittedBytesToSpw( unsigned int nbBytes);
+                void updateCCSDSPacketTransmittedToSpw( void );
+                unsigned int getNbPacketsTransmittedToSpw( void );
+                unsigned int getNbCCSDSPacketsTransmittedToSpw( void );
             private:
                 Ui::StarDundeeUI *ui;
                 unsigned int nbBytesReceivedFromSpw;
                 unsigned int nbBytesTransmittedToSpw;
                 unsigned int nbPacketsReceivedFromSpw;
                 unsigned int nbPacketsTransmittedToSpw;
+                unsigned int nbCCSDSPacketsTransmittedToSpw;
             };
             #endif // STARDUNDEEGUI_H

spwplugin/StarDundee/stardundeespw_usb.cpp +23 -4

                 connect(this->manager,SIGNAL(emitPacket(char*,int)),this,SIGNAL(pushPacketOverTCP(char*,int)));
                 connect(this->manager, SIGNAL(bytesReceivedFromSpw(uint)), this, SIGNAL(BytesReceivedFromSpw(uint)));
                 connect(this->manager, SIGNAL(bytesTransmittedToSpw(uint)), this, SIGNAL(BytesTransmittedToSpw(uint)));
+                connect(this->manager, SIGNAL(ccsdsPacketTransmittedToSpw()), this, SIGNAL(CCSDSPacketTransmittedToSpw()));
             }
             stardundeeSPW_USB::~stardundeeSPW_USB()
                 connect(this,SIGNAL(SetSourceAddress(QString)),     ((StarDundeeGUI*)this->p_GUI),SLOT(setSourceAddress(QString)));
                 connect(this,SIGNAL(SetRmapTimeout(QString)),       ((StarDundeeGUI*)this->p_GUI),SLOT(setRmapTimeout(QString)));
                 connect(this,SIGNAL(GetAvailableBrickCount()),      ((StarDundeeGUI*)this->p_GUI),SLOT(getAvailableBrickCount()));
+                connect(this,SIGNAL(GetNbPacketsTransmittedToSpw()),((StarDundeeGUI*)this->p_GUI),SLOT(getNbPacketsTransmittedToSpw()));
+                connect(this,SIGNAL(GetNbCCSDSPacketsTransmittedToSpw()),
+                        ((StarDundeeGUI*)this->p_GUI),SLOT(getNbCCSDSPacketsTransmittedToSpw()));
                 connect(this,SIGNAL(SetBrickAsAnInterface(bool)),   ((StarDundeeGUI*)this->p_GUI),SLOT(setBrickAsAnInterface(bool)));
                 connect(this,SIGNAL(SetBrickAsARouter(bool)),       ((StarDundeeGUI*)this->p_GUI),SLOT(setBrickAsARouter(bool)));
                 connect(this,SIGNAL(BytesReceivedFromSpw(uint)),    ((StarDundeeGUI*)this->p_GUI),SLOT(updateNbReceivedBytesFromSpw(uint)));
                 connect(this,SIGNAL(BytesTransmittedToSpw(uint)),   ((StarDundeeGUI*)this->p_GUI),SLOT(updateNbTransmittedBytesToSpw(uint)));
+                connect(this, SIGNAL(CCSDSPacketTransmittedToSpw()),((StarDundeeGUI*)this->p_GUI),SLOT(updateCCSDSPacketTransmittedToSpw()));
                 connect(this,SIGNAL(SetTimecodeFrequency(double)),  ((StarDundeeGUI*)this->p_GUI),SLOT(setTimecodeFrequency(QString)));
                 connect(this,SIGNAL(StartSendingTimecodes(bool)),   ((StarDundeeGUI*)this->p_GUI),SLOT(setStartSendingTimecodes(bool)));
+                connect(this,SIGNAL(GetLinkNumber()),               this->manager,                SLOT(getLinkNumber()));
             }
             void stardundeeSPW_USB::sendPacketComingFromTCPServer(char *packet, int size)
                 data = (char *) malloc( size + 5 );
                 data[0] = this->manager->linkNumber;
-                data[1] = this->manager->destinationLogicalAddress;  // target logical address
+                data[1] = this->manager->destinationLogicalAddress; // target logical address
-                data[2] = SPW_PROTO_ID_CCSDS;               // protocol identifier
+                data[2] = SPW_PROTO_ID_CCSDS;                       // protocol identifier
-                data[3] = 0x00;                             // reserved
+                data[3] = 0x00;                                     // reserved
-                data[4] = 0x00;                             // user application
+                data[4] = 0x00;                                     // user application
                 for ( i=0; i<size; i++ )
                 {
             bool stardundeeSPW_USB_Manager::sendPacket(char *packet, int size)
             {
+                char protocoleIdentifier;
                 USB_SPACEWIRE_STATUS result;
                 USB_SPACEWIRE_ID pIdentifier;
                 SocExplorerEngine::message(this->plugin,"Sending SPW packet",2);
                 else
                 {
                     emit bytesTransmittedToSpw( size-1 ); // -1 is for removing the first bytes added to the packet to route to the right link
+                    // read the protocole identifier
+                    protocoleIdentifier = packet[2];
+                    if (protocoleIdentifier == SPW_PROTO_ID_CCSDS)
+                            emit ccsdsPacketTransmittedToSpw();
                     SocExplorerEngine::message(this->plugin,"Packet sent",2);
                     USBSpaceWire_FreeSend(hDevice, pIdentifier);
                 }
                 }
             }
+            int stardundeeSPW_USB_Manager::getLinkNumber( void )
+            {
+                return this->linkNumber;
+            }
             void stardundeeSPW_USB_Manager::setTimecodeFrequency(double requestedFrequency)
             {
                 U32 rtr_clk_freq;

spwplugin/StarDundee/stardundeespw_usb.h +6 0

                 void emitPacket(char* packet,int size);
                 void bytesReceivedFromSpw( unsigned int );
                 void bytesTransmittedToSpw( unsigned int);
+                void ccsdsPacketTransmittedToSpw( void );
             public slots:
                 void sendTimecodePeriodically( bool onOff );
+                int getLinkNumber( void );
             private:
                 QMutex* handleMutex,*RMAP_AnswersMtx,*RMAP_pending_transaction_IDsMtx;
                 void SetBrickAsAnInterface( bool );
                 void SetBrickAsARouter( bool );
                 int GetAvailableBrickCount( void );
+                unsigned int GetNbPacketsTransmittedToSpw( void );
+                unsigned int GetNbCCSDSPacketsTransmittedToSpw( void );
                 void BytesReceivedFromSpw( unsigned int );
                 void BytesTransmittedToSpw( unsigned int );
+                void CCSDSPacketTransmittedToSpw( void );
                 void StartSendingTimecodes( bool );
+                int GetLinkNumber();
             public slots:
                 void toggleBridgeConnection();

spwplugin/spwplugin.cpp +7 -1

                     connect(((spwPyWrapper*)this->pyObject),SIGNAL(StarDundeeSetRmapTimeout(QString)),((stardundeeSPW_USB*)bridge),SIGNAL(SetRmapTimeout(QString)));
                     connect(((spwPyWrapper*)this->pyObject),SIGNAL(connectBridge()),((stardundeeSPW_USB*)bridge),SLOT(connectBridge()));
                     connect(((spwPyWrapper*)this->pyObject),SIGNAL(disconnectBridge()),((stardundeeSPW_USB*)bridge),SLOT(disconnectBridge()));
-                    connect(((spwPyWrapper*)this->pyObject),SIGNAL(StarDundeeGetAvailableBrickCount()),((stardundeeSPW_USB*)bridge),SIGNAL(GetAvailableBrickCount()));
+                    connect(((spwPyWrapper*)this->pyObject),SIGNAL(StarDundeeGetAvailableBrickCount()),
+                            ((stardundeeSPW_USB*)bridge),SIGNAL(GetAvailableBrickCount()));
+                    connect(((spwPyWrapper*)this->pyObject),SIGNAL(StarDundeeGetNbPacketsTransmittedToSpw()),
+                            ((stardundeeSPW_USB*)bridge),SIGNAL(GetNbPacketsTransmittedToSpw()));
+                    connect(((spwPyWrapper*)this->pyObject),SIGNAL(StarDundeeGetNbCCSDSPacketsTransmittedToSpw()),
+                            ((stardundeeSPW_USB*)bridge),SIGNAL(GetNbCCSDSPacketsTransmittedToSpw()));
+                    connect(((spwPyWrapper*)this->pyObject),SIGNAL(StarDundeeGetLinkNumber()),((stardundeeSPW_USB*)bridge),SIGNAL(GetLinkNumber()));
                     connect(((spwPyWrapper*)this->pyObject),SIGNAL(StarDundeeSetBrickAsAninterface(bool)),
                             ((stardundeeSPW_USB*)bridge),SIGNAL(SetBrickAsAnInterface(bool)));
                     connect(((spwPyWrapper*)this->pyObject),SIGNAL(StarDundeeSetBrickAsARouter(bool)),

spwplugin/spwplugin.pro +4 -2

                 SpwTcpPacketServer/spwtcppacketserver.h \
                 spwpywrapper.h \
                 GR-ESB/gr_esb_bridge.h \
-                GR-ESB/gr_esb_ui.h
+                GR-ESB/gr_esb_ui.h \
+                incomingtcparser.h
             SOURCES += \
                 SpwTcpPacketServer/spwtcppacketserver.cpp \
                 spwpywrapper.cpp \
                 GR-ESB/gr_esb_bridge.cpp \
-                GR-ESB/gr_esb_ui.cpp
+                GR-ESB/gr_esb_ui.cpp \
+                incomingtcparser.cpp
             FORMS += \
                 StarDundee/stardundeeGUI.ui \

spwplugin/spwpywrapper.h +4 -1

                 void StarDundeeSetDestinationKey(const QString & key);
                 void StarDundeeSetRmapTimeout(const QString & timeout);
                 int StarDundeeGetAvailableBrickCount();
+                unsigned int StarDundeeGetNbPacketsTransmittedToSpw( void );
+                unsigned int StarDundeeGetNbCCSDSPacketsTransmittedToSpw( void );
+                int StarDundeeGetLinkNumber();
                 void StarDundeeSetBrickAsAninterface( bool );
                 void StarDundeeSetBrickAsARouter( bool );
                 void StarDundeeSetTimecodeFrequency( double );
                 void TCPServerDisconnect();
                 void TCPServerSetPort(qint32 port);
                 void TCPServerSetIP(QString ip);
             public slots:
             };
             #endif // SPWPYWRAPPER_H

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