##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » LFR_FSW
RSS

Fork of HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/DEV_PLE

Clone from https://hephaistos.lpp.polytechnique.fr/rhodecode/HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/DEV_PLE

Bug 861...
paul -
r84:335d64d1e4bf VHDLib206
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,6 +1,6
1 1 #############################################################################
2 2 # Makefile for building: bin/fsw
3 # Generated by qmake (2.01a) (Qt 4.8.5) on: Tue Nov 19 10:04:58 2013
3 # Generated by qmake (2.01a) (Qt 4.8.5) on: Thu Nov 21 17:20:36 2013
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=0 -DPRINT_MESSAGES_ON_CONSOLE
13 DEFINES = -DSW_VERSION_N1=1 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=1 -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
Show file before | Show file after | Hide comments
@@ -11,7 +11,7 SWVERSION=-1-0
11 11 DEFINES += SW_VERSION_N1=1 # major
12 12 DEFINES += SW_VERSION_N2=0 # minor
13 13 DEFINES += SW_VERSION_N3=0 # patch
14 DEFINES += SW_VERSION_N4=0 # internal
14 DEFINES += SW_VERSION_N4=1 # internal
15 15
16 16 contains( CONFIG, verbose ) {
17 17 DEFINES += PRINT_MESSAGES_ON_CONSOLE
Show file before | Show file after | Hide comments
@@ -1,6 +1,6
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <!DOCTYPE QtCreatorProject>
3 <!-- Written by QtCreator 2.8.1, 2013-11-19T10:04:48. -->
3 <!-- Written by QtCreator 2.8.1, 2013-11-21T16:58:13. -->
4 4 <qtcreator>
5 5 <data>
6 6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
Show file before | Show file after | Hide comments
@@ -146,8 +146,7 enum apid_destid{
146 146 OBCP,
147 147 SYSTEM_CONTROL,
148 148 AOCS,
149 RPW_INTERNAL,
150 UNKNOWN
149 RPW_INTERNAL
151 150 };
152 151 // SEQUENCE COUNTERS
153 152 #define SEQ_CNT_MAX 16383
Show file before | Show file after | Hide comments
@@ -469,33 +469,26 void increment_seq_counter_destination_i
469 469 i = RPW_INTERNAL;
470 470 break;
471 471 default:
472 i = UNKNOWN;
472 i = GROUND;
473 473 break;
474 474 }
475 475
476 if (i != UNKNOWN)
477 {
478 segmentation_grouping_flag = TM_PACKET_SEQ_CTRL_STANDALONE << 8;
479 sequence_cnt = sequenceCounters_TC_EXE[ i ] & 0x3fff;
476 segmentation_grouping_flag = TM_PACKET_SEQ_CTRL_STANDALONE << 8;
477 sequence_cnt = sequenceCounters_TC_EXE[ i ] & 0x3fff;
480 478
481 new_packet_sequence_control = segmentation_grouping_flag | sequence_cnt ;
482
483 packet_sequence_control[0] = (unsigned char) (new_packet_sequence_control >> 8);
484 packet_sequence_control[1] = (unsigned char) (new_packet_sequence_control );
479 new_packet_sequence_control = segmentation_grouping_flag | sequence_cnt ;
485 480
486 // increment the sequence counter for the next packet
487 if ( sequenceCounters_TC_EXE[ i ] < SEQ_CNT_MAX)
488 {
489 sequenceCounters_TC_EXE[ i ] = sequenceCounters_TC_EXE[ i ] + 1;
490 }
491 else
492 {
493 sequenceCounters_TC_EXE[ i ] = 0;
494 }
481 packet_sequence_control[0] = (unsigned char) (new_packet_sequence_control >> 8);
482 packet_sequence_control[1] = (unsigned char) (new_packet_sequence_control );
483
484 // increment the sequence counter for the next packet
485 if ( sequenceCounters_TC_EXE[ i ] < SEQ_CNT_MAX)
486 {
487 sequenceCounters_TC_EXE[ i ] = sequenceCounters_TC_EXE[ i ] + 1;
495 488 }
496 489 else
497 490 {
498 DEBUG_PRINTF1("in increment_seq_counter_destination_id *** ERR destination ID %d not known\n", destination_id)
491 sequenceCounters_TC_EXE[ i ] = 0;
499 492 }
500 493
501 494 }
Show file before | Show file after | Hide comments
@@ -1198,26 +1198,28 void increment_seq_counter_source_id( un
1198 1198 }
1199 1199 else
1200 1200 {
1201 sequence_cnt = &sequenceCounters_TC_EXE[ UNKNOWN ];
1201 sequence_cnt = NULL;
1202 1202 PRINTF1("in increment_seq_counter_source_id *** ERR apid_destid %d not known\n", sid)
1203 1203 }
1204 1204
1205 segmentation_grouping_flag = (packet_sequence_control[ 0 ] & 0xc0) << 8;
1206 *sequence_cnt = (*sequence_cnt) & 0x3fff;
1205 if (sequence_cnt != NULL)
1206 {
1207 segmentation_grouping_flag = (packet_sequence_control[ 0 ] & 0xc0) << 8;
1208 *sequence_cnt = (*sequence_cnt) & 0x3fff;
1207 1209
1208 new_packet_sequence_control = segmentation_grouping_flag | *sequence_cnt ;
1210 new_packet_sequence_control = segmentation_grouping_flag | *sequence_cnt ;
1209 1211
1210 packet_sequence_control[0] = (unsigned char) (new_packet_sequence_control >> 8);
1211 packet_sequence_control[1] = (unsigned char) (new_packet_sequence_control );
1212 packet_sequence_control[0] = (unsigned char) (new_packet_sequence_control >> 8);
1213 packet_sequence_control[1] = (unsigned char) (new_packet_sequence_control );
1212 1214
1213 // increment the seuqence counter for the next packet
1214 if ( *sequence_cnt < SEQ_CNT_MAX)
1215 {
1216 *sequence_cnt = *sequence_cnt + 1;
1215 // increment the sequence counter for the next packet
1216 if ( *sequence_cnt < SEQ_CNT_MAX)
1217 {
1218 *sequence_cnt = *sequence_cnt + 1;
1219 }
1220 else
1221 {
1222 *sequence_cnt = 0;
1223 }
1217 1224 }
1218 else
1219 {
1220 *sequence_cnt = 0;
1221 }
1222
1223 1225 }
General Comments 0
You need to be logged in to leave comments. Login now