# HG changeset patch # User Paul LEROY # Date 2013-04-05 16:22:53 # Node ID 482a184909efe8a8e088f79b79e2ddd2a87584d8 # Parent 84d45620e57755b513b34b15568eb3a81c6ccd6f plugin updated, TM packet store reworked to store any TM continuously test done in NORMAL mode diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: PAULs_LPPMON_PLUGINS -# Generated by qmake (2.01a) (Qt 4.8.4) on: Mon Mar 25 13:19:51 2013 +# Generated by qmake (2.01a) (Qt 4.8.4) on: Fri Apr 5 15:41:42 2013 # Project: PAULs_LPPMON_PLUGINS.pro # Template: subdirs # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile PAULs_LPPMON_PLUGINS.pro diff --git a/PAULs_LPPMON_PLUGINS.pro.user b/PAULs_LPPMON_PLUGINS.pro.user --- a/PAULs_LPPMON_PLUGINS.pro.user +++ b/PAULs_LPPMON_PLUGINS.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget @@ -246,7 +246,85 @@ false false - 1 + + true + true + + + false + false + false + false + false + false + false + false + true + true + 0.01 + 0.01 + 10 + 10 + true + true + 25 + 25 + + + true + true + valgrind + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + spwtimegenerator + + Qt4ProjectManager.Qt4RunConfiguration + 2 + + spwtimegenerator/spwtimegenerator/spwtimegenerator.pro + false + false + + + 3768 + true + false + true + + 2 diff --git a/rmapplugin/Makefile b/rmapplugin/Makefile --- a/rmapplugin/Makefile +++ b/rmapplugin/Makefile @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: librmapplugin.so.1.0.0 -# Generated by qmake (2.01a) (Qt 4.8.4) on: Mon Mar 25 13:19:51 2013 +# Generated by qmake (2.01a) (Qt 4.8.4) on: Fri Apr 5 15:41:42 2013 # Project: rmapplugin.pro # Template: lib # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile rmapplugin.pro @@ -54,6 +54,7 @@ SOURCES = rmapplugin.cpp \ stardundee.cpp \ gresb.cpp \ tcpackettosend.cpp \ + tmpackettoread.cpp \ /usr/include/lppmon/pluginsInterface/lppmonplugininterface.cpp moc/moc_rmappluginui.cpp \ moc/moc_rmapplugin.cpp \ moc/moc_qipdialogbox.cpp \ @@ -63,6 +64,7 @@ SOURCES = rmapplugin.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 OBJECTS = obj/rmapplugin.o \ @@ -76,6 +78,7 @@ OBJECTS = obj/rmapplugin.o \ obj/stardundee.o \ obj/gresb.o \ obj/tcpackettosend.o \ + obj/tmpackettoread.o \ obj/lppmonplugininterface.o \ obj/moc_rmappluginui.o \ obj/moc_rmapplugin.o \ @@ -86,6 +89,7 @@ OBJECTS = obj/rmapplugin.o \ obj/moc_stardundee.o \ obj/moc_gresb.o \ obj/moc_tcpackettosend.o \ + obj/moc_tmpackettoread.o \ obj/moc_genericPySysdriver.o \ obj/moc_lppmonplugin.o DIST = /usr/lib64/qt4/mkspecs/common/unix.conf \ @@ -235,7 +239,7 @@ qmake: FORCE dist: @$(CHK_DIR_EXISTS) obj/rmapplugin1.0.0 || $(MKDIR) obj/rmapplugin1.0.0 - $(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 + $(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 clean:compiler_clean @@ -257,13 +261,14 @@ mocclean: compiler_moc_header_clean comp mocables: compiler_moc_header_make_all compiler_moc_source_make_all -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 +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 compiler_moc_header_clean: - -$(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 + -$(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 moc/moc_rmappluginui.cpp: rmapoperations.h \ spectralmatricesdmasimulator.h \ stardundee.h \ ccsds.h \ + tmpackettoread.h \ gresb.h \ rmappluginui.h /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) rmappluginui.h -o moc/moc_rmappluginui.cpp @@ -273,6 +278,7 @@ moc/moc_rmapplugin.cpp: rmappluginui.h \ spectralmatricesdmasimulator.h \ stardundee.h \ ccsds.h \ + tmpackettoread.h \ gresb.h \ rmapplugin.h /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) rmapplugin.h -o moc/moc_rmapplugin.cpp @@ -289,22 +295,28 @@ moc/moc_spectralmatricesdmasimulator.cpp moc/moc_rmappluginpythonwrapper.cpp: rmapoperations.h \ ccsds.h \ tcpackettosend.h \ + tmpackettoread.h \ rmappluginpythonwrapper.h /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) rmappluginpythonwrapper.h -o moc/moc_rmappluginpythonwrapper.cpp moc/moc_stardundee.cpp: rmapoperations.h \ ccsds.h \ + tmpackettoread.h \ stardundee.h /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) stardundee.h -o moc/moc_stardundee.cpp moc/moc_gresb.cpp: rmapoperations.h \ ccsds.h \ + tmpackettoread.h \ gresb.h /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) gresb.h -o moc/moc_gresb.cpp moc/moc_tcpackettosend.cpp: tcpackettosend.h /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) tcpackettosend.h -o moc/moc_tcpackettosend.cpp +moc/moc_tmpackettoread.cpp: tmpackettoread.h + /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) tmpackettoread.h -o moc/moc_tmpackettoread.cpp + moc/moc_genericPySysdriver.cpp: /usr/include/lppmon/genericPySysdriver.h /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) /usr/include/lppmon/genericPySysdriver.h -o moc/moc_genericPySysdriver.cpp @@ -336,6 +348,7 @@ obj/rmapplugin.o: rmapplugin.cpp rmapplu spectralmatricesdmasimulator.h \ stardundee.h \ ccsds.h \ + tmpackettoread.h \ gresb.h \ rmappluginpythonwrapper.h \ tcpackettosend.h @@ -347,6 +360,7 @@ obj/rmappluginui.o: rmappluginui.cpp rma spectralmatricesdmasimulator.h \ stardundee.h \ ccsds.h \ + tmpackettoread.h \ gresb.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/rmappluginui.o rmappluginui.cpp @@ -368,22 +382,28 @@ obj/spectralmatricesdmasimulator.o: spec obj/rmappluginpythonwrapper.o: rmappluginpythonwrapper.cpp rmappluginpythonwrapper.h \ rmapoperations.h \ ccsds.h \ - tcpackettosend.h + tcpackettosend.h \ + tmpackettoread.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/rmappluginpythonwrapper.o rmappluginpythonwrapper.cpp obj/stardundee.o: stardundee.cpp stardundee.h \ rmapoperations.h \ - ccsds.h + ccsds.h \ + tmpackettoread.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/stardundee.o stardundee.cpp obj/gresb.o: gresb.cpp gresb.h \ rmapoperations.h \ - ccsds.h + ccsds.h \ + tmpackettoread.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/gresb.o gresb.cpp obj/tcpackettosend.o: tcpackettosend.cpp tcpackettosend.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/tcpackettosend.o tcpackettosend.cpp +obj/tmpackettoread.o: tmpackettoread.cpp tmpackettoread.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/tmpackettoread.o tmpackettoread.cpp + obj/lppmonplugininterface.o: /usr/include/lppmon/pluginsInterface/lppmonplugininterface.cpp /usr/include/lppmon/pluginsInterface/lppmonplugininterface.h \ /usr/include/lppmon/pluginsInterface/lppmonplugininterface_global.h $(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 obj/moc_tcpackettosend.o: moc/moc_tcpackettosend.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_tcpackettosend.o moc/moc_tcpackettosend.cpp +obj/moc_tmpackettoread.o: moc/moc_tmpackettoread.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_tmpackettoread.o moc/moc_tmpackettoread.cpp + obj/moc_genericPySysdriver.o: moc/moc_genericPySysdriver.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_genericPySysdriver.o moc/moc_genericPySysdriver.cpp diff --git a/rmapplugin/gresb.cpp b/rmapplugin/gresb.cpp --- a/rmapplugin/gresb.cpp +++ b/rmapplugin/gresb.cpp @@ -525,9 +525,6 @@ int gresb::receiveSPWPacket(unsigned cha }*/ for(unsigned int i=0; irelease(); - //emit(ccsdsPacketAvailable(ccsdsPacket, packetLength)); - //emit sendMessage("CCSDS packet of size " + QString::number(packetLength) + " received"); storeCCSDSPacket(ccsdsPacket, packetLength); return packetLength; } @@ -536,17 +533,11 @@ int gresb::receiveSPWPacket(unsigned cha unsigned int gresb::storeCCSDSPacket(unsigned char *ccsdsPacket, unsigned int size) { - unsigned int i; - ccsdsPacketToProcess_t ccsdsPacketToStore; + TMPacketToRead *packet; - ccsdsPacketToStore.size = size; - for(i=0; i ccsdsPacketStore; + QList ccsdsPacketStore; signals: void sendMessage(QString message); diff --git a/rmapplugin/rmapplugin.cpp b/rmapplugin/rmapplugin.cpp --- a/rmapplugin/rmapplugin.cpp +++ b/rmapplugin/rmapplugin.cpp @@ -116,7 +116,7 @@ rmapplugin::rmapplugin(QWidget *parent) this, SLOT(processPacketStore())); connect(this->UI, SIGNAL(bridgeHasChanged(selectedBridge)), this, SLOT(bridgeHasChanged(selectedBridge))); - connect(this->UI, SIGNAL(bridgeHasChanged(selectedBridge)), this, SLOT(updatePacketStore())); + connect(this->UI, SIGNAL(bridgeHasChanged(selectedBridge)), this, SLOT(updatePacketStore(selectedBridge))); } @@ -373,7 +373,7 @@ void rmapplugin::processCCSDSPacket(unsi //+" " //+ QString::number(ccsdsPacket[7], 16)); displayOnConsole(message); - ((rmappluginPythonWrapper*)this->pyObject)->storeCCSDSPacket(ccsdsPacket, size); + //((rmappluginPythonWrapper*)this->pyObject)->storeCCSDSPacket(ccsdsPacket, size); emit ccsdsPacketIsProcessed(); } @@ -382,9 +382,9 @@ void rmapplugin::processPacketStore() ((rmappluginPythonWrapper*)this->pyObject)->processPacketStore(); } -void rmapplugin::updatePacketStore() +void rmapplugin::updatePacketStore(selectedBridge bridge) { - switch(currentBridge) + switch(bridge) { case selectedBridgeIsGRESB : ((rmappluginPythonWrapper*)this->pyObject)->ccsdsPacketStore = &(this->UI->gresbBridge->ccsdsPacketStore); diff --git a/rmapplugin/rmapplugin.h b/rmapplugin/rmapplugin.h --- a/rmapplugin/rmapplugin.h +++ b/rmapplugin/rmapplugin.h @@ -60,7 +60,7 @@ public slots: void closeBridge(); void processCCSDSPacket(unsigned char *ccsdsPacket, unsigned int size); void processPacketStore(); - void updatePacketStore(); + void updatePacketStore(selectedBridge bridge); int fetchPacket(); // void sendCCSDS(); diff --git a/rmapplugin/rmapplugin.pro b/rmapplugin/rmapplugin.pro --- a/rmapplugin/rmapplugin.pro +++ b/rmapplugin/rmapplugin.pro @@ -43,7 +43,8 @@ HEADERS += \ ../spw_usb_driver_v2.61/inc/spw_usb_api.h \ ../spw_usb_driver_v2.61/inc/spw_config_library.h \ gresb.h \ - tcpackettosend.h + tcpackettosend.h \ + tmpackettoread.h SOURCES += \ @@ -57,7 +58,8 @@ SOURCES += \ rmappluginpythonwrapper.cpp \ stardundee.cpp \ gresb.cpp \ - tcpackettosend.cpp + tcpackettosend.cpp \ + tmpackettoread.cpp diff --git a/rmapplugin/rmappluginpythonwrapper.cpp b/rmapplugin/rmappluginpythonwrapper.cpp --- a/rmapplugin/rmappluginpythonwrapper.cpp +++ b/rmapplugin/rmappluginpythonwrapper.cpp @@ -14,16 +14,18 @@ rmappluginPythonWrapper::rmappluginPytho QList rmappluginPythonWrapper::ReadSPW(unsigned int size) // size is not used { QList result; - ccsdsPacketToProcess_t ccsdsPacket; + TMPacketToRead *ccsdsPacket; if (!ccsdsPacketStore->isEmpty()) { ccsdsPacket = ccsdsPacketStore->takeFirst(); - for(unsigned int i = 0;isize;i++) { - result.append((QVariant)ccsdsPacket.data[i]); + result.append((QVariant)ccsdsPacket->Value[i]); } + delete(ccsdsPacket); } + return result; } @@ -118,10 +120,10 @@ void rmappluginPythonWrapper::sendTC() } } -unsigned int rmappluginPythonWrapper::storeCCSDSPacket(unsigned char *ccsdsPacket, unsigned int size) +/*unsigned int rmappluginPythonWrapper::storeCCSDSPacket(unsigned char *ccsdsPacket, unsigned int size) { unsigned int i; - ccsdsPacketToProcess_t ccsdsPacketToStore; + TMPacketToRead ccsdsPacketToStore; ccsdsPacketToStore.size = size; for(i=0; iappend(ccsdsPacketToStore); emit ccsdsPacketIsAvailable(size); return 1; -} +}*/ void rmappluginPythonWrapper::processPacketStore() { - if (!ccsdsPacketStore->isEmpty()) + while (!ccsdsPacketStore->isEmpty()) { - emit ccsdsPacketIsAvailable(ccsdsPacketStore->at(0).size); + emit ccsdsPacketIsAvailable(ccsdsPacketStore->at(0)->size); } } diff --git a/rmapplugin/rmappluginpythonwrapper.h b/rmapplugin/rmappluginpythonwrapper.h --- a/rmapplugin/rmappluginpythonwrapper.h +++ b/rmapplugin/rmappluginpythonwrapper.h @@ -8,6 +8,7 @@ #include "rmapoperations.h" #include "ccsds.h" #include +#include #include class rmappluginPythonWrapper : public genericPySysdriver @@ -16,7 +17,7 @@ class rmappluginPythonWrapper : public g public: explicit rmappluginPythonWrapper(QObject *parent = 0); - QList *ccsdsPacketStore; + QList *ccsdsPacketStore; void processPacketStore(); unsigned int storeCCSDSPacket(unsigned char *ccsdsPacket, unsigned int size); diff --git a/rmapplugin/rmappluginui.cpp b/rmapplugin/rmappluginui.cpp --- a/rmapplugin/rmappluginui.cpp +++ b/rmapplugin/rmappluginui.cpp @@ -55,6 +55,7 @@ rmapPluginUI::rmapPluginUI(QWidget *pare gresbStatusQueryLabel = new QLabel(tr("Status query socket (port 3010): waiting for connection")); gresbStatusQueryDialogLabel = new QLabel(tr("sockets opened but SpaceWire link not running")); sendCCSDSCommandLabel = new QLabel(tr("Address of the target")); + nbPacketInStore = new QLabel(tr("nb packets in store: -")); //*** QPUSHBUTTON ***// rmapOpenCommunicationButton = new QPushButton(tr("Open selected bridge")); @@ -120,6 +121,7 @@ rmapPluginUI::rmapPluginUI(QWidget *pare generalParameters_LAYOUT->addWidget(rmapCloseCommunicationButton, 3, 1, 1, 1); generalParameters_LAYOUT->addWidget(RMAP_write_verify, 4, 0, 1, 2); generalParameters_LAYOUT->addWidget(RMAP_write_reply, 5, 0, 1, 2); + generalParameters_LAYOUT->setRowStretch(6, 1); generalParameters_LAYOUT->setColumnStretch(2, 1); @@ -142,6 +144,7 @@ rmapPluginUI::rmapPluginUI(QWidget *pare consoleLayout->addWidget(console); consoleLayout->addWidget(clearConsoleButton); + consoleLayout->addWidget(nbPacketInStore); connect(this->logFileChooseButton, SIGNAL(clicked()), this, SLOT(chooseLogFile())); connect(this, SIGNAL(setLogFileName(QString)), this->logFileName, SLOT(setText(QString))); diff --git a/rmapplugin/rmappluginui.h b/rmapplugin/rmappluginui.h --- a/rmapplugin/rmappluginui.h +++ b/rmapplugin/rmappluginui.h @@ -92,6 +92,7 @@ public: QLabel* gresbStatusQueryLabel; QLabel* gresbStatusQueryDialogLabel; QLabel* sendCCSDSCommandLabel; + QLabel* nbPacketInStore; QDialog* gresbStatusQueryDialog; diff --git a/rmapplugin/stardundee.cpp b/rmapplugin/stardundee.cpp --- a/rmapplugin/stardundee.cpp +++ b/rmapplugin/stardundee.cpp @@ -58,7 +58,6 @@ StarDundee::StarDundee(QWidget *parent) connect(starDundeeStatusQueryAbortButton, SIGNAL(clicked()), starDundeeStatusQueryDialog, SLOT(reject())); connect(this->timer, SIGNAL(timeout()), this, SLOT(receivePollingLoop())); - timer->start(100); // starts the periodical timer, period = 100ms } StarDundee::~StarDundee() @@ -151,6 +150,7 @@ void StarDundee::Open() if (getLinkStatus(linkNumber_SPINBOX->value())) { emit isOpen(true); + timer->start(100); // starts the periodical timer, period = 100ms } else { @@ -732,7 +732,6 @@ int StarDundee::receiveSPWPacketLoop(uns while (USBSpaceWire_WaitOnReadPacketAvailable(hDevice, 0)) { - //sendMessage("trying to get a packet"); result = receiveSPWPacket(requestID); } if (!ccsdsPacketStore.isEmpty()) @@ -765,6 +764,7 @@ int StarDundee::receiveSPWPacket(unsigne if (result != TRANSFER_SUCCESS) { emit sendMessage("Error: Could not receive the packet"); + USBSpaceWire_FreeRead(hDevice, pIdentifierRead); // Free the read buffer return 0; } else @@ -832,17 +832,11 @@ int StarDundee::receiveSPWPacket(unsigne unsigned int StarDundee::storeCCSDSPacket(unsigned char *ccsdsPacket, unsigned int size) { - unsigned int i; - ccsdsPacketToProcess_t ccsdsPacketToStore; + TMPacketToRead *packet; - ccsdsPacketToStore.size = size; - for(i=0; i ccsdsPacketStore; + QList ccsdsPacketStore; signals: void sendMessage(QString message);