HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r68:8128a81f2c21

Bug ...

paul -

r68:8128a81f2c21 VHDLib206

parent child

Context file:

r68:8128a81f2c21

.hgignore +2 0

             *.o
             tests/*.err
             doc
+            *.srec
+            FSW-qt/bin/fsw

FSW-qt/Makefile +2 -2

             #############################################################################
             # Makefile for building: bin/fsw
-            # Generated by qmake (2.01a) (Qt 4.8.5) on: Tue Nov 12 13:28:25 2013
+            # Generated by qmake (2.01a) (Qt 4.8.5) on: Wed Nov 13 08:18:19 2013
             # Project:  fsw-qt.pro
             # Template: app
             # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile fsw-qt.pro
             CC            = sparc-rtems-gcc
             CXX           = sparc-rtems-g++
-            DEFINES       = -DSW_VERSION_N1=0 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=21 -DPRINT_MESSAGES_ON_CONSOLE
+            DEFINES       = -DSW_VERSION_N1=0 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=22 -DPRINT_MESSAGES_ON_CONSOLE
             CFLAGS        = -pipe -O3 -Wall $(DEFINES)
             CXXFLAGS      = -pipe -O3 -Wall $(DEFINES)
             INCPATH       = -I/usr/lib64/qt4/mkspecs/linux-g++ -I. -I../src -I../header

FSW-qt/fsw-qt.pro +2 -2

             include(./sparc.pri)
             # flight software version
-            SWVERSION=-0-21
+            SWVERSION=-0-22
             DEFINES += SW_VERSION_N1=0
             DEFINES += SW_VERSION_N2=0
             DEFINES += SW_VERSION_N3=0
-            DEFINES += SW_VERSION_N4=21
+            DEFINES += SW_VERSION_N4=22
             contains( CONFIG, verbose ) {
                 DEFINES += PRINT_MESSAGES_ON_CONSOLE

FSW-qt/fsw-qt.pro.user +1 -1

             <?xml version="1.0" encoding="UTF-8"?>
             <!DOCTYPE QtCreatorProject>
-            <!-- Written by QtCreator 2.8.1, 2013-11-12T14:12:08. -->
+            <!-- Written by QtCreator 2.8.1, 2013-11-13T08:16:16. -->
             <qtcreator>
              <data>
               <variable>ProjectExplorer.Project.ActiveTarget</variable>

header/tm_lfr_tc_exe.h +1 -1

             int send_tm_lfr_tc_exe_not_implemented(ccsdsTelecommandPacket_t *TC, rtems_id queue_id);
             int send_tm_lfr_tc_exe_error(ccsdsTelecommandPacket_t *TC, rtems_id queue_id);
             int send_tm_lfr_tc_exe_corrupted(ccsdsTelecommandPacket_t *TC, rtems_id queue_id,
-                                             unsigned char *computed_CRC, unsigned char *currentTC_LEN_RCV);
+                                             unsigned char *computed_CRC, unsigned char *currentTC_LEN_RCV, unsigned char destinationID);
             void increment_seq_counter_destination_id( unsigned char *packet_sequence_control, unsigned char destination_id );

src/fsw_spacewire.c +10 -1

                 ccsdsTelecommandPacket_t currentTC;
                 unsigned char computed_CRC[ 2 ];
                 unsigned char currentTC_LEN_RCV[ 2 ];
+                unsigned char destinationID;
                 unsigned int currentTC_LEN_RCV_AsUnsignedInt;
                 unsigned int parserCode;
                 rtems_status_code status;
                                      !( (currentTC.serviceType==TC_TYPE_GEN) && (currentTC.serviceSubType==TC_SUBTYPE_UPDT_INFO))
                                      )
                                 {
-                                    send_tm_lfr_tc_exe_corrupted( &currentTC, queue_send_id, computed_CRC, currentTC_LEN_RCV );
+                                    if ( parserCode == WRONG_SRC_ID )
+                                    {
+                                        destinationID = SID_TC_GROUND;
+                                    }
+                                    else
+                                    {
+                                        destinationID = currentTC.sourceID;
+                                    }
+                                    send_tm_lfr_tc_exe_corrupted( &currentTC, queue_send_id, computed_CRC, currentTC_LEN_RCV, destinationID );
                                 }
                             }
                             else

src/tc_acceptance.c +3 -1

                  */
                 int status;
+                int status_crc;
                 unsigned char pid;
                 unsigned char category;
                 unsigned int length;
                 {
                     status = tc_check_length( packetSubtype, length );
                 }
+                status_crc = tc_check_crc( TCPacket, length, computed_CRC );
                 if (status == CCSDS_TM_VALID )  // CHECK CRC
                 {
-                    status = tc_check_crc( TCPacket, length, computed_CRC );
+                    status = status_crc;
                 }
                 return status;

src/tm_lfr_tc_exe.c +3 -2

             }
             int send_tm_lfr_tc_exe_corrupted(ccsdsTelecommandPacket_t *TC, rtems_id queue_id,
-                                             unsigned char *computed_CRC, unsigned char *currentTC_LEN_RCV )
+                                             unsigned char *computed_CRC, unsigned char *currentTC_LEN_RCV,
+                                             unsigned char destinationID)
             {
                 /** This function sends a TM_LFR_TC_EXE_CORRUPTED packet in the dedicated RTEMS message queue.
                  *
                 TM.spare1_pusVersion_spare2 = DEFAULT_SPARE1_PUSVERSION_SPARE2;
                 TM.serviceType = TM_TYPE_TC_EXE;
                 TM.serviceSubType = TM_SUBTYPE_EXE_NOK;
-                TM.destinationID = TC->sourceID;    // default destination id
+                TM.destinationID = destinationID;
                 TM.time[0] = (unsigned char) (time_management_regs->coarse_time>>24);
                 TM.time[1] = (unsigned char) (time_management_regs->coarse_time>>16);
                 TM.time[2] = (unsigned char) (time_management_regs->coarse_time>>8);

General Comments 0

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

No TODOs yet

	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