##// END OF EJS Templates
Removed commented code
jeandet -
r376:30b34f0fbdfa No PWD scrub with... draft
parent child
Show More
@@ -64,7 +64,7 option(FSW_debug_tch "?" OFF)
64 set(SW_VERSION_N1 "3" CACHE STRING "Choose N1 FSW Version." FORCE)
64 set(SW_VERSION_N1 "3" CACHE STRING "Choose N1 FSW Version." FORCE)
65 set(SW_VERSION_N2 "2" CACHE STRING "Choose N2 FSW Version." FORCE)
65 set(SW_VERSION_N2 "2" CACHE STRING "Choose N2 FSW Version." FORCE)
66 set(SW_VERSION_N3 "0" CACHE STRING "Choose N3 FSW Version." FORCE)
66 set(SW_VERSION_N3 "0" CACHE STRING "Choose N3 FSW Version." FORCE)
67 set(SW_VERSION_N4 "15" CACHE STRING "Choose N4 FSW Version." FORCE)
67 set(SW_VERSION_N4 "16" CACHE STRING "Choose N4 FSW Version." FORCE)
68
68
69 if(FSW_verbose)
69 if(FSW_verbose)
70 add_definitions(-DPRINT_MESSAGES_ON_CONSOLE)
70 add_definitions(-DPRINT_MESSAGES_ON_CONSOLE)
@@ -414,8 +414,6 int send_tm_lfr_tc_exe_corrupted(ccsdsTe
414 TM.pkt_len_rcv_value[1] = TC->packetLength[1];
414 TM.pkt_len_rcv_value[1] = TC->packetLength[1];
415 TM.pkt_datafieldsize_cnt[0] = currentTC_LEN_RCV[0];
415 TM.pkt_datafieldsize_cnt[0] = currentTC_LEN_RCV[0];
416 TM.pkt_datafieldsize_cnt[1] = currentTC_LEN_RCV[1];
416 TM.pkt_datafieldsize_cnt[1] = currentTC_LEN_RCV[1];
417 // TM.rcv_crc[0] = packetDataField[ packetLength - 1 ];
418 // TM.rcv_crc[1] = packetDataField[ packetLength ];
419 TM.rcv_crc[0] = packetDataField[ estimatedPacketLength - 1 ];
417 TM.rcv_crc[0] = packetDataField[ estimatedPacketLength - 1 ];
420 TM.rcv_crc[1] = packetDataField[ estimatedPacketLength ];
418 TM.rcv_crc[1] = packetDataField[ estimatedPacketLength ];
421 TM.computed_crc[0] = computed_CRC[0];
419 TM.computed_crc[0] = computed_CRC[0];
@@ -842,11 +842,9 void build_snapshot_from_ring( ring_node
842 node = 0;
842 node = 0;
843 while ( node < nb_ring_nodes)
843 while ( node < nb_ring_nodes)
844 {
844 {
845 //PRINTF1("%d ... ", node);
846 bufferAcquisitionTime_asLong = get_acquisition_time( (unsigned char *) &ring_node_to_send->coarseTime );
845 bufferAcquisitionTime_asLong = get_acquisition_time( (unsigned char *) &ring_node_to_send->coarseTime );
847 if (bufferAcquisitionTime_asLong <= acquisitionTime_asLong)
846 if (bufferAcquisitionTime_asLong <= acquisitionTime_asLong)
848 {
847 {
849 //PRINTF1("buffer found with acquisition time = %llx\n", bufferAcquisitionTime_asLong);
850 node = nb_ring_nodes;
848 node = nb_ring_nodes;
851 }
849 }
852 else
850 else
@@ -859,7 +857,6 void build_snapshot_from_ring( ring_node
859 // (5) compute the number of samples to take in the current buffer
857 // (5) compute the number of samples to take in the current buffer
860 sampleOffset_asLong = ((acquisitionTime_asLong - bufferAcquisitionTime_asLong) * frequency_asLong ) >> SHIFT_2_BYTES;
858 sampleOffset_asLong = ((acquisitionTime_asLong - bufferAcquisitionTime_asLong) * frequency_asLong ) >> SHIFT_2_BYTES;
861 nbSamplesPart1_asLong = NB_SAMPLES_PER_SNAPSHOT - sampleOffset_asLong;
859 nbSamplesPart1_asLong = NB_SAMPLES_PER_SNAPSHOT - sampleOffset_asLong;
862 //PRINTF2("sampleOffset_asLong = %lld, nbSamplesPart1_asLong = %lld\n", sampleOffset_asLong, nbSamplesPart1_asLong);
863
860
864 // (6) compute the final acquisition time
861 // (6) compute the final acquisition time
865 acquisitionTime_asLong = bufferAcquisitionTime_asLong +
862 acquisitionTime_asLong = bufferAcquisitionTime_asLong +
@@ -882,7 +879,7 void build_snapshot_from_ring( ring_node
882 timeCharPtr = (unsigned char*) &ring_node_to_send->coarseTime;
879 timeCharPtr = (unsigned char*) &ring_node_to_send->coarseTime;
883 ptr2[0] = ptr2[0] | (timeCharPtr[0] & SYNC_BIT); // [1000 0000]
880 ptr2[0] = ptr2[0] | (timeCharPtr[0] & SYNC_BIT); // [1000 0000]
884
881
885 if ( (nbSamplesPart1_asLong >= NB_SAMPLES_PER_SNAPSHOT) | (nbSamplesPart1_asLong < 0) )
882 if ( (nbSamplesPart1_asLong > NB_SAMPLES_PER_SNAPSHOT) | (nbSamplesPart1_asLong < 0) )
886 {
883 {
887 nbSamplesPart1_asLong = 0;
884 nbSamplesPart1_asLong = 0;
888 }
885 }
@@ -1342,3 +1339,4 void increment_seq_counter_source_id( un
1342 // RESTORE THE MODE OF THE CALLING TASK
1339 // RESTORE THE MODE OF THE CALLING TASK
1343 status = rtems_task_mode( initial_mode_set, RTEMS_PREEMPT_MASK, &current_mode_set );
1340 status = rtems_task_mode( initial_mode_set, RTEMS_PREEMPT_MASK, &current_mode_set );
1344 }
1341 }
1342
General Comments 0
You need to be logged in to leave comments. Login now