| @@ -1,6 +1,6 | |||
|
|
1 | 1 | ############################################################################# |
|
|
2 | 2 | # Makefile for building: bin/fsw |
|
|
3 |
# Generated by qmake (2.01a) (Qt 4.8.6) on: Tue Jun 17 1 |
|
|
|
3 | # Generated by qmake (2.01a) (Qt 4.8.6) on: Tue Jun 17 13:35:22 2014 | |
|
|
4 | 4 | # Project: fsw-qt.pro |
|
|
5 | 5 | # Template: app |
|
|
6 | 6 | # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile fsw-qt.pro |
| @@ -10,7 +10,7 | |||
|
|
10 | 10 | |
|
|
11 | 11 | CC = sparc-rtems-gcc |
|
|
12 | 12 | CXX = sparc-rtems-g++ |
|
|
13 |
DEFINES = -DSW_VERSION_N1=1 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=1 |
|
|
|
13 | DEFINES = -DSW_VERSION_N1=1 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=11 -DPRINT_MESSAGES_ON_CONSOLE | |
|
|
14 | 14 | CFLAGS = -pipe -O3 -Wall $(DEFINES) |
|
|
15 | 15 | CXXFLAGS = -pipe -O3 -Wall $(DEFINES) |
|
|
16 | 16 | INCPATH = -I/usr/lib64/qt4/mkspecs/linux-g++ -I. -I../src -I../header -I../header/processing -I../src/LFR_basic-parameters |
| @@ -1374,6 +1374,14 void increment_seq_counter_source_id( un | |||
|
|
1374 | 1374 | |
|
|
1375 | 1375 | if (sequence_cnt != NULL) |
|
|
1376 | 1376 | { |
|
|
1377 | segmentation_grouping_flag = TM_PACKET_SEQ_CTRL_STANDALONE << 8; | |
|
|
1378 | *sequence_cnt = (*sequence_cnt) & 0x3fff; | |
|
|
1379 | ||
|
|
1380 | new_packet_sequence_control = segmentation_grouping_flag | (*sequence_cnt) ; | |
|
|
1381 | ||
|
|
1382 | packet_sequence_control[0] = (unsigned char) (new_packet_sequence_control >> 8); | |
|
|
1383 | packet_sequence_control[1] = (unsigned char) (new_packet_sequence_control ); | |
|
|
1384 | ||
|
|
1377 | 1385 | // increment the sequence counter |
|
|
1378 | 1386 | if ( *sequence_cnt < SEQ_CNT_MAX) |
|
|
1379 | 1387 | { |
| @@ -1383,13 +1391,6 void increment_seq_counter_source_id( un | |||
|
|
1383 | 1391 | { |
|
|
1384 | 1392 | *sequence_cnt = 0; |
|
|
1385 | 1393 | } |
|
|
1386 | segmentation_grouping_flag = TM_PACKET_SEQ_CTRL_STANDALONE << 8; | |
|
|
1387 | *sequence_cnt = (*sequence_cnt) & 0x3fff; | |
|
|
1388 | ||
|
|
1389 | new_packet_sequence_control = segmentation_grouping_flag | (*sequence_cnt) ; | |
|
|
1390 | ||
|
|
1391 | packet_sequence_control[0] = (unsigned char) (new_packet_sequence_control >> 8); | |
|
|
1392 | packet_sequence_control[1] = (unsigned char) (new_packet_sequence_control ); | |
|
|
1393 | 1394 | } |
|
|
1394 | 1395 | |
|
|
1395 | 1396 | //*********************************** |
General Comments 0
You need to be logged in to leave comments.
Login now