HG_REPOSITORIES/LPP/INSTRUMENTATION/SocExplorerPlugins Commit - r25:8fdbbdd7a3a4

Some work on GRESB driver for spwplugin.

Jeandet Alexis -

r25:8fdbbdd7a3a4 default

parent child

Context file:

r25:8fdbbdd7a3a4

Collapse all files

spwplugin/GR-ESB/gr_esb_bridge.cpp +142 -34

@@ -1,94 +1,202
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	#include <unistd.h>
		4	#include "spw.h"
		5	#include <socexplorerengine.h>
4		6
5	GR_ESB_bridge::GR_ESB_bridge(socexplorerplugin *parent) :	7	GR_ESB_bridge::GR_ESB_bridge(socexplorerplugin *parent) :
6	abstractSpwBridge(parent)	8	abstractSpwBridge(parent)
7	{	9	{
8	this->p_GUI = new GR_ESB_ui();	10	this->p_GUI = new GR_ESB_ui();
9	this->Read_soc = new QTcpSocket(this);	11	this->manager = new GR_ESB_Manager(parent,this);
10	this->Write_soc = new QTcpSocket(this);	12
11	connect((GR_ESB_ui*)(this->p_GUI),SIGNAL(ipchanged(QString)),this,SLOT(setIP(QString)));	13	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(set~~Port~~(QString)));	14	connect((GR_ESB_ui*)(this->p_GUI),SIGNAL(vlinkchanged(QString)),this,SLOT(setVirtualLink(QString)));
		15	connect((GR_ESB_ui*)(this->p_GUI),SIGNAL(connectClicked()),this,SLOT(toggleBridgeConnection()));
		16	this->manager->virtualLinkIndex = 0;
		17	this->manager->start();
13	}	18	}
14		19
15	GR_ESB_bridge::~GR_ESB_bridge()	20	GR_ESB_bridge::~GR_ESB_bridge()
16	{	21	{
17	}	22	}
18		23
		24	void GR_ESB_bridge::toggleBridgeConnection()
		25	{
		26	if(this->plugin->isConnected())
		27	{
		28	this->disconnectBridge();
		29	}
		30	else
		31	{
		32	this->connectBridge();
		33	}
		34	}
		35
19	bool GR_ESB_bridge::connectBridge()	36	bool GR_ESB_bridge::connectBridge()
20	{	37	{
		38	if(this->manager->connectBridge())
		39	{
		40	((GR_ESB_ui*)this->p_GUI)->lock(true);
		41	emit setConnected(true);
		42	return true;
		43	}
		44	return false;
		45	}
		46
		47	bool GR_ESB_bridge::disconnectBridge()
		48	{
		49	if(this->manager->disconnectBridge())
		50	{
		51	((GR_ESB_ui*)this->p_GUI)->lock(false);
		52	emit setConnected(false);
		53	return true;
		54	}
		55	return false;
		56	}
		57
		58	void GR_ESB_bridge::setIP(QString ip)
		59	{
		60	this->manager->IP = ip;
		61	}
		62
		63	void GR_ESB_bridge::setVirtualLink(QString vlink)
		64	{
		65	vlink = vlink.section("Virtual link",0,0);
		66	bool success;
		67	int vlinkTmp = vlink.toInt(&success);
		68	if(success)
		69	{
		70	setVirtualLink(vlinkTmp);
		71	}
		72	}
		73
		74	void GR_ESB_bridge::setVirtualLink(qint32 vlink)
		75	{
		76	if(vlink<6 && vlink>=0)
		77	{
		78	this->manager->virtualLinkIndex = vlink;
		79	}
		80	}
		81
		82
		83	unsigned int GR_ESB_bridge::Write(unsigned int *Value, unsigned int count, unsigned int address)
		84	{
		85
		86	}
		87
		88	unsigned int GR_ESB_bridge::Read(unsigned int *Value, unsigned int count, unsigned int address)
		89	{
		90
		91	}
		92
		93	int GR_ESB_bridge::pushRMAPPacket(char *packet, int size)
		94	{
		95	return this->manager->sendPacket(packet,size);
		96	}
		97
		98
		99	GR_ESB_Manager::GR_ESB_Manager(socexplorerplugin plugin, QObject parent)
		100	:QThread((QObject*)parent)
		101	{
		102	this->Read_soc = new QTcpSocket(this);
		103	this->Write_soc = new QTcpSocket(this);
		104	this->RMAPtimeout = 2000;
		105	this->handleMutex = new QMutex(QMutex::NonRecursive);
		106	this->RMAP_AnswersSem = new QSemaphore(0);
		107	this->RMAP_AnswersMtx=new QMutex(QMutex::Recursive);
		108	this->RMAP_pending_transaction_IDsMtx=new QMutex(QMutex::Recursive);
		109	this->plugin = plugin;
		110	connected = false;
		111	this->moveToThread(this);
		112	}
		113
		114	GR_ESB_Manager::~GR_ESB_Manager()
		115	{
		116
		117	}
		118
		119	void GR_ESB_Manager::run()
		120	{
		121	SocExplorerEngine::message(this->plugin,"Starting GRESB pooling thread",1);
		122	while (!this->isInterruptionRequested())
		123	{
		124	if(this->connected)
		125	{
		126	handleMutex->lock();
		127	SocExplorerEngine::message(this->plugin,"Looking for new RMAP packets",4);
		128
		129	}
		130	else
		131	{
		132	//do some sanity checks!
		133
		134	usleep(RMAPtimeout/2);
		135	}
		136	usleep(1000);
		137	}
		138	SocExplorerEngine::message(this->plugin,"Exiting Startdundee USB pooling thread",1);
		139	}
		140
		141	bool GR_ESB_Manager::connectBridge()
		142	{
21	int timeout=60;	143	int timeout=60;
22	if(this->Read_soc->state()==QTcpSocket::UnconnectedState)	144	if(this->Read_soc->state()==QTcpSocket::UnconnectedState)
23	{	145	{
24	this->Read_soc->connectToHost(IP,gresb_Conf[virtualLinkIndex].Read_port);	146	this->Read_soc->connectToHost(IP,gresb_Conf[virtualLinkIndex].Read_port);
25	this->Read_soc->waitForConnected(30000);	147	this->Read_soc->waitForConnected(30000);
26	}	148	}
27	if(this->Write_soc->state()==QTcpSocket::UnconnectedState)	149	if(this->Write_soc->state()==QTcpSocket::UnconnectedState)
28	{	150	{
29	this->Write_soc->connectToHost(IP,gresb_Conf[virtualLinkIndex].Write_port);	151	this->Write_soc->connectToHost(IP,gresb_Conf[virtualLinkIndex].Write_port);
30	this->Write_soc->waitForConnected(30000);	152	this->Write_soc->waitForConnected(30000);
31	}	153	}
32	while((this->Read_soc->state()!=QTcpSocket::ConnectedState) && (this->Write_soc->state()!=QTcpSocket::ConnectedState))	154	while((this->Read_soc->state()!=QTcpSocket::ConnectedState) && (this->Write_soc->state()!=QTcpSocket::ConnectedState))
33	{	155	{
34	usleep(100000);	156	usleep(100000);
35	if(timeout--==0)return false;	157	if(timeout--==0)return false;
36	}	158	}
37	return true;	159	return true;
		160
38	}	161	}
39		162
40	bool GR_ESB_~~bridge~~::disconnectBridge()	163	bool GR_ESB_Manager::disconnectBridge()
41	{	164	{
42	int timeout=60;	165	int timeout=60;
43	if(this->Read_soc->state()!=QTcpSocket::UnconnectedState)	166	if(this->Read_soc->state()!=QTcpSocket::UnconnectedState)
44	{	167	{
45	this->Read_soc->disconnectFromHost();	168	this->Read_soc->disconnectFromHost();
46	this->Read_soc->waitForDisconnected(30000);	169	this->Read_soc->waitForDisconnected(30000);
47	while(this->Read_soc->state()!=QTcpSocket::UnconnectedState)	170	}
48	{	171	if(this->Write_soc->state()!=QTcpSocket::UnconnectedState)
49	usleep(100000);	172	{
50	if(timeout--==0)return false;	173	this->Write_soc->disconnectFromHost();
51	}	174	this->Write_soc->waitForDisconnected(30000);
		175	}
		176	while((this->Read_soc->state()!=QTcpSocket::UnconnectedState) && (this->Write_soc->state()!=QTcpSocket::UnconnectedState))
		177	{
		178	usleep(100000);
		179	if(timeout--==0)return false;
52	}	180	}
53	return true;	181	return true;
54	}	182	}
55		183
56	void GR_ESB_bridge::setIP(QString ip)	184	int GR_ESB_Manager::getRMAPtransactionID()
57	{	185	{
58	this->IP = ip;	186
59	}	187	}
60		188
61	void GR_ESB_bridge::setVirtualLink(QString vlink)	189	int GR_ESB_Manager::getRMAPanswer(int transactionID, char **buffer)
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
81	unsigned int GR_ESB_bridge::Write(unsigned int *Value, unsigned int count, unsigned int address)
82	{	190	{
83		191
84	}	192	}
85		193
86	unsigned int GR_ESB_bridge::Read(unsigned int *Value, unsigned int count, unsigned int address)	194	bool GR_ESB_Manager::sendPacket(char *packet, int size)
87	{	195	{
88		196
89	}	197	}
90		198
91	~~int~~ GR_ESB_~~bridge~~::pushR~~MAP~~Packet(char *packet, int ~~size~~)	199	void GR_ESB_Manager::pushRmapPacket(char *packet, int len)
92	{	200	{
93		201
94	}	202	}

spwplugin/GR-ESB/gr_esb_bridge.h +42 -4

             #ifndef GR_ESB_BRIDGE_H
             #define GR_ESB_BRIDGE_H
             #include "abstractspwbridge.h"
             #include <QTcpSocket>
+            #include <QThread>
+            #include <QMutex>
+            #include <QSemaphore>
             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_Manager: public QThread
+            {
+                Q_OBJECT
+            public:
+                explicit GR_ESB_Manager(socexplorerplugin *plugin = 0,QObject* parent=0);
+                ~GR_ESB_Manager();
+                void run();
+                bool connectBridge();
+                bool disconnectBridge();
+                int getRMAPtransactionID();
+                int getRMAPanswer(int transactionID,char** buffer);
+                bool sendPacket(char* packet,int size);
+            signals:
+                void emitPacket(char* packet,int size);
+            private:
+                QMutex* handleMutex,*RMAP_AnswersMtx,*RMAP_pending_transaction_IDsMtx;
+                QSemaphore* RMAP_AnswersSem;
+                void pushRmapPacket(char* packet,int len);
+                socexplorerplugin* plugin;
+                bool connected;
+                char* SPWPacketBuff;
+                QList<RMAP_Answer*> RMAP_Answers;
+                QList<int> RMAP_pending_transaction_IDs;
+            public:
+                QTcpSocket* Read_soc;
+                QTcpSocket* Write_soc;
+                QString IP;
+                int virtualLinkIndex;
+                int RMAPtimeout;
+            };
             class GR_ESB_bridge : public abstractSpwBridge
             {
                 Q_OBJECT
             public:
                 explicit GR_ESB_bridge(socexplorerplugin *parent = 0);
                 ~GR_ESB_bridge();
             signals:
             public slots:
+                void toggleBridgeConnection();
                 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();
             private:
-                QTcpSocket* Read_soc;
-                QTcpSocket* Write_soc;
+                GR_ESB_Manager* manager;
-                QString IP;
-                int virtualLinkIndex;
             };
             #endif // GR_ESB_BRIDGE_H

spwplugin/GR-ESB/gr_esb_ui.cpp +12 0

             #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)));
+                connect(this->ui->connectQpb,SIGNAL(clicked()),this,SIGNAL(connectClicked()));
             }
             void GR_ESB_ui::changeIp(QString ip)
             {
                 this->ui->WebView->load(QUrl("http://"+ip));
                 emit this->ipchanged(ip);
             }
+            void GR_ESB_ui::lock(bool lock)
+            {
+                this->ui->GRESB_IP_lineEdit->setDisabled(lock);
+                this->ui->GRESB_LinkNum_CmBx->setDisabled(lock);
+                this->ui->GRESB_Vlink_CmBx->setDisabled(lock);
+                if(lock)
+                    this->ui->connectQpb->setText("Disconnect");
+                else
+                    this->ui->connectQpb->setText("Connect");
+            }

spwplugin/GR-ESB/gr_esb_ui.h +2 -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);
             public slots:
                 void changeIp(QString ip);
+                void lock(bool lock);
             signals:
                 void ipchanged(QString ip);
                 void vlinkchanged(QString vlink);
+                void connectClicked();
             private:
                 Ui::GR_ESB_ui *ui;
             };
             #endif // GR_ESB_UI_H

spwplugin/GR-ESB/gr_esb_ui.ui +9 -2

             <?xml version="1.0" encoding="UTF-8"?>
             <ui version="4.0">
              <class>GR_ESB_ui</class>
              <widget class="QWidget" name="GR_ESB_ui">
               <property name="geometry">
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>489</width>
+                <width>968</width>
-                <height>295</height>
+                <height>392</height>
                </rect>
               </property>
               <property name="windowTitle">
                <string>Form</string>
               </property>
               <layout class="QVBoxLayout" name="verticalLayout">
                <item>
                 <widget class="QTabWidget" name="tabWidget">
                  <property name="toolTip">
                   <string/>
                  </property>
                  <property name="currentIndex">
                   <number>0</number>
                  </property>
                  <widget class="QWidget" name="Config">
                   <property name="toolTip">
                    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The Config tab allows you to configure the Ethernet conncetion to the GR-ESB and some spacewire parameters.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                   </property>
                   <attribute name="title">
                    <string>Config</string>
                   </attribute>
                   <layout class="QGridLayout" name="gridLayout_2">
                    <item row="1" column="1">
                     <widget class="QComboBox" name="GRESB_Vlink_CmBx">
                      <item>
                       <property name="text">
                        <string>Virtual link 0</string>
                       </property>
                      </item>
                      <item>
                       <property name="text">
                        <string>Virtual link 1</string>
                       </property>
                      </item>
                      <item>
                       <property name="text">
                        <string>Virtual link 2</string>
                       </property>
                      </item>
                      <item>
                       <property name="text">
                        <string>Virtual link 3</string>
                       </property>
                      </item>
                      <item>
                       <property name="text">
                        <string>Virtual link 4</string>
                       </property>
                      </item>
                      <item>
                       <property name="text">
                        <string>Virtual link 5</string>
                       </property>
                      </item>
                     </widget>
                    </item>
                    <item row="1" column="0">
                     <widget class="QLabel" name="GRESB_Vlink_Lbl">
                      <property name="text">
                       <string>GR-ESB Virtual link</string>
                      </property>
                     </widget>
                    </item>
                    <item row="2" column="1">
                     <widget class="QComboBox" name="GRESB_LinkNum_CmBx">
                      <item>
                       <property name="text">
                        <string>SPW0</string>
                       </property>
                      </item>
                      <item>
                       <property name="text">
                        <string>SPW1</string>
                       </property>
                      </item>
                      <item>
                       <property name="text">
                        <string>SPW2</string>
                       </property>
                      </item>
                     </widget>
                    </item>
                    <item row="0" column="1">
                     <widget class="QLineEdit" name="GRESB_IP_lineEdit"/>
                    </item>
                    <item row="2" column="0">
                     <widget class="QLabel" name="GRESB_LinkNum_Lbl">
                      <property name="text">
                       <string>Select link number</string>
                      </property>
                     </widget>
                    </item>
                    <item row="0" column="0">
                     <widget class="QLabel" name="GRESB_IP_Lbl">
                      <property name="text">
                       <string>GR-ESB IP Address</string>
                      </property>
                     </widget>
                    </item>
+                   <item row="3" column="0" colspan="2">
+                    <widget class="QPushButton" name="connectQpb">
+                     <property name="text">
+                      <string>Connect</string>
+                     </property>
+                    </widget>
+                   </item>
                   </layout>
                  </widget>
                  <widget class="QWidget" name="Web">
                   <property name="toolTip">
                    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The Web tab gives access to the GR-ESB web interface.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                   </property>
                   <attribute name="title">
                    <string>Web</string>
                   </attribute>
                   <layout class="QHBoxLayout" name="horizontalLayout">
                    <item>
                     <widget class="QWebView" name="WebView" native="true"/>
                    </item>
                   </layout>
                  </widget>
                 </widget>
                </item>
               </layout>
              </widget>
              <customwidgets>
               <customwidget>
                <class>QWebView</class>
                <extends>QWidget</extends>
                <header location="global">QWebView</header>
                <container>1</container>
               </customwidget>
              </customwidgets>
              <resources/>
              <connections/>
             </ui>

spwplugin/SpwTcpPacketServer/spwtcppacketserver.ui +39 -10

             <?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>
+                <width>726</width>
-                <height>409</height>
+                <height>535</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">
                     <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">
+                <widget class="QGroupBox" name="groupBox">
                  <property name="title">
-                  <string>Connected clients</string>
+                  <string>Server Statistics</string>
                  </property>
-                 <property name="flat">
+                 <layout class="QGridLayout" name="gridLayout">
-                  <bool>false</bool>
+                  <item row="2" column="0" colspan="2">
-                 </property>
+                   <widget class="QGroupBox" name="clientListGroupBox_2">
-                 <layout class="QVBoxLayout" name="verticalLayout_2">
+                    <property name="title">
-                  <item>
+                     <string>Connected clients</string>
-                   <widget class="QListWidget" name="listWidget"/>
+                    </property>
+                    <property name="flat">
+                     <bool>false</bool>
+                    </property>
+                    <layout class="QVBoxLayout" name="verticalLayout_2">
+                     <item>
+                      <widget class="QListWidget" name="listWidget"/>
+                     </item>
+                    </layout>
+                   </widget>
+                  </item>
+                  <item row="0" column="1">
+                   <widget class="QLCDNumber" name="lcdNumber"/>
+                  </item>
+                  <item row="0" column="0">
+                   <widget class="QLabel" name="label">
+                    <property name="text">
+                     <string>Sended Packets</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="1" column="0">
+                   <widget class="QLabel" name="label_2">
+                    <property name="text">
+                     <string>Received Packets</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="1" column="1">
+                   <widget class="QLCDNumber" name="lcdNumber_2"/>
                   </item>
                  </layout>
                 </widget>
                </item>
               </layout>
              </widget>
              <resources/>
              <connections/>
             </ui>

spwplugin/StarDundee/stardundeespw_usb.h +1 -13

             /*------------------------------------------------------------------------------
             --  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 STARDUNDEESPW_USB_H
             #define STARDUNDEESPW_USB_H
             #include <QObject>
             #include <spw_usb_api.h>
             #include <spw_config_library.h>
             #include <socexplorerplugin.h>
             #include <abstractspwbridge.h>
             #include <QThread>
             #include <QMutex>
             #include <QSemaphore>
             #include <QGridLayout>
             #include <QPushButton>
             #include <QComboBox>
             #include <QLabel>
             #include "stardundeegui.h"
-            class RMAP_Answer
-              public:
-                RMAP_Answer(int ID,char* data,int len)
-                    transactionID = ID;
-                    this->data = data;
-                    this->len = len;
-                int transactionID;
-                char* data;
-                int len;
-            };
             class stardundeeSPW_USB_Manager: public QThread
             {
                 Q_OBJECT
             public:
                 explicit stardundeeSPW_USB_Manager(socexplorerplugin *plugin = 0,QObject* parent=0);
                 ~stardundeeSPW_USB_Manager();
                 void run();
                 bool connectBridge();
                 bool disconnectBridge();
                 int getRMAPtransactionID();
                 int getRMAPanswer(int transactionID,char** buffer);
                 bool sendPacket(char* packet,int size);
             signals:
                 void updateAvailableBrickCount(int count);
                 void emitPacket(char* packet,int size);
             private:
                 QMutex* handleMutex,*RMAP_AnswersMtx,*RMAP_pending_transaction_IDsMtx;
                 QSemaphore* RMAP_AnswersSem;
                 void pushRmapPacket(char* packet,int len);
                 star_device_handle hDevice;
                 socexplorerplugin* plugin;
                 bool connected;
                 char* SPWPacketBuff;
                 QList<RMAP_Answer*> RMAP_Answers;
                 QList<int> RMAP_pending_transaction_IDs;
             public:
                 int selectedBrick;
                 int linkNumber;
                 int brickList;
                 int linkSpeed;
                 int destinationKey;
                 int rmapAddress;
                 int rmapKey;
                 int RMAPtimeout;
             };
             class stardundeeSPW_USB : public abstractSpwBridge
             {
                 Q_OBJECT
             public:
                 explicit stardundeeSPW_USB(socexplorerplugin *parent = 0);
                 ~stardundeeSPW_USB();
             signals:
                 void setRmapTimeout(const QString & timeout);
                 void SelectBrick(int brickIndex);
                 void SelectLinkNumber(int linkIndex);
                 void SelectLinkSpeed(int linkSpeed);
                 void SetDestinationKey(const QString & destKey);
                 void SetRmapAddress(const QString & address);
                 void SetRmapKey(const QString & key);
                 void SetRmapTimeout(const QString & timeout);
             public slots:
                 void toggleBridgeConnection();
                 bool connectBridge();
                 bool disconnectBridge();
                 int  pushRMAPPacket(char* packet,int size);
                 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);
                 void brickSelectionChanged(int brickIndex);
                 void linkNumberSelectionChanged(int linkIndex);
                 void linkSpeedSelectionChanged(const QString & linkSpeed);
                 void destinationKeyChanged(const QString & destKey);
                 void rmapAddressChanged(const QString & rmapaddress);
                 void rmapKeyChanged(const QString & key);
                 void rmapTimeoutChanged(const QString & timeout);
             private:
                 void makeGUI(socexplorerplugin *parent);
                 stardundeeSPW_USB_Manager* manager;
             };
             #endif // STARDUNDEESPW_USB_H

spwplugin/abstractspwbridge.h +14 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 RMAP_Answer
+            {
+              public:
+                RMAP_Answer(int ID,char* data,int len)
+                {
+                    transactionID = ID;
+                    this->data = data;
+                    this->len = len;
+                }
+                int transactionID;
+                char* data;
+                int len;
+            };
             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.cpp +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
             ----------------------------------------------------------------------------*/
             #include "spwplugin.h"
             #include "stardundeespw_usb.h"
             #include "gr_esb_bridge.h"
             #include <socexplorerproxy.h>
             #include "spwpywrapper.h"
             spwplugin::spwplugin(QWidget *parent):socexplorerplugin(parent,false)
             {
                 Q_UNUSED(parent)
                 this->bridge = NULL;
                 this->scanDone = false;
                 this->pyObject = new spwPyWrapper(this);
                 this->tcpServer = new SpwTcpPacketServer(this);
                 this->mainGroupBox = new QGroupBox("SpaceWire Plugin Configuration",this);
                 this->bridgeSelector = new QComboBox(this);
                 this->mainTabWidgt = new QTabWidget(this);
                 this->mainTabWidgt->addTab(this->mainGroupBox,"Bridge Configuration");
                 this->mainTabWidgt->addTab(this->tcpServer,"TCP Server");
                 this->mainLayout = new QGridLayout(this->mainGroupBox);
                 this->mainLayout->addWidget(new QLabel("Select SpaceWire bridge",this),0,0,1,1,Qt::AlignCenter);
                 this->mainLayout->addWidget(this->bridgeSelector,0,1,1,1);
                 this->setWidget(this->mainTabWidgt);
                 this->bridgeSelector->addItem("none");
                 this->bridgeSelector->addItem("STAR-Dundee Spw USB Brick");
                 this->bridgeSelector->addItem("GR-ESB");
                 connect(this->bridgeSelector,SIGNAL(currentIndexChanged(QString)),this,SLOT(bridgeSelectionChanged(QString)));
                 connect(((spwPyWrapper*)this->pyObject),SIGNAL(selectBridge(QString)),this,SLOT(selectBridge(QString)));
                 connect(((spwPyWrapper*)this->pyObject),SIGNAL(TCPServerConnect()),this->tcpServer,SLOT(connectServer()));
                 connect(((spwPyWrapper*)this->pyObject),SIGNAL(TCPServerDisconnect()),this->tcpServer,SLOT(disconnectServer()));
                 connect(((spwPyWrapper*)this->pyObject),SIGNAL(TCPServerSetPort(qint32)),this->tcpServer,SLOT(setServerPort(qint32)));
                 connect(((spwPyWrapper*)this->pyObject),SIGNAL(TCPServerSetIP(QString)),this->tcpServer,SLOT(setServerSetIP(QString)));
             }
             spwplugin::~spwplugin()
             {
             }
             unsigned int spwplugin::Read(unsigned int *Value,unsigned int count,unsigned int address)
             {
                 if(Connected)
                 {
                     return  bridge->Read(Value,count,address);
                 }
                 return 0;
             }
             void spwplugin::bridgeSelectionChanged(const QString &text)
             {
                 printf("test");
                 if(text=="none")
                 {
                     if(this->bridge!=NULL)
                     {
                         this->mainLayout->removeWidget(this->bridge->getGUI());
                         this->disconnect(this,SLOT(setConnected(bool)));
                         delete this->bridge;
                         this->bridge= NULL;
                     }
                 }
                 if(text=="STAR-Dundee Spw USB Brick")
                 {
                     if(this->bridge!=NULL)
                     {
                         this->mainLayout->removeWidget(this->bridge->getGUI());
                         this->disconnect(this,SLOT(setConnected(bool)));
                         delete this->bridge;
                     }
                     this->bridge = new stardundeeSPW_USB(this);
                     this->mainLayout->addWidget(this->bridge->getGUI(),1,0,1,2);
                     connect(this->bridge,SIGNAL(setConnected(bool)),this,SLOT(setConnected(bool)));
                     connect(((spwPyWrapper*)this->pyObject),SIGNAL(StarDundeeSelectBrick(int)),((stardundeeSPW_USB*)bridge),SIGNAL(SelectBrick(int)));
                     connect(((spwPyWrapper*)this->pyObject),SIGNAL(StarDundeeSelectLinkNumber(int)),((stardundeeSPW_USB*)bridge),SIGNAL(SelectLinkNumber(int)));
                     connect(((spwPyWrapper*)this->pyObject),SIGNAL(StarDundeeSelectLinkSpeed(int)),((stardundeeSPW_USB*)bridge),SIGNAL(SelectLinkSpeed(int)));
                     connect(((spwPyWrapper*)this->pyObject),SIGNAL(StarDundeeSetDestinationKey(QString)),((stardundeeSPW_USB*)bridge),SIGNAL(SetDestinationKey(QString)));
                     connect(((spwPyWrapper*)this->pyObject),SIGNAL(StarDundeeSetRmapAddress(QString)),((stardundeeSPW_USB*)bridge),SIGNAL(SetRmapAddress(QString)));
                     connect(((spwPyWrapper*)this->pyObject),SIGNAL(StarDundeeSetRmapKey(QString)),((stardundeeSPW_USB*)bridge),SIGNAL(SetRmapKey(QString)));
                     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(this->bridge,SIGNAL(pushPacketOverTCP(char*,int)),this->tcpServer,SLOT(pushPacket(char*,int)));
                 }
                 if(text=="GR-ESB")
                 {
                     if(this->bridge!=NULL)
                     {
                         this->mainLayout->removeWidget(this->bridge->getGUI());
                         this->disconnect(this,SLOT(setConnected(bool)));
                         delete this->bridge;
                     }
                     this->bridge = new GR_ESB_bridge(this);
                     this->mainLayout->addWidget(this->bridge->getGUI(),1,0,1,2);
                     connect(this->bridge,SIGNAL(setConnected(bool)),this,SLOT(setConnected(bool)));
                 }
             }
             void spwplugin::selectBridge(const QString &text)
             {
                 if(text=="none")
                 {
                     this->bridgeSelector->setCurrentIndex(0);
                 }
                 if(text=="STAR-Dundee Spw USB Brick")
                 {
                     this->bridgeSelector->setCurrentIndex(1);
                 }
             }
             void spwplugin::setConnected(bool connected)
             {
                 this->bridgeSelector->setDisabled(connected);
                 this->Connected = connected;
                 emit activateSig(connected);
                 if(!this->scanDone)
                 {
                     socexplorerproxy::loadChildSysDriver(this,"AMBA_PLUGIN");
                     this->scanDone=true;
                 }
             }
             unsigned int spwplugin::Write(unsigned int *Value,unsigned int count, unsigned int address)
             {
                 if(Connected)
                 {
                     return  bridge->Write(Value,count,address);
                 }
                 return 0;
             }

spwplugin/spwplugin.h +3 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 spwplugin_H
             #define spwplugin_H
             #include <QMenuBar>
             #include <QMenu>
             #include <QAction>
             #include <QLayout>
             #include <QGroupBox>
             #include <QComboBox>
             #include <QLabel>
             #include <QTabWidget>
             #include <abstractspwbridge.h>
             #include <socexplorerplugin.h>
             #include "SpwTcpPacketServer/spwtcppacketserver.h"
+            // TODO switch to a class factory approach with self registration
             class spwplugin : public socexplorerplugin
             {
                 Q_OBJECT
             public:
                 explicit spwplugin(QWidget *parent = 0);
                 ~spwplugin();
                 /* You can implement the folowing function if you want to overwrite
                  *  their default behavior
                 */
                 /*
                 int registermenu(QMainWindow *menuHolder);
                 int isConnected();
                 int connect();
                 int VID(){return driver_VID;}
                 int PID(){return driver_PID;}
                 */
             public slots:
                 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);
                 void bridgeSelectionChanged( const QString & text );
                 void selectBridge( const QString & text );
                 void setConnected(bool connected);
             signals:
             private:
                 SpwTcpPacketServer* tcpServer;
                 abstractSpwBridge* bridge;
                 bool scanDone;
                 QTabWidget* mainTabWidgt;
                 QGroupBox* mainGroupBox;
                 QComboBox* bridgeSelector;
                 QGridLayout* mainLayout;
             };
             #endif // spwplugin_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