##// END OF EJS Templates
Last commit before leaving!
paul -
r219:96757b6fa557 R3
parent child
Show More
@@ -15,9 +15,9 DEFINES += SW_VERSION_N3=0 # patch
15 DEFINES += SW_VERSION_N4=8 # internal
15 DEFINES += SW_VERSION_N4=8 # internal
16
16
17 # <GCOV>
17 # <GCOV>
18 QMAKE_CFLAGS_RELEASE += -fprofile-arcs -ftest-coverage
18 #QMAKE_CFLAGS_RELEASE += -fprofile-arcs -ftest-coverage
19 #LIBS += -lgcov /opt/GCOV/01A/lib/overload.o -lc
19 #LIBS += -lgcov /opt/GCOV/01A/lib/overload.o -lc
20 LIBS += -lgcov /opt/GCOV/HOWTO_gcov_for_lfr_test/01A/lib/overload.o -lc
20 #LIBS += -lgcov /opt/GCOV/HOWTO_gcov_for_lfr_test/01A/lib/overload.o -lc
21 # </GCOV>
21 # </GCOV>
22
22
23 # <CHANGE BEFORE FLIGHT>
23 # <CHANGE BEFORE FLIGHT>
@@ -179,7 +179,7 int action_enter_mode(ccsdsTelecommandPa
179 {
179 {
180 send_tm_lfr_tc_exe_inconsistent( TC, queue_id, BYTE_POS_CP_MODE_LFR_SET, requestedMode );
180 send_tm_lfr_tc_exe_inconsistent( TC, queue_id, BYTE_POS_CP_MODE_LFR_SET, requestedMode );
181 }
181 }
182 else // the mode value is consistent, check the transition
182 else // the mode value is valid, check the transition
183 {
183 {
184 status = check_mode_transition(requestedMode);
184 status = check_mode_transition(requestedMode);
185 if (status != LFR_SUCCESSFUL)
185 if (status != LFR_SUCCESSFUL)
@@ -189,7 +189,7 int action_enter_mode(ccsdsTelecommandPa
189 }
189 }
190 }
190 }
191
191
192 if ( status == LFR_SUCCESSFUL ) // the transition is valid, enter the mode
192 if ( status == LFR_SUCCESSFUL ) // the transition is valid, check the date
193 {
193 {
194 status = check_transition_date( transitionCoarseTime );
194 status = check_transition_date( transitionCoarseTime );
195 if (status != LFR_SUCCESSFUL)
195 if (status != LFR_SUCCESSFUL)
@@ -527,31 +527,36 int enter_mode( unsigned char mode, unsi
527
527
528 //*************************
528 //*************************
529 // ENTER THE REQUESTED MODE
529 // ENTER THE REQUESTED MODE
530 if ( (mode == LFR_MODE_NORMAL) || (mode == LFR_MODE_BURST)
530 if (status == RTEMS_SUCCESSFUL) // if the current mode has been successfully stopped
531 || (mode == LFR_MODE_SBM1) || (mode == LFR_MODE_SBM2) )
532 {
531 {
532 if ( (mode == LFR_MODE_NORMAL) || (mode == LFR_MODE_BURST)
533 || (mode == LFR_MODE_SBM1) || (mode == LFR_MODE_SBM2) )
534 {
533 #ifdef PRINT_TASK_STATISTICS
535 #ifdef PRINT_TASK_STATISTICS
534 rtems_cpu_usage_reset();
536 rtems_cpu_usage_reset();
535 #endif
537 #endif
536 status = restart_science_tasks( mode );
538 status = restart_science_tasks( mode );
537 launch_spectral_matrix( );
539 if (status == RTEMS_SUCCESSFUL)
538 launch_waveform_picker( mode, transitionCoarseTime );
540 {
539 // launch_spectral_matrix_simu( );
541 launch_spectral_matrix( );
540 }
542 launch_waveform_picker( mode, transitionCoarseTime );
541 else if ( mode == LFR_MODE_STANDBY )
543 }
542 {
544 }
545 else if ( mode == LFR_MODE_STANDBY )
546 {
543 #ifdef PRINT_TASK_STATISTICS
547 #ifdef PRINT_TASK_STATISTICS
544 rtems_cpu_usage_report();
548 rtems_cpu_usage_report();
545 #endif
549 #endif
546
550
547 #ifdef PRINT_STACK_REPORT
551 #ifdef PRINT_STACK_REPORT
548 PRINTF("stack report selected\n")
552 PRINTF("stack report selected\n")
549 rtems_stack_checker_report_usage();
553 rtems_stack_checker_report_usage();
550 #endif
554 #endif
551 }
555 }
552 else
556 else
553 {
557 {
554 status = RTEMS_UNSATISFIED;
558 status = RTEMS_UNSATISFIED;
559 }
555 }
560 }
556
561
557 if (status != RTEMS_SUCCESSFUL)
562 if (status != RTEMS_SUCCESSFUL)
General Comments 0
You need to be logged in to leave comments. Login now