HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r84:335d64d1e4bf

Bug ...

paul -

r84:335d64d1e4bf VHDLib206

parent child

Context file:

r84:335d64d1e4bf

FSW-qt/Makefile +2 -2

             #############################################################################
             # Makefile for building: bin/fsw
-            # Generated by qmake (2.01a) (Qt 4.8.5) on: Tue Nov 19 10:04:58 2013
+            # Generated by qmake (2.01a) (Qt 4.8.5) on: Thu Nov 21 17:20:36 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=1 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=0 -DPRINT_MESSAGES_ON_CONSOLE
+            DEFINES       = -DSW_VERSION_N1=1 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=1 -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 +1 -1

             DEFINES += SW_VERSION_N1=1 # major
             DEFINES += SW_VERSION_N2=0 # minor
             DEFINES += SW_VERSION_N3=0 # patch
-            DEFINES += SW_VERSION_N4=0 # internal
+            DEFINES += SW_VERSION_N4=1 # internal
             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-19T10:04:48. -->
+            <!-- Written by QtCreator 2.8.1, 2013-11-21T16:58:13. -->
             <qtcreator>
              <data>
               <variable>ProjectExplorer.Project.ActiveTarget</variable>

header/ccsds_types.h +1 -2

                 OBCP,
                 SYSTEM_CONTROL,
                 AOCS,
-                RPW_INTERNAL,
+                RPW_INTERNAL
-                UNKNOWN
             };
             // SEQUENCE COUNTERS
             #define SEQ_CNT_MAX 16383

src/tm_lfr_tc_exe.c +1 -8

                     i = RPW_INTERNAL;
                     break;
                 default:
-                    i = UNKNOWN;
+                    i = GROUND;
                     break;
                 }
-                if (i != UNKNOWN)
                 segmentation_grouping_flag  = TM_PACKET_SEQ_CTRL_STANDALONE << 8;
                 sequence_cnt                = sequenceCounters_TC_EXE[ i ] & 0x3fff;
                 {
                     sequenceCounters_TC_EXE[ i ] = 0;
                 }
-                else
-                    DEBUG_PRINTF1("in increment_seq_counter_destination_id *** ERR destination ID %d not known\n", destination_id)
             }

src/wf_handler.c +5 -3

                 }
                 else
                 {
-                    sequence_cnt = &sequenceCounters_TC_EXE[ UNKNOWN ];
+                    sequence_cnt = NULL;
                     PRINTF1("in increment_seq_counter_source_id *** ERR apid_destid %d not known\n", sid)
                 }
+                if (sequence_cnt != NULL)
+                {
                     segmentation_grouping_flag  = (packet_sequence_control[ 0 ] & 0xc0) << 8;
                     *sequence_cnt                = (*sequence_cnt) & 0x3fff;
                     packet_sequence_control[0] = (unsigned char) (new_packet_sequence_control >> 8);
                     packet_sequence_control[1] = (unsigned char) (new_packet_sequence_control     );
-                // increment the seuqence counter for the next packet
+                    // increment the sequence counter for the next packet
                     if ( *sequence_cnt < SEQ_CNT_MAX)
                     {
                         *sequence_cnt = *sequence_cnt + 1;
                     {
                         *sequence_cnt = 0;
                     }
                 }
+            }

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