HG_REPOSITORIES/LPP/INSTRUMENTATION/SocExplorerPlugins Commit - r24:f6b7bed80207

Sync

Jeandet Alexis -

r24:f6b7bed80207 default

parent child

Context file:

r24:f6b7bed80207

Collapse all files

spwplugin/GR-ESB/gr_esb_bridge.cpp +58 -2

@@ -1,38 +1,94
1	#include "gr_esb_bridge.h"	1	#include "gr_esb_bridge.h"
2	#include "gr_esb_ui.h"	2	#include "gr_esb_ui.h"
		3	#include <unistd.h>
3		4
4	GR_ESB_bridge::GR_ESB_bridge(socexplorerplugin *parent) :	5	GR_ESB_bridge::GR_ESB_bridge(socexplorerplugin *parent) :
5	abstractSpwBridge(parent)	6	abstractSpwBridge(parent)
6	{	7	{
7	this->p_GUI = new GR_ESB_ui();	8	this->p_GUI = new GR_ESB_ui();
8	this->soc = new QTcpSocket(this);	9	this->Read_soc = new QTcpSocket(this);
		10	this->Write_soc = new QTcpSocket(this);
		11	connect((GR_ESB_ui*)(this->p_GUI),SIGNAL(ipchanged(QString)),this,SLOT(setIP(QString)));
		12	connect((GR_ESB_ui*)(this->p_GUI),SIGNAL(vlinkchanged(QString)),this,SLOT(setPort(QString)));
9	}	13	}
10		14
11	GR_ESB_bridge::~GR_ESB_bridge()	15	GR_ESB_bridge::~GR_ESB_bridge()
12	{	16	{
13	}	17	}
14		18
15	bool GR_ESB_bridge::connectBridge()	19	bool GR_ESB_bridge::connectBridge()
16	{	20	{
17		21	int timeout=60;
		22	if(this->Read_soc->state()==QTcpSocket::UnconnectedState)
		23	{
		24	this->Read_soc->connectToHost(IP,gresb_Conf[virtualLinkIndex].Read_port);
		25	this->Read_soc->waitForConnected(30000);
		26	}
		27	if(this->Write_soc->state()==QTcpSocket::UnconnectedState)
		28	{
		29	this->Write_soc->connectToHost(IP,gresb_Conf[virtualLinkIndex].Write_port);
		30	this->Write_soc->waitForConnected(30000);
		31	}
		32	while((this->Read_soc->state()!=QTcpSocket::ConnectedState) && (this->Write_soc->state()!=QTcpSocket::ConnectedState))
		33	{
		34	usleep(100000);
		35	if(timeout--==0)return false;
		36	}
		37	return true;
18	}	38	}
19		39
20	bool GR_ESB_bridge::disconnectBridge()	40	bool GR_ESB_bridge::disconnectBridge()
21	{	41	{
		42	int timeout=60;
		43	if(this->Read_soc->state()!=QTcpSocket::UnconnectedState)
		44	{
		45	this->Read_soc->disconnectFromHost();
		46	this->Read_soc->waitForDisconnected(30000);
		47	while(this->Read_soc->state()!=QTcpSocket::UnconnectedState)
		48	{
		49	usleep(100000);
		50	if(timeout--==0)return false;
		51	}
		52	}
		53	return true;
		54	}
22		55
		56	void GR_ESB_bridge::setIP(QString ip)
		57	{
		58	this->IP = ip;
23	}	59	}
24		60
		61	void GR_ESB_bridge::setVirtualLink(QString vlink)
		62	{
		63	vlink = vlink.section("Virtual link",0,0);
		64	bool success;
		65	int vlinkTmp = vlink.toInt(&success);
		66	if(success)
		67	{
		68	setVirtualLink(vlinkTmp);
		69	}
		70	}
		71
		72	void GR_ESB_bridge::setVirtualLink(qint32 vlink)
		73	{
		74	if(vlink<6 && vlink>=0)
		75	{
		76	virtualLinkIndex = vlink;
		77	}
		78	}
		79
		80
25	unsigned int GR_ESB_bridge::Write(unsigned int *Value, unsigned int count, unsigned int address)	81	unsigned int GR_ESB_bridge::Write(unsigned int *Value, unsigned int count, unsigned int address)
26	{	82	{
27		83
28	}	84	}
29		85
30	unsigned int GR_ESB_bridge::Read(unsigned int *Value, unsigned int count, unsigned int address)	86	unsigned int GR_ESB_bridge::Read(unsigned int *Value, unsigned int count, unsigned int address)
31	{	87	{
32		88
33	}	89	}
34		90
35	int GR_ESB_bridge::pushRMAPPacket(char *packet, int size)	91	int GR_ESB_bridge::pushRMAPPacket(char *packet, int size)
36	{	92	{
37		93
38	}	94	}

spwplugin/GR-ESB/gr_esb_bridge.h +24 -1

             #ifndef GR_ESB_BRIDGE_H
             #define GR_ESB_BRIDGE_H
             #include "abstractspwbridge.h"
             #include <QTcpSocket>
+            struct gresb_Conf_str
+            {
+                qint32 Read_port;
+                qint32 Write_port;
+            };
+            const struct gresb_Conf_str gresb_Conf[]=
+            {
+                {3000,3001},  //Virtual link 0
+                {3002,3003},  //Virtual link 1
+                {3004,3005},  //Virtual link 2
+                {3006,3007},  //Virtual link 3
+                {3008,3009},  //Virtual link 4
+                {3010,3011}   //Virtual link 5
+            };
             class GR_ESB_bridge : public abstractSpwBridge
             {
                 Q_OBJECT
             public:
                 explicit GR_ESB_bridge(socexplorerplugin *parent = 0);
                 ~GR_ESB_bridge();
             signals:
             public slots:
                 bool connectBridge();
                 bool disconnectBridge();
+                void setIP(QString ip);
+                void setVirtualLink(QString vlink);
+                void setVirtualLink(qint32 vlink);
                 unsigned int Write(unsigned int *Value,unsigned int count, unsigned int address=0);
                 unsigned int Read(unsigned int *Value,unsigned int count, unsigned int address=0);
                 int pushRMAPPacket(char* packet,int size);
                 void packetReceived();
-                QTcpSocket* soc;
+            private:
+                QTcpSocket* Read_soc;
+                QTcpSocket* Write_soc;
+                QString IP;
+                int virtualLinkIndex;
             };
             #endif // GR_ESB_BRIDGE_H

spwplugin/GR-ESB/gr_esb_ui.cpp +7 -2

             #include "gr_esb_ui.h"
             #include "ui_gr_esb_ui.h"
+            #include <QWebView>
             GR_ESB_ui::GR_ESB_ui(QWidget *parent) :
                 QWidget(parent),
                 ui(new Ui::GR_ESB_ui)
             {
                 ui->setupUi(this);
+                connect(this->ui->GRESB_IP_lineEdit,SIGNAL(textChanged(QString)),this,SLOT(changeIp(QString)));
+                connect(this->ui->GRESB_Vlink_CmBx,SIGNAL(currentIndexChanged(QString)),this,SIGNAL(vlinkchanged(QString)));
             }
-            GR_ESB_ui::~GR_ESB_ui()
+            void GR_ESB_ui::changeIp(QString ip)
             {
-                delete ui;
+                this->ui->WebView->load(QUrl("http://"+ip));
+                emit this->ipchanged(ip);
             }

spwplugin/GR-ESB/gr_esb_ui.h +6 -1

             #ifndef GR_ESB_UI_H
             #define GR_ESB_UI_H
             #include <QWidget>
             namespace Ui {
             class GR_ESB_ui;
             }
             class GR_ESB_ui : public QWidget
             {
                 Q_OBJECT
             public:
                 explicit GR_ESB_ui(QWidget *parent = 0);
-                ~GR_ESB_ui();
+            public slots:
+                void changeIp(QString ip);
+            signals:
+                void ipchanged(QString ip);
+                void vlinkchanged(QString vlink);
             private:
                 Ui::GR_ESB_ui *ui;
             };
             #endif // GR_ESB_UI_H

spwplugin/GR-ESB/gr_esb_ui.ui +113 -41

@@ -1,67 +1,139
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<ui version="4.0">	2	<ui version="4.0">
3	<class>GR_ESB_ui</class>	3	<class>GR_ESB_ui</class>
4	<widget class="QWidget" name="GR_ESB_ui">	4	<widget class="QWidget" name="GR_ESB_ui">
5	<property name="geometry">	5	<property name="geometry">
6	<rect>	6	<rect>
7	<x>0</x>	7	<x>0</x>
8	<y>0</y>	8	<y>0</y>
9	<width>489</width>	9	<width>489</width>
10	<height>295</height>	10	<height>295</height>
11	</rect>	11	</rect>
12	</property>	12	</property>
13	<property name="windowTitle">	13	<property name="windowTitle">
14	<string>Form</string>	14	<string>Form</string>
15	</property>	15	</property>
16	<layout class="Q~~Grid~~Layout" name="~~grid~~Layout">	16	<layout class="QVBoxLayout" name="verticalLayout">
17	<item row="1" column="2">	17	<item>
18	<widget class="Q~~LineEdit" name="GRESB_Port_lineEdit"/~~>	18	<widget class="QTabWidget" name="tabWidget">
19	</item>	19	<property name="toolTip">
20	<item row="1" column="0">	20	<string/>
21	<widget class="QLabel" name="GRESB_Port_Lbl">
22	<property name="text">
23	<string>GR-ESB Port</string>
24	</property>	21	</property>
25	</widget>	22	<property name="currentIndex">
26	</item>	23	<number>0</number>
27	<item row="0" column="2">
28	<widget class="QLineEdit" name="GRESB_IP_lineEdit"/>
29	</item>
30	<item row="0" column="0">
31	<widget class="QLabel" name="GRESB_IP_Lbl">
32	<property name="text">
33	<string>GR-ESB IP Address</string>
34	</property>	24	</property>
35	</widget>	25	<widget class="QWidget" name="Config">
36	</item>	26	<property name="toolTip">
37	<item row="2" column="0">	27	<string><html><head/><body><p>The Config tab allows you to configure the Ethernet conncetion to the GR-ESB and some spacewire parameters.</p></body></html></string>
38	<widget class="QLabel" name="GRESB_LinkNum_Lbl">
39	<property name="text">
40	<string>Select link number</string>
41	</property>
42	</widget>
43	</item>
44	<item row="2" column="2">
45	<widget class="QComboBox" name="GRESB_LinkNum_CmBx">
46	<item>
47	<property name="text">
48	<string>SPW0</string>
49	</property>	28	</property>
50	</item>	29	<attribute name="title">
51	<item>	30	<string>Config</string>
52	<property name="text">	31	</attribute>
53	<string>SPW1</string>	32	<layout class="QGridLayout" name="gridLayout_2">
		33	<item row="1" column="1">
		34	<widget class="QComboBox" name="GRESB_Vlink_CmBx">
		35	<item>
		36	<property name="text">
		37	<string>Virtual link 0</string>
		38	</property>
		39	</item>
		40	<item>
		41	<property name="text">
		42	<string>Virtual link 1</string>
		43	</property>
		44	</item>
		45	<item>
		46	<property name="text">
		47	<string>Virtual link 2</string>
		48	</property>
		49	</item>
		50	<item>
		51	<property name="text">
		52	<string>Virtual link 3</string>
		53	</property>
		54	</item>
		55	<item>
		56	<property name="text">
		57	<string>Virtual link 4</string>
		58	</property>
		59	</item>
		60	<item>
		61	<property name="text">
		62	<string>Virtual link 5</string>
		63	</property>
		64	</item>
		65	</widget>
		66	</item>
		67	<item row="1" column="0">
		68	<widget class="QLabel" name="GRESB_Vlink_Lbl">
		69	<property name="text">
		70	<string>GR-ESB Virtual link</string>
		71	</property>
		72	</widget>
		73	</item>
		74	<item row="2" column="1">
		75	<widget class="QComboBox" name="GRESB_LinkNum_CmBx">
		76	<item>
		77	<property name="text">
		78	<string>SPW0</string>
		79	</property>
		80	</item>
		81	<item>
		82	<property name="text">
		83	<string>SPW1</string>
		84	</property>
		85	</item>
		86	<item>
		87	<property name="text">
		88	<string>SPW2</string>
		89	</property>
		90	</item>
		91	</widget>
		92	</item>
		93	<item row="0" column="1">
		94	<widget class="QLineEdit" name="GRESB_IP_lineEdit"/>
		95	</item>
		96	<item row="2" column="0">
		97	<widget class="QLabel" name="GRESB_LinkNum_Lbl">
		98	<property name="text">
		99	<string>Select link number</string>
		100	</property>
		101	</widget>
		102	</item>
		103	<item row="0" column="0">
		104	<widget class="QLabel" name="GRESB_IP_Lbl">
		105	<property name="text">
		106	<string>GR-ESB IP Address</string>
		107	</property>
		108	</widget>
		109	</item>
		110	</layout>
		111	</widget>
		112	<widget class="QWidget" name="Web">
		113	<property name="toolTip">
		114	<string><html><head/><body><p>The Web tab gives access to the GR-ESB web interface.</p></body></html></string>
54	</property>	115	</property>
55	</item>	116	<attribute name="title">
56	<item>	117	<string>Web</string>
57	<property name="text">	118	</attribute>
58	<string>SPW2</string>	119	<layout class="QHBoxLayout" name="horizontalLayout">
59	~~</property~~>	120	<item>
60	</item>	121	<widget class="QWebView" name="WebView" native="true"/>
		122	</item>
		123	</layout>
		124	</widget>
61	</widget>	125	</widget>
62	</item>	126	</item>
63	</layout>	127	</layout>
64	</widget>	128	</widget>
		129	<customwidgets>
		130	<customwidget>
		131	<class>QWebView</class>
		132	<extends>QWidget</extends>
		133	<header location="global">QWebView</header>
		134	<container>1</container>
		135	</customwidget>
		136	</customwidgets>
65	<resources/>	137	<resources/>
66	<connections/>	138	<connections/>
67	</ui>	139	</ui>

spwplugin/SpwTcpPacketServer/spwtcppacketserver.ui +8 -1

             <?xml version="1.0" encoding="UTF-8"?>
             <ui version="4.0">
              <class>SpwTcpPacketServer</class>
              <widget class="QWidget" name="SpwTcpPacketServer">
               <property name="geometry">
                <rect>
                 <x>0</x>
                 <y>0</y>
                 <width>671</width>
                 <height>409</height>
                </rect>
               </property>
               <property name="windowTitle">
                <string>Form</string>
               </property>
+              <property name="toolTip">
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The spacewire plugin TCP server allows you to forward spacewire packets to any custom application, here you will configure the TCP connection and get some status information.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              </property>
               <layout class="QVBoxLayout" name="verticalLayout">
                <item>
                 <widget class="QGroupBox" name="configGroupBox">
                  <property name="title">
                   <string>Configuration</string>
                  </property>
                  <layout class="QFormLayout" name="formLayout_2">
                   <item row="0" column="0">
                    <widget class="QLabel" name="IPLbl">
                     <property name="text">
                      <string>Server IP</string>
                     </property>
                    </widget>
                   </item>
                   <item row="0" column="1">
                    <widget class="QLineEdit" name="IPLineEdit">
                     <property name="maxLength">
                      <number>15</number>
                     </property>
                     <property name="readOnly">
                      <bool>true</bool>
                     </property>
                    </widget>
                   </item>
                   <item row="1" column="0">
                    <widget class="QLabel" name="PortLbl">
                     <property name="text">
                      <string>Server Port</string>
                     </property>
                    </widget>
                   </item>
                   <item row="1" column="1">
-                   <widget class="QLineEdit" name="PortLineEdit"/>
+                   <widget class="QLineEdit" name="PortLineEdit">
+                    <property name="toolTip">
+                     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set the port on which the server will listen and accept client connections.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                    </property>
+                   </widget>
                   </item>
                   <item row="2" column="1">
                    <widget class="QPushButton" name="startServeQpb">
                     <property name="text">
                      <string>Start Server</string>
                     </property>
                    </widget>
                   </item>
                  </layout>
                 </widget>
                </item>
                <item>
                 <widget class="QGroupBox" name="clientListGroupBox_2">
                  <property name="title">
                   <string>Connected clients</string>
                  </property>
                  <property name="flat">
                   <bool>false</bool>
                  </property>
                  <layout class="QVBoxLayout" name="verticalLayout_2">
                   <item>
                    <widget class="QListWidget" name="listWidget"/>
                   </item>
                  </layout>
                 </widget>
                </item>
               </layout>
              </widget>
              <resources/>
              <connections/>
             </ui>

spwplugin/StarDundee/stardundeespw_usb.cpp 0 -1

             /*------------------------------------------------------------------------------
             --  This file is a part of the SocExplorer Software
             --  Copyright (C) 2014, Plasma Physics Laboratory - CNRS
             --
             --  This program is free software; you can redistribute it and/or modify
             --  it under the terms of the GNU General Public License as published by
             --  the Free Software Foundation; either version 3 of the License, or
             --  (at your option) any later version.
             --
             --  This program is distributed in the hope that it will be useful,
             --  but WITHOUT ANY WARRANTY; without even the implied warranty of
             --  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             --  GNU General Public License for more details.
             --
             --  You should have received a copy of the GNU General Public License
             --  along with this program; if not, write to the Free Software
             --  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
             -------------------------------------------------------------------------------*/
             /*--                  Author : Alexis Jeandet
             --                     Mail : alexis.jeandet@member.fsf.org
             ----------------------------------------------------------------------------*/
             #include "stardundeespw_usb.h"
             #include <socexplorerengine.h>
             #include <qhexedit.h>
             stardundeeSPW_USB::stardundeeSPW_USB(socexplorerplugin *parent) :
                 abstractSpwBridge(parent)
             {
                 Q_UNUSED(parent)
                 this->manager = new stardundeeSPW_USB_Manager(parent,this);
                 makeGUI(parent);
                 this->manager->start();
                 connect(this->manager,SIGNAL(emitPacket(char*,int)),this,SIGNAL(pushPacketOverTCP(char*,int)));
             }
             stardundeeSPW_USB::~stardundeeSPW_USB()
             {
                 this->manager->requestInterruption();
-                delete this->p_GUI;
             }
             void stardundeeSPW_USB::toggleBridgeConnection()
             {
                 if(this->plugin->isConnected())
                 {
                     this->disconnectBridge();
                 }
                 else
                 {
                     this->connectBridge();
                 }
             }
             bool stardundeeSPW_USB::connectBridge()
             {
                 if(this->manager->connectBridge())
                 {
                     ((StarDundeeGUI*)this->p_GUI)->lock(true);
                     emit setConnected(true);
                     return true;
                 }
                 return false;
             }
             bool stardundeeSPW_USB::disconnectBridge()
             {
                 if(this->manager->disconnectBridge())
                 {
                     ((StarDundeeGUI*)this->p_GUI)->lock(false);
                     emit setConnected(false);
                     return true;
                 }
                 return false;
             }
             int stardundeeSPW_USB::pushRMAPPacket(char *packet, int size)
             {
                 return this->manager->sendPacket(packet,size);
             }
             unsigned int stardundeeSPW_USB::Write(unsigned int *Value, unsigned int count, unsigned int address)
             {
                 char writeBuffer[RMAP_WRITE_PACKET_MIN_SZ((RMAP_MAX_XFER_SIZE*4))+1];
                 char *RMAPAckBuff;
                 writeBuffer[0]=this->manager->linkNumber;//Link number
                 int transactionID = 0;
                 int written=0;
                 SocExplorerEngine::message(this->plugin,"Enter Write function",2);
                 QProgressBar* progress=NULL;
                 SocExplorerAutoProgressBar autopb;
                 if(count>RMAP_MAX_XFER_SIZE)
                 {
                     progress= SocExplorerEngine::getProgressBar("Writing on SPW @0x"+QString::number(address,16)+" %v of "+QString::number(count)+" words ",count);
                     autopb.setProgressBar(progress);
                 }
                 //Quite stupide loop, I guess that I always get the number of byte I asked for!
                 while(count>=RMAP_MAX_XFER_SIZE)
                 {
                     for(int i=0;i<(RMAP_MAX_XFER_SIZE);i++)
                     {
                         writeBuffer[RMAP_WRITE_HEADER_MIN_SZ+(i*4)+1] = (char)(((unsigned int)Value[i+written]>>24)&0xFF);
                         writeBuffer[RMAP_WRITE_HEADER_MIN_SZ+(i*4)+2] = (char)(((unsigned int)Value[i+written]>>16)&0xFF);
                         writeBuffer[RMAP_WRITE_HEADER_MIN_SZ+(i*4)+3] = (char)(((unsigned int)Value[i+written]>>8)&0xFF);
                         writeBuffer[RMAP_WRITE_HEADER_MIN_SZ+(i*4)+4] = (char)(((unsigned int)Value[i+written])&0xFF);
                     }
                     transactionID=manager->getRMAPtransactionID();
                     SocExplorerEngine::message(this->plugin,QString("Sending Write request with ID=%1").arg(transactionID),2);
                     RMAP_build_tx_request_header(this->manager->rmapAddress,this->manager->rmapKey,1,transactionID,address+(written*4),RMAP_MAX_XFER_SIZE*4,writeBuffer+1);
                     manager->sendPacket(writeBuffer,RMAP_WRITE_PACKET_MIN_SZ(RMAP_MAX_XFER_SIZE*4)+1);
                     manager->getRMAPanswer(transactionID,&RMAPAckBuff);
                     free(RMAPAckBuff);
                     written+=RMAP_MAX_XFER_SIZE;
                     count-=RMAP_MAX_XFER_SIZE;
                     progress->setValue(written);
                     qApp->processEvents();
                 }
                 if(count>0)
                 {
                     for(int i=0;i<((int)count);i++)
                     {
                         writeBuffer[RMAP_WRITE_HEADER_MIN_SZ+(i*4)+1] = (char)(((unsigned int)Value[i+written]>>24)&0xFF);
                         writeBuffer[RMAP_WRITE_HEADER_MIN_SZ+(i*4)+2] = (char)(((unsigned int)Value[i+written]>>16)&0xFF);
                         writeBuffer[RMAP_WRITE_HEADER_MIN_SZ+(i*4)+3] = (char)(((unsigned int)Value[i+written]>>8)&0xFF);
                         writeBuffer[RMAP_WRITE_HEADER_MIN_SZ+(i*4)+4] = (char)(((unsigned int)Value[i+written])&0xFF);
                     }
                     transactionID=manager->getRMAPtransactionID();
                     SocExplorerEngine::message(this->plugin,QString("Sending Write request with ID=%1").arg(transactionID),2);
                     RMAP_build_tx_request_header(this->manager->rmapAddress,this->manager->rmapKey,1,transactionID,address+(written*4),count*4,writeBuffer+1);
                     manager->sendPacket(writeBuffer,RMAP_WRITE_PACKET_MIN_SZ(count*4) +1);
                     manager->getRMAPanswer(transactionID,&RMAPAckBuff);
                     free(RMAPAckBuff);
                     written+=count;
                     if(progress!=NULL)
                     {
                         progress->setValue(written);
                         qApp->processEvents();
                     }
                 }
                 return written;
             }
             unsigned int stardundeeSPW_USB::Read(unsigned int *Value, unsigned int count, unsigned int address)
             {
                 char requestBuffer[RMAP_READ_HEADER_MIN_SZ+1];
                 char* RMAP_AnswerBuffer;
                 requestBuffer[0]=this->manager->linkNumber;//Link number
                 int transactionID = 0;
                 int read=0;
                 QProgressBar* progress=NULL;
                 SocExplorerAutoProgressBar autopb;
                 if(count>RMAP_MAX_XFER_SIZE)
                 {
                     progress= SocExplorerEngine::getProgressBar("Reading on SPW @0x"+QString::number(address,16)+" %v of "+QString::number(count)+" words ",count);
                     autopb.setProgressBar(progress);
                 }
                 SocExplorerEngine::message(this->plugin,QString("Enter read function, count=%1, RMAP_MAX_XFER_SIZE=%2").arg(count).arg(RMAP_MAX_XFER_SIZE),2);
                 //Quite stupide loop, I guess that I always get the number of byte I asked for!
                 while((int)count>=(int)RMAP_MAX_XFER_SIZE)
                 {
                     transactionID = manager->getRMAPtransactionID();
                     SocExplorerEngine::message(this->plugin,QString("New transactionID:%1").arg(transactionID),2);
                     RMAP_build_rx_request_header(this->manager->rmapAddress,this->manager->rmapKey,1,transactionID,address+(read*4),RMAP_MAX_XFER_SIZE*4,requestBuffer+1);
                     manager->sendPacket(requestBuffer,RMAP_READ_HEADER_MIN_SZ+1);
                     int len=manager->getRMAPanswer(transactionID,&RMAP_AnswerBuffer);
                     if(len==-1)
                     {
                         this->toggleBridgeConnection();
                         return 0;
                     }
                     for(int i=0;i<((len-13)/4);i++)
                     {
                         Value[read+i] =   0x0FF & ((unsigned int)RMAP_AnswerBuffer[(4*i)+12]);
                         Value[read+i] =  (Value[read+i]<<8) + (0x0FF & ((unsigned int)RMAP_AnswerBuffer[(4*i)+13]));
                         Value[read+i] =  (Value[read+i]<<8) + (0x0FF & ((unsigned int)RMAP_AnswerBuffer[(4*i)+14]));
                         Value[read+i] =  (Value[read+i]<<8) + (0x0FF & ((unsigned int)RMAP_AnswerBuffer[(4*i)+15]));
                     }
                     free(RMAP_AnswerBuffer);
                     read+=RMAP_MAX_XFER_SIZE;
                     count-=RMAP_MAX_XFER_SIZE;
                     progress->setValue(read);
                     qApp->processEvents();
                 }
                 if((int)count>0)
                 {
                     transactionID = manager->getRMAPtransactionID();
                     SocExplorerEngine::message(this->plugin,QString("New transactionID: %1").arg(transactionID),2);
                     SocExplorerEngine::message(this->plugin,QString("Building request with:"),2);
                     SocExplorerEngine::message(this->plugin,QString("Address = %1").arg(address+(read*4),8,16),2);
                     SocExplorerEngine::message(this->plugin,QString("Size = %1").arg(count*4),2);
                     SocExplorerEngine::message(this->plugin,QString("Size + 13 = %1").arg((count*4)+13),2);
                     RMAP_build_rx_request_header(this->manager->rmapAddress,this->manager->rmapKey,1,transactionID,address+(read*4),count*4,requestBuffer+1);
                     manager->sendPacket(requestBuffer,RMAP_READ_HEADER_MIN_SZ+1);
                     int len=manager->getRMAPanswer(transactionID,&RMAP_AnswerBuffer);
                     if(len==-1)
                     {
                         this->toggleBridgeConnection();
                         return 0;
                     }
                     for(int i=0;i<((len-13)/4);i++)
                     {
                         Value[read+i] =   0x0FF & ((unsigned int)RMAP_AnswerBuffer[(4*i)+12]);
                         Value[read+i] =  (Value[read+i]<<8) + (0x0FF & ((unsigned int)RMAP_AnswerBuffer[(4*i)+13]));
                         Value[read+i] =  (Value[read+i]<<8) + (0x0FF & ((unsigned int)RMAP_AnswerBuffer[(4*i)+14]));
                         Value[read+i] =  (Value[read+i]<<8) + (0x0FF & ((unsigned int)RMAP_AnswerBuffer[(4*i)+15]));
                     }
                     free(RMAP_AnswerBuffer);
                     read+=count;
                     if(progress!=NULL)
                     {
                         progress->setValue(read);
                         qApp->processEvents();
                     }
                 }
                 return read;
             }
             void stardundeeSPW_USB::brickSelectionChanged(int brickIndex)
             {
                 this->manager->selectedBrick = brickIndex-1;
                 SocExplorerEngine::message(plugin,QString("Changing brick index: %1").arg(manager->selectedBrick),1);
             }
             void stardundeeSPW_USB::linkNumberSelectionChanged(int linkIndex)
             {
                 this->manager->linkNumber = linkIndex + 1;
                 SocExplorerEngine::message(plugin,QString("Changing Link Number: %1").arg(manager->linkNumber),1);
             }
             void stardundeeSPW_USB::linkSpeedSelectionChanged(const QString &linkSpeed)
             {
                 this->manager->linkSpeed = linkSpeed.toInt();
                 SocExplorerEngine::message(plugin,QString("Changing Link Speed: %1").arg(manager->linkSpeed),1);
             }
             void stardundeeSPW_USB::destinationKeyChanged(const QString &destKey)
             {
                 this->manager->destinationKey = destKey.toInt();
                 SocExplorerEngine::message(plugin,QString("Changing Destination Key: %1").arg(manager->destinationKey),1);
             }
             void stardundeeSPW_USB::rmapAddressChanged(const QString &rmapaddress)
             {
                 this->manager->rmapAddress = rmapaddress.toInt();
                 SocExplorerEngine::message(plugin,QString("Changing RMAP address: %1").arg(manager->rmapAddress),1);
             }
             void stardundeeSPW_USB::rmapKeyChanged(const QString &key)
             {
                 this->manager->rmapKey = key.toInt();
                 SocExplorerEngine::message(plugin,QString("Changing RMAP Key: %1").arg(manager->rmapKey),1);
             }
             void stardundeeSPW_USB::rmapTimeoutChanged(const QString &timeout)
             {
                 int tim=timeout.toInt();
                 if(tim<50)
                 {
                     tim = 50;
                     ((StarDundeeGUI*)this->p_GUI)->setRmapTimeout(QString("%1").arg(tim));
                 }
                 this->manager->RMAPtimeout = tim;
                 SocExplorerEngine::message(plugin,QString("Changing RMAP Timeout: %1").arg(manager->RMAPtimeout),1);
             }
             void stardundeeSPW_USB::makeGUI(socexplorerplugin *parent)
             {
                 this->p_GUI = new StarDundeeGUI();
                 //    this->mainLayout = new QGridLayout(this->p_GUI);
                 connect(((StarDundeeGUI*)this->p_GUI),SIGNAL(connectClicked()),this,SLOT(toggleBridgeConnection()));
                 connect(this->manager,SIGNAL(updateAvailableBrickCount(int)),((StarDundeeGUI*)this->p_GUI),SLOT(updateAvailableBrickCount(int)));
                 connect(((StarDundeeGUI*)this->p_GUI),SIGNAL(brickSelectionChanged(int)),this,SLOT(brickSelectionChanged(int)));
                 connect(((StarDundeeGUI*)this->p_GUI),SIGNAL(linkNumberSelectionChanged(int)),this,SLOT(linkNumberSelectionChanged(int)));
                 connect(((StarDundeeGUI*)this->p_GUI),SIGNAL(linkSpeedSelectionChanged(QString)),this,SLOT(linkSpeedSelectionChanged(QString)));
                 connect(((StarDundeeGUI*)this->p_GUI),SIGNAL(destinationKeyChanged(QString)),this,SLOT(destinationKeyChanged(QString)));
                 connect(((StarDundeeGUI*)this->p_GUI),SIGNAL(rmapAddressChanged(QString)),this,SLOT(rmapAddressChanged(QString)));
                 connect(((StarDundeeGUI*)this->p_GUI),SIGNAL(rmapKeyChanged(QString)),this,SLOT(rmapKeyChanged(QString)));
                 connect(((StarDundeeGUI*)this->p_GUI),SIGNAL(rmapTimeoutChanged(QString)),this,SLOT(rmapTimeoutChanged(QString)));
                 this->brickSelectionChanged(((StarDundeeGUI*)this->p_GUI)->getBrickSelection());
                 this->linkNumberSelectionChanged(((StarDundeeGUI*)this->p_GUI)->getLinkNumberSelection());
                 this->linkSpeedSelectionChanged(((StarDundeeGUI*)this->p_GUI)->getLinkSpeedSelection());
                 this->destinationKeyChanged(((StarDundeeGUI*)this->p_GUI)->getDestinationKey());
                 this->rmapAddressChanged(((StarDundeeGUI*)this->p_GUI)->getRmapAddress());
                 this->rmapKeyChanged(((StarDundeeGUI*)this->p_GUI)->getRmapKey());
                 this->rmapTimeoutChanged(((StarDundeeGUI*)this->p_GUI)->getRmapTimeout());
                 connect(this,SIGNAL(SelectBrick(int)),((StarDundeeGUI*)this->p_GUI),SLOT(selectBrick(int)));
                 connect(this,SIGNAL(SelectLinkNumber(int)),((StarDundeeGUI*)this->p_GUI),SLOT(selectLinkNumber(int)));
                 connect(this,SIGNAL(SelectLinkSpeed(int)),((StarDundeeGUI*)this->p_GUI),SLOT(selectLinkSpeed(int)));
                 connect(this,SIGNAL(SetDestinationKey(QString)),((StarDundeeGUI*)this->p_GUI),SLOT(setDestinationKey(QString)));
                 connect(this,SIGNAL(SetRmapAddress(QString)),((StarDundeeGUI*)this->p_GUI),SLOT(setRmapAddress(QString)));
                 connect(this,SIGNAL(SetRmapKey(QString)),((StarDundeeGUI*)this->p_GUI),SLOT(setRmapKey(QString)));
                 connect(this,SIGNAL(SetRmapTimeout(QString)),((StarDundeeGUI*)this->p_GUI),SLOT(setRmapTimeout(QString)));
             }
             stardundeeSPW_USB_Manager::stardundeeSPW_USB_Manager(socexplorerplugin *plugin, QObject *parent)
                 :QThread((QObject*)parent)
             {
                 this->RMAPtimeout = 2000;
                 this->handleMutex = new QMutex(QMutex::NonRecursive);
                 this->RMAP_AnswersSem = new QSemaphore(0);
                 this->RMAP_AnswersMtx=new QMutex(QMutex::Recursive);
                 this->RMAP_pending_transaction_IDsMtx=new QMutex(QMutex::Recursive);
                 this->plugin = plugin;
                 connected = false;
                 this->moveToThread(this);
             }
             stardundeeSPW_USB_Manager::~stardundeeSPW_USB_Manager()
             {
                 this->terminate();
                 while (!this->isFinished()) {
                     this->usleep(1000);
                 }
             }
             void stardundeeSPW_USB_Manager::run()
             {
                 USB_SPACEWIRE_PACKET_PROPERTIES properties;
                 USB_SPACEWIRE_ID pIdentifier=NULL;
                 USB_SPACEWIRE_STATUS stat;
                 SocExplorerEngine::message(this->plugin,"Starting Startdundee USB pooling thread",1);
                 char buffer[(RMAP_MAX_XFER_SIZE*4)+50];
                 while (!this->isInterruptionRequested())
                 {
                     if(this->connected)
                     {
                         handleMutex->lock();
                         SocExplorerEngine::message(this->plugin,"Looking for new RMAP packets",4);
                         if(USBSpaceWire_WaitOnReadPacketAvailable(hDevice,0.01))
                         {
                             SocExplorerEngine::message(this->plugin,"Got packet",2);
                             stat = USBSpaceWire_ReadPackets(hDevice, buffer, (RMAP_MAX_XFER_SIZE*4)+50,1, 1, &properties, &pIdentifier);
                             if (stat == TRANSFER_SUCCESS)
                             {
                                 if(USBSpaceWire_GetReadTrafficType(&properties, 0) ==SPACEWIRE_TRAFFIC_PACKET)
                                 {
                                     SocExplorerEngine::message(this->plugin,"It's a SPW packet",2);
                                     if(USBSpaceWire_GetReadEOPStatus(&properties, 0)== SPACEWIRE_USB_EOP)
                                     {
                                         SocExplorerEngine::message(this->plugin,"Got end of packet",2);
                                         if(buffer[1]==(char)SPW_PROTO_ID_RMAP) //RMAP packet
                                         {
                                             RMAP_Answer* packet;
                                             SocExplorerEngine::message(this->plugin,"Got RMAP packet",2);
                                             SocExplorerEngine::message(this->plugin,QString("Rmap packet size %1").arg(properties.len),2);
                                             char* packetbuffer = (char*)malloc(properties.len);
                                             memcpy(packetbuffer,buffer,properties.len);
                                             USBSpaceWire_FreeRead(hDevice, pIdentifier);
                                             pIdentifier = NULL;
                                             handleMutex->unlock();
                                             if(properties.len==8)
                                             {
                                                 packet=new RMAP_Answer(RMAP_get_transactionID(buffer),packetbuffer,properties.len);
                                             }
                                             else
                                             {
                                                 packet=new RMAP_Answer(RMAP_get_transactionID(buffer+1),packetbuffer,properties.len);
                                             }
                                             RMAP_AnswersMtx->lock();
                                             RMAP_Answers.append(packet);
                                             RMAP_AnswersMtx->unlock();
                                             RMAP_AnswersSem->release();
                                         }
                                         else //any non-rmap packet will be pushed to the network
                                         {
                                             char* packetbuffer = (char*)malloc(properties.len);
                                             memcpy(packetbuffer,buffer,properties.len);
                                             emit emitPacket(packetbuffer,properties.len);
                                             USBSpaceWire_FreeRead(hDevice, pIdentifier);
                                             handleMutex->unlock();
                                             SocExplorerEngine::message(this->plugin,"Got SPW packet",2);
                                         }
                                     }
                                     else
                                     {
                                         SocExplorerEngine::message(this->plugin,"No EOP received",2);
                                     }
                                 }
                             }
                             else
                             {
                                 USBSpaceWire_FreeRead(hDevice, pIdentifier);
                                 handleMutex->unlock();
                             }
                         }
                         else
                         {
                             USBSpaceWire_FreeRead(hDevice, pIdentifier);
                             handleMutex->unlock();
                         }
                     }
                     else
                     {
                         //do some sanity checks!
                         int list = USBSpaceWire_ListDevices();
                         if(this->brickList!=list)
                         {
                             this->brickList = list;
                             emit updateAvailableBrickCount(this->brickList);
                         }
                         usleep(RMAPtimeout/2);
                     }
                     usleep(1000);
                 }
                 SocExplorerEngine::message(this->plugin,"Exiting Startdundee USB pooling thread",1);
             }
             bool stardundeeSPW_USB_Manager::connectBridge()
             {
                 QMutexLocker mlock(this->handleMutex);
                 int status;
                 U32 statusControl;
                 this->connected = false;
                 if (!USBSpaceWire_Open(&hDevice, this->selectedBrick)) // Open the USB device
                 {
                     SocExplorerEngine::message(this->plugin,"stardundee *** Open *** ERROR: USBSpaceWire_Open(&hDevice, 0))",0);
                     return false;
                 }
                 SocExplorerEngine::message(this->plugin,"stardundee *** Open *** USBSpaceWire_Open successful",0);
                 USBSpaceWire_EnableNetworkMode(hDevice, 0); // deactivate the network mode
                 CFGSpaceWire_EnableRMAP(1);                 // Enable the use of RMAP for the StarDundee brick configuration
                 CFGSpaceWire_SetRMAPDestinationKey(0x20);   // Set the destination key expected by STAR-Dundee devices
                 // Set the path and return path to the device
                 CFGSpaceWire_StackClear();
                 CFGSpaceWire_AddrStackPush(0);
                 CFGSpaceWire_AddrStackPush(254);
                 CFGSpaceWire_RetAddrStackPush(254);
                 // set the base transmit rate to 100 MHz
                 status = CFGSpaceWire_SetBrickBaseTransmitRate( hDevice, CFG_BRK_CLK_100_MHZ, CFG_BRK_DVDR_1, 0xff);
                 if (status != CFG_TRANSFER_SUCCESS)
                 {
                     SocExplorerEngine::message(this->plugin,"ERROR CFGSpaceWire_SetBrickBaseTransmitRate",1);
                     return false;
                 }
                 else
                 {
                     SocExplorerEngine::message(this->plugin,"OK CFGSpaceWire_SetBrickBaseTransmitRate, base rate = 100 MHz",1);
                 }
                 // read the link status
                 if (CFGSpaceWire_GetLinkStatusControl(hDevice, this->linkNumber, &statusControl) != CFG_TRANSFER_SUCCESS)
                 {
                     SocExplorerEngine::message(this->plugin,"Could not read link status control for link " + QString::number(this->linkNumber),1);
                     return false;
                 }
                 else
                 {
                     SocExplorerEngine::message(this->plugin,"OK CFGSpaceWire_GetLinkStatusControl of link " + QString::number(this->linkNumber),1);
                     // Set the link status control register properties
                     CFGSpaceWire_LSEnableAutoStart(&statusControl, 1);
                     CFGSpaceWire_LSEnableStart(&statusControl, 1);
                     CFGSpaceWire_LSEnableDisabled(&statusControl, 0);
                     CFGSpaceWire_LSEnableTristate(&statusControl, 0);
                     CFGSpaceWire_LSSetOperatingSpeed(&statusControl, 9);    // sets the link speed to ( 100 MHz / (9+1) ) = 10 MHz
                     // Set the link status control register
                     if (CFGSpaceWire_SetLinkStatusControl(hDevice, this->linkNumber, statusControl) != CFG_TRANSFER_SUCCESS)
                     {
                         SocExplorerEngine::message(this->plugin,"Could not set the link status control for link " + QString::number(this->linkNumber),1);
                         return false;
                     }
                     else
                     {
                         SocExplorerEngine::message(this->plugin,"Set the link status control for link " + QString::number(this->linkNumber),1);
                     }
                 }
                 if (CFGSpaceWire_SetAsInterface(hDevice, 1, 0) != CFG_TRANSFER_SUCCESS)
                 {
                     SocExplorerEngine::message(this->plugin,"Could not set the device to be an interface",1);
                     return false;
                 }
                 else
                 {
                     SocExplorerEngine::message(this->plugin,"Device set to be an interface",1);
                 }
                 USBSpaceWire_RegisterReceiveOnAllPorts(hDevice);    // Register to receive on all ports
                 USBSpaceWire_ClearEndpoints(hDevice);               // clear the USB endpoints
                 USBSpaceWire_SetTimeout(hDevice,1.0);
                 SocExplorerEngine::message(this->plugin,"The driver's current send buffer size is " + QString::number(USBSpaceWire_GetDriverSendBufferSize(hDevice)) + " bytes",1);
                 SocExplorerEngine::message(this->plugin,"The driver's current read buffer size is " + QString::number(USBSpaceWire_GetDriverReadBufferSize(hDevice)) + " bytes",1);
                 SocExplorerEngine::message(this->plugin,"USBSpaceWire_IsReadThrottling is " + QString::number(USBSpaceWire_IsReadThrottling(hDevice)),1);
                 this->connected = true;
                 return true;
             }
             bool stardundeeSPW_USB_Manager::disconnectBridge()
             {
                 this->handleMutex->lock();
                 USBSpaceWire_Close(hDevice); // Close the device
                 SocExplorerEngine::message(this->plugin,"stardundee *** Close *** USBSpaceWire_Close, device: " + QString::number(0),0);
                 USBSpaceWire_UnregisterReceiveOnAllPorts(hDevice);  // Stop receiving on all ports
                 this->handleMutex->unlock();
                 this->RMAP_pending_transaction_IDsMtx->lock();
                 this->RMAP_pending_transaction_IDs.clear();
                 this->RMAP_pending_transaction_IDsMtx->unlock();
                 this->RMAP_AnswersMtx->lock();
                 this->RMAP_Answers.clear();
                 this->RMAP_AnswersMtx->unlock();
                 this->RMAP_AnswersSem->acquire(this->RMAP_AnswersSem->available());
                 return true;
             }
             int stardundeeSPW_USB_Manager::getRMAPtransactionID()
             {
                 this->RMAP_pending_transaction_IDsMtx->lock();
                 int  ID=0;
                 bool found=true;
                 while(ID<511)
                 {
                     for(int i=0;i<RMAP_pending_transaction_IDs.count();i++)
                     {
                         if(RMAP_pending_transaction_IDs[i]==ID)found=false;
                     }
                     if(found==true)break;
                     ID++;
                     found = true;
                 }
                 if(found)
                 {
                     RMAP_pending_transaction_IDs.append(ID);
                 }
                 this->RMAP_pending_transaction_IDsMtx->unlock();
                 return ID;
             }
             int stardundeeSPW_USB_Manager::getRMAPanswer(int transactionID, char **buffer)
             {
                 QTime timeout;
                 *buffer=NULL;
                 int count=0;
                 SocExplorerEngine::message(this->plugin,"Looking for RMAP answer",2);
                 timeout.start();
                 while (*buffer==NULL)
                 {
                     this->RMAP_AnswersMtx->lock();
                     SocExplorerEngine::message(this->plugin,"Got exclusive access on RMAP_Answers stack",2);
                     SocExplorerEngine::message(this->plugin,QString("%1 packet(s) available in RMAP_Answers stack").arg(RMAP_Answers.count()),2);
                     for(int i=0;i<RMAP_Answers.count();i++)
                     {
                         SocExplorerEngine::message(this->plugin,QString("Packet %1 ID=%2").arg(i).arg(RMAP_Answers[i]->transactionID),2);
                         if(RMAP_Answers[i]->transactionID==transactionID)
                         {
                             this->RMAP_pending_transaction_IDsMtx->lock();
                             SocExplorerEngine::message(this->plugin,"Got exclusive access on RMAP_pending_transaction_ID stack",2);
                             for(int j=0;j<RMAP_pending_transaction_IDs.count();j++)
                             {
                                 if(RMAP_pending_transaction_IDs[j]==transactionID)
                                 {
                                     RMAP_pending_transaction_IDs.removeAt(j);
                                 }
                             }
                             this->RMAP_pending_transaction_IDsMtx->unlock();
                             *buffer = RMAP_Answers[i]->data;
                             count = RMAP_Answers[i]->len;
                             RMAP_Answer* tmp=RMAP_Answers[i];
                             RMAP_Answers.removeAt(i);
                             delete tmp;
                         }
                     }
                     this->RMAP_AnswersMtx->unlock();
                     //if no answer found in the stack wait until a new packet is pushed
                     SocExplorerEngine::message(this->plugin,"waiting until a new packet is pushed",2);
                     if(*buffer==NULL)
                     {
                         while (0==this->RMAP_AnswersSem->available())
                         {
                             SocExplorerEngine::message(this->plugin,QString("this->RMAP_AnswersSem->available() = %1").arg(this->RMAP_AnswersSem->available()),2);
                             if(timeout.elapsed()>=RMAPtimeout)
                             {
                                 SocExplorerEngine::message(this->plugin,"Timeout reached giving up!",2);
                                 return -1;
                             }
                             usleep(1000);
                         }
                         this->RMAP_AnswersSem->acquire();
                     }
                 }
                 return count;
             }
             bool stardundeeSPW_USB_Manager::sendPacket(char *packet, int size)
             {
                 USB_SPACEWIRE_STATUS result;
                 USB_SPACEWIRE_ID pIdentifier;
                 SocExplorerEngine::message(this->plugin,"Sending SPW packet",2);
                 this->handleMutex->lock();
                 result = USBSpaceWire_SendPacket(hDevice,packet,size,1, &pIdentifier);
                 if (result != TRANSFER_SUCCESS)
                 {
                     SocExplorerEngine::message(this->plugin,"ERR sending the READ command ",2);
                     this->handleMutex->unlock();
                     return false;
                 }
                 else
                 {
                     SocExplorerEngine::message(this->plugin,"Packet sent",2);
                     USBSpaceWire_FreeSend(hDevice, pIdentifier);
                 }
                 this->handleMutex->unlock();
                 return true;
             }
             void stardundeeSPW_USB_Manager::pushRmapPacket(char *packet, int len)
             {
                 char* packetbuffer = (char*)malloc(len);
                 memcpy(packetbuffer,packet,len);
                 RMAP_Answer* RMPAPpacket=new RMAP_Answer(RMAP_get_transactionID(packetbuffer+1),packetbuffer,len);
                 RMAP_AnswersMtx->lock();
                 RMAP_Answers.append(RMPAPpacket);
                 RMAP_AnswersMtx->unlock();
             }

spwplugin/abstractspwbridge.cpp +5 0

             /*------------------------------------------------------------------------------
             --  This file is a part of the SocExplorer Software
             --  Copyright (C) 2014, Plasma Physics Laboratory - CNRS
             --
             --  This program is free software; you can redistribute it and/or modify
             --  it under the terms of the GNU General Public License as published by
             --  the Free Software Foundation; either version 3 of the License, or
             --  (at your option) any later version.
             --
             --  This program is distributed in the hope that it will be useful,
             --  but WITHOUT ANY WARRANTY; without even the implied warranty of
             --  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             --  GNU General Public License for more details.
             --
             --  You should have received a copy of the GNU General Public License
             --  along with this program; if not, write to the Free Software
             --  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
             -------------------------------------------------------------------------------*/
             /*--                  Author : Alexis Jeandet
             --                     Mail : alexis.jeandet@member.fsf.org
             ----------------------------------------------------------------------------*/
             #include "abstractspwbridge.h"
             abstractSpwBridge::abstractSpwBridge(socexplorerplugin *parent)
                 :QObject((QObject*)parent)
             {
                 this->plugin = parent;
                 this->p_GUI=NULL;
             }
+            abstractSpwBridge::~abstractSpwBridge()
+            {
+                    delete this->p_GUI;
+            }
             QWidget *abstractSpwBridge::getGUI()
             {
                 return this->p_GUI;
             }
             bool abstractSpwBridge::connectBridge()
             {
                 return false;
             }
             bool abstractSpwBridge::disconnectBridge()
             {
                 return false;
             }

spwplugin/abstractspwbridge.h +1 0

             /*------------------------------------------------------------------------------
             --  This file is a part of the SocExplorer Software
             --  Copyright (C) 2014, Plasma Physics Laboratory - CNRS
             --
             --  This program is free software; you can redistribute it and/or modify
             --  it under the terms of the GNU General Public License as published by
             --  the Free Software Foundation; either version 3 of the License, or
             --  (at your option) any later version.
             --
             --  This program is distributed in the hope that it will be useful,
             --  but WITHOUT ANY WARRANTY; without even the implied warranty of
             --  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             --  GNU General Public License for more details.
             --
             --  You should have received a copy of the GNU General Public License
             --  along with this program; if not, write to the Free Software
             --  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
             -------------------------------------------------------------------------------*/
             /*--                  Author : Alexis Jeandet
             --                     Mail : alexis.jeandet@member.fsf.org
             ----------------------------------------------------------------------------*/
             #ifndef ABSTRACTSPWBRIDGE_H
             #define ABSTRACTSPWBRIDGE_H
             #include <QObject>
             #include <socexplorerplugin.h>
             #define RMAP_MAX_XFER_SIZE 4000 //slightly less than 16kBytes
             #include <spw.h>
             class abstractSpwBridge : public QObject
             {
                 Q_OBJECT
             public:
                 explicit abstractSpwBridge(socexplorerplugin *parent);
+                ~abstractSpwBridge();
                 QWidget *getGUI();
             public slots:
                 virtual bool connectBridge();
                 virtual bool disconnectBridge();
                 virtual unsigned int Write(unsigned int *Value,unsigned int count, unsigned int address=0)=0;
                 virtual unsigned int Read(unsigned int *Value,unsigned int count, unsigned int address=0)=0;
                 virtual int pushRMAPPacket(char* packet,int size)=0;
             signals:
                 void setConnected(bool connected);
                 void pushPacketOverTCP(char* packet,int size);
             protected:
                 socexplorerplugin* plugin;
                 QWidget* p_GUI;
             private:
             };
             #endif // ABSTRACTSPWBRIDGE_H

spwplugin/spwplugin.pro +3 -1

             #
             # Project created by QtCreator 2011-09-20T08:15:30
             #
             #-------------------------------------------------
             CONFIG += socexplorerplugin
-            QT += network
+            QT += network webkit
+            greaterThan(QT_MAJOR_VERSION, 4): QT += webkitwidgets
             win32:CONFIG += dll
             win32:CONFIG -= static
             CONFIG(debug, debug|release) {
               DEBUG_EXT = _d
             } else {
               DEBUG_EXT =
             }
             TARGET = spwplugin$${DEBUG_EXT}
             DEFINES += PLUGIN=spwplugin
             DEFINES += PLUGINHEADER="\"\\\"spwplugin.h"\\\"\"
             DEFINES += driver_Name="\"\\\"SpwPlugin"\\\"\"
             DEFINES += driver_Author="\"\\\"Alexis Jeandet alexis.jeandet@member.fsf.org"\\\"\"
             DEFINES += driver_Version="\"\\\"0.0.1"\\\"\"
             DEFINES += driver_Description="\"\\\"Driver description"\\\"\"
             DEFINES += driver_can_be_root=1
             DEFINES += driver_can_be_child=0
             DEFINES += driver_VID=0
             DEFINES += driver_PID=0
             STARTDUNDEEPATH=/home/spacewire/usb/spw_usb_driver_v2.68/
             LIBS += $$STARTDUNDEEPATH/lib/x86_64/libSpaceWireUSBAPI.so \
                 $$STARTDUNDEEPATH/lib/x86_64/libConfigLibraryUSB.so
             INCLUDEPATH += \
                     $${PWD} \
                     $$STARTDUNDEEPATH/inc \
                     StarDundee \
                     GR-ESB
             HEADERS += \
                 spwplugin.h \
                 StarDundee/stardundeespw_usb.h \
                 abstractspwbridge.h \
                 spw.h \
                 StarDundee/stardundeegui.h \
                 SpwTcpPacketServer/spwtcppacketserver.h \
                 spwpywrapper.h \
                 GR-ESB/gr_esb_bridge.h \
                 GR-ESB/gr_esb_ui.h
             SOURCES += \
                 spwplugin.cpp \
                 StarDundee/stardundeespw_usb.cpp \
                 abstractspwbridge.cpp \
                 StarDundee/stardundeegui.cpp \
                 SpwTcpPacketServer/spwtcppacketserver.cpp \
                 spwpywrapper.cpp \
                 GR-ESB/gr_esb_bridge.cpp \
                 GR-ESB/gr_esb_ui.cpp
             FORMS += \
                 StarDundee/stardundeeGUI.ui \
                 SpwTcpPacketServer/spwtcppacketserver.ui \
                 GR-ESB/gr_esb_ui.ui
             RESOURCES += \
                 spwRessources.qrc

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