HG_REPOSITORIES/LPP/INSTRUMENTATION/SocExplorerPlugins Commit - r18:3b7afcb93195

Sync

Jeandet Alexis -

r18:3b7afcb93195 default

parent child

Context file:

r18:3b7afcb93195

Collapse all files

spwplugin/SpwTcpPacketServer/spwtcppacketserver.cpp +33 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 "spwtcppacketserver.h"
             #include "ui_spwtcppacketserver.h"
             SpwTcpPacketServer::SpwTcpPacketServer(QWidget *parent) :
                 QWidget(parent),
                 ui(new Ui::SpwTcpPacketServer)
             {
                 ui->setupUi(this);
+                this->p_bridge = NULL;
+                this->p_server = new QTcpServer();
+                connect(this->ui->startServeQpb,SIGNAL(clicked(bool)),SLOT(toggleServer()));
             }
             SpwTcpPacketServer::~SpwTcpPacketServer()
             {
                 delete ui;
             }
+            void SpwTcpPacketServer::setBridge(abstractSpwBridge *bridge)
+            {
+                if(this->p_bridge!=NULL)
+                {
+                    disconnect(this,SLOT(pushPacket(char*,int)));
+                }
+                this->p_bridge = bridge;
+                connect(bridge,SIGNAL(pushPacketOverTCP(char*,int)),SLOT(pushPacket(char*,int)));
+            }
+            void SpwTcpPacketServer::pushPacket(char *packet, int size)
+            {
+            }
+            void SpwTcpPacketServer::toggleServer()
+            {
+                if(this->p_server->isListening())
+                {
+                    this->ui->startServeQpb->setText("Start Server");
+                    this->p_server->close();
+                }
+                else
+                {
+                    this->p_server->listen(QHostAddress::Any,this->ui->PortLineEdit->text().toInt());
+                    this->ui->startServeQpb->setText("Stop Server");
+                }
+            }

spwplugin/SpwTcpPacketServer/spwtcppacketserver.h +9 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 SPWTCPPACKETSERVER_H
             #define SPWTCPPACKETSERVER_H
             #include <QWidget>
+            #include <abstractspwbridge.h>
+            #include <QTcpServer>
             namespace Ui {
             class SpwTcpPacketServer;
             }
             class SpwTcpPacketServer : public QWidget
             {
                 Q_OBJECT
             public:
                 explicit SpwTcpPacketServer(QWidget *parent = 0);
                 ~SpwTcpPacketServer();
+                void setBridge(abstractSpwBridge* bridge);
+            public slots:
+                void pushPacket(char* packet,int size);
+                void toggleServer();
             private:
                 Ui::SpwTcpPacketServer *ui;
+                abstractSpwBridge* p_bridge;
+                QTcpServer* p_server;
             };
             #endif // SPWTCPPACKETSERVER_H

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);
                 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 +4 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 <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->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->mainGroupBox->setLayout(this->mainLayout);
                 this->setWidget(this->mainGroupBox);
                 this->bridgeSelector->addItem("none");
                 this->bridgeSelector->addItem("STAR-Dundee Spw USB Brick");
                 connect(this->bridgeSelector,SIGNAL(currentIndexChanged(QString)),this,SLOT(bridgeSelectionChanged(QString)));
                 connect(((spwPyWrapper*)this->pyObject),SIGNAL(selectBridge(QString)),this,SLOT(selectBridge(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()));
                 }
             }
             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 +4 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"
             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:
                 abstractSpwBridge* bridge;
+                SpwTcpPacketServer* tcpServer;
                 bool scanDone;
+                QTabWidget* mainTabWidgt;
                 QGroupBox* mainGroupBox;
                 QComboBox* bridgeSelector;
                 QGridLayout* mainLayout;
             };
             #endif // spwplugin_H

spwplugin/spwplugin.pro +1 0

             #
             # Project created by QtCreator 2011-09-20T08:15:30
             #
             #-------------------------------------------------
             CONFIG += socexplorerplugin
+            QT += network
             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 \
             HEADERS += \
                 spwplugin.h \
                 stardundeespw_usb.h \
                 abstractspwbridge.h \
                 spw.h \
                 stardundeegui.h \
                 SpwTcpPacketServer/spwtcppacketserver.h \
                 spwpywrapper.h
             SOURCES += \
                 spwplugin.cpp \
                 stardundeespw_usb.cpp \
                 abstractspwbridge.cpp \
                 stardundeegui.cpp \
                 SpwTcpPacketServer/spwtcppacketserver.cpp \
                 spwpywrapper.cpp
             FORMS += \
                 stardundeeGUI.ui \
                 SpwTcpPacketServer/spwtcppacketserver.ui
             RESOURCES += \
                 spwRessources.qrc

spwplugin/stardundeespw_usb.h 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
             ----------------------------------------------------------------------------*/
             #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);
             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;
-            //    QGridLayout* mainLayout;
             };
             #endif // STARDUNDEESPW_USB_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