##// END OF EJS Templates
Cleaniing complete, ready for testing.
jeandet -
r53:dd405168d9ae default
parent child
Show More
@@ -21,7 +21,6
21 ----------------------------------------------------------------------------*/
21 ----------------------------------------------------------------------------*/
22 #include "APBUARTPLUGIN.h"
22 #include "APBUARTPLUGIN.h"
23 #include <socexplorerengine.h>
23 #include <socexplorerengine.h>
24 #include <apbuartpywrapper.h>
25
24
26 ApbUartPlugin::ApbUartPlugin(QWidget *parent):socexplorerplugin(parent,false)
25 ApbUartPlugin::ApbUartPlugin(QWidget *parent):socexplorerplugin(parent,false)
27 {
26 {
@@ -7,7 +7,7 CONFIG += socexplorerplugin
7
7
8 win32:CONFIG += dll
8 win32:CONFIG += dll
9 win32:CONFIG -= static
9 win32:CONFIG -= static
10 VERSION=1.0.0
10 VERSION=1.1.0
11 TARGET = ApbUartPlugin #$${DEBUG_EXT}
11 TARGET = ApbUartPlugin #$${DEBUG_EXT}
12
12
13 DEFINES += PLUGIN=ApbUartPlugin
13 DEFINES += PLUGIN=ApbUartPlugin
@@ -29,16 +29,14 HEADERS += \
29 APBUARTPLUGIN.h \
29 APBUARTPLUGIN.h \
30 apbuartterminal.h \
30 apbuartterminal.h \
31 apbuart_plugin_ui.h \
31 apbuart_plugin_ui.h \
32 uartpollingthread.h \
32 uartpollingthread.h
33 apbuartpywrapper.h
34
33
35
34
36 SOURCES += \
35 SOURCES += \
37 APBUARTPLUGIN.cpp \
36 APBUARTPLUGIN.cpp \
38 apbuartterminal.cpp \
37 apbuartterminal.cpp \
39 apbuart_plugin_ui.cpp \
38 apbuart_plugin_ui.cpp \
40 uartpollingthread.cpp \
39 uartpollingthread.cpp
41 apbuartpywrapper.cpp
42
40
43 FORMS += \
41 FORMS += \
44 apbuart_plugin_ui.ui
42 apbuart_plugin_ui.ui
@@ -1,7 +1,7
1 %global upstream_name socexplorer-plugins-0.5
1 %global upstream_name socexplorer-plugins-0.6
2
2
3 Name: socexplorer-plugins
3 Name: socexplorer-plugins
4 Version: 0.5
4 Version: 0.6
5 Release: 0%{?dist}
5 Release: 0%{?dist}
6 Summary: Base plugins for SocExplorer.
6 Summary: Base plugins for SocExplorer.
7 Group: Development/Tools
7 Group: Development/Tools
@@ -18,7 +18,7 BuildRequires: qt5-qtsvg-devel
18 BuildRequires: qt5-qtxmlpatterns-devel
18 BuildRequires: qt5-qtxmlpatterns-devel
19 BuildRequires: elfutils-libelf-devel
19 BuildRequires: elfutils-libelf-devel
20 BuildRequires: qt5-pythonqt-devel
20 BuildRequires: qt5-pythonqt-devel
21 BuildRequires: socexplorer-devel
21 BuildRequires: socexplorer-devel-0.6-0
22
22
23 %description
23 %description
24 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.
24 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}
55 %{_qt5_libdir}/SocExplorer/plugins/libmemctrlrplugin.so*
55 %{_qt5_libdir}/SocExplorer/plugins/libmemctrlrplugin.so*
56
56
57 %changelog
57 %changelog
58 * Thu Apr 2 2015 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.6
59 -Uses r53 as source.
60 -Removed GenericPySysdriver interface, now socexplorer plugins can be subclassed in python.
61
58 * Thu Mar 26 2015 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.5
62 * Thu Mar 26 2015 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.5
59 -Uses r51 as source.
63 -Uses r51 as source.
60
64
@@ -27,7 +27,6
27 #include <QProgressBar>
27 #include <QProgressBar>
28 #include <stdio.h>
28 #include <stdio.h>
29 #include <QThread>
29 #include <QThread>
30 #include "ahbuartpywrapper.h"
31 #include <QCompleter>
30 #include <QCompleter>
32 #include <QStringList>
31 #include <QStringList>
33 #include <QLineEdit>
32 #include <QLineEdit>
@@ -7,7 +7,7 CONFIG += socexplorerplugin
7 TEMPLATE = lib
7 TEMPLATE = lib
8 CONFIG += dll
8 CONFIG += dll
9 CONFIG -= static
9 CONFIG -= static
10 VERSION=1.4.0
10 VERSION=1.5.0
11 TARGET = ahbuartplugin #$${DEBUG_EXT}
11 TARGET = ahbuartplugin #$${DEBUG_EXT}
12 DEFINES += PLUGIN=ahbuartplugin
12 DEFINES += PLUGIN=ahbuartplugin
13 DEFINES += PLUGINHEADER="\"\\\"ahbuartplugin.h"\\\"\"
13 DEFINES += PLUGINHEADER="\"\\\"ahbuartplugin.h"\\\"\"
@@ -22,7 +22,6
22 #include "dsu3plugin.h"
22 #include "dsu3plugin.h"
23 #include <QFileDialog>
23 #include <QFileDialog>
24 #include <QDir>
24 #include <QDir>
25 #include "dsu3pluginpywrapper.h"
26 #include <socexplorerengine.h>
25 #include <socexplorerengine.h>
27
26
28
27
@@ -10,7 +10,7 TEMPLATE = lib
10 QMAKE_LFLAGS_RELEASE += --enable-auto-import -mstackrealign
10 QMAKE_LFLAGS_RELEASE += --enable-auto-import -mstackrealign
11 QMAKE_LFLAGS_DEBUG += --enable-auto-import -mstackrealign
11 QMAKE_LFLAGS_DEBUG += --enable-auto-import -mstackrealign
12
12
13 VERSION=0.2.0
13 VERSION=0.3.0
14 TARGET = dsu3plugin #$${DEBUG_EXT}
14 TARGET = dsu3plugin #$${DEBUG_EXT}
15
15
16 DEFINES += PLUGIN=dsu3plugin
16 DEFINES += PLUGIN=dsu3plugin
@@ -20,7 +20,6
20 -- Mail : alexis.jeandet@lpp.polytechnique.fr
20 -- Mail : alexis.jeandet@lpp.polytechnique.fr
21 ----------------------------------------------------------------------------*/
21 ----------------------------------------------------------------------------*/
22 #include "genericrwplugin.h"
22 #include "genericrwplugin.h"
23 #include "genericrwpluginpywrapper.h"
24 genericrwplugin::genericrwplugin(QWidget *parent):socexplorerplugin(parent,false)
23 genericrwplugin::genericrwplugin(QWidget *parent):socexplorerplugin(parent,false)
25 {
24 {
26 this->UI = new genericrwpluginUi();
25 this->UI = new genericrwpluginUi();
@@ -7,7 +7,7 CONFIG += socexplorerplugin
7 CONFIG += dll
7 CONFIG += dll
8 CONFIG -= static
8 CONFIG -= static
9
9
10 VERSION=1.1.0
10 VERSION=1.2.0
11 TARGET = genericrwplugin
11 TARGET = genericrwplugin
12 DEFINES += PLUGIN=genericrwplugin
12 DEFINES += PLUGIN=genericrwplugin
13 DEFINES += PLUGINHEADER="\"\\\"genericrwplugin.h"\\\"\"
13 DEFINES += PLUGINHEADER="\"\\\"genericrwplugin.h"\\\"\"
@@ -7,7 +7,7 CONFIG += socexplorerplugin
7 CONFIG += dll
7 CONFIG += dll
8 CONFIG -= static
8 CONFIG -= static
9
9
10 VERSION=0.1.0
10 VERSION=0.2.0
11 TARGET = memcheckplugin
11 TARGET = memcheckplugin
12 DEFINES += PLUGIN=memcheckplugin
12 DEFINES += PLUGIN=memcheckplugin
13 DEFINES += PLUGINHEADER="\"\\\"memcheckplugin.h"\\\"\"
13 DEFINES += PLUGINHEADER="\"\\\"memcheckplugin.h"\\\"\"
@@ -20,7 +20,6
20 -- Mail : alexis.jeandet@lpp.polytechnique.fr
20 -- Mail : alexis.jeandet@lpp.polytechnique.fr
21 ----------------------------------------------------------------------------*/
21 ----------------------------------------------------------------------------*/
22 #include "memctrlrplugin.h"
22 #include "memctrlrplugin.h"
23 #include "memctrlrpywrapper.h"
24
23
25 memctrlrplugin::memctrlrplugin(QWidget *parent):socexplorerplugin(parent,false)
24 memctrlrplugin::memctrlrplugin(QWidget *parent):socexplorerplugin(parent,false)
26 {
25 {
@@ -7,7 +7,7 CONFIG += socexplorerplugin
7 CONFIG += dll
7 CONFIG += dll
8 CONFIG -= static
8 CONFIG -= static
9
9
10 VERSION=1.0.1
10 VERSION=1.1.0
11 TARGET = memctrlrplugin
11 TARGET = memctrlrplugin
12 DEFINES += PLUGIN=memctrlrplugin
12 DEFINES += PLUGIN=memctrlrplugin
13 DEFINES += PLUGINHEADER="\"\\\"memctrlrplugin.h"\\\"\"
13 DEFINES += PLUGINHEADER="\"\\\"memctrlrplugin.h"\\\"\"
@@ -24,7 +24,6
24 #include "stardundeespw_usb.h"
24 #include "stardundeespw_usb.h"
25 #include "gr_esb_bridge.h"
25 #include "gr_esb_bridge.h"
26 #include <socexplorerproxy.h>
26 #include <socexplorerproxy.h>
27 #include "spwpywrapper.h"
28
27
29
28
30 spwplugin::spwplugin(QWidget *parent):socexplorerplugin(parent,false)
29 spwplugin::spwplugin(QWidget *parent):socexplorerplugin(parent,false)
@@ -111,7 +110,7 void spwplugin::bridgeSelectionChanged(c
111 connect(this,SIGNAL(StarDundeeGetNbCCSDSPacketsTransmittedToSpw()),
110 connect(this,SIGNAL(StarDundeeGetNbCCSDSPacketsTransmittedToSpw()),
112 ((stardundeeSPW_USB*)bridge),SIGNAL(GetNbCCSDSPacketsTransmittedToSpw()));
111 ((stardundeeSPW_USB*)bridge),SIGNAL(GetNbCCSDSPacketsTransmittedToSpw()));
113 connect(this,SIGNAL(StarDundeeGetLinkNumber()),((stardundeeSPW_USB*)bridge),SIGNAL(GetLinkNumber()));
112 connect(this,SIGNAL(StarDundeeGetLinkNumber()),((stardundeeSPW_USB*)bridge),SIGNAL(GetLinkNumber()));
114 connect(this->,SIGNAL(StarDundeeSetBrickAsAninterface(bool)),
113 connect(this,SIGNAL(StarDundeeSetBrickAsAninterface(bool)),
115 ((stardundeeSPW_USB*)bridge),SIGNAL(SetBrickAsAnInterface(bool)));
114 ((stardundeeSPW_USB*)bridge),SIGNAL(SetBrickAsAnInterface(bool)));
116 connect(this,SIGNAL(StarDundeeSetBrickAsARouter(bool)),
115 connect(this,SIGNAL(StarDundeeSetBrickAsARouter(bool)),
117 ((stardundeeSPW_USB*)bridge),SIGNAL(SetBrickAsARouter(bool)));
116 ((stardundeeSPW_USB*)bridge),SIGNAL(SetBrickAsARouter(bool)));
@@ -63,7 +63,7 public slots:
63 void setConnected(bool connected);
63 void setConnected(bool connected);
64
64
65 signals:
65 signals:
66 void selectBridge(const QString &bridgeName);
66 // void selectBridge(const QString &bridgeName);
67 bool connectBridge();
67 bool connectBridge();
68 bool disconnectBridge();
68 bool disconnectBridge();
69 void StarDundeeSelectBrick(int brickIndex);
69 void StarDundeeSelectBrick(int brickIndex);
@@ -9,7 +9,7 greaterThan(QT_MAJOR_VERSION, 4): QT +=
9
9
10 win32:CONFIG += dll
10 win32:CONFIG += dll
11 win32:CONFIG -= static
11 win32:CONFIG -= static
12 VERSION=0.5.0
12 VERSION=0.6.0
13 TARGET = spwplugin
13 TARGET = spwplugin
14 DEFINES += PLUGIN=spwplugin
14 DEFINES += PLUGIN=spwplugin
15 DEFINES += PLUGINHEADER="\"\\\"spwplugin.h"\\\"\"
15 DEFINES += PLUGINHEADER="\"\\\"spwplugin.h"\\\"\"
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now