HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/LPPMON_PLUGINS_PAUL Commit - r53:cd731a3327c0

spooling frequency of the star dundee bridge changed from 100 ms to 1 ms

leroy -

r53:cd731a3327c0 default

parent child

Context file:

r53:cd731a3327c0

Makefile +1 -1

             #############################################################################
             # Makefile for building: PAULs_LPPMON_PLUGINS
-            # Generated by qmake (2.01a) (Qt 4.8.5) on: Fri Sep 27 14:11:49 2013
+            # Generated by qmake (2.01a) (Qt 4.8.5) on: Mon Oct 21 07:16: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

PAULs_LPPMON_PLUGINS.pro.user +1 -1

             <?xml version="1.0" encoding="UTF-8"?>
             <!DOCTYPE QtCreatorProject>
-            <!-- Written by QtCreator 2.8.0, 2013-10-11T09:55:13. -->
+            <!-- Written by QtCreator 2.8.1, 2013-11-07T12:53:04. -->
             <qtcreator>
              <data>
               <variable>ProjectExplorer.Project.ActiveTarget</variable>

common_PLE/hkdisplay.cpp +41 -15

                 hk_lfr_mode = new QLabel("hk_lfr_mode: -");
                 hk_lfr_dpu_spw_enabled = new QLabel("hk_lfr_dpu_spw_enabled: -");
                 hk_lfr_dpu_link_state = new QLabel("hk_lfr_dpu_link_state: -");
+                hk_lfr_dpu_spare = new QLabel("hk_lfr_dpu_spare: -");
                 sy_lfr_watchdog_enabled = new QLabel("sy_lfr_watchdog_enabled: -");
                 hk_lfr_calib_enabled = new QLabel("hk_lfr_calib_enabled: -");
                 hk_lfr_reset_cause = new QLabel("hk_lfr_reset_cause: -");
                 box_lfrStatusWord->addWidget(hk_lfr_mode);
                 box_lfrStatusWord->addWidget(hk_lfr_dpu_spw_enabled);
                 box_lfrStatusWord->addWidget(hk_lfr_dpu_link_state);
+                box_lfrStatusWord->addWidget(hk_lfr_dpu_spare);
                 box_lfrStatusWord->addWidget(sy_lfr_watchdog_enabled);
                 box_lfrStatusWord->addWidget(hk_lfr_calib_enabled);
                 box_lfrStatusWord->addWidget(hk_lfr_reset_cause);
                 else {
                     housekeepingPacket = (Packet_TM_LFR_HK_t *) tmPacketToRead->Value;
-                    updateLFRMode(housekeepingPacket);
+                    update_lfr_status_word( housekeepingPacket );
-                    updateSWVersion(housekeepingPacket);
+                    updateSWVersion( housekeepingPacket );
-                    updateTCStatistics(housekeepingPacket);
+                    updateTCStatistics( housekeepingPacket );
-                    updateAnomalyStatistics(housekeepingPacket);
+                    updateAnomalyStatistics( housekeepingPacket );
-                    updateSpaceWireIFStatistics(housekeepingPacket);
+                    updateSpaceWireIFStatistics( housekeepingPacket );
-                    updateErrorCountersSpaceWire(housekeepingPacket);
+                    updateErrorCountersSpaceWire( housekeepingPacket );
                 }
             }
                 else {
                     housekeepingPacket = (Packet_TM_LFR_HK_t *) (tmPacketToRead->Value-4);
-                    updateLFRMode(housekeepingPacket);
+                    update_lfr_status_word( housekeepingPacket );
-                    updateSWVersion(housekeepingPacket);
+                    updateSWVersion( housekeepingPacket );
-                    updateTCStatistics(housekeepingPacket);
+                    updateTCStatistics( housekeepingPacket );
-                    updateAnomalyStatistics(housekeepingPacket);
+                    updateAnomalyStatistics( housekeepingPacket );
-                    updateSpaceWireIFStatistics(housekeepingPacket);
+                    updateSpaceWireIFStatistics( housekeepingPacket );
-                    updateErrorCountersSpaceWire(housekeepingPacket);
+                    updateErrorCountersSpaceWire( housekeepingPacket );
                 }
             }
-            void HKDisplay::updateLFRMode(Packet_TM_LFR_HK_t *housekeepingPacket)
+            void HKDisplay::update_lfr_status_word(Packet_TM_LFR_HK_t *housekeepingPacket)
             {
                 hk_lfr_mode->setText("hk_lfr_mode: "
-                                     +QString::number( ( (housekeepingPacket->lfr_status_word[0] & 0x70) >> 4 ) )
+                                     +QString::number( ( (housekeepingPacket->lfr_status_word[0] & 0xf0) >> 4 ) )
-                                     );
+                        );
+                hk_lfr_dpu_spw_enabled->setText("hk_lfr_dpu_spw_enabled: "
+                                                +QString::number( ( (housekeepingPacket->lfr_status_word[0] & 0x08) >> 3 ) )
+                        );
+                hk_lfr_dpu_link_state->setText("hk_lfr_dpu_link_state: "
+                                                +QString::number( ( (housekeepingPacket->lfr_status_word[0] & 0x07) >> 0 ) )
+                        );
+                hk_lfr_dpu_spare->setText("hk_lfr_dpu_spare: "
+                                           +QString::number( ( (housekeepingPacket->lfr_status_word[1] & 0xe0) >> 5 ) )
+                        );
+                sy_lfr_watchdog_enabled->setText("sy_lfr_watchdog_enabled: "
+                                                  +QString::number( ( (housekeepingPacket->lfr_status_word[1] & 0x10) >> 4 ) )
+                        );
+                hk_lfr_calib_enabled->setText("hk_lfr_calib_enabled: "
+                                               +QString::number( ( (housekeepingPacket->lfr_status_word[1] & 0x08) >> 3 ) )
+                        );
+                hk_lfr_reset_cause->setText(" hk_lfr_reset_cause: "
+                                             +QString::number( ( (housekeepingPacket->lfr_status_word[1] & 0x07) >> 0 ) )
+                        );
             }

common_PLE/hkdisplay.h +2 -1

                 void setupSpaceWireIFStatistics();
                 void setupErrorCountersSpaceWire();
-                void updateLFRMode(Packet_TM_LFR_HK_t *housekeepingPacket);
+                void update_lfr_status_word(Packet_TM_LFR_HK_t *housekeepingPacket);
                 void updateSWVersion(Packet_TM_LFR_HK_t *housekeepingPacket);
                 void updateTCStatistics(Packet_TM_LFR_HK_t *housekeepingPacket);
                 void updateAnomalyStatistics(Packet_TM_LFR_HK_t *housekeepingPacket);
                 QLabel *hk_lfr_mode;
                 QLabel *hk_lfr_dpu_spw_enabled;
                 QLabel *hk_lfr_dpu_link_state;
+                QLabel *hk_lfr_dpu_spare;
                 QLabel *sy_lfr_watchdog_enabled;
                 QLabel *hk_lfr_calib_enabled;
                 QLabel *hk_lfr_reset_cause;

gse_lesia/gselesia.pro.user +1 -1

             <?xml version="1.0" encoding="UTF-8"?>
             <!DOCTYPE QtCreatorProject>
-            <!-- Written by QtCreator 2.8.0, 2013-10-11T14:18:06. -->
+            <!-- Written by QtCreator 2.8.1, 2013-11-07T12:35:53. -->
             <qtcreator>
              <data>
               <variable>ProjectExplorer.Project.ActiveTarget</variable>

gse_lesia/lfrsgse binary modified 0 0

NO CONTENT: modified file, binary diff hidden

rmapplugin/Makefile +4 -4

             #############################################################################
             # Makefile for building: librmapplugin.so.1.0.0
-            # Generated by qmake (2.01a) (Qt 4.8.5) on: Fri Sep 20 14:37:48 2013
+            # Generated by qmake (2.01a) (Qt 4.8.5) on: Mon Oct 14 07:55:31 2013
             # Project:  rmapplugin.pro
             # Template: lib
-            # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile rmapplugin.pro
+            # Command: /usr/bin/qmake-qt4 -o Makefile rmapplugin.pro
             #############################################################################
             ####### Compiler, tools and options
             		/usr/lib64/libQtCore.prl \
             		/usr/lib64/libQtGui.prl \
             		/usr/lib64/libQtNetwork.prl
-            	$(QMAKE) -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile rmapplugin.pro
+            	$(QMAKE) -o Makefile rmapplugin.pro
             /usr/lib64/qt4/mkspecs/common/unix.conf:
             /usr/lib64/qt4/mkspecs/common/linux.conf:
             /usr/lib64/qt4/mkspecs/common/gcc-base.conf:
             /usr/lib64/libQtGui.prl:
             /usr/lib64/libQtNetwork.prl:
             qmake:  FORCE
-            	@$(QMAKE) -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile rmapplugin.pro
+            	@$(QMAKE) -o Makefile rmapplugin.pro
             dist:
             	@$(CHK_DIR_EXISTS) obj/rmapplugin1.0.0 || $(MKDIR) obj/rmapplugin1.0.0

rmapplugin/entermode.cpp +5 -5

                 packet.ccsdsSecHeaderFlag_pusVersion_ack = 0x19;
                 packet.serviceType = TC_TYPE_DEFAULT;
                 packet.serviceSubType = TC_SUBTYPE_ENTER_MODE;
-                packet.sourceID = SID_DEFAULT;
+                packet.sourceID = SID_TC_DEFAULT;
                 packet.spare = 0x00;
                 packet.mode = mode;
                 packet.enterModeTime[0] = 0x00;
                 packet.ccsdsSecHeaderFlag_pusVersion_ack = 0x19;
                 packet.serviceType = TC_TYPE_DEFAULT;
                 packet.serviceSubType = TC_SUBTYPE_RESET;
-                packet.sourceID = SID_DEFAULT;
+                packet.sourceID = SID_TC_DEFAULT;
                 parameterDump->GetCRCAsTwoBytes((unsigned char*) &packet, crcAsTwoBytes,
                                                PACKET_LENGTH_TC_LFR_RESET + CCSDS_TC_TM_PACKET_OFFSET - 2);
                 packet.ccsdsSecHeaderFlag_pusVersion_ack = 0x19;
                 packet.serviceType = TC_TYPE_DEFAULT;
                 packet.serviceSubType = TC_SUBTYPE_UPDATE_INFO;
-                packet.sourceID = SID_DEFAULT;
+                packet.sourceID = SID_TC_DEFAULT;
                 packet.set1 = 0x00;
                 packet.set2 = 0x00;
                 packet.ccsdsSecHeaderFlag_pusVersion_ack = 0x19;
                 packet.serviceType = TC_TYPE_DEFAULT;
                 packet.serviceSubType = TC_SUBTYPE_ENABLE_CALIBRATION;
-                packet.sourceID = SID_DEFAULT;
+                packet.sourceID = SID_TC_DEFAULT;
                 parameterDump->GetCRCAsTwoBytes((unsigned char*) &packet, crcAsTwoBytes,
                                                PACKET_LENGTH_TC_LFR_ENABLE_CALIBRATION + CCSDS_TC_TM_PACKET_OFFSET - 2);
                 packet.ccsdsSecHeaderFlag_pusVersion_ack = 0x19;
                 packet.serviceType = TC_TYPE_DEFAULT;
                 packet.serviceSubType = TC_SUBTYPE_DISABLE_CALIBRATION;
-                packet.sourceID = SID_DEFAULT;
+                packet.sourceID = SID_TC_DEFAULT;
                 parameterDump->GetCRCAsTwoBytes((unsigned char*) &packet, crcAsTwoBytes,
                                                PACKET_LENGTH_TC_LFR_DISABLE_CALIBRATION + CCSDS_TC_TM_PACKET_OFFSET - 2);

rmapplugin/stardundee.cpp +27 -22

                 if (getLinkStatus(linkNumber_SPINBOX->value()))
                 {
                     emit isOpen(true);
-                    timer->start(100); // starts the periodical timer, period = 100ms
+                    timer->start(1); // starts the periodical timer, period = 100ms
                 }
                 else
                 {
                 data = (char*) malloc(READ_WRITE_MAX_COUNTS*4);
                 emit appendToLog(QString("*** START *** WRITE ")+ QString::number(count) + QString(" word(s) @0x")+ QString::number(address,16));
+                emit sendMessage(QString("*** START *** WRITE ")+ QString::number(count) + QString(" word(s) @0x")+ QString::number(address,16));
                 while (remainingCount > READ_WRITE_MAX_COUNTS)
                 {
                 }
                 emit appendToLog(QString("*** STOP *** WRITE"));
+                emit sendMessage(QString("*** STOP *** WRITE"));
                 free(data);
                 return count;
             }
                     emit appendToLog("WARNING === in function READ of rmapplugin *** RMAP request already running, READ access stopped");
                     return 1;
                 }
                 emit appendToLog(QString("*** START *** READ ")+ QString::number(count) + QString(" word(s) @0x")+ QString::number(address,16));
+                emit sendMessage(QString("*** START *** READ ")+ QString::number(count) + QString(" word(s) @0x")+ QString::number(address,16));
                 while (remainingCount > READ_WRITE_MAX_COUNTS)
                 {
                 }
                 emit appendToLog(QString("*** STOP *** READ "));
+                emit sendMessage(QString("*** STOP *** READ "));
                 return count;
             }
                     free(data);
                     return 1;
                 }
-                else emit sendMessage("OK *** WriteStarDundee when sending packet of size " + QString::number(totalSize));
+            //    else emit sendMessage("OK *** WriteStarDundee when sending packet of size " + QString::number(totalSize));
                 //**************
                 // Free the send
                 if (result != TRANSFER_SUCCESS) emit sendMessage("ERR *** ReadStarDundee *** ReadBLOCK *** sending the READ command ");
                 else
                 {
-                    emit sendMessage("OK *** ReadStarDundee *** ReadBLOCK *** sending the READ command");
+            //        emit sendMessage("OK *** ReadStarDundee *** ReadBLOCK *** sending the READ command");
-                    emit appendToLog("packet sent, B0 = " + QString::number(packet[0], 16)
+            //        emit appendToLog("packet sent, B0 = " + QString::number(packet[0], 16)
-                                     + " *** B1 = " + QString::number(packet[1], 16)
+            //                         + " *** B1 = " + QString::number(packet[1], 16)
-                                     + " *** B2 = " + QString::number(packet[2], 16)
+            //                         + " *** B2 = " + QString::number(packet[2], 16)
-                                     + " *** B3 = " + QString::number(packet[3], 16)
+            //                         + " *** B3 = " + QString::number(packet[3], 16)
-                                     + " *** B4 = " + QString::number(packet[4], 16)
+            //                         + " *** B4 = " + QString::number(packet[4], 16)
-                                     + " *** B5 = " + QString::number(packet[5], 16)
+            //                         + " *** B5 = " + QString::number(packet[5], 16)
-                                     );
+            //                         );
                 }
                 //**************
                     {
                         emit appendToLog("No end of packet marker received");
                     }
-                    else if (properties.eop == SPACEWIRE_USB_EOP)
+            //        else if (properties.eop == SPACEWIRE_USB_EOP)
+            //        {
-                        emit appendToLog("Normal end of packet marker received");
+            //            emit appendToLog("Normal end of packet marker received");
+            //        }
                     else if (properties.eop == SPACEWIRE_USB_EEP)
                     {
                         emit appendToLog("Error end of packet marker received");
                     for(unsigned int i=0; i<packetLength; i++) rmapPacket[i] = spwPacket[i];
                     rmapPacketSize = packetLength;
                     rmapPacketSEMAPHORE->release();
-                    emit appendToLog("RMAP packet of size " + QString::number(packetLength) + " received");
+            //        emit appendToLog("RMAP packet of size " + QString::number(packetLength) + " received");
-                    emit appendToLog("packet received, B0 = " + QString::number(spwPacket[0], 16)
+            //        emit appendToLog("packet received, B0 = " + QString::number(spwPacket[0], 16)
-                                     + " *** B1 = " + QString::number(spwPacket[1], 16)
+            //                         + " *** B1 = " + QString::number(spwPacket[1], 16)
-                                     + " *** B2 = " + QString::number(spwPacket[2], 16)
+            //                         + " *** B2 = " + QString::number(spwPacket[2], 16)
-                                     + " *** B3 = " + QString::number(spwPacket[3], 16)
+            //                         + " *** B3 = " + QString::number(spwPacket[3], 16)
-                                     + " *** B4 = " + QString::number(spwPacket[4], 16)
+            //                         + " *** B4 = " + QString::number(spwPacket[4], 16)
-                                     + " *** B5 = " + QString::number(spwPacket[5], 16)
+            //                         + " *** B5 = " + QString::number(spwPacket[5], 16)
-                                     );
+            //                         );
                     return packetLength;
                 case 2: // 0x02 is the protocole identifier for CCSDS packets

rmapplugin/tmstatistics.cpp +10 -10

                         }
                         else if (sub == TM_SUBTYPE_EXE_NOK)
                         {
-                            if (sid == SID_EXE_INC)
+                            if (sid == WRONG_APP_DATA)
                             {
                                 INCO_nb = INCO_nb + 1;
                                 label_INCO_nb->setText(QString::number(INCO_nb));
                             }
-                            else if (sid == SID_NOT_EXE)
+                            else if (sid == TC_NOT_EXE)
                             {
                                 NOTE_nb = NOTE_nb + 1;
                                 label_NOTE_nb->setText(QString::number(NOTE_nb));
                             }
-                            else if (sid == SID_NOT_IMP)
+                            else if (sid == FUNCT_NOT_IMPL)
                             {
                                 NOTI_nb = NOTI_nb + 1;
                                 label_NOTI_nb->setText(QString::number(NOTI_nb));
                             }
-                            else if (sid == SID_EXE_ERR)
+                            else if (sid == FAIL_DETECTED)
                             {
                                 ERRO_nb = ERRO_nb + 1;
                                 label_ERRO_nb->setText(QString::number(ERRO_nb));
                             }
-                            else if (sid == SID_EXE_CORR)
+                            else if (sid == CORRUPTED)
                             {
                                 CORR_nb = CORR_nb + 1;
                                 label_CORR_nb->setText(QString::number(CORR_nb));
                     if (subtype== TM_SUBTYPE_EXE_OK) packetName = "TM_LFR_TC_EXE_SUCCESS";
                     if (subtype == TM_SUBTYPE_EXE_NOK)
                     {
-                        if (sid == SID_EXE_INC) packetName = "TM_LFR_TC_EXE_INCONSISTENT";
+                        if (sid == WRONG_APP_DATA) packetName = "TM_LFR_TC_EXE_INCONSISTENT";
-                        if (sid == SID_NOT_EXE) packetName = "TM_LFR_TC_EXE_NOT_EXECUTABLE";
+                        if (sid == TC_NOT_EXE) packetName = "TM_LFR_TC_EXE_NOT_EXECUTABLE";
-                        if (sid == SID_NOT_IMP) packetName = "TM_LFR_TC_EXE_NOT_IMPLEMENTED";
+                        if (sid == FUNCT_NOT_IMPL) packetName = "TM_LFR_TC_EXE_NOT_IMPLEMENTED";
-                        if (sid == SID_EXE_ERR) packetName = "TM_LFR_TC_EXE_ERROR";
+                        if (sid == FAIL_DETECTED) packetName = "TM_LFR_TC_EXE_ERROR";
-                        if (sid == SID_EXE_CORR) packetName = "TM_LFR_TC_EXE_CORRUPTED";
+                        if (sid == CORRUPTED) packetName = "TM_LFR_TC_EXE_CORRUPTED";
                     }
                 }
                 if (type == TM_TYPE_HK)

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages