HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/DEV_PLE Commit - r219:96757b6fa557

Last commit before leaving!

paul -

r219:96757b6fa557 R3

parent child

Context file:

r219:96757b6fa557

Collapse all files

FSW-qt/fsw-qt.pro +2 -2

             DEFINES += SW_VERSION_N4=8 # internal
             # <GCOV>
-            QMAKE_CFLAGS_RELEASE += -fprofile-arcs -ftest-coverage
+            #QMAKE_CFLAGS_RELEASE += -fprofile-arcs -ftest-coverage
             #LIBS += -lgcov /opt/GCOV/01A/lib/overload.o -lc
-            LIBS += -lgcov /opt/GCOV/HOWTO_gcov_for_lfr_test/01A/lib/overload.o -lc
+            #LIBS += -lgcov /opt/GCOV/HOWTO_gcov_for_lfr_test/01A/lib/overload.o -lc
             # </GCOV>
             # <CHANGE BEFORE FLIGHT>

src/tc_handler.c +8 -3

                 {
                     send_tm_lfr_tc_exe_inconsistent( TC, queue_id, BYTE_POS_CP_MODE_LFR_SET, requestedMode );
                 }
-                else                                // the mode value is consistent, check the transition
+                else                                // the mode value is valid, check the transition
                 {
                     status = check_mode_transition(requestedMode);
                     if (status != LFR_SUCCESSFUL)
                     }
                 }
-                if ( status == LFR_SUCCESSFUL )     // the transition is valid, enter the mode
+                if ( status == LFR_SUCCESSFUL )     // the transition is valid, check the date
                 {
                     status = check_transition_date( transitionCoarseTime );
                     if (status != LFR_SUCCESSFUL)
                 //*************************
                 // ENTER THE REQUESTED MODE
+                if (status == RTEMS_SUCCESSFUL) // if the current mode has been successfully stopped
+                {
                     if ( (mode == LFR_MODE_NORMAL) || (mode == LFR_MODE_BURST)
                          || (mode == LFR_MODE_SBM1) || (mode == LFR_MODE_SBM2) )
                     {
                         rtems_cpu_usage_reset();
             #endif
                         status = restart_science_tasks( mode );
+                        if (status == RTEMS_SUCCESSFUL)
+                        {
                             launch_spectral_matrix( );
                             launch_waveform_picker( mode, transitionCoarseTime );
-            //        launch_spectral_matrix_simu( );
                     }
                     else if ( mode == LFR_MODE_STANDBY )
                     {
                     {
                         status = RTEMS_UNSATISFIED;
                     }
+                }
                 if (status != RTEMS_SUCCESSFUL)
                 {

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