@@ -1,6 +1,6 | |||
|
1 | 1 | ############################################################################# |
|
2 | 2 | # Makefile for building: PAULs_LPPMON_PLUGINS |
|
3 |
# Generated by qmake (2.01a) (Qt 4.8.4) on: |
|
|
3 | # Generated by qmake (2.01a) (Qt 4.8.4) on: Mon Mar 25 13:19:51 2013 | |
|
4 | 4 | # Project: PAULs_LPPMON_PLUGINS.pro |
|
5 | 5 | # Template: subdirs |
|
6 | 6 | # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile PAULs_LPPMON_PLUGINS.pro |
@@ -1,6 +1,6 | |||
|
1 | 1 | <?xml version="1.0" encoding="UTF-8"?> |
|
2 | 2 | <!DOCTYPE QtCreatorProject> |
|
3 |
<!-- Written by Qt Creator 2.4.1, 2013-03-2 |
|
|
3 | <!-- Written by Qt Creator 2.4.1, 2013-03-26T13:29:01. --> | |
|
4 | 4 | <qtcreator> |
|
5 | 5 | <data> |
|
6 | 6 | <variable>ProjectExplorer.Project.ActiveTarget</variable> |
@@ -1,6 +1,6 | |||
|
1 | 1 | ############################################################################# |
|
2 | 2 | # Makefile for building: librmapplugin.so.1.0.0 |
|
3 |
# Generated by qmake (2.01a) (Qt 4.8.4) on: |
|
|
3 | # Generated by qmake (2.01a) (Qt 4.8.4) on: Mon Mar 25 13:19:51 2013 | |
|
4 | 4 | # Project: rmapplugin.pro |
|
5 | 5 | # Template: lib |
|
6 | 6 | # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile rmapplugin.pro |
@@ -10,13 +10,13 | |||
|
10 | 10 | |
|
11 | 11 | CC = gcc |
|
12 | 12 | CXX = g++ |
|
13 | DEFINES = -DPLUGIN=rmapplugin -DPLUGINHEADER="\"rmapplugin.h\"" -Ddriver_Name="\"RMAPPlugin\"" -Ddriver_Author="\"Paul Leroy paul.leroy@lpp.polytechnique.fr\"" -Ddriver_Version="\"1.1.2\"" -Ddriver_Description="\"AHB bus controler, works with Gaisler's AHB plugn' play bus.\"" -Ddriver_can_be_root=1 -Ddriver_can_be_child=0 -Ddriver_VID=0 -Ddriver_PID=0 -DUNIXTRANSLATIONPATH -DLPPMON_PLUGINS_INSTALL_PATH="QDir::homePath()+\"/.lppmon/plugins\"" -DLPPMON_CONFIG_PATH="QDir::homePath()+\"/.lppmon/config\"" -DLPPMON_TRANSLATION_PATH="\"/etc/lppmon/translations\"" -DLPPMONPLUGIN_LIBRARY -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED | |
|
13 | DEFINES = -DPLUGIN=rmapplugin -DPLUGINHEADER="\"rmapplugin.h\"" -Ddriver_Name="\"RMAPPlugin\"" -Ddriver_Author="\"Paul Leroy paul.leroy@lpp.polytechnique.fr\"" -Ddriver_Version="\"1.1.2\"" -Ddriver_Description="\"AHB bus controler, works with Gaisler's AHB plugn' play bus.\"" -Ddriver_can_be_root=1 -Ddriver_can_be_child=0 -Ddriver_VID=0 -Ddriver_PID=0 -DLPPMON_VERSION="\"0.0.1\"" -DUNIXTRANSLATIONPATH -DLPPMON_PLUGINS_INSTALL_PATH="QDir::homePath()+\"/.lppmon/plugins\"" -DLPPMON_CONFIG_PATH="QDir::homePath()+\"/.lppmon/config\"" -DLPPMON_TRANSLATION_PATH="\"/etc/lppmon/translations\"" -DLPPMONPLUGIN_LIBRARY -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED | |
|
14 | 14 | CFLAGS = -pipe -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -O2 -Wall -W -D_REENTRANT -fPIC $(DEFINES) |
|
15 | 15 | CXXFLAGS = -pipe -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -O2 -I/usr/include/python2.7 -I/usr/include/python2.7 -Wall -W -D_REENTRANT -fPIC $(DEFINES) |
|
16 | 16 | INCPATH = -I/usr/lib64/qt4/mkspecs/linux-g++ -I. -I/usr/include/QtCore -I/usr/include/QtNetwork -I/usr/include/QtGui -I/usr/include/QtXml -I/usr/include -I. -I../common_PLE -I../spw_usb_driver_v2.61/inc -I/usr/include/lppmon/common -I/usr/include/lppmon -I/usr/include/lppmon/pluginsInterface -I/usr/include/PythonQt -Imoc |
|
17 | 17 | LINK = g++ |
|
18 | 18 | LFLAGS = -Wl,-O1 -Wl,-z,relro -shared -Wl,-soname,librmapplugin.so.1 |
|
19 |
LIBS = $(SUBLIBS) -L/usr/lib64 ../spw_usb_driver_v2.6 |
|
|
19 | LIBS = $(SUBLIBS) -L/usr/lib64 ../spw_usb_driver_v2.62/lib/x86_64/libSpaceWireUSBAPI.so ../spw_usb_driver_v2.62/lib/x86_64/libConfigLibraryUSB.so -ldl -lutil -lm -lpython2.7 -lPythonQt_QtAll -lPythonQt -lQtXml -lQtGui -lQtNetwork -lQtCore -lpthread | |
|
20 | 20 | AR = ar cqs |
|
21 | 21 | RANLIB = |
|
22 | 22 | QMAKE = /usr/bin/qmake-qt4 |
@@ -235,7 +235,7 qmake: FORCE | |||
|
235 | 235 | |
|
236 | 236 | dist: |
|
237 | 237 | @$(CHK_DIR_EXISTS) obj/rmapplugin1.0.0 || $(MKDIR) obj/rmapplugin1.0.0 |
|
238 | $(COPY_FILE) --parents $(SOURCES) $(DIST) obj/rmapplugin1.0.0/ && $(COPY_FILE) --parents rmappluginui.h rmapplugin.h rmapoperations.h ccsds.h ../common_PLE/qipdialogbox.h ../common_PLE/gresbstatusenquiry.h spectralmatricesdmasimulator.h rmappluginpythonwrapper.h stardundee.h ../spw_usb_driver_v2.61/inc/spw_usb_api.h ../spw_usb_driver_v2.61/inc/spw_config_library.h gresb.h tcpackettosend.h /usr/include/genericPySysdriver.h /usr/include/lppmonplugin.h obj/rmapplugin1.0.0/ && $(COPY_FILE) --parents rmapplugin.cpp rmappluginui.cpp rmapoperations.cpp ccsds.cpp ../common_PLE/qipdialogbox.cpp ../common_PLE/gresbstatusenquiry.cpp spectralmatricesdmasimulator.cpp rmappluginpythonwrapper.cpp stardundee.cpp gresb.cpp tcpackettosend.cpp /usr/include/lppmon/pluginsInterface/lppmonplugininterface.cpp obj/rmapplugin1.0.0/ && (cd `dirname obj/rmapplugin1.0.0` && $(TAR) rmapplugin1.0.0.tar rmapplugin1.0.0 && $(COMPRESS) rmapplugin1.0.0.tar) && $(MOVE) `dirname obj/rmapplugin1.0.0`/rmapplugin1.0.0.tar.gz . && $(DEL_FILE) -r obj/rmapplugin1.0.0 | |
|
238 | $(COPY_FILE) --parents $(SOURCES) $(DIST) obj/rmapplugin1.0.0/ && $(COPY_FILE) --parents rmappluginui.h rmapplugin.h rmapoperations.h ccsds.h ../common_PLE/qipdialogbox.h ../common_PLE/gresbstatusenquiry.h spectralmatricesdmasimulator.h rmappluginpythonwrapper.h stardundee.h ../spw_usb_driver_v2.61/inc/spw_usb_api.h ../spw_usb_driver_v2.61/inc/spw_config_library.h gresb.h tcpackettosend.h /usr/include/lppmon/genericPySysdriver.h /usr/include/lppmon/lppmonplugin.h obj/rmapplugin1.0.0/ && $(COPY_FILE) --parents rmapplugin.cpp rmappluginui.cpp rmapoperations.cpp ccsds.cpp ../common_PLE/qipdialogbox.cpp ../common_PLE/gresbstatusenquiry.cpp spectralmatricesdmasimulator.cpp rmappluginpythonwrapper.cpp stardundee.cpp gresb.cpp tcpackettosend.cpp /usr/include/lppmon/pluginsInterface/lppmonplugininterface.cpp obj/rmapplugin1.0.0/ && (cd `dirname obj/rmapplugin1.0.0` && $(TAR) rmapplugin1.0.0.tar rmapplugin1.0.0 && $(COMPRESS) rmapplugin1.0.0.tar) && $(MOVE) `dirname obj/rmapplugin1.0.0`/rmapplugin1.0.0.tar.gz . && $(DEL_FILE) -r obj/rmapplugin1.0.0 | |
|
239 | 239 | |
|
240 | 240 | |
|
241 | 241 | clean:compiler_clean |
@@ -288,6 +288,7 moc/moc_spectralmatricesdmasimulator.cpp | |||
|
288 | 288 | |
|
289 | 289 | moc/moc_rmappluginpythonwrapper.cpp: rmapoperations.h \ |
|
290 | 290 | ccsds.h \ |
|
291 | tcpackettosend.h \ | |
|
291 | 292 | rmappluginpythonwrapper.h |
|
292 | 293 | /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) rmappluginpythonwrapper.h -o moc/moc_rmappluginpythonwrapper.cpp |
|
293 | 294 | |
@@ -304,11 +305,11 moc/moc_gresb.cpp: rmapoperations.h \ | |||
|
304 | 305 | moc/moc_tcpackettosend.cpp: tcpackettosend.h |
|
305 | 306 | /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) tcpackettosend.h -o moc/moc_tcpackettosend.cpp |
|
306 | 307 | |
|
307 | moc/moc_genericPySysdriver.cpp: /usr/include/genericPySysdriver.h | |
|
308 | /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) /usr/include/genericPySysdriver.h -o moc/moc_genericPySysdriver.cpp | |
|
308 | moc/moc_genericPySysdriver.cpp: /usr/include/lppmon/genericPySysdriver.h | |
|
309 | /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) /usr/include/lppmon/genericPySysdriver.h -o moc/moc_genericPySysdriver.cpp | |
|
309 | 310 | |
|
310 | moc/moc_lppmonplugin.cpp: /usr/include/lppmonplugin.h | |
|
311 | /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) /usr/include/lppmonplugin.h -o moc/moc_lppmonplugin.cpp | |
|
311 | moc/moc_lppmonplugin.cpp: /usr/include/lppmon/lppmonplugin.h | |
|
312 | /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) /usr/include/lppmon/lppmonplugin.h -o moc/moc_lppmonplugin.cpp | |
|
312 | 313 | |
|
313 | 314 | compiler_rcc_make_all: |
|
314 | 315 | compiler_rcc_clean: |
@@ -336,7 +337,8 obj/rmapplugin.o: rmapplugin.cpp rmapplu | |||
|
336 | 337 | stardundee.h \ |
|
337 | 338 | ccsds.h \ |
|
338 | 339 | gresb.h \ |
|
339 | rmappluginpythonwrapper.h | |
|
340 | rmappluginpythonwrapper.h \ | |
|
341 | tcpackettosend.h | |
|
340 | 342 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/rmapplugin.o rmapplugin.cpp |
|
341 | 343 | |
|
342 | 344 | obj/rmappluginui.o: rmappluginui.cpp rmapplugin.h \ |
@@ -56,6 +56,9 rmapplugin::rmapplugin(QWidget *parent) | |||
|
56 | 56 | //** |
|
57 | 57 | connect( (rmappluginPythonWrapper*)this->pyObject, SIGNAL(sendMessage(QString)), |
|
58 | 58 | this, SLOT(displayOnConsole(QString)) ); |
|
59 | //** | |
|
60 | connect( (rmappluginPythonWrapper*)this->pyObject, SIGNAL(fetchPacketSig()), | |
|
61 | this, SLOT(fetchPacket()), Qt::DirectConnection ); | |
|
59 | 62 | //************** |
|
60 | 63 | |
|
61 | 64 | //************** |
@@ -113,6 +116,7 rmapplugin::rmapplugin(QWidget *parent) | |||
|
113 | 116 | this, SLOT(processPacketStore())); |
|
114 | 117 | |
|
115 | 118 | connect(this->UI, SIGNAL(bridgeHasChanged(selectedBridge)), this, SLOT(bridgeHasChanged(selectedBridge))); |
|
119 | connect(this->UI, SIGNAL(bridgeHasChanged(selectedBridge)), this, SLOT(updatePacketStore())); | |
|
116 | 120 | |
|
117 | 121 | } |
|
118 | 122 | |
@@ -375,6 +379,11 void rmapplugin::processCCSDSPacket(unsi | |||
|
375 | 379 | |
|
376 | 380 | void rmapplugin::processPacketStore() |
|
377 | 381 | { |
|
382 | ((rmappluginPythonWrapper*)this->pyObject)->processPacketStore(); | |
|
383 | } | |
|
384 | ||
|
385 | void rmapplugin::updatePacketStore() | |
|
386 | { | |
|
378 | 387 | switch(currentBridge) |
|
379 | 388 | { |
|
380 | 389 | case selectedBridgeIsGRESB : |
@@ -386,5 +395,22 void rmapplugin::processPacketStore() | |||
|
386 | 395 | default: |
|
387 | 396 | break; |
|
388 | 397 | } |
|
389 | ((rmappluginPythonWrapper*)this->pyObject)->processPacketStore(); | |
|
390 | 398 | } |
|
399 | ||
|
400 | int rmapplugin::fetchPacket() | |
|
401 | { | |
|
402 | int ret = 0; | |
|
403 | ||
|
404 | switch(currentBridge) | |
|
405 | { | |
|
406 | case selectedBridgeIsGRESB : | |
|
407 | break; | |
|
408 | case selectedBridgeIsStarDundee : | |
|
409 | ret = this->UI->starDundee->receiveSPWPacketLoop(); | |
|
410 | break; | |
|
411 | default: | |
|
412 | break; | |
|
413 | } | |
|
414 | ||
|
415 | return ret; | |
|
416 | } |
@@ -60,6 +60,8 public slots: | |||
|
60 | 60 | void closeBridge(); |
|
61 | 61 | void processCCSDSPacket(unsigned char *ccsdsPacket, unsigned int size); |
|
62 | 62 | void processPacketStore(); |
|
63 | void updatePacketStore(); | |
|
64 | int fetchPacket(); | |
|
63 | 65 | // |
|
64 | 66 | void sendCCSDS(); |
|
65 | 67 | void send_TC_LFR_UPDATE_TIME(); |
@@ -20,8 +20,8 DEFINES += driver_PID=0 | |||
|
20 | 20 | |
|
21 | 21 | QT += network |
|
22 | 22 | |
|
23 |
LIBS += ../spw_usb_driver_v2.6 |
|
|
24 |
../spw_usb_driver_v2.6 |
|
|
23 | LIBS += ../spw_usb_driver_v2.62/lib/x86_64/libSpaceWireUSBAPI.so \ | |
|
24 | ../spw_usb_driver_v2.62/lib/x86_64/libConfigLibraryUSB.so | |
|
25 | 25 | |
|
26 | 26 | |
|
27 | 27 | INCLUDEPATH += \ |
@@ -11,18 +11,7 rmappluginPythonWrapper::rmappluginPytho | |||
|
11 | 11 | connect(this, SIGNAL(activateTCLoopSig()), this, SLOT(sendTCLoop())); |
|
12 | 12 | } |
|
13 | 13 | |
|
14 |
QList<QVariant> rmappluginPythonWrapper:: |
|
|
15 | { | |
|
16 | QList<QVariant> data; | |
|
17 | for (int i = 0; i<1024; i++) | |
|
18 | { | |
|
19 | QVariant t(1000*cos(0.1*i)); | |
|
20 | data.append(t); | |
|
21 | } | |
|
22 | return data; | |
|
23 | } | |
|
24 | ||
|
25 | QList<QVariant> rmappluginPythonWrapper::ReadSPW(unsigned int size) | |
|
14 | QList<QVariant> rmappluginPythonWrapper::ReadSPW(unsigned int size) // size is not used | |
|
26 | 15 | { |
|
27 | 16 | QList<QVariant> result; |
|
28 | 17 | ccsdsPacketToProcess_t ccsdsPacket; |
@@ -30,7 +19,7 QList<QVariant> rmappluginPythonWrapper: | |||
|
30 | 19 | if (!ccsdsPacketStore->isEmpty()) |
|
31 | 20 | { |
|
32 | 21 | ccsdsPacket = ccsdsPacketStore->takeFirst(); |
|
33 | for(unsigned int i = 0;i<size;i++) | |
|
22 | for(unsigned int i = 0;i<ccsdsPacket.size;i++) | |
|
34 | 23 | { |
|
35 | 24 | result.append((QVariant)ccsdsPacket.data[i]); |
|
36 | 25 | } |
@@ -147,10 +136,9 unsigned int rmappluginPythonWrapper::st | |||
|
147 | 136 | |
|
148 | 137 | void rmappluginPythonWrapper::processPacketStore() |
|
149 | 138 | { |
|
150 |
|
|
|
139 | if (!ccsdsPacketStore->isEmpty()) | |
|
151 | 140 | { |
|
152 | 141 | emit ccsdsPacketIsAvailable(ccsdsPacketStore->at(0).size); |
|
153 | ProcessPendingEvents(); | |
|
154 | 142 | } |
|
155 | 143 | } |
|
156 | 144 | |
@@ -172,3 +160,4 void rmappluginPythonWrapper::ProcessPen | |||
|
172 | 160 | { |
|
173 | 161 | QCoreApplication::processEvents(); |
|
174 | 162 | } |
|
163 |
@@ -32,11 +32,11 signals: | |||
|
32 | 32 | void activateTCLoopSig(); |
|
33 | 33 | void processPacketStoreNowSig(); |
|
34 | 34 | void sendMessage(QString message); |
|
35 | int fetchPacketSig(); | |
|
35 | 36 | |
|
36 | 37 | public slots: |
|
37 |
QList<QVariant> |
|
|
38 | ||
|
39 | QList<QVariant> ReadSPW(unsigned int size); | |
|
38 | QList<QVariant> ReadSPW(unsigned int size=0); | |
|
39 | int fetchPacket() {return emit fetchPacketSig();} | |
|
40 | 40 | void WriteSPW(QList<int> dataList); |
|
41 | 41 | void WriteSPWDelay(QList<int> dataList, unsigned int delay=0); |
|
42 | 42 | void processPacketStoreLater(unsigned int delay); |
@@ -49,6 +49,7 public slots: | |||
|
49 | 49 | void setTargetAddressValue(unsigned int address); |
|
50 | 50 | void setSourceAddressValue(unsigned int address); |
|
51 | 51 | void ProcessPendingEvents(); |
|
52 | void BlockAllSignals(); | |
|
52 | 53 | |
|
53 | 54 | }; |
|
54 | 55 |
General Comments 0
You need to be logged in to leave comments.
Login now