HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r376:30b34f0fbdfa

Removed commented code

jeandet -

parent child

Context file:

r376:30b34f0fbdfa

src/CMakeLists.txt +1 -1

             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)

src/tm_lfr_tc_exe.c 0 -2

                 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];

src/wf_handler.c +2 -4

                 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
                 // (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 +
                 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;
                 }
                 // RESTORE THE MODE OF THE CALLING TASK
                 status =  rtems_task_mode( initial_mode_set, RTEMS_PREEMPT_MASK, &current_mode_set );
             }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages