# HG changeset patch
# User paul
# Date 2015-07-03 14:13:28
# Node ID 96757b6fa55754787a11cfca6ebc96b0a387948c
# Parent  2953540325b72a73c96bcecabce5b17cf20e6fd3

Last commit before leaving!

diff --git a/FSW-qt/fsw-qt.pro b/FSW-qt/fsw-qt.pro
--- a/FSW-qt/fsw-qt.pro
+++ b/FSW-qt/fsw-qt.pro
@@ -15,9 +15,9 @@ DEFINES += SW_VERSION_N3=0 # patch
 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>
diff --git a/src/tc_handler.c b/src/tc_handler.c
--- a/src/tc_handler.c
+++ b/src/tc_handler.c
@@ -179,7 +179,7 @@ int action_enter_mode(ccsdsTelecommandPa
     {
         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)
@@ -189,7 +189,7 @@ int action_enter_mode(ccsdsTelecommandPa
         }
     }
 
-    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)
@@ -527,31 +527,36 @@ int enter_mode( unsigned char mode, unsi
 
     //*************************
     // ENTER THE REQUESTED MODE
-    if ( (mode == LFR_MODE_NORMAL) || (mode == LFR_MODE_BURST)
-         || (mode == LFR_MODE_SBM1) || (mode == LFR_MODE_SBM2) )
+    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) )
+        {
 #ifdef PRINT_TASK_STATISTICS
-        rtems_cpu_usage_reset();
+            rtems_cpu_usage_reset();
 #endif
-        status = restart_science_tasks( mode );
-        launch_spectral_matrix( );
-        launch_waveform_picker( mode, transitionCoarseTime );
-//        launch_spectral_matrix_simu( );
-    }
-    else if ( mode == LFR_MODE_STANDBY )
-    {
+            status = restart_science_tasks( mode );
+            if (status == RTEMS_SUCCESSFUL)
+            {
+                launch_spectral_matrix( );
+                launch_waveform_picker( mode, transitionCoarseTime );
+            }
+        }
+        else if ( mode == LFR_MODE_STANDBY )
+        {
 #ifdef PRINT_TASK_STATISTICS
-        rtems_cpu_usage_report();
+            rtems_cpu_usage_report();
 #endif
 
 #ifdef PRINT_STACK_REPORT
-        PRINTF("stack report selected\n")
-        rtems_stack_checker_report_usage();
+            PRINTF("stack report selected\n")
+                    rtems_stack_checker_report_usage();
 #endif
-    }
-    else
-    {
-        status = RTEMS_UNSATISFIED;
+        }
+        else
+        {
+            status = RTEMS_UNSATISFIED;
+        }
     }
 
     if (status != RTEMS_SUCCESSFUL)