HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r271:98f943ec5c62

3.0.0.19...

paul -

r271:98f943ec5c62 R3a

parent child

Context file:

r271:98f943ec5c62

Collapse all files

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

             DEFINES += SW_VERSION_N1=3 # major
             DEFINES += SW_VERSION_N2=0 # minor
             DEFINES += SW_VERSION_N3=0 # patch
-            DEFINES += SW_VERSION_N4=18 # internal
+            DEFINES += SW_VERSION_N4=19 # internal
             # <GCOV>
             #QMAKE_CFLAGS_RELEASE += -fprofile-arcs -ftest-coverage

header/fsw_spacewire.h +2 -1

             extern spw_stats grspw_stats;
             extern rtems_name timecode_timer_name;
             extern rtems_id timecode_timer_id;
+            extern unsigned char oneTcLfrUpdateTimeReceived;
             // RTEMS TASK
             rtems_task spiq_task( rtems_task_argument argument );
             void spw_send_asm_f2( ring_node *ring_node_to_send, Header_TM_LFR_SCIENCE_ASM_t *header );
             void spw_send_k_dump( ring_node *ring_node_to_send );
-            rtems_timer_service_routine timecode_timer_routine( rtems_id timer_id, void *user_data );
             unsigned int check_timecode_and_previous_timecode_coherency(unsigned char currentTimecodeCtr);
             unsigned int check_timecode_and_internal_time_coherency(unsigned char timecode, unsigned char internalTime);
             void timecode_irq_handler( void *pDev, void *regs, int minor, unsigned int tc );
+            rtems_timer_service_routine timecode_timer_routine( rtems_id timer_id, void *user_data );
             void (*grspw_timecode_callback) ( void *pDev, void *regs, int minor, unsigned int tc );

header/tc_handler.h +1 0

             #include "lfr_cpu_usage_report.h"
             extern unsigned int lastValidEnterModeTime;
+            extern unsigned char oneTcLfrUpdateTimeReceived;
             //****
             // ISR

src/fsw_globals.c +1 0

             unsigned char lfrCurrentMode;
             unsigned char pa_bia_status_info;
             unsigned char thisIsAnASMRestart = 0;
+            unsigned char oneTcLfrUpdateTimeReceived = 0;
             // WAVEFORMS GLOBAL VARIABLES   // 2048 * 3 * 4 + 2 * 4 = 24576 + 8 bytes = 24584
                                             //  97 * 256 = 24832 => delta = 248 bytes = 62 words

src/fsw_spacewire.c +48 -45

@@ -813,51 +813,6 void increase_unsigned_char_counter( uns
813	}	813	}
814	}	814	}
815		815
816	rtems_timer_service_routine timecode_timer_routine( rtems_id timer_id, void *user_data )
817	{
818	static unsigned char initStep = 1;
819
820	unsigned char currentTimecodeCtr;
821
822	currentTimecodeCtr = (unsigned char) (grspwPtr[0] & TIMECODE_MASK);
823
824	if (initStep == 1)
825	{
826	if (currentTimecodeCtr == previousTimecodeCtr)
827	{
828	//************************
829	// HK_LFR_TIMECODE_MISSING
830	// the timecode value has not changed, no valid timecode has been received, the timecode is MISSING
831	increase_unsigned_char_counter( &housekeeping_packet.hk_lfr_timecode_missing );
832	update_hk_lfr_last_er_fields( RID_LE_LFR_TIMEC, CODE_MISSING );
833	}
834	else if (currentTimecodeCtr == (previousTimecodeCtr+1))
835	{
836	// the timecode value has changed and the value is valid, this is unexpected because
837	// the timer should not have fired, the timecode_irq_handler should have been raised
838	}
839	else
840	{
841	//************************
842	// HK_LFR_TIMECODE_INVALID
843	// the timecode value has changed and the value is not valid, no tickout has been generated
844	// this is why the timer has fired
845	increase_unsigned_char_counter( &housekeeping_packet.hk_lfr_timecode_invalid );
846	update_hk_lfr_last_er_fields( RID_LE_LFR_TIMEC, CODE_INVALID );
847	}
848	}
849	else
850	{
851	initStep = 1;
852	//************************
853	// HK_LFR_TIMECODE_MISSING
854	increase_unsigned_char_counter( &housekeeping_packet.hk_lfr_timecode_missing );
855	update_hk_lfr_last_er_fields( RID_LE_LFR_TIMEC, CODE_MISSING );
856	}
857
858	rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_13 );
859	}
860
861	unsigned int check_timecode_and_previous_timecode_coherency(unsigned char currentTimecodeCtr)	816	unsigned int check_timecode_and_previous_timecode_coherency(unsigned char currentTimecodeCtr)
862	{	817	{
863	/** This function checks the coherency between the incoming timecode and the last valid timecode.	818	/** This function checks the coherency between the incoming timecode and the last valid timecode.
@@ -967,11 +922,14 void timecode_irq_handler( void *pDev, v
967	//********************	922	//********************
968	// HK_LFR_TIMECODE_CTR	923	// HK_LFR_TIMECODE_CTR
969	// check the value of the timecode with respect to the last TC_LFR_UPDATE_TIME => SSS-CP-FS-370	924	// check the value of the timecode with respect to the last TC_LFR_UPDATE_TIME => SSS-CP-FS-370
		925	if (oneTcLfrUpdateTimeReceived == 1)
		926	{
970	if (incomingTimecode != updateTime)	927	if ( incomingTimecode != updateTime )
971	{	928	{
972	increase_unsigned_char_counter( &housekeeping_packet.hk_lfr_time_timecode_ctr );	929	increase_unsigned_char_counter( &housekeeping_packet.hk_lfr_time_timecode_ctr );
973	update_hk_lfr_last_er_fields( RID_LE_LFR_TIME, CODE_TIMECODE_CTR );	930	update_hk_lfr_last_er_fields( RID_LE_LFR_TIME, CODE_TIMECODE_CTR );
974	}	931	}
		932	}
975		933
976	// launch the timecode timer to detect missing or invalid timecodes	934	// launch the timecode timer to detect missing or invalid timecodes
977	previousTimecodeCtr = incomingTimecode; // update the previousTimecodeCtr value	935	previousTimecodeCtr = incomingTimecode; // update the previousTimecodeCtr value
@@ -982,6 +940,51 void timecode_irq_handler( void *pDev, v
982	}	940	}
983	}	941	}
984		942
		943	rtems_timer_service_routine timecode_timer_routine( rtems_id timer_id, void *user_data )
		944	{
		945	static unsigned char initStep = 1;
		946
		947	unsigned char currentTimecodeCtr;
		948
		949	currentTimecodeCtr = (unsigned char) (grspwPtr[0] & TIMECODE_MASK);
		950
		951	if (initStep == 1)
		952	{
		953	if (currentTimecodeCtr == previousTimecodeCtr)
		954	{
		955	//************************
		956	// HK_LFR_TIMECODE_MISSING
		957	// the timecode value has not changed, no valid timecode has been received, the timecode is MISSING
		958	increase_unsigned_char_counter( &housekeeping_packet.hk_lfr_timecode_missing );
		959	update_hk_lfr_last_er_fields( RID_LE_LFR_TIMEC, CODE_MISSING );
		960	}
		961	else if (currentTimecodeCtr == (previousTimecodeCtr+1))
		962	{
		963	// the timecode value has changed and the value is valid, this is unexpected because
		964	// the timer should not have fired, the timecode_irq_handler should have been raised
		965	}
		966	else
		967	{
		968	//************************
		969	// HK_LFR_TIMECODE_INVALID
		970	// the timecode value has changed and the value is not valid, no tickout has been generated
		971	// this is why the timer has fired
		972	increase_unsigned_char_counter( &housekeeping_packet.hk_lfr_timecode_invalid );
		973	update_hk_lfr_last_er_fields( RID_LE_LFR_TIMEC, CODE_INVALID );
		974	}
		975	}
		976	else
		977	{
		978	initStep = 1;
		979	//************************
		980	// HK_LFR_TIMECODE_MISSING
		981	increase_unsigned_char_counter( &housekeeping_packet.hk_lfr_timecode_missing );
		982	update_hk_lfr_last_er_fields( RID_LE_LFR_TIMEC, CODE_MISSING );
		983	}
		984
		985	rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_13 );
		986	}
		987
985	void init_header_cwf( Header_TM_LFR_SCIENCE_CWF_t *header )	988	void init_header_cwf( Header_TM_LFR_SCIENCE_CWF_t *header )
986	{	989	{
987	header->targetLogicalAddress = CCSDS_DESTINATION_ID;	990	header->targetLogicalAddress = CCSDS_DESTINATION_ID;

src/tc_handler.c +16 -10

                 {
                     PRINTF1("OK  *** in action_enter_mode *** enter mode %d\n", requestedMode);
-                    update_last_valid_transition_date( transitionCoarseTime );
                     switch(requestedMode)
                     {
                     case LFR_MODE_STANDBY:
                 housekeeping_packet.hk_lfr_update_time_tc_cnt[0] = (unsigned char) (val >> 8);
                 housekeeping_packet.hk_lfr_update_time_tc_cnt[1] = (unsigned char) (val);
+                oneTcLfrUpdateTimeReceived = 1;
                 return LFR_SUCCESSFUL;
             }
                 if (transitionCoarseTime == 0)
                 {
                     lastValidEnterModeTime = time_management_regs->coarse_time + 1;
-                    PRINTF1("lastValidEnterModeTime = 0x%x (transitionCoarseTime = 0 => coarse_time+1)\n", transitionCoarseTime);
+                    PRINTF1("lastValidEnterModeTime = 0x%x (transitionCoarseTime = 0 => coarse_time+1)\n", lastValidEnterModeTime);
                 }
                 else
                 {
                     }
                     break;
                 case LFR_MODE_SBM1:
-                    restart_asm_activities( LFR_MODE_NORMAL ); // this is necessary to restart ASM tasks to update the parameters
+                    status = restart_asm_activities( LFR_MODE_NORMAL ); // this is necessary to restart ASM tasks to update the parameters
                     status = LFR_SUCCESSFUL;                   // lfrCurrentMode will be updated after the execution of close_action
+                    update_last_valid_transition_date( transitionCoarseTime );
                     break;
                 case LFR_MODE_SBM2:
-                    restart_asm_activities( LFR_MODE_NORMAL ); // this is necessary to restart ASM tasks to update the parameters
+                    status = restart_asm_activities( LFR_MODE_NORMAL ); // this is necessary to restart ASM tasks to update the parameters
                     status = LFR_SUCCESSFUL;                   // lfrCurrentMode will be updated after the execution of close_action
+                    update_last_valid_transition_date( transitionCoarseTime );
                     break;
                 default:
                     break;
                     }
                     break;
                 case LFR_MODE_NORMAL:                       // lfrCurrentMode will be updated after the execution of close_action
-                    restart_asm_activities( LFR_MODE_SBM1 );
+                    status = restart_asm_activities( LFR_MODE_SBM1 );
                     status = LFR_SUCCESSFUL;
+                    update_last_valid_transition_date( transitionCoarseTime );
                     break;
                 case LFR_MODE_BURST:
                     status = stop_current_mode();           // stop the current mode
                     }
                     break;
                 case LFR_MODE_SBM2:
-                    restart_asm_activities( LFR_MODE_SBM1 );
+                    status = restart_asm_activities( LFR_MODE_SBM1 );
                     status = LFR_SUCCESSFUL;                // lfrCurrentMode will be updated after the execution of close_action
+                    update_last_valid_transition_date( transitionCoarseTime );
                     break;
                 default:
                     break;
                     }
                     break;
                 case LFR_MODE_NORMAL:
-                    restart_asm_activities( LFR_MODE_SBM2 );
+                    status = restart_asm_activities( LFR_MODE_SBM2 );
                     status = LFR_SUCCESSFUL;                // lfrCurrentMode will be updated after the execution of close_action
+                    update_last_valid_transition_date( transitionCoarseTime );
                     break;
                 case LFR_MODE_BURST:
                     status = stop_current_mode();           // stop the current mode
                     }
                     break;
                 case LFR_MODE_SBM1:
-                    restart_asm_activities( LFR_MODE_SBM2 );
+                    status = restart_asm_activities( LFR_MODE_SBM2 );
                     status = LFR_SUCCESSFUL;                // lfrCurrentMode will be updated after the execution of close_action
+                    update_last_valid_transition_date( transitionCoarseTime );
                     break;
                 default:
                     break;
                 if (transitionCoarseTime == 0)
                 {
                     // instant transition means transition on the next valid date
-                    // this is mandatory to have a good snapshot period a a good correction of the snapshot period
+                    // this is mandatory to have a good snapshot period and a good correction of the snapshot period
                     waveform_picker_regs->start_date = time_management_regs->coarse_time + 1;
                 }
                 else

src/wf_handler.c +5 -2

                 static double correction    = 0.;
                 static resynchro_state state = MEASURE;
+                static unsigned int nbSnapshots = 0;
                 int correctionInt;
                 case MEASURE:
                     // ********
-                    PRINTF("MEASURE ===\n");
+                    PRINTF1("MEASURE === %d\n", nbSnapshots);
                     state = CORRECTION;
                     correction = computeCorrection( timePtr );
                     PRINTF1("MEASURE === correction = %.2f\n", correction );
                 case CORRECTION:
                     //************
-                    PRINTF("CORRECTION ===\n");
+                    PRINTF1("CORRECTION === %d\n", nbSnapshots);
                     state = MEASURE;
                     computeCorrection( timePtr );
                     correction = -correction;
                     break;
                 }
+                nbSnapshots++;
             }
             //**************

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