# HG changeset patch # User Alexis Jeandet # Date 2015-04-02 12:18:25 # Node ID dd405168d9ae9cb42b2f08f1612c64abe4e78193 # Parent c8f8e77e323c2781e0db70638a68c2f992f31c7d Cleaniing complete, ready for testing. diff --git a/APBUARTPLUGIN/APBUARTPLUGIN.cpp b/APBUARTPLUGIN/APBUARTPLUGIN.cpp --- a/APBUARTPLUGIN/APBUARTPLUGIN.cpp +++ b/APBUARTPLUGIN/APBUARTPLUGIN.cpp @@ -21,7 +21,6 @@ ----------------------------------------------------------------------------*/ #include "APBUARTPLUGIN.h" #include -#include ApbUartPlugin::ApbUartPlugin(QWidget *parent):socexplorerplugin(parent,false) { diff --git a/APBUARTPLUGIN/APBUARTPLUGIN.pro b/APBUARTPLUGIN/APBUARTPLUGIN.pro --- a/APBUARTPLUGIN/APBUARTPLUGIN.pro +++ b/APBUARTPLUGIN/APBUARTPLUGIN.pro @@ -7,7 +7,7 @@ CONFIG += socexplorerplugin win32:CONFIG += dll win32:CONFIG -= static -VERSION=1.0.0 +VERSION=1.1.0 TARGET = ApbUartPlugin #$${DEBUG_EXT} DEFINES += PLUGIN=ApbUartPlugin @@ -29,16 +29,14 @@ HEADERS += \ APBUARTPLUGIN.h \ apbuartterminal.h \ apbuart_plugin_ui.h \ - uartpollingthread.h \ - apbuartpywrapper.h + uartpollingthread.h SOURCES += \ APBUARTPLUGIN.cpp \ apbuartterminal.cpp \ apbuart_plugin_ui.cpp \ - uartpollingthread.cpp \ - apbuartpywrapper.cpp + uartpollingthread.cpp FORMS += \ apbuart_plugin_ui.ui diff --git a/APBUARTPLUGIN/apbuartpywrapper.cpp b/APBUARTPLUGIN/apbuartpywrapper.cpp deleted file mode 100644 --- a/APBUARTPLUGIN/apbuartpywrapper.cpp +++ /dev/null @@ -1,27 +0,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 2 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 "apbuartpywrapper.h" - -APBUartPyWrapper::APBUartPyWrapper(socexplorerplugin *parent) : - genericPySysdriver(parent) -{ -} diff --git a/APBUARTPLUGIN/apbuartpywrapper.h b/APBUARTPLUGIN/apbuartpywrapper.h deleted file mode 100644 --- a/APBUARTPLUGIN/apbuartpywrapper.h +++ /dev/null @@ -1,46 +0,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 2 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 APBUARTPYWRAPPER_H -#define APBUARTPYWRAPPER_H -#include -#include -#include - -class APBUartPyWrapper : public genericPySysdriver -{ - Q_OBJECT -public: - explicit APBUartPyWrapper(socexplorerplugin *parent = 0); - -signals: - void setFifoDebugEnabled(bool enable); - void setAPBUartIndex(int index); - void setUARTPortNane(QString name); - void setUARTPortSpeed(int speed); - void updateAPBUartsList(); - void openUart(); - void closeUart(); -public slots: - -}; - -#endif // APBUARTPYWRAPPER_H diff --git a/SocExplorer-plugins.spec b/SocExplorer-plugins.spec --- a/SocExplorer-plugins.spec +++ b/SocExplorer-plugins.spec @@ -1,7 +1,7 @@ -%global upstream_name socexplorer-plugins-0.5 +%global upstream_name socexplorer-plugins-0.6 Name: socexplorer-plugins -Version: 0.5 +Version: 0.6 Release: 0%{?dist} Summary: Base plugins for SocExplorer. Group: Development/Tools @@ -18,7 +18,7 @@ BuildRequires: qt5-qtsvg-devel BuildRequires: qt5-qtxmlpatterns-devel BuildRequires: elfutils-libelf-devel BuildRequires: qt5-pythonqt-devel -BuildRequires: socexplorer-devel +BuildRequires: socexplorer-devel-0.6-0 %description SocExplorer is an open source generic System On Chip testing software/framework. This package contains the base plugins for SocExplorer such as AHBUARTplugin for connecting to any grlib based design with an AHBUART. @@ -55,6 +55,10 @@ make install INSTALL_ROOT=%{buildroot} %{_qt5_libdir}/SocExplorer/plugins/libmemctrlrplugin.so* %changelog +* Thu Apr 2 2015 Alexis Jeandet - 0.6 +-Uses r53 as source. +-Removed GenericPySysdriver interface, now socexplorer plugins can be subclassed in python. + * Thu Mar 26 2015 Alexis Jeandet - 0.5 -Uses r51 as source. diff --git a/ahbuartplugin/ahbuartplugin.cpp b/ahbuartplugin/ahbuartplugin.cpp --- a/ahbuartplugin/ahbuartplugin.cpp +++ b/ahbuartplugin/ahbuartplugin.cpp @@ -27,7 +27,6 @@ #include #include #include -#include "ahbuartpywrapper.h" #include #include #include diff --git a/ahbuartplugin/ahbuartplugin.pro b/ahbuartplugin/ahbuartplugin.pro --- a/ahbuartplugin/ahbuartplugin.pro +++ b/ahbuartplugin/ahbuartplugin.pro @@ -7,7 +7,7 @@ CONFIG += socexplorerplugin TEMPLATE = lib CONFIG += dll CONFIG -= static -VERSION=1.4.0 +VERSION=1.5.0 TARGET = ahbuartplugin #$${DEBUG_EXT} DEFINES += PLUGIN=ahbuartplugin DEFINES += PLUGINHEADER="\"\\\"ahbuartplugin.h"\\\"\" diff --git a/dsu3plugin/dsu3plugin.cpp b/dsu3plugin/dsu3plugin.cpp --- a/dsu3plugin/dsu3plugin.cpp +++ b/dsu3plugin/dsu3plugin.cpp @@ -22,7 +22,6 @@ #include "dsu3plugin.h" #include #include -#include "dsu3pluginpywrapper.h" #include diff --git a/dsu3plugin/dsu3plugin.pro b/dsu3plugin/dsu3plugin.pro --- a/dsu3plugin/dsu3plugin.pro +++ b/dsu3plugin/dsu3plugin.pro @@ -10,7 +10,7 @@ TEMPLATE = lib QMAKE_LFLAGS_RELEASE += --enable-auto-import -mstackrealign QMAKE_LFLAGS_DEBUG += --enable-auto-import -mstackrealign -VERSION=0.2.0 +VERSION=0.3.0 TARGET = dsu3plugin #$${DEBUG_EXT} DEFINES += PLUGIN=dsu3plugin diff --git a/genericrwplugin/genericrwplugin.cpp b/genericrwplugin/genericrwplugin.cpp --- a/genericrwplugin/genericrwplugin.cpp +++ b/genericrwplugin/genericrwplugin.cpp @@ -20,7 +20,6 @@ -- Mail : alexis.jeandet@lpp.polytechnique.fr ----------------------------------------------------------------------------*/ #include "genericrwplugin.h" -#include "genericrwpluginpywrapper.h" genericrwplugin::genericrwplugin(QWidget *parent):socexplorerplugin(parent,false) { this->UI = new genericrwpluginUi(); diff --git a/genericrwplugin/genericrwplugin.pro b/genericrwplugin/genericrwplugin.pro --- a/genericrwplugin/genericrwplugin.pro +++ b/genericrwplugin/genericrwplugin.pro @@ -7,7 +7,7 @@ CONFIG += socexplorerplugin CONFIG += dll CONFIG -= static -VERSION=1.1.0 +VERSION=1.2.0 TARGET = genericrwplugin DEFINES += PLUGIN=genericrwplugin DEFINES += PLUGINHEADER="\"\\\"genericrwplugin.h"\\\"\" diff --git a/memcheckplugin/memcheckplugin.pro b/memcheckplugin/memcheckplugin.pro --- a/memcheckplugin/memcheckplugin.pro +++ b/memcheckplugin/memcheckplugin.pro @@ -7,7 +7,7 @@ CONFIG += socexplorerplugin CONFIG += dll CONFIG -= static -VERSION=0.1.0 +VERSION=0.2.0 TARGET = memcheckplugin DEFINES += PLUGIN=memcheckplugin DEFINES += PLUGINHEADER="\"\\\"memcheckplugin.h"\\\"\" diff --git a/memctrlrplugin/memctrlrplugin.cpp b/memctrlrplugin/memctrlrplugin.cpp --- a/memctrlrplugin/memctrlrplugin.cpp +++ b/memctrlrplugin/memctrlrplugin.cpp @@ -20,7 +20,6 @@ -- Mail : alexis.jeandet@lpp.polytechnique.fr ----------------------------------------------------------------------------*/ #include "memctrlrplugin.h" -#include "memctrlrpywrapper.h" memctrlrplugin::memctrlrplugin(QWidget *parent):socexplorerplugin(parent,false) { diff --git a/memctrlrplugin/memctrlrplugin.pro b/memctrlrplugin/memctrlrplugin.pro --- a/memctrlrplugin/memctrlrplugin.pro +++ b/memctrlrplugin/memctrlrplugin.pro @@ -7,7 +7,7 @@ CONFIG += socexplorerplugin CONFIG += dll CONFIG -= static -VERSION=1.0.1 +VERSION=1.1.0 TARGET = memctrlrplugin DEFINES += PLUGIN=memctrlrplugin DEFINES += PLUGINHEADER="\"\\\"memctrlrplugin.h"\\\"\" diff --git a/spwplugin/spwplugin.cpp b/spwplugin/spwplugin.cpp --- a/spwplugin/spwplugin.cpp +++ b/spwplugin/spwplugin.cpp @@ -24,7 +24,6 @@ #include "stardundeespw_usb.h" #include "gr_esb_bridge.h" #include -#include "spwpywrapper.h" spwplugin::spwplugin(QWidget *parent):socexplorerplugin(parent,false) @@ -111,7 +110,7 @@ void spwplugin::bridgeSelectionChanged(c connect(this,SIGNAL(StarDundeeGetNbCCSDSPacketsTransmittedToSpw()), ((stardundeeSPW_USB*)bridge),SIGNAL(GetNbCCSDSPacketsTransmittedToSpw())); connect(this,SIGNAL(StarDundeeGetLinkNumber()),((stardundeeSPW_USB*)bridge),SIGNAL(GetLinkNumber())); - connect(this->,SIGNAL(StarDundeeSetBrickAsAninterface(bool)), + connect(this,SIGNAL(StarDundeeSetBrickAsAninterface(bool)), ((stardundeeSPW_USB*)bridge),SIGNAL(SetBrickAsAnInterface(bool))); connect(this,SIGNAL(StarDundeeSetBrickAsARouter(bool)), ((stardundeeSPW_USB*)bridge),SIGNAL(SetBrickAsARouter(bool))); diff --git a/spwplugin/spwplugin.h b/spwplugin/spwplugin.h --- a/spwplugin/spwplugin.h +++ b/spwplugin/spwplugin.h @@ -63,7 +63,7 @@ public slots: void setConnected(bool connected); signals: - void selectBridge(const QString &bridgeName); +// void selectBridge(const QString &bridgeName); bool connectBridge(); bool disconnectBridge(); void StarDundeeSelectBrick(int brickIndex); diff --git a/spwplugin/spwplugin.pro b/spwplugin/spwplugin.pro --- a/spwplugin/spwplugin.pro +++ b/spwplugin/spwplugin.pro @@ -9,7 +9,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += win32:CONFIG += dll win32:CONFIG -= static -VERSION=0.5.0 +VERSION=0.6.0 TARGET = spwplugin DEFINES += PLUGIN=spwplugin DEFINES += PLUGINHEADER="\"\\\"spwplugin.h"\\\"\"