diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -2,6 +2,7 @@ syntax: glob *.pdf *~ *.o +*.zip tests/*.err doc *.srec diff --git a/src/fsw_misc.c b/src/fsw_misc.c --- a/src/fsw_misc.c +++ b/src/fsw_misc.c @@ -342,6 +342,11 @@ void increment_seq_counter( unsigned cha + packet_sequence_control[1] ); + 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 ); + if ( sequence_cnt < SEQ_CNT_MAX) { sequence_cnt = sequence_cnt + 1; @@ -350,11 +355,6 @@ void increment_seq_counter( unsigned cha { sequence_cnt = 0; } - - 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 ); } void getTime( unsigned char *time) diff --git a/src/tm_lfr_tc_exe.c b/src/tm_lfr_tc_exe.c --- a/src/tm_lfr_tc_exe.c +++ b/src/tm_lfr_tc_exe.c @@ -490,6 +490,14 @@ void increment_seq_counter_destination_i break; } + segmentation_grouping_flag = TM_PACKET_SEQ_CTRL_STANDALONE << 8; + sequence_cnt = sequenceCounters_TC_EXE[ i ] & 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 ( sequenceCounters_TC_EXE[ i ] < SEQ_CNT_MAX ) { @@ -499,13 +507,4 @@ void increment_seq_counter_destination_i { sequenceCounters_TC_EXE[ i ] = 0; } - - segmentation_grouping_flag = TM_PACKET_SEQ_CTRL_STANDALONE << 8; - sequence_cnt = sequenceCounters_TC_EXE[ i ] & 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 ); - }