##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » SOLO_LFR » LPPMON_PLUGINS_PAUL
RSS

Clone from http://pc-instru.lpp.polytechnique.fr:5000/LPPMON_GROUP/LPPMON_PLUGINS_PAUL

plugin updated, TM packet store reworked to store any TM continuously...
leroy -
r13:482a184909ef default
parent child
Show More
Show file before | Show file after | Hide comments
@@ -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: Mon Mar 25 13:19:51 2013
3 # Generated by qmake (2.01a) (Qt 4.8.4) on: Fri Apr 5 15:41:42 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
Show file before | Show file after | Hide comments
@@ -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-26T13:29:01. -->
3 <!-- Written by Qt Creator 2.4.1, 2013-04-05T17:42:05. -->
4 4 <qtcreator>
5 5 <data>
6 6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -246,7 +246,85
246 246 <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
247 247 <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">false</value>
248 248 </valuemap>
249 <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
249 <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.1">
250 <value type="bool" key="Analyzer.Project.UseGlobal">true</value>
251 <value type="bool" key="Analyzer.Project.UseGlobal">true</value>
252 <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
253 <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
254 <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
255 <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
256 <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
257 <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
258 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
259 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
260 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
261 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
262 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
263 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
264 <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
265 <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
266 <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
267 <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
268 <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
269 <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
270 <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
271 <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
272 <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
273 <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
274 <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
275 <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
276 <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
277 <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
278 <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
279 <value type="int">0</value>
280 <value type="int">1</value>
281 <value type="int">2</value>
282 <value type="int">3</value>
283 <value type="int">4</value>
284 <value type="int">5</value>
285 <value type="int">6</value>
286 <value type="int">7</value>
287 <value type="int">8</value>
288 <value type="int">9</value>
289 <value type="int">10</value>
290 <value type="int">11</value>
291 <value type="int">12</value>
292 <value type="int">13</value>
293 <value type="int">14</value>
294 </valuelist>
295 <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
296 <value type="int">0</value>
297 <value type="int">1</value>
298 <value type="int">2</value>
299 <value type="int">3</value>
300 <value type="int">4</value>
301 <value type="int">5</value>
302 <value type="int">6</value>
303 <value type="int">7</value>
304 <value type="int">8</value>
305 <value type="int">9</value>
306 <value type="int">10</value>
307 <value type="int">11</value>
308 <value type="int">12</value>
309 <value type="int">13</value>
310 <value type="int">14</value>
311 </valuelist>
312 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">spwtimegenerator</value>
313 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
314 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration</value>
315 <value type="int" key="Qt4ProjectManager.Qt4RunConfiguration.BaseEnvironmentBase">2</value>
316 <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
317 <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">spwtimegenerator/spwtimegenerator/spwtimegenerator.pro</value>
318 <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
319 <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value>
320 <valuelist type="QVariantList" key="Qt4ProjectManager.Qt4RunConfiguration.UserEnvironmentChanges"/>
321 <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
322 <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
323 <value type="bool" key="RunConfiguration.UseCppDebugger">true</value>
324 <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
325 <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
326 </valuemap>
327 <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">2</value>
250 328 </valuemap>
251 329 </data>
252 330 <data>
Show file before | Show file after | Hide comments
@@ -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: Mon Mar 25 13:19:51 2013
3 # Generated by qmake (2.01a) (Qt 4.8.4) on: Fri Apr 5 15:41:42 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
@@ -54,6 +54,7 SOURCES = rmapplugin.cpp \
54 54 stardundee.cpp \
55 55 gresb.cpp \
56 56 tcpackettosend.cpp \
57 tmpackettoread.cpp \
57 58 /usr/include/lppmon/pluginsInterface/lppmonplugininterface.cpp moc/moc_rmappluginui.cpp \
58 59 moc/moc_rmapplugin.cpp \
59 60 moc/moc_qipdialogbox.cpp \
@@ -63,6 +64,7 SOURCES = rmapplugin.cpp \
63 64 moc/moc_stardundee.cpp \
64 65 moc/moc_gresb.cpp \
65 66 moc/moc_tcpackettosend.cpp \
67 moc/moc_tmpackettoread.cpp \
66 68 moc/moc_genericPySysdriver.cpp \
67 69 moc/moc_lppmonplugin.cpp
68 70 OBJECTS = obj/rmapplugin.o \
@@ -76,6 +78,7 OBJECTS = obj/rmapplugin.o \
76 78 obj/stardundee.o \
77 79 obj/gresb.o \
78 80 obj/tcpackettosend.o \
81 obj/tmpackettoread.o \
79 82 obj/lppmonplugininterface.o \
80 83 obj/moc_rmappluginui.o \
81 84 obj/moc_rmapplugin.o \
@@ -86,6 +89,7 OBJECTS = obj/rmapplugin.o \
86 89 obj/moc_stardundee.o \
87 90 obj/moc_gresb.o \
88 91 obj/moc_tcpackettosend.o \
92 obj/moc_tmpackettoread.o \
89 93 obj/moc_genericPySysdriver.o \
90 94 obj/moc_lppmonplugin.o
91 95 DIST = /usr/lib64/qt4/mkspecs/common/unix.conf \
@@ -235,7 +239,7 qmake: FORCE
235 239
236 240 dist:
237 241 @$(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/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
242 $(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 tmpackettoread.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 tmpackettoread.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 243
240 244
241 245 clean:compiler_clean
@@ -257,13 +261,14 mocclean: compiler_moc_header_clean comp
257 261
258 262 mocables: compiler_moc_header_make_all compiler_moc_source_make_all
259 263
260 compiler_moc_header_make_all: moc/moc_rmappluginui.cpp moc/moc_rmapplugin.cpp moc/moc_qipdialogbox.cpp moc/moc_gresbstatusenquiry.cpp moc/moc_spectralmatricesdmasimulator.cpp moc/moc_rmappluginpythonwrapper.cpp moc/moc_stardundee.cpp moc/moc_gresb.cpp moc/moc_tcpackettosend.cpp moc/moc_genericPySysdriver.cpp moc/moc_lppmonplugin.cpp
264 compiler_moc_header_make_all: moc/moc_rmappluginui.cpp moc/moc_rmapplugin.cpp moc/moc_qipdialogbox.cpp moc/moc_gresbstatusenquiry.cpp moc/moc_spectralmatricesdmasimulator.cpp moc/moc_rmappluginpythonwrapper.cpp moc/moc_stardundee.cpp moc/moc_gresb.cpp moc/moc_tcpackettosend.cpp moc/moc_tmpackettoread.cpp moc/moc_genericPySysdriver.cpp moc/moc_lppmonplugin.cpp
261 265 compiler_moc_header_clean:
262 -$(DEL_FILE) moc/moc_rmappluginui.cpp moc/moc_rmapplugin.cpp moc/moc_qipdialogbox.cpp moc/moc_gresbstatusenquiry.cpp moc/moc_spectralmatricesdmasimulator.cpp moc/moc_rmappluginpythonwrapper.cpp moc/moc_stardundee.cpp moc/moc_gresb.cpp moc/moc_tcpackettosend.cpp moc/moc_genericPySysdriver.cpp moc/moc_lppmonplugin.cpp
266 -$(DEL_FILE) moc/moc_rmappluginui.cpp moc/moc_rmapplugin.cpp moc/moc_qipdialogbox.cpp moc/moc_gresbstatusenquiry.cpp moc/moc_spectralmatricesdmasimulator.cpp moc/moc_rmappluginpythonwrapper.cpp moc/moc_stardundee.cpp moc/moc_gresb.cpp moc/moc_tcpackettosend.cpp moc/moc_tmpackettoread.cpp moc/moc_genericPySysdriver.cpp moc/moc_lppmonplugin.cpp
263 267 moc/moc_rmappluginui.cpp: rmapoperations.h \
264 268 spectralmatricesdmasimulator.h \
265 269 stardundee.h \
266 270 ccsds.h \
271 tmpackettoread.h \
267 272 gresb.h \
268 273 rmappluginui.h
269 274 /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) rmappluginui.h -o moc/moc_rmappluginui.cpp
@@ -273,6 +278,7 moc/moc_rmapplugin.cpp: rmappluginui.h \
273 278 spectralmatricesdmasimulator.h \
274 279 stardundee.h \
275 280 ccsds.h \
281 tmpackettoread.h \
276 282 gresb.h \
277 283 rmapplugin.h
278 284 /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) rmapplugin.h -o moc/moc_rmapplugin.cpp
@@ -289,22 +295,28 moc/moc_spectralmatricesdmasimulator.cpp
289 295 moc/moc_rmappluginpythonwrapper.cpp: rmapoperations.h \
290 296 ccsds.h \
291 297 tcpackettosend.h \
298 tmpackettoread.h \
292 299 rmappluginpythonwrapper.h
293 300 /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) rmappluginpythonwrapper.h -o moc/moc_rmappluginpythonwrapper.cpp
294 301
295 302 moc/moc_stardundee.cpp: rmapoperations.h \
296 303 ccsds.h \
304 tmpackettoread.h \
297 305 stardundee.h
298 306 /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) stardundee.h -o moc/moc_stardundee.cpp
299 307
300 308 moc/moc_gresb.cpp: rmapoperations.h \
301 309 ccsds.h \
310 tmpackettoread.h \
302 311 gresb.h
303 312 /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) gresb.h -o moc/moc_gresb.cpp
304 313
305 314 moc/moc_tcpackettosend.cpp: tcpackettosend.h
306 315 /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) tcpackettosend.h -o moc/moc_tcpackettosend.cpp
307 316
317 moc/moc_tmpackettoread.cpp: tmpackettoread.h
318 /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) tmpackettoread.h -o moc/moc_tmpackettoread.cpp
319
308 320 moc/moc_genericPySysdriver.cpp: /usr/include/lppmon/genericPySysdriver.h
309 321 /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) /usr/include/lppmon/genericPySysdriver.h -o moc/moc_genericPySysdriver.cpp
310 322
@@ -336,6 +348,7 obj/rmapplugin.o: rmapplugin.cpp rmapplu
336 348 spectralmatricesdmasimulator.h \
337 349 stardundee.h \
338 350 ccsds.h \
351 tmpackettoread.h \
339 352 gresb.h \
340 353 rmappluginpythonwrapper.h \
341 354 tcpackettosend.h
@@ -347,6 +360,7 obj/rmappluginui.o: rmappluginui.cpp rma
347 360 spectralmatricesdmasimulator.h \
348 361 stardundee.h \
349 362 ccsds.h \
363 tmpackettoread.h \
350 364 gresb.h
351 365 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/rmappluginui.o rmappluginui.cpp
352 366
@@ -368,22 +382,28 obj/spectralmatricesdmasimulator.o: spec
368 382 obj/rmappluginpythonwrapper.o: rmappluginpythonwrapper.cpp rmappluginpythonwrapper.h \
369 383 rmapoperations.h \
370 384 ccsds.h \
371 tcpackettosend.h
385 tcpackettosend.h \
386 tmpackettoread.h
372 387 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/rmappluginpythonwrapper.o rmappluginpythonwrapper.cpp
373 388
374 389 obj/stardundee.o: stardundee.cpp stardundee.h \
375 390 rmapoperations.h \
376 ccsds.h
391 ccsds.h \
392 tmpackettoread.h
377 393 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/stardundee.o stardundee.cpp
378 394
379 395 obj/gresb.o: gresb.cpp gresb.h \
380 396 rmapoperations.h \
381 ccsds.h
397 ccsds.h \
398 tmpackettoread.h
382 399 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/gresb.o gresb.cpp
383 400
384 401 obj/tcpackettosend.o: tcpackettosend.cpp tcpackettosend.h
385 402 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/tcpackettosend.o tcpackettosend.cpp
386 403
404 obj/tmpackettoread.o: tmpackettoread.cpp tmpackettoread.h
405 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/tmpackettoread.o tmpackettoread.cpp
406
387 407 obj/lppmonplugininterface.o: /usr/include/lppmon/pluginsInterface/lppmonplugininterface.cpp /usr/include/lppmon/pluginsInterface/lppmonplugininterface.h \
388 408 /usr/include/lppmon/pluginsInterface/lppmonplugininterface_global.h
389 409 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/lppmonplugininterface.o /usr/include/lppmon/pluginsInterface/lppmonplugininterface.cpp
@@ -415,6 +435,9 obj/moc_gresb.o: moc/moc_gresb.cpp
415 435 obj/moc_tcpackettosend.o: moc/moc_tcpackettosend.cpp
416 436 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_tcpackettosend.o moc/moc_tcpackettosend.cpp
417 437
438 obj/moc_tmpackettoread.o: moc/moc_tmpackettoread.cpp
439 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_tmpackettoread.o moc/moc_tmpackettoread.cpp
440
418 441 obj/moc_genericPySysdriver.o: moc/moc_genericPySysdriver.cpp
419 442 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_genericPySysdriver.o moc/moc_genericPySysdriver.cpp
420 443
Show file before | Show file after | Hide comments
@@ -525,9 +525,6 int gresb::receiveSPWPacket(unsigned cha
525 525 }*/
526 526 for(unsigned int i=0; i<packetLength; i++) ccsdsPacket[i] = spwPacket[i];
527 527 ccsdsPacketSize = packetLength;
528 //ccsdsPacketSEMAPHORE->release();
529 //emit(ccsdsPacketAvailable(ccsdsPacket, packetLength));
530 //emit sendMessage("CCSDS packet of size " + QString::number(packetLength) + " received");
531 528 storeCCSDSPacket(ccsdsPacket, packetLength);
532 529 return packetLength;
533 530 }
@@ -536,17 +533,11 int gresb::receiveSPWPacket(unsigned cha
536 533
537 534 unsigned int gresb::storeCCSDSPacket(unsigned char *ccsdsPacket, unsigned int size)
538 535 {
539 unsigned int i;
540 ccsdsPacketToProcess_t ccsdsPacketToStore;
536 TMPacketToRead *packet;
541 537
542 ccsdsPacketToStore.size = size;
543 for(i=0; i<size; i++)
544 {
545 ccsdsPacketToStore.data[i] = ccsdsPacket[i];
546 }
547 ccsdsPacketStore << ccsdsPacketToStore;
548 //emit(ccsdsPacketAvailable(ccsdsPacket, packetLength));
549 //emit ccsdsPacketIsAvailable(size);
538 packet = new TMPacketToRead(ccsdsPacket, size);
539 ccsdsPacketStore.append(packet);
540
550 541 return 1;
551 542 }
552 543
Show file before | Show file after | Hide comments
@@ -14,6 +14,7
14 14 #include "rmapoperations.h"
15 15 #include "qipdialogbox.h"
16 16 #include "ccsds.h"
17 #include "tmpackettoread.h"
17 18
18 19 class gresb : public QWidget
19 20 {
@@ -26,7 +27,7 public:
26 27 unsigned int WriteSPW(char *Value, unsigned int count, char targetLogicalAddress, char userApplication);
27 28
28 29 unsigned int storeCCSDSPacket(unsigned char *ccsdsPacket, unsigned int size);
29 QList<ccsdsPacketToProcess_t> ccsdsPacketStore;
30 QList<TMPacketToRead*> ccsdsPacketStore;
30 31
31 32 signals:
32 33 void sendMessage(QString message);
Show file before | Show file after | Hide comments
@@ -116,7 +116,7 rmapplugin::rmapplugin(QWidget *parent)
116 116 this, SLOT(processPacketStore()));
117 117
118 118 connect(this->UI, SIGNAL(bridgeHasChanged(selectedBridge)), this, SLOT(bridgeHasChanged(selectedBridge)));
119 connect(this->UI, SIGNAL(bridgeHasChanged(selectedBridge)), this, SLOT(updatePacketStore()));
119 connect(this->UI, SIGNAL(bridgeHasChanged(selectedBridge)), this, SLOT(updatePacketStore(selectedBridge)));
120 120
121 121 }
122 122
@@ -373,7 +373,7 void rmapplugin::processCCSDSPacket(unsi
373 373 //+" "
374 374 //+ QString::number(ccsdsPacket[7], 16));
375 375 displayOnConsole(message);
376 ((rmappluginPythonWrapper*)this->pyObject)->storeCCSDSPacket(ccsdsPacket, size);
376 //((rmappluginPythonWrapper*)this->pyObject)->storeCCSDSPacket(ccsdsPacket, size);
377 377 emit ccsdsPacketIsProcessed();
378 378 }
379 379
@@ -382,9 +382,9 void rmapplugin::processPacketStore()
382 382 ((rmappluginPythonWrapper*)this->pyObject)->processPacketStore();
383 383 }
384 384
385 void rmapplugin::updatePacketStore()
385 void rmapplugin::updatePacketStore(selectedBridge bridge)
386 386 {
387 switch(currentBridge)
387 switch(bridge)
388 388 {
389 389 case selectedBridgeIsGRESB :
390 390 ((rmappluginPythonWrapper*)this->pyObject)->ccsdsPacketStore = &(this->UI->gresbBridge->ccsdsPacketStore);
Show file before | Show file after | Hide comments
@@ -60,7 +60,7 public slots:
60 60 void closeBridge();
61 61 void processCCSDSPacket(unsigned char *ccsdsPacket, unsigned int size);
62 62 void processPacketStore();
63 void updatePacketStore();
63 void updatePacketStore(selectedBridge bridge);
64 64 int fetchPacket();
65 65 //
66 66 void sendCCSDS();
Show file before | Show file after | Hide comments
@@ -43,7 +43,8 HEADERS += \
43 43 ../spw_usb_driver_v2.61/inc/spw_usb_api.h \
44 44 ../spw_usb_driver_v2.61/inc/spw_config_library.h \
45 45 gresb.h \
46 tcpackettosend.h
46 tcpackettosend.h \
47 tmpackettoread.h
47 48
48 49
49 50 SOURCES += \
@@ -57,7 +58,8 SOURCES += \
57 58 rmappluginpythonwrapper.cpp \
58 59 stardundee.cpp \
59 60 gresb.cpp \
60 tcpackettosend.cpp
61 tcpackettosend.cpp \
62 tmpackettoread.cpp
61 63
62 64
63 65
Show file before | Show file after | Hide comments
@@ -14,16 +14,18 rmappluginPythonWrapper::rmappluginPytho
14 14 QList<QVariant> rmappluginPythonWrapper::ReadSPW(unsigned int size) // size is not used
15 15 {
16 16 QList<QVariant> result;
17 ccsdsPacketToProcess_t ccsdsPacket;
17 TMPacketToRead *ccsdsPacket;
18 18
19 19 if (!ccsdsPacketStore->isEmpty())
20 20 {
21 21 ccsdsPacket = ccsdsPacketStore->takeFirst();
22 for(unsigned int i = 0;i<ccsdsPacket.size;i++)
22 for(unsigned int i = 0;i<ccsdsPacket->size;i++)
23 23 {
24 result.append((QVariant)ccsdsPacket.data[i]);
24 result.append((QVariant)ccsdsPacket->Value[i]);
25 25 }
26 delete(ccsdsPacket);
26 27 }
28
27 29 return result;
28 30 }
29 31
@@ -118,10 +120,10 void rmappluginPythonWrapper::sendTC()
118 120 }
119 121 }
120 122
121 unsigned int rmappluginPythonWrapper::storeCCSDSPacket(unsigned char *ccsdsPacket, unsigned int size)
123 /*unsigned int rmappluginPythonWrapper::storeCCSDSPacket(unsigned char *ccsdsPacket, unsigned int size)
122 124 {
123 125 unsigned int i;
124 ccsdsPacketToProcess_t ccsdsPacketToStore;
126 TMPacketToRead ccsdsPacketToStore;
125 127
126 128 ccsdsPacketToStore.size = size;
127 129 for(i=0; i<size; i++)
@@ -132,13 +134,13 unsigned int rmappluginPythonWrapper::st
132 134 ccsdsPacketStore->append(ccsdsPacketToStore);
133 135 emit ccsdsPacketIsAvailable(size);
134 136 return 1;
135 }
137 }*/
136 138
137 139 void rmappluginPythonWrapper::processPacketStore()
138 140 {
139 if (!ccsdsPacketStore->isEmpty())
141 while (!ccsdsPacketStore->isEmpty())
140 142 {
141 emit ccsdsPacketIsAvailable(ccsdsPacketStore->at(0).size);
143 emit ccsdsPacketIsAvailable(ccsdsPacketStore->at(0)->size);
142 144 }
143 145 }
144 146
Show file before | Show file after | Hide comments
@@ -8,6 +8,7
8 8 #include "rmapoperations.h"
9 9 #include "ccsds.h"
10 10 #include <tcpackettosend.h>
11 #include <tmpackettoread.h>
11 12 #include <QTimer>
12 13
13 14 class rmappluginPythonWrapper : public genericPySysdriver
@@ -16,7 +17,7 class rmappluginPythonWrapper : public g
16 17 public:
17 18 explicit rmappluginPythonWrapper(QObject *parent = 0);
18 19
19 QList<ccsdsPacketToProcess_t> *ccsdsPacketStore;
20 QList<TMPacketToRead*> *ccsdsPacketStore;
20 21 void processPacketStore();
21 22 unsigned int storeCCSDSPacket(unsigned char *ccsdsPacket, unsigned int size);
22 23
Show file before | Show file after | Hide comments
@@ -55,6 +55,7 rmapPluginUI::rmapPluginUI(QWidget *pare
55 55 gresbStatusQueryLabel = new QLabel(tr("Status query socket (port 3010): waiting for connection"));
56 56 gresbStatusQueryDialogLabel = new QLabel(tr("sockets opened but SpaceWire link not running"));
57 57 sendCCSDSCommandLabel = new QLabel(tr("Address of the target"));
58 nbPacketInStore = new QLabel(tr("nb packets in store: -"));
58 59
59 60 //*** QPUSHBUTTON ***//
60 61 rmapOpenCommunicationButton = new QPushButton(tr("Open selected bridge"));
@@ -120,6 +121,7 rmapPluginUI::rmapPluginUI(QWidget *pare
120 121 generalParameters_LAYOUT->addWidget(rmapCloseCommunicationButton, 3, 1, 1, 1);
121 122 generalParameters_LAYOUT->addWidget(RMAP_write_verify, 4, 0, 1, 2);
122 123 generalParameters_LAYOUT->addWidget(RMAP_write_reply, 5, 0, 1, 2);
124
123 125 generalParameters_LAYOUT->setRowStretch(6, 1);
124 126 generalParameters_LAYOUT->setColumnStretch(2, 1);
125 127
@@ -142,6 +144,7 rmapPluginUI::rmapPluginUI(QWidget *pare
142 144
143 145 consoleLayout->addWidget(console);
144 146 consoleLayout->addWidget(clearConsoleButton);
147 consoleLayout->addWidget(nbPacketInStore);
145 148
146 149 connect(this->logFileChooseButton, SIGNAL(clicked()), this, SLOT(chooseLogFile()));
147 150 connect(this, SIGNAL(setLogFileName(QString)), this->logFileName, SLOT(setText(QString)));
Show file before | Show file after | Hide comments
@@ -92,6 +92,7 public:
92 92 QLabel* gresbStatusQueryLabel;
93 93 QLabel* gresbStatusQueryDialogLabel;
94 94 QLabel* sendCCSDSCommandLabel;
95 QLabel* nbPacketInStore;
95 96
96 97 QDialog* gresbStatusQueryDialog;
97 98
Show file before | Show file after | Hide comments
@@ -58,7 +58,6 StarDundee::StarDundee(QWidget *parent)
58 58 connect(starDundeeStatusQueryAbortButton, SIGNAL(clicked()), starDundeeStatusQueryDialog, SLOT(reject()));
59 59
60 60 connect(this->timer, SIGNAL(timeout()), this, SLOT(receivePollingLoop()));
61 timer->start(100); // starts the periodical timer, period = 100ms
62 61 }
63 62
64 63 StarDundee::~StarDundee()
@@ -151,6 +150,7 void StarDundee::Open()
151 150 if (getLinkStatus(linkNumber_SPINBOX->value()))
152 151 {
153 152 emit isOpen(true);
153 timer->start(100); // starts the periodical timer, period = 100ms
154 154 }
155 155 else
156 156 {
@@ -732,7 +732,6 int StarDundee::receiveSPWPacketLoop(uns
732 732
733 733 while (USBSpaceWire_WaitOnReadPacketAvailable(hDevice, 0))
734 734 {
735 //sendMessage("trying to get a packet");
736 735 result = receiveSPWPacket(requestID);
737 736 }
738 737 if (!ccsdsPacketStore.isEmpty())
@@ -765,6 +764,7 int StarDundee::receiveSPWPacket(unsigne
765 764 if (result != TRANSFER_SUCCESS)
766 765 {
767 766 emit sendMessage("Error: Could not receive the packet");
767 USBSpaceWire_FreeRead(hDevice, pIdentifierRead); // Free the read buffer
768 768 return 0;
769 769 }
770 770 else
@@ -832,17 +832,11 int StarDundee::receiveSPWPacket(unsigne
832 832
833 833 unsigned int StarDundee::storeCCSDSPacket(unsigned char *ccsdsPacket, unsigned int size)
834 834 {
835 unsigned int i;
836 ccsdsPacketToProcess_t ccsdsPacketToStore;
835 TMPacketToRead *packet;
837 836
838 ccsdsPacketToStore.size = size;
839 for(i=0; i<size; i++)
840 {
841 ccsdsPacketToStore.data[i] = ccsdsPacket[i];
842 }
843 ccsdsPacketStore << ccsdsPacketToStore;
844 //emit(ccsdsPacketAvailable(ccsdsPacket, packetLength));
845 //emit ccsdsPacketIsAvailable(size);
837 packet = new TMPacketToRead(ccsdsPacket, size);
838 ccsdsPacketStore.append(packet);
839
846 840 return 1;
847 841 }
848 842
Show file before | Show file after | Hide comments
@@ -14,6 +14,7
14 14 #include "spw_usb_api.h"
15 15 #include "spw_config_library.h"
16 16 #include "ccsds.h"
17 #include "tmpackettoread.h"
17 18
18 19 #define BWAIT_0 0
19 20 #define BWAIT_1 1
@@ -30,7 +31,7 public:
30 31 unsigned int WriteSPW(char *Value, unsigned int count, char targetLogicalAddress, char userApplication);
31 32
32 33 unsigned int storeCCSDSPacket(unsigned char *ccsdsPacket, unsigned int size);
33 QList<ccsdsPacketToProcess_t> ccsdsPacketStore;
34 QList<TMPacketToRead*> ccsdsPacketStore;
34 35
35 36 signals:
36 37 void sendMessage(QString message);
General Comments 0
You need to be logged in to leave comments. Login now