HG_REPOSITORIES/LPP/INSTRUMENTATION/SocExplorerPlugins Commit - r35:a4e9ba42be66

Functions added to the Python API:...

paul -

parent child

Context file:

r35:a4e9ba42be66

Collapse all files

spwplugin/SpwTcpPacketServer/spwtcppacketserver.cpp +29 -2

             /*------------------------------------------------------------------------------
             --  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"
             #include <QNetworkInterface>
             #include <QByteArray>
             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()));
                 updateHostIP();
                 this->ui->PortLineEdit->setText("2200");
                 connect(this->p_server,SIGNAL(newConnection()),this,SLOT(newConnection()));
+                resetStatististics();
             }
             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)
             {
                 QByteArray data;
                 char sizech[3];
                 data.append((char)0);
                 sizech[0]=size & 0x0FF;
                 sizech[1]=(size>>8) & 0x0FF;
                 sizech[2]=(size>>16) & 0x0FF;
                 data.append(sizech,3);
                 data.append(packet,size);
                 for(int i=0;i<connectedClients.count();i++)
                 {
                     QTcpSocket* soc=connectedClients.at(i);
                     if(soc->state()!=QAbstractSocket::ConnectedState)
                     {
                         connectedClients.removeAt(i);
                         delete soc;
                     }
                     else
                     {
                         connectedClients.at(i)->write(data);
+                        onePacketTransmitted();
                     }
                 }
                 free(packet);
             }
             void SpwTcpPacketServer::toggleServer()
             {
                 if(this->p_server->isListening())
                 {
                    disconnectServer();
                 }
                 else
                 {
                     connectServer();
                 }
             }
             void SpwTcpPacketServer::connectServer()
             {
                 this->p_server->listen(QHostAddress::Any,this->ui->PortLineEdit->text().toInt());
                 this->ui->startServeQpb->setText("Stop Server");
+                resetStatististics();
             }
             void SpwTcpPacketServer::disconnectServer()
             {
                 this->ui->startServeQpb->setText("Start Server");
                 this->p_server->close();
             }
             void SpwTcpPacketServer::setServerPort(qint32 port)
             {
                 this->ui->PortLineEdit->setText(QString("%1").arg(port));
             }
             void SpwTcpPacketServer::setServerSetIP(QString ip)
             {
                 this->ui->IPLineEdit->setText(ip);
             }
             void SpwTcpPacketServer::newConnection()
             {
                 QTcpSocket* soc=this->p_server->nextPendingConnection();
                 this->connectedClients.append(soc);
                 this->ui->listWidget->addItem(this->connectedClients.last()->peerAddress().toString());
                 connect(soc,SIGNAL(readyRead()),this,SLOT(readReady()));
             }
             void SpwTcpPacketServer::readReady()
             {
                 for(int i=0;i<connectedClients.count();i++)
                 {
                     QTcpSocket* soc=connectedClients.at(i);
                     if(soc->state()!=QAbstractSocket::ConnectedState)
                     {
                         connectedClients.removeAt(i);
                         delete soc;
                     }
                     else
                     {
                         if(soc->bytesAvailable()!=0)
                         {
                             do
                             {
                                 QByteArray data = soc->readAll();
-                                if(data[0]==0)
+                                onePacketReceived();
+                                if(data[0]==0)  // Protocole = 0 => Host to SpaceWire packet transmission
                                 {
                                     int size = (data[1]*256*256) + (data[2]*256) + data[3];
                                     char* SPWpacket = (char*)malloc(size);
-                                    memcpy(SPWpacket,data.data()+4,size);
+                                    memcpy(SPWpacket,data.data()+4,size);   // 4 bytes will be added later to the packet
                                     emit sendSPWPacket(SPWpacket,size);
                                 }
                             }while(soc->bytesAvailable()!=0);
                         }
                     }
                 }
             }
+            void SpwTcpPacketServer::resetStatististics()
+            {
+                receivedPackets = 0;
+                transmittedPackets = 0;
+                this->ui->receivedPacketsNumber->display( QString::number(receivedPackets) );
+                this->ui->transmittedPacketsNumber->display( QString::number(transmittedPackets) );
+            }
             void SpwTcpPacketServer::updateHostIP()
             {
                 QList<QHostAddress> list = QNetworkInterface::allAddresses();
                 for(int nIter=0; nIter<list.count(); nIter++)
                 {
                     if(!list[nIter].isLoopback())
                         if (list[nIter].protocol() == QAbstractSocket::IPv4Protocol )
                             this->ui->IPLineEdit->setText(list[nIter].toString());
                 }
             }
+            void SpwTcpPacketServer::onePacketReceived()
+            {
+                receivedPackets = receivedPackets + 1;
+                this->ui->receivedPacketsNumber->display( QString::number(receivedPackets) );
+            }
+            void SpwTcpPacketServer::onePacketTransmitted()
+            {
+                transmittedPackets = transmittedPackets + 1;
+                this->ui->transmittedPacketsNumber->display( QString::number(transmittedPackets) );
+            }

spwplugin/SpwTcpPacketServer/spwtcppacketserver.h +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
             ----------------------------------------------------------------------------*/
             #ifndef SPWTCPPACKETSERVER_H
             #define SPWTCPPACKETSERVER_H
             #include <QWidget>
             #include <abstractspwbridge.h>
             #include <QTcpServer>
             #include <QList>
             #include <QTcpSocket>
             namespace Ui {
             class SpwTcpPacketServer;
             }
             class SpwTcpPacketServer : public QWidget
             {
                 Q_OBJECT
             public:
                 explicit SpwTcpPacketServer(QWidget *parent = 0);
                 ~SpwTcpPacketServer();
                 void setBridge(abstractSpwBridge* bridge);
             signals:
                 void sendSPWPacket(char* packet,int size);
             public slots:
                 void pushPacket(char* packet,int size);
                 void toggleServer();
                 void connectServer();
                 void disconnectServer();
                 void setServerPort(qint32 port);
                 void setServerSetIP(QString ip);
                 void newConnection();
                 void readReady();
+                void resetStatististics();
             private:
                 void updateHostIP();
+                void onePacketReceived();
+                void onePacketTransmitted();
                 Ui::SpwTcpPacketServer *ui;
                 abstractSpwBridge* p_bridge;
                 QTcpServer* p_server;
                 QList<QTcpSocket*> connectedClients;
+                unsigned int receivedPackets;
+                unsigned int transmittedPackets;
             };
             #endif // SPWTCPPACKETSERVER_H

spwplugin/SpwTcpPacketServer/spwtcppacketserver.ui +3 -3

             <?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>726</width>
                 <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="groupBox">
                  <property name="title">
                   <string>Server Statistics</string>
                  </property>
                  <layout class="QGridLayout" name="gridLayout">
                   <item row="2" column="0" colspan="2">
                    <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>
                   <item row="0" column="1">
-                   <widget class="QLCDNumber" name="lcdNumber"/>
+                   <widget class="QLCDNumber" name="transmittedPacketsNumber"/>
                   </item>
                   <item row="0" column="0">
                    <widget class="QLabel" name="label">
                     <property name="text">
-                     <string>Sended Packets</string>
+                     <string>Transmitted 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"/>
+                   <widget class="QLCDNumber" name="receivedPacketsNumber"/>
                   </item>
                  </layout>
                 </widget>
                </item>
               </layout>
              </widget>
              <resources/>
              <connections/>
             </ui>

spwplugin/StarDundee/stardundeeGUI.ui +107 -11

             <?xml version="1.0" encoding="UTF-8"?>
             <ui version="4.0">
              <class>StarDundeeUI</class>
              <widget class="QWidget" name="StarDundeeUI">
               <property name="geometry">
                <rect>
                 <x>0</x>
                 <y>0</y>
                 <width>397</width>
-                <height>243</height>
+                <height>467</height>
                </rect>
               </property>
               <property name="windowTitle">
                <string>Form</string>
               </property>
               <layout class="QFormLayout" name="formLayout">
                <item row="0" column="0">
                 <widget class="QLabel" name="selectBrickLbl">
                  <property name="text">
                   <string>Select Brick</string>
                  </property>
                 </widget>
                </item>
                <item row="0" column="1">
                 <widget class="QComboBox" name="selectBrickCmbx">
                  <property name="toolTip">
                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select the brick you want to use.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                  </property>
                  <property name="whatsThis">
                   <string/>
                  </property>
                  <item>
                   <property name="text">
                    <string>None</string>
                   </property>
                  </item>
                 </widget>
                </item>
                <item row="1" column="0">
                 <widget class="QLabel" name="selectLinkLbl">
                  <property name="text">
                   <string>Select link number</string>
                  </property>
                 </widget>
                </item>
                <item row="1" column="1">
                 <widget class="QComboBox" name="selectLinkCmbx">
                  <property name="toolTip">
                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select the link number you want to use.&lt;/p&gt;&lt;p&gt;The link number correspond to the numbers on the brick:&lt;/p&gt;&lt;p&gt;&lt;img src=&quot;:/imgs/stardundee.tif&quot;/&gt;&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                  </property>
                  <item>
                   <property name="text">
                    <string>1</string>
                   </property>
                  </item>
                  <item>
                   <property name="text">
                    <string>2</string>
                   </property>
                  </item>
                 </widget>
                </item>
                <item row="2" column="0">
                 <widget class="QLabel" name="selectLinkSpeedLbl">
                  <property name="text">
                   <string>Link Speed</string>
                  </property>
                 </widget>
                </item>
                <item row="2" column="1">
                 <widget class="QComboBox" name="setLinkSpeedCmbx">
                  <property name="toolTip">
                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select the Space Wire link speed you want to use.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                  </property>
                  <item>
                   <property name="text">
                    <string>10MHz</string>
                   </property>
                  </item>
                 </widget>
                </item>
                <item row="3" column="0">
                 <widget class="QLabel" name="setDestKeyLbl">
                  <property name="text">
-                  <string>Destination key</string>
+                  <string>Source address</string>
                  </property>
                 </widget>
                </item>
                <item row="3" column="1">
                 <widget class="QLineEdit" name="destKeyLineEdit">
                  <property name="toolTip">
                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set the Space Wire Brick destination Key, the default value is 32 (0x20).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                  </property>
                  <property name="inputMask">
                   <string comment="ddD"/>
                  </property>
                  <property name="text">
                   <string>32</string>
                  </property>
                  <property name="maxLength">
                   <number>3</number>
                  </property>
                 </widget>
                </item>
                <item row="4" column="0">
                 <widget class="QLabel" name="RMAPaddressLbl">
                  <property name="text">
-                  <string>RMAP Target address</string>
+                  <string>Destination address</string>
                  </property>
                 </widget>
                </item>
                <item row="4" column="1">
                 <widget class="QLineEdit" name="RMAPAddresslineEdit">
                  <property name="toolTip">
                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set the RMAP target address, this address will be used as destination address for all the RMAP transfers.&lt;/p&gt;&lt;p&gt;This is you SOC spw address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                  </property>
                  <property name="inputMask">
                   <string comment="ddD"/>
                  </property>
                  <property name="text">
                   <string>254</string>
                  </property>
                  <property name="maxLength">
                   <number>3</number>
                  </property>
                 </widget>
                </item>
                <item row="5" column="0">
                 <widget class="QLabel" name="RMAPKeyLbl">
                  <property name="text">
-                  <string>RMAP Target key</string>
+                  <string>Destination key</string>
                  </property>
                 </widget>
                </item>
                <item row="5" column="1">
                 <widget class="QLineEdit" name="RMAPKeylineEdit">
                  <property name="toolTip">
                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set the RMAP target key, this key will be used for all the RMAP transfers.&lt;/p&gt;&lt;p&gt;This is you SOC spw key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                  </property>
                  <property name="inputMask">
                   <string comment="ddD"/>
                  </property>
                  <property name="text">
                   <string comment="ddD">2</string>
                  </property>
                  <property name="maxLength">
                   <number>3</number>
                  </property>
                 </widget>
                </item>
-               <item row="7" column="1">
-                <widget class="QPushButton" name="connectQpb">
-                 <property name="text">
-                  <string>Connect</string>
-                 </property>
-                </widget>
-               </item>
                <item row="6" column="1">
                 <widget class="QLineEdit" name="RMAPTimeoutLineEdit">
                  <property name="toolTip">
                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set the RMAP timeout, when waiting for a RMAP answer the driver will give up after this time if it doesn't get any answer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                  </property>
                  <property name="inputMethodHints">
                   <set>Qt::ImhDigitsOnly</set>
                  </property>
                  <property name="inputMask">
                   <string comment="DDdd;"/>
                  </property>
                  <property name="text">
                   <string>500</string>
                  </property>
                  <property name="maxLength">
                   <number>5</number>
                  </property>
                 </widget>
                </item>
                <item row="6" column="0">
                 <widget class="QLabel" name="RMAPTimeoutLbl">
                  <property name="text">
                   <string>RMAP timeout(ms)</string>
                  </property>
                 </widget>
                </item>
+               <item row="9" column="1">
+                <widget class="QPushButton" name="connectQpb">
+                 <property name="text">
+                  <string>Connect</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="7" column="1">
+                <widget class="QRadioButton" name="setInterfaceModeQrb">
+                 <property name="text">
+                  <string>interface mode</string>
+                 </property>
+                 <property name="checked">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+               <item row="8" column="1">
+                <widget class="QRadioButton" name="setRouterModeQrb">
+                 <property name="text">
+                  <string>router mode</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="10" column="0" colspan="2">
+                <layout class="QGridLayout" name="gridLayout">
+                 <item row="1" column="0">
+                  <widget class="QLabel" name="label_4">
+                   <property name="text">
+                    <string>Packets</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="1" column="1">
+                  <widget class="QLabel" name="starDundeeReceivedPackets">
+                   <property name="text">
+                    <string>-</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="0" column="1">
+                  <widget class="QLabel" name="label_3">
+                   <property name="font">
+                    <font>
+                     <weight>75</weight>
+                     <bold>true</bold>
+                    </font>
+                   </property>
+                   <property name="text">
+                    <string>Received</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="2" column="1">
+                  <widget class="QLabel" name="starDundeeReceivedBytes">
+                   <property name="text">
+                    <string>-</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="2" column="0">
+                  <widget class="QLabel" name="label_5">
+                   <property name="text">
+                    <string>Bytes</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="0" column="2">
+                  <widget class="QLabel" name="label_7">
+                   <property name="font">
+                    <font>
+                     <weight>75</weight>
+                     <bold>true</bold>
+                    </font>
+                   </property>
+                   <property name="text">
+                    <string>Transmitted</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="1" column="2">
+                  <widget class="QLabel" name="starDundeeTransmittedPackets">
+                   <property name="text">
+                    <string>-</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="2" column="2">
+                  <widget class="QLabel" name="starDundeeTransmittedBytes">
+                   <property name="text">
+                    <string>-</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="0" column="0">
+                  <widget class="QPushButton" name="resetStatsQpb">
+                   <property name="text">
+                    <string>Reset stats</string>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>
+               </item>
               </layout>
              </widget>
              <resources/>
              <connections/>
             </ui>

spwplugin/StarDundee/stardundeegui.cpp +81 -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 "stardundeegui.h"
             #include "ui_stardundeeGUI.h"
             #include <spw_usb_api.h>
             #include <spw_config_library.h>
             StarDundeeGUI::StarDundeeGUI(QWidget *parent) :
                 QWidget(parent),ui(new Ui::StarDundeeUI)
             {
+                resetBytesPacketsStatistics();
                 this->ui->setupUi(this);
                 connect(this->ui->selectBrickCmbx,SIGNAL(currentIndexChanged(int)),this,SIGNAL(brickSelectionChanged(int)));
                 connect(this->ui->selectLinkCmbx,SIGNAL(currentIndexChanged(int)),this,SIGNAL(linkNumberSelectionChanged(int)));
                 connect(this->ui->setLinkSpeedCmbx,SIGNAL(currentIndexChanged(QString)),this,SIGNAL(linkSpeedSelectionChanged(QString)));
                 connect(this->ui->destKeyLineEdit,SIGNAL(textChanged(QString)),this,SIGNAL(destinationKeyChanged(QString)));
                 connect(this->ui->RMAPAddresslineEdit,SIGNAL(textChanged(QString)),this,SIGNAL(rmapAddressChanged(QString)));
                 connect(this->ui->RMAPKeylineEdit,SIGNAL(textChanged(QString)),this,SIGNAL(rmapKeyChanged(QString)));
                 connect(this->ui->RMAPTimeoutLineEdit,SIGNAL(textChanged(QString)),this,SIGNAL(rmapTimeoutChanged(QString)));
                 connect(this->ui->connectQpb,SIGNAL(clicked()),this,SIGNAL(connectClicked()));
+                connect(this->ui->setInterfaceModeQrb, SIGNAL(toggled(bool)), this, SIGNAL(brickModeChanged(bool)));
+                connect(this->ui->resetStatsQpb, SIGNAL(clicked()), this, SLOT(resetStatistics()));
             }
             int StarDundeeGUI::getBrickSelection()
             {
                 return ui->selectBrickCmbx->currentIndex();
             }
             int StarDundeeGUI::getLinkNumberSelection()
             {
                 return ui->selectLinkCmbx->currentIndex();
             }
             QString StarDundeeGUI::getLinkSpeedSelection()
             {
                 return ui->setLinkSpeedCmbx->currentText();
             }
             QString StarDundeeGUI::getDestinationKey()
             {
                 return ui->destKeyLineEdit->text();
             }
             QString StarDundeeGUI::getRmapAddress()
             {
                 return ui->RMAPAddresslineEdit->text();
             }
             QString StarDundeeGUI::getRmapKey()
             {
                 return ui->RMAPKeylineEdit->text();
             }
             QString StarDundeeGUI::getRmapTimeout()
             {
                 return ui->RMAPTimeoutLineEdit->text();
             }
+            bool StarDundeeGUI::isBrickSetAsAnInterface()
+            {
+                return ui->setInterfaceModeQrb->isChecked();
+            }
+            void StarDundeeGUI::setBrickAsAnInterface( bool interfaceMode )
+            {
+                if (interfaceMode == true)
+                {
+                    this->ui->setInterfaceModeQrb->setChecked( true );
+                }
+                else
+                {
+                    this->ui->setRouterModeQrb->setChecked( true );
+                }
+            }
+            void StarDundeeGUI::setBrickAsARouter( bool interfaceMode )
+            {
+                if (interfaceMode==true)
+                {
+                    this->ui->setRouterModeQrb->setChecked( true );
+                }
+                else
+                {
+                    this->ui->setInterfaceModeQrb->setChecked( true );
+                }
+            }
             void StarDundeeGUI::lock(bool lock)
             {
                 this->ui->selectBrickCmbx->setDisabled(lock);
                 this->ui->selectLinkCmbx->setDisabled(lock);
                 this->ui->setLinkSpeedCmbx->setDisabled(lock);
                 this->ui->destKeyLineEdit->setDisabled(lock);
                 this->ui->RMAPAddresslineEdit->setDisabled(lock);
                 this->ui->RMAPKeylineEdit->setDisabled(lock);
                 this->ui->RMAPTimeoutLineEdit->setDisabled(lock);
+                this->ui->setInterfaceModeQrb->setDisabled(lock);
+                this->ui->setRouterModeQrb->setDisabled(lock);
                 if(lock)
                     this->ui->connectQpb->setText("Disconnect");
                 else
                     this->ui->connectQpb->setText("Connect");
             }
             void StarDundeeGUI::updateAvailableBrickCount(int count)
             {
                 this->ui->selectBrickCmbx->clear();
                 this->ui->selectBrickCmbx->addItem("none");
                 for(int i =0;i<32;i++)
                 {
                     if((count&1)==1)
                     {
                         star_device_handle hDevice;
                         char serial[11]="";
                         if (USBSpaceWire_Open(&hDevice, 0))
                         {
                             USBSpaceWire_GetSerialNumber(hDevice,(U8*) serial);
                             USBSpaceWire_Close(hDevice);
                         }
                         this->ui->selectBrickCmbx->addItem("STAR-Dundee USB brick "+QString::number(i)+" sn:" + serial);
                     }
                     count>>=1;
                 }
             }
             void StarDundeeGUI::setRmapTimeout(const QString &timeout)
             {
                 this->ui->RMAPTimeoutLineEdit->setText(timeout);
             }
             void StarDundeeGUI::selectBrick(int brickIndex)
             {
                 if(brickIndex>=0&& brickIndex<this->ui->selectBrickCmbx->count())
                 {
                     this->ui->selectBrickCmbx->setCurrentIndex(brickIndex);
                 }
             }
             void StarDundeeGUI::selectLinkNumber(int linkNumber)
             {
                 if(linkNumber==1 || linkNumber==2)
                 {
                     this->ui->selectLinkCmbx->setCurrentIndex(linkNumber-1);
                 }
             }
             void StarDundeeGUI::selectLinkSpeed(int linkSpeed)
             {
             #define MHz *(1000*1000)
                 if(linkSpeed==10 MHz)
                 {
                     this->ui->selectLinkCmbx->setCurrentIndex(0);
                 }
             }
             void StarDundeeGUI::setDestinationKey(const QString &destKey)
             {
                 bool ok;
                 int Key=destKey.toInt(&ok,10);
                 if(ok)
                 {
                     this->ui->destKeyLineEdit->setText(destKey);
                 }
             }
             void StarDundeeGUI::setRmapAddress(const QString &address)
             {
                 bool ok;
                 int tmp=address.toInt(&ok,10);
                 if(ok)
                 {
                     this->ui->RMAPAddresslineEdit->setText(address);
                 }
             }
             void StarDundeeGUI::setRmapKey(const QString &key)
             {
                 bool ok;
                 int tmp=key.toInt(&ok,10);
                 if(ok)
                 {
                     this->ui->RMAPKeylineEdit->setText(key);
                 }
             }
+            int StarDundeeGUI::getAvailableBrickCount( void )
+            {
+                int list = USBSpaceWire_ListDevices();
+                emit updateAvailableBrickCount(list);
+                QCoreApplication::processEvents();
+                return list;
+            }
+            void StarDundeeGUI::resetBytesPacketsStatistics( void )
+            {
+                nbBytesReceivedFromSpw = 0;
+                nbBytesTransmittedToSpw = 0;
+                nbPacketsReceivedFromSpw = 0;
+                nbPacketsTransmittedToSpw = 0;
+            }
+            void StarDundeeGUI::resetStatistics( void )
+            {
+                nbBytesReceivedFromSpw = 0;
+                nbBytesTransmittedToSpw = 0;
+                nbPacketsReceivedFromSpw = 0;
+                nbPacketsTransmittedToSpw = 0;
+                this->ui->starDundeeReceivedBytes->setText( QString::number(nbBytesReceivedFromSpw) );
+                this->ui->starDundeeReceivedPackets->setText( QString::number(nbPacketsReceivedFromSpw) );
+                this->ui->starDundeeTransmittedBytes->setText( QString::number(nbBytesTransmittedToSpw) );
+                this->ui->starDundeeTransmittedPackets->setText( QString::number(nbPacketsTransmittedToSpw) );
+            }
+            void StarDundeeGUI::updateNbReceivedBytesFromSpw( unsigned int nbBytes)
+            {
+                nbBytesReceivedFromSpw   = nbBytesReceivedFromSpw + nbBytes;
+                nbPacketsReceivedFromSpw = nbPacketsReceivedFromSpw + 1;
+                this->ui->starDundeeReceivedBytes->setText( QString::number(nbBytesReceivedFromSpw) );
+                this->ui->starDundeeReceivedPackets->setText( QString::number(nbPacketsReceivedFromSpw) );
+            }
+            void StarDundeeGUI::updateNbTransmittedBytesToSpw( unsigned int nbBytes)
+            {
+                nbBytesTransmittedToSpw   = nbBytesTransmittedToSpw + nbBytes;
+                nbPacketsTransmittedToSpw = nbPacketsTransmittedToSpw + 1;
+                this->ui->starDundeeTransmittedBytes->setText( QString::number(nbBytesTransmittedToSpw) );
+                this->ui->starDundeeTransmittedPackets->setText( QString::number(nbPacketsTransmittedToSpw) );
+            }

spwplugin/StarDundee/stardundeegui.h +13 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 STARDUNDEEGUI_H
             #define STARDUNDEEGUI_H
             #include <QWidget>
             namespace Ui {
                 class StarDundeeUI;
             }
             class StarDundeeGUI : public QWidget
             {
                 Q_OBJECT
             public:
                 explicit StarDundeeGUI(QWidget *parent = 0);
                 int getBrickSelection();
                 int getLinkNumberSelection();
                 QString getLinkSpeedSelection();
                 QString getDestinationKey();
                 QString getRmapAddress();
                 QString getRmapKey();
                 QString getRmapTimeout();
+                bool isBrickSetAsAnInterface();
             signals:
                 void brickSelectionChanged(int brickIndex);
                 void linkNumberSelectionChanged(int linkIndex);
                 void linkSpeedSelectionChanged(const QString & linkSpeed);
                 void destinationKeyChanged(const QString & destKey);
                 void rmapAddressChanged(const QString & address);
                 void rmapKeyChanged(const QString & key);
                 void rmapTimeoutChanged(const QString & timeout);
                 void connectClicked();
+                void brickModeChanged(bool);
             public slots:
                 void lock(bool lock);
                 void updateAvailableBrickCount(int count);
                 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);
+                int getAvailableBrickCount( void );
+                void setBrickAsAnInterface(bool interfaceMode);
+                void setBrickAsARouter( bool interfaceMode );
+                void resetBytesPacketsStatistics( void );
+                void resetStatistics( void );
+                void updateNbReceivedBytesFromSpw( unsigned int nbBytes);
+                void updateNbTransmittedBytesToSpw( unsigned int nbBytes);
             private:
                 Ui::StarDundeeUI *ui;
+                unsigned int nbBytesReceivedFromSpw;
+                unsigned int nbBytesTransmittedToSpw;
+                unsigned int nbPacketsReceivedFromSpw;
+                unsigned int nbPacketsTransmittedToSpw;
             };
             #endif // STARDUNDEEGUI_H

spwplugin/StarDundee/stardundeespw_usb.cpp +398 -25

             /*------------------------------------------------------------------------------
             --  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>
+            QString dwLinkStatusQString[6] = {
+                "CFG_SPACEWIRE_ERROR_RESET",
+                "CFG_SPACEWIRE_ERROR_WAIT",
+                "CFG_SPACEWIRE_READY",
+                "CFG_SPACEWIRE_STARTED",
+                "CFG_SPACEWIRE_CONNECTING",
+                "CFG_SPACEWIRE_RUN"
+            };
             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)));
+                connect(this->manager, SIGNAL(bytesReceivedFromSpw(uint)), this, SIGNAL(BytesReceivedFromSpw(uint)));
+                connect(this->manager, SIGNAL(bytesTransmittedToSpw(uint)), this, SIGNAL(BytesTransmittedToSpw(uint)));
             }
             stardundeeSPW_USB::~stardundeeSPW_USB()
             {
                 this->manager->requestInterruption();
                 while(this->manager->isRunning());
             }
             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);
+                    RMAP_build_tx_request_header(
+                                this->manager->destinationLogicalAddress,
+                                this->manager->destinationKey,
+                                this->manager->sourceLogicalAddress,
+                                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);
+                    RMAP_build_tx_request_header(
+                                this->manager->destinationLogicalAddress,
+                                this->manager->destinationKey,
+                                this->manager->sourceLogicalAddress,
+                                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);
+                    RMAP_build_rx_request_header(
+                                this->manager->destinationLogicalAddress,
+                                this->manager->destinationKey,
+                                this->manager->sourceLogicalAddress,
+                                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);
+                    RMAP_build_rx_request_header(
+                                this->manager->destinationLogicalAddress,
+                                this->manager->destinationKey,
+                                this->manager->sourceLogicalAddress,
+                                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)
+            void stardundeeSPW_USB::sourceLogicalAddressChanged(const QString &sourceAddress)
             {
-                this->manager->destinationKey = destKey.toInt();
+                this->manager->sourceLogicalAddress = sourceAddress.toInt();
-                SocExplorerEngine::message(plugin,QString("Changing Destination Key: %1").arg(manager->destinationKey),1);
+                SocExplorerEngine::message(plugin,QString("Changing Destination Key: %1").arg(manager->sourceLogicalAddress),1);
             }
             void stardundeeSPW_USB::rmapAddressChanged(const QString &rmapaddress)
             {
-                this->manager->rmapAddress = rmapaddress.toInt();
+                this->manager->destinationLogicalAddress = rmapaddress.toInt();
-                SocExplorerEngine::message(plugin,QString("Changing RMAP address: %1").arg(manager->rmapAddress),1);
+                SocExplorerEngine::message(plugin,QString("Changing RMAP address: %1").arg(manager->destinationLogicalAddress),1);
             }
-            void stardundeeSPW_USB::rmapKeyChanged(const QString &key)
+            void stardundeeSPW_USB::destinationKeyChanged(const QString &key)
             {
-                this->manager->rmapKey = key.toInt();
+                this->manager->destinationKey = key.toInt();
-                SocExplorerEngine::message(plugin,QString("Changing RMAP Key: %1").arg(manager->rmapKey),1);
+                SocExplorerEngine::message(plugin,QString("Changing RMAP Key: %1").arg(manager->destinationKey),1);
+            }
+            void stardundeeSPW_USB::brickModeChanged( bool interfaceMode )
+            {
+                this->manager->interfaceMode = interfaceMode;
             }
             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(sourceLogicalAddressChanged(QString)),this,SLOT(sourceLogicalAddressChanged(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(destinationKeyChanged(QString)),this,SLOT(destinationKeyChanged(QString)));
                 connect(((StarDundeeGUI*)this->p_GUI),SIGNAL(rmapTimeoutChanged(QString)),this,SLOT(rmapTimeoutChanged(QString)));
+                connect(((StarDundeeGUI*)this->p_GUI),SIGNAL(brickModeChanged(bool)), this, SLOT(brickModeChanged(bool)));
                 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->sourceLogicalAddressChanged(((StarDundeeGUI*)this->p_GUI)->getDestinationKey());
                 this->rmapAddressChanged(((StarDundeeGUI*)this->p_GUI)->getRmapAddress());
-                this->rmapKeyChanged(((StarDundeeGUI*)this->p_GUI)->getRmapKey());
+                this->destinationKeyChanged(((StarDundeeGUI*)this->p_GUI)->getRmapKey());
                 this->rmapTimeoutChanged(((StarDundeeGUI*)this->p_GUI)->getRmapTimeout());
+                this->brickModeChanged(((StarDundeeGUI*)this->p_GUI)->isBrickSetAsAnInterface());
+                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)));
+                connect(this,SIGNAL(GetAvailableBrickCount()),    ((StarDundeeGUI*)this->p_GUI),SLOT(getAvailableBrickCount()));
+                connect(this,SIGNAL(SetBrickAsAnInterface(bool)), ((StarDundeeGUI*)this->p_GUI),SLOT(setBrickAsAnInterface(bool)));
+                connect(this,SIGNAL(SetBrickAsARouter(bool)),     ((StarDundeeGUI*)this->p_GUI),SLOT(setBrickAsARouter(bool)));
+                connect(this,SIGNAL(BytesReceivedFromSpw(uint)), ((StarDundeeGUI*)this->p_GUI),SLOT(updateNbReceivedBytesFromSpw(uint)));
+                connect(this,SIGNAL(BytesTransmittedToSpw(uint)),((StarDundeeGUI*)this->p_GUI),SLOT(updateNbTransmittedBytesToSpw(uint)));
+            }
-                connect(this,SIGNAL(SelectBrick(int)),((StarDundeeGUI*)this->p_GUI),SLOT(selectBrick(int)));
+            void stardundeeSPW_USB::sendPacketComingFromTCPServer(char *packet, int size)
-                connect(this,SIGNAL(SelectLinkNumber(int)),((StarDundeeGUI*)this->p_GUI),SLOT(selectLinkNumber(int)));
-                connect(this,SIGNAL(SelectLinkSpeed(int)),((StarDundeeGUI*)this->p_GUI),SLOT(selectLinkSpeed(int)));
+                char* data;
-                connect(this,SIGNAL(SetDestinationKey(QString)),((StarDundeeGUI*)this->p_GUI),SLOT(setDestinationKey(QString)));
+                int i;
-                connect(this,SIGNAL(SetRmapAddress(QString)),((StarDundeeGUI*)this->p_GUI),SLOT(setRmapAddress(QString)));
-                connect(this,SIGNAL(SetRmapKey(QString)),((StarDundeeGUI*)this->p_GUI),SLOT(setRmapKey(QString)));
+                data = (char *) malloc( size + 5 );
-                connect(this,SIGNAL(SetRmapTimeout(QString)),((StarDundeeGUI*)this->p_GUI),SLOT(setRmapTimeout(QString)));
+                data[0] = this->manager->linkNumber;
+                data[1] = this->manager->destinationLogicalAddress;  // target logical address
+                data[2] = SPW_PROTO_ID_CCSDS;               // protocol identifier
+                data[3] = 0x00;                             // reserved
+                data[4] = 0x00;                             // user application
+                for ( i=0; i<size; i++ )
+                {
+                    data[i+5] = packet[i];
+                }
+                this->manager->sendPacket( data, size + 5);
+                free(data);
+                free(packet);
             }
             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);
+                                        emit bytesReceivedFromSpw( properties.len );
                                         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()
             {
+                bool ret;
+                if (this->interfaceMode == BRICK_IS_SET_AS_AN_INTERFACE)
+                {
+                    ret = connectBridgeAsInterface();
+                }
+                else if (this->interfaceMode == BRICK_IS_SET_AS_A_ROUTER)
+                {
+                    ret = connectBridgeAsRouter();
+                }
+                else
+                {
+                    ret = false;
+                }
+                return ret;
+            }
+            bool stardundeeSPW_USB_Manager::connectBridgeAsInterface()
+            {
                 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::connectBridgeAsRouter()
+            {
+                QMutexLocker mlock(this->handleMutex);
+                int status;
+                U32 statusControl;
+                unsigned int linkStatus1;
+                unsigned int linkStatus2;
+                unsigned char linkNumber;
+                unsigned char deviceIsAnInterface;
+                if (!USBSpaceWire_Open(&hDevice, this->selectedBrick)) // Open the USB device
+                {
+                    SocExplorerEngine::message(this->plugin,"stardundee *** Open *** ERROR: USBSpaceWire_Open(&hDevice, 0))");
+                    return false;
+                }
+                SocExplorerEngine::message(this->plugin,"stardundee *** Open *** USBSpaceWire_Open successful, device number: "
+                                 + QString::number(this->selectedBrick));
+                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
+                // This affects just the operations performed by the Configuration Library and does not affect the packets
+                // sent and received using the driver API.
+                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");
+                }
+                else SocExplorerEngine::message(this->plugin,"OK CFGSpaceWire_SetBrickBaseTransmitRate, base rate = 100 MHz");
+                //*********************
+                // LINK 1 CONFIGURATION
+                linkNumber = 1;
+                if (CFGSpaceWire_GetLinkStatusControl(hDevice, linkNumber, &statusControl) != CFG_TRANSFER_SUCCESS)
+                    SocExplorerEngine::message(this->plugin,"Could not read link status control for link " + QString::number(linkNumber));
+                else
+                {
+                    SocExplorerEngine::message(this->plugin,"OK CFGSpaceWire_GetLinkStatusControl of link " + QString::number(linkNumber));
+                    // 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, linkNumber, statusControl) != CFG_TRANSFER_SUCCESS)
+                        SocExplorerEngine::message(this->plugin,"Could not set the link status control for link " + QString::number(linkNumber));
+                    else
+                        SocExplorerEngine::message(this->plugin,"link status control for link " + QString::number(0x01) + " is set");
+                }
+                //*********************
+                // LINK 2 CONFIGURATION
+                linkNumber = 2;
+                if (CFGSpaceWire_GetLinkStatusControl(hDevice, linkNumber, &statusControl) != CFG_TRANSFER_SUCCESS)
+                    SocExplorerEngine::message(this->plugin,"Could not read link status control for link " + QString::number(linkNumber));
+                else
+                {
+                    SocExplorerEngine::message(this->plugin,"OK CFGSpaceWire_GetLinkStatusControl of link " + QString::number(linkNumber));
+                    // 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, linkNumber, statusControl) != CFG_TRANSFER_SUCCESS)
+                        SocExplorerEngine::message(this->plugin,"Could not set the link status control for link " + QString::number(linkNumber));
+                    else
+                        SocExplorerEngine::message(this->plugin,"link status control for link " + QString::number(linkNumber) + " is set");
+                }
+                //***************************
+                // SET THE DEVICE AS A ROUTER
+                deviceIsAnInterface = 0;    // 0 = router, 1 = interface
+                if (CFGSpaceWire_SetAsInterface(hDevice, deviceIsAnInterface, 0) != CFG_TRANSFER_SUCCESS)
+                    SocExplorerEngine::message(this->plugin,"Could not set the device to be an interface");
+                else
+                    SocExplorerEngine::message(this->plugin,"Device is an interface: " + QString::number(deviceIsAnInterface) + " (1 => true, 0 => false)");
+                setRoutingTableEntry(0xfe, 0x02, 0); // [0010] => route 0xfe on port 1
+                setRoutingTableEntry(32  , 0x08, 0); // [1000] => route 32   on port 3
+                USBSpaceWire_RegisterReceiveOnAllPorts(hDevice);  // Register to receive on port 1 only
+                USBSpaceWire_ClearEndpoints(hDevice);               // clear the USB endpoints
+                SocExplorerEngine::message(this->plugin,"The driver's current send buffer size is " + QString::number(USBSpaceWire_GetDriverSendBufferSize(hDevice)) + " bytes");
+                SocExplorerEngine::message(this->plugin,"The driver's current read buffer size is " + QString::number(USBSpaceWire_GetDriverReadBufferSize(hDevice)) + " bytes");
+                SocExplorerEngine::message(this->plugin,"USBSpaceWire_IsReadThrottling is " + QString::number(USBSpaceWire_IsReadThrottling(hDevice)));
+                //************
+                // test Link 1 and Link 2
+                linkStatus1 = getLinkStatus(0x01);
+                linkStatus2 = getLinkStatus(0x02);
+                if ((linkStatus1==1) || (linkStatus2==1))
+                {
+                    initializeTimecodeGeneration();
+                    this->connected=true;
+                    return true;
+                }
+                else
+                {
+                    statusLink1->setText("Link 1 status code: " + QString::number(linkStatus1));
+                    statusLink2->setText("Link 2 status code: " + QString::number(linkStatus2));
+                    starDundeeStatusQueryDialog->exec();
+                    this->connected = false;
+                    return false;
+                }
+            }
+            void stardundeeSPW_USB_Manager::initDialog( void )
+            {
+                // STAR DUNDEE STATUS QUERY DIALOG
+                starDundeeStatusQueryDialog         = new QDialog;
+                starDundeeStatusQueryDialogLayout   = new QGridLayout;
+                starDundeeStatusQueryDialogLabel    = new QLabel(tr("SpaceWire links state"));
+                starDundeeStatusQueryContinueButton = new QPushButton(tr("Continue"));
+                starDundeeStatusQueryRetryButton    = new QPushButton(tr("Retry"));
+                starDundeeStatusQueryAbortButton    = new QPushButton(tr("Abort"));
+                statusLink1 = new QLabel(tr("Link 1 status code: -"));
+                statusLink2 = new QLabel(tr("Link 2 status code: -"));
+                starDundeeStatusQueryDialogLayout->addWidget(starDundeeStatusQueryDialogLabel, 0, 0, 1, 2);
+                starDundeeStatusQueryDialogLayout->addWidget(starDundeeStatusQueryContinueButton, 1, 0, 0);
+                starDundeeStatusQueryDialogLayout->addWidget(starDundeeStatusQueryRetryButton, 1, 1, 0);
+                starDundeeStatusQueryDialogLayout->addWidget(starDundeeStatusQueryAbortButton, 1, 2, 0);
+                starDundeeStatusQueryDialogLayout->addWidget(statusLink1, 2, 0, 0);
+                starDundeeStatusQueryDialogLayout->addWidget(statusLink2, 3, 0, 0);
+                starDundeeStatusQueryDialog->setLayout(starDundeeStatusQueryDialogLayout);
+            }
+            unsigned char stardundeeSPW_USB_Manager::setRoutingTableEntry(int tableEntry, U32 dwOutputPorts, char bDelHead)
+            {
+                U32 routingTableEntry;
+                // SET THE ROUTING TABLE ENTRY FOR LOGICAL ADDRESSING, TARGET entryNumber
+                if (CFGSpaceWire_ClearRoutingTableEntry(hDevice, tableEntry) != CFG_TRANSFER_SUCCESS)
+                {
+                    SocExplorerEngine::message(this->plugin,"Could not clear routing table entry " + QString::number(tableEntry));
+                }
+                // Build the routing table entry
+                CFGSpaceWire_RTBuildRoutingTableEntry(&routingTableEntry,
+                                                      dwOutputPorts,        // route out of port dwOutputPorts
+                                                      bDelHead,             // header deletion is enabled [1] or disabled [0]
+);                   // priority normal
+                // Set the routing table entry for logical address tableEntry
+                if (CFGSpaceWire_SetRoutingTableEntry(hDevice, tableEntry, routingTableEntry) != CFG_TRANSFER_SUCCESS)
+                {
+                    SocExplorerEngine::message(this->plugin,"Could not set routing table entry [" + QString::number(tableEntry) + "]");
+                }
+                else SocExplorerEngine::message(this->plugin,"Routing table entry [" + QString::number(tableEntry) + "] set" );
+                return 1;
+            }
+            unsigned int stardundeeSPW_USB_Manager::getRoutingTableEntry(int tableEntry)
+            {
+                U32 routingTableEntry, outputPorts;
+                char enabled, delHead, priority;
+                int portNum;
+                SocExplorerEngine::message(this->plugin,"GetRoutingTableEntry [" + QString::number(tableEntry) + "]");
+                // Read the routing table entry
+                if (CFGSpaceWire_GetRoutingTableEntry(hDevice, tableEntry, &routingTableEntry) != CFG_TRANSFER_SUCCESS)
+                {
+                    SocExplorerEngine::message(this->plugin,"Could not read routing table entry [" + QString::number(tableEntry) + "]");
+                }
+                else
+                {
+                    // Display the routing table entry properties
+                    CFGSpaceWire_RTIsEnabled(routingTableEntry, &enabled);
+                    CFGSpaceWire_RTIsDelHead(routingTableEntry, &delHead);
+                    CFGSpaceWire_RTIsPriority(routingTableEntry, &priority);
+                    CFGSpaceWire_RTGetOutputPorts(routingTableEntry, &outputPorts);
+                    SocExplorerEngine::message(this->plugin,"CFGSpaceWire_RTIsEnabled      : " + QString::number(enabled));
+                    SocExplorerEngine::message(this->plugin,"CFGSpaceWire_RTIsDelHead      : " + QString::number(delHead));
+                    SocExplorerEngine::message(this->plugin,"CFGSpaceWire_RTIsPriority     : " + QString::number(priority));
+                    SocExplorerEngine::message(this->plugin,"CFGSpaceWire_RTGetOutputPorts : ");
+                    for (portNum = 0; portNum < 32; portNum++)
+                    {
+                        if (outputPorts & (1 << portNum))
+                        {
+                            SocExplorerEngine::message(this->plugin,QString::number(portNum));
+                        }
+                    }
+                }
+                return 1;
+            }
+            void stardundeeSPW_USB_Manager::initializeTimecodeGeneration()
+            {
+                U32 dwTickEnableStatus;
+                U32 rtr_clk_freq;
+                // (1) RESET
+                if (!USBSpaceWire_TC_Reset(hDevice))
+                    SocExplorerEngine::message(this->plugin,"ERR *** in Open *** Could not reset timecodes\n");
+                // (2) Clear the tick enable register
+                if (CFGSpaceWire_SetTickEnableStatus(hDevice, 6) != CFG_TRANSFER_SUCCESS)
+                    SocExplorerEngine::message(this->plugin,"Could not clear the tick enable register");
+                else
+                    SocExplorerEngine::message(this->plugin,"Cleared the tick enable register");
+                // (3) get the tick status
+                CFGSpaceWire_GetTickEnableStatus(hDevice, &dwTickEnableStatus);
+                SocExplorerEngine::message(this->plugin,"OK *** in Open *** CFGSpaceWire_GetTickEnableStatus, code is " + QString::number(dwTickEnableStatus, 2));
+                // (4) enable external timecode selection
+                if(!USBSpaceWire_TC_EnableExternalTimecodeSelection(hDevice,0))
+                    SocExplorerEngine::message(this->plugin,"ERR *** disable external timecode selection");
+                rtr_clk_freq = USBSpaceWire_TC_GetClockFrequency(hDevice);
+                SocExplorerEngine::message(this->plugin,"clock frequency = " + QString::number(rtr_clk_freq) );
+                //**************************************************
+                // auto _ tick _ freq = rtr _ clk _ freq / freqCount
+                if (!USBSpaceWire_TC_SetAutoTickInFrequency(hDevice, rtr_clk_freq) )
+                    SocExplorerEngine::message(this->plugin,"Could not set the tick-in frequency");
+            }
+            unsigned int stardundeeSPW_USB_Manager::getLinkStatus(unsigned char link)
+            {
+                U32 statusControl, errorStatus, portType;
+                U32 linkStatus, operatingSpeed, outputPortConnection;
+                char isLinkRunning, isAutoStart, isStart, isDisabled, isTristate;
+                // Read the link status control register
+                if (CFGSpaceWire_GetLinkStatusControl(hDevice, link, &statusControl) != CFG_TRANSFER_SUCCESS)
+                {
+                    SocExplorerEngine::message(this->plugin,"Could not read link status control for link" + QString::number(link));
+                }
+                else
+                {
+                    // Display the link status control register properties
+                    CFGSpaceWire_LSPortType(statusControl, &portType);
+                    if (portType == CFG_CONFIGURATION_PORT)
+                    {
+                        CFGSpaceWire_LSConfigErrorStatus(statusControl, &errorStatus);
+                    }
+                    else if (portType == CFG_SPACEWIRE_EXTERNAL_PORT)
+                    {
+                        CFGSpaceWire_LSExternalErrorStatus(statusControl, &errorStatus);
+                    }
+                    else
+                    {
+                        CFGSpaceWire_LSErrorStatus(statusControl, &errorStatus);
+                    }
+                    CFGSpaceWire_LSLinkState(statusControl, &linkStatus);
+                    CFGSpaceWire_LSIsLinkRunning(statusControl, &isLinkRunning);
+                    CFGSpaceWire_LSIsAutoStart(statusControl, &isAutoStart);
+                    CFGSpaceWire_LSIsStart(statusControl, &isStart);
+                    CFGSpaceWire_LSIsDisabled(statusControl, &isDisabled);
+                    CFGSpaceWire_LSIsTristate(statusControl, &isTristate);
+                    CFGSpaceWire_LSOperatingSpeed(statusControl, &operatingSpeed);
+                    CFGSpaceWire_LSOutputPortConnection(statusControl, &outputPortConnection);
+                }
+                SocExplorerEngine::message(this->plugin,"status of link " + QString::number(link)
+                                           +" is " + dwLinkStatusQString[linkStatus]);
+                if (linkStatus == 5)
+                {
+                    return 1;
+                }
+                else return 0;
+            }
             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
                 {
+                    emit bytesTransmittedToSpw( size-1 ); // -1 is for removing the first bytes added to the packet to route to the right link
                     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/StarDundee/stardundeespw_usb.h +33 -5

             /*------------------------------------------------------------------------------
             --  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"
+            #define BRICK_IS_SET_AS_AN_INTERFACE true
+            #define BRICK_IS_SET_AS_A_ROUTER false
             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 connectBridgeAsInterface();
+                bool connectBridgeAsRouter();
+                void initDialog( void );
+                unsigned char setRoutingTableEntry(int tableEntry, U32 dwOutputPorts, char bDelHead);
+                unsigned int getRoutingTableEntry(int tableEntry);
+                void initializeTimecodeGeneration();
+                unsigned int getLinkStatus(unsigned char link);
                 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);
+                void bytesReceivedFromSpw( unsigned int );
+                void bytesTransmittedToSpw( unsigned int);
             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;
+                QLabel *starDundeeStatusQueryDialogLabel;
+                QPushButton *starDundeeStatusQueryRetryButton;
+                QPushButton *starDundeeStatusQueryAbortButton;
+                QLabel *statusLink1;
+                QLabel *statusLink2;
+                QPushButton *starDundeeStatusQueryContinueButton;
+                QDialog *starDundeeStatusQueryDialog;
+                QGridLayout *starDundeeStatusQueryDialogLayout;
             public:
                 int selectedBrick;
                 int linkNumber;
                 int brickList;
                 int linkSpeed;
+                int sourceLogicalAddress;
+                int destinationLogicalAddress;
                 int destinationKey;
-                int rmapAddress;
-                int rmapKey;
                 int RMAPtimeout;
+                bool interfaceMode; // 1 => interface mode, 0 => router mode
             };
             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);
+                void SetBrickAsAnInterface( bool );
+                void SetBrickAsARouter( bool );
+                int GetAvailableBrickCount( void );
+                void BytesReceivedFromSpw( unsigned int );
+                void BytesTransmittedToSpw( unsigned int );
             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 sourceLogicalAddressChanged(const QString & destKey);
                 void rmapAddressChanged(const QString & rmapaddress);
-                void rmapKeyChanged(const QString & key);
+                void brickModeChanged( bool interfaceMode );
+                void destinationKeyChanged(const QString & key);
                 void rmapTimeoutChanged(const QString & timeout);
+                void sendPacketComingFromTCPServer(char *packet, int size);
             private:
                 void makeGUI(socexplorerplugin *parent);
                 stardundeeSPW_USB_Manager* manager;
             };
             #endif // STARDUNDEESPW_USB_H

spwplugin/spwplugin.cpp +6 -2

             /*------------------------------------------------------------------------------
             --  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(((spwPyWrapper*)this->pyObject),SIGNAL(StarDundeeGetAvailableBrickCount()),((stardundeeSPW_USB*)bridge),SIGNAL(GetAvailableBrickCount()));
+                    connect(((spwPyWrapper*)this->pyObject),SIGNAL(StarDundeeSetBrickAsAninterface(bool)),
+                            ((stardundeeSPW_USB*)bridge),SIGNAL(SetBrickAsAnInterface(bool)));
+                    connect(((spwPyWrapper*)this->pyObject),SIGNAL(StarDundeeSetBrickAsARouter(bool)),
+                            ((stardundeeSPW_USB*)bridge),SIGNAL(SetBrickAsARouter(bool)));
                     connect(this->bridge,SIGNAL(pushPacketOverTCP(char*,int)),this->tcpServer,SLOT(pushPacket(char*,int)));
+                    connect(this->tcpServer, SIGNAL(sendSPWPacket(char*,int)), ((stardundeeSPW_USB*)bridge), SLOT(sendPacketComingFromTCPServer(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/spwpywrapper.h +3 0

             #ifndef SPWPYWRAPPER_H
             #define SPWPYWRAPPER_H
             #include <genericPySysdriver.h>
             class spwPyWrapper : public genericPySysdriver
             {
                 Q_OBJECT
             public:
                 explicit spwPyWrapper(socexplorerplugin *parent = 0);
             signals:
                 void selectBridge(const QString &bridgeName);
                 bool connectBridge();
                 bool disconnectBridge();
                 void StarDundeeSelectBrick(int brickIndex);
                 void StarDundeeSelectLinkNumber(int linkIndex);
                 void StarDundeeSelectLinkSpeed(int linkSpeed);
                 void StarDundeeSetDestinationKey(const QString & destKey);
                 void StarDundeeSetRmapAddress(const QString & address);
                 void StarDundeeSetRmapKey(const QString & key);
                 void StarDundeeSetRmapTimeout(const QString & timeout);
+                int StarDundeeGetAvailableBrickCount();
+                void StarDundeeSetBrickAsAninterface( bool );
+                void StarDundeeSetBrickAsARouter( bool );
                 void TCPServerConnect();
                 void TCPServerDisconnect();
                 void TCPServerSetPort(qint32 port);
                 void TCPServerSetIP(QString ip);
             public slots:
             };
             #endif // SPWPYWRAPPER_H

General Comments 0

Write
Preview

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

No TODOs yet

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

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