# HG changeset patch # User Alexis Jeandet # Date 2018-07-02 09:17:34 # Node ID 30b34f0fbdfa0cbfe99e580550f74df38452e744 # Parent 0ae79c717213eaaf0f4b68a48b5f5ac2ea20d7e2 Removed commented code diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -64,7 +64,7 @@ option(FSW_debug_tch "?" OFF) set(SW_VERSION_N1 "3" CACHE STRING "Choose N1 FSW Version." FORCE) set(SW_VERSION_N2 "2" CACHE STRING "Choose N2 FSW Version." FORCE) set(SW_VERSION_N3 "0" CACHE STRING "Choose N3 FSW Version." FORCE) -set(SW_VERSION_N4 "15" CACHE STRING "Choose N4 FSW Version." FORCE) +set(SW_VERSION_N4 "16" CACHE STRING "Choose N4 FSW Version." FORCE) if(FSW_verbose) add_definitions(-DPRINT_MESSAGES_ON_CONSOLE) 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 @@ -414,8 +414,6 @@ int send_tm_lfr_tc_exe_corrupted(ccsdsTe TM.pkt_len_rcv_value[1] = TC->packetLength[1]; TM.pkt_datafieldsize_cnt[0] = currentTC_LEN_RCV[0]; TM.pkt_datafieldsize_cnt[1] = currentTC_LEN_RCV[1]; -// TM.rcv_crc[0] = packetDataField[ packetLength - 1 ]; -// TM.rcv_crc[1] = packetDataField[ packetLength ]; TM.rcv_crc[0] = packetDataField[ estimatedPacketLength - 1 ]; TM.rcv_crc[1] = packetDataField[ estimatedPacketLength ]; TM.computed_crc[0] = computed_CRC[0]; diff --git a/src/wf_handler.c b/src/wf_handler.c --- a/src/wf_handler.c +++ b/src/wf_handler.c @@ -842,11 +842,9 @@ void build_snapshot_from_ring( ring_node node = 0; while ( node < nb_ring_nodes) { - //PRINTF1("%d ... ", node); bufferAcquisitionTime_asLong = get_acquisition_time( (unsigned char *) &ring_node_to_send->coarseTime ); if (bufferAcquisitionTime_asLong <= acquisitionTime_asLong) { - //PRINTF1("buffer found with acquisition time = %llx\n", bufferAcquisitionTime_asLong); node = nb_ring_nodes; } else @@ -859,7 +857,6 @@ void build_snapshot_from_ring( ring_node // (5) compute the number of samples to take in the current buffer sampleOffset_asLong = ((acquisitionTime_asLong - bufferAcquisitionTime_asLong) * frequency_asLong ) >> SHIFT_2_BYTES; nbSamplesPart1_asLong = NB_SAMPLES_PER_SNAPSHOT - sampleOffset_asLong; - //PRINTF2("sampleOffset_asLong = %lld, nbSamplesPart1_asLong = %lld\n", sampleOffset_asLong, nbSamplesPart1_asLong); // (6) compute the final acquisition time acquisitionTime_asLong = bufferAcquisitionTime_asLong + @@ -882,7 +879,7 @@ void build_snapshot_from_ring( ring_node timeCharPtr = (unsigned char*) &ring_node_to_send->coarseTime; ptr2[0] = ptr2[0] | (timeCharPtr[0] & SYNC_BIT); // [1000 0000] - if ( (nbSamplesPart1_asLong >= NB_SAMPLES_PER_SNAPSHOT) | (nbSamplesPart1_asLong < 0) ) + if ( (nbSamplesPart1_asLong > NB_SAMPLES_PER_SNAPSHOT) | (nbSamplesPart1_asLong < 0) ) { nbSamplesPart1_asLong = 0; } @@ -1342,3 +1339,4 @@ void increment_seq_counter_source_id( un // RESTORE THE MODE OF THE CALLING TASK status = rtems_task_mode( initial_mode_set, RTEMS_PREEMPT_MASK, ¤t_mode_set ); } +