diff --git a/FSW-qt/Makefile b/FSW-qt/Makefile --- a/FSW-qt/Makefile +++ b/FSW-qt/Makefile @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: bin/fsw -# Generated by qmake (2.01a) (Qt 4.8.6) on: Tue Jun 17 10:40:49 2014 +# Generated by qmake (2.01a) (Qt 4.8.6) on: Tue Jun 17 13:35:22 2014 # Project: fsw-qt.pro # Template: app # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile fsw-qt.pro @@ -10,7 +10,7 @@ CC = sparc-rtems-gcc CXX = sparc-rtems-g++ -DEFINES = -DSW_VERSION_N1=1 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=10 -DPRINT_MESSAGES_ON_CONSOLE +DEFINES = -DSW_VERSION_N1=1 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=11 -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 -I../header/processing -I../src/LFR_basic-parameters diff --git a/src/wf_handler.c b/src/wf_handler.c --- a/src/wf_handler.c +++ b/src/wf_handler.c @@ -1374,6 +1374,14 @@ void increment_seq_counter_source_id( un if (sequence_cnt != NULL) { + segmentation_grouping_flag = TM_PACKET_SEQ_CTRL_STANDALONE << 8; + *sequence_cnt = (*sequence_cnt) & 0x3fff; + + new_packet_sequence_control = segmentation_grouping_flag | (*sequence_cnt) ; + + packet_sequence_control[0] = (unsigned char) (new_packet_sequence_control >> 8); + packet_sequence_control[1] = (unsigned char) (new_packet_sequence_control ); + // increment the sequence counter if ( *sequence_cnt < SEQ_CNT_MAX) { @@ -1383,13 +1391,6 @@ void increment_seq_counter_source_id( un { *sequence_cnt = 0; } - segmentation_grouping_flag = TM_PACKET_SEQ_CTRL_STANDALONE << 8; - *sequence_cnt = (*sequence_cnt) & 0x3fff; - - new_packet_sequence_control = segmentation_grouping_flag | (*sequence_cnt) ; - - packet_sequence_control[0] = (unsigned char) (new_packet_sequence_control >> 8); - packet_sequence_control[1] = (unsigned char) (new_packet_sequence_control ); } //***********************************