HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r279:42c0a3b87048

modifications following :...

paul -

r279:42c0a3b87048 R3a

parent child

Context file:

r279:42c0a3b87048

.hgsubstate +1 -1

@@ -1,2 +1,2
1	3081d1f9bb20b2b64a192585337a292a9804e0c5 LFR_basic-parameters	1	3081d1f9bb20b2b64a192585337a292a9804e0c5 LFR_basic-parameters
2	449d1ebc41af2e62571508883dab8043a33f16df header/lfr_common_headers	2	1f3d7ce688e982a378d739596c8e3f8972f40b9d header/lfr_common_headers

header/fsw_spacewire.h +1 0

             void spacewire_get_last_error( void );
             void update_hk_lfr_last_er_fields(unsigned int rid, unsigned char code);
             void update_hk_with_grspw_stats(void );
+            void spacewire_update_hk_lfr_link_state( unsigned char *hk_lfr_status_word_0 );
             void increase_unsigned_char_counter( unsigned char *counter );
             void init_header_cwf( Header_TM_LFR_SCIENCE_CWF_t *header );

src/fsw_misc.c +6 -1

                 status = rtems_rate_monotonic_cancel(HK_id);
                 DEBUG_PRINTF1("startup HK, HK_id status = %d\n", period_status.state)
-                set_hk_lfr_reset_cause( POWER_ON );
+                set_hk_lfr_reset_cause( UNKNOWN_CAUSE );
                 while(1){ // launch the rate monotonic task
                     status = rtems_rate_monotonic_period( HK_id, HK_PERIOD );
                         housekeeping_packet.time[4] = (unsigned char) (time_management_regs->fine_time>>8);
                         housekeeping_packet.time[5] = (unsigned char) (time_management_regs->fine_time);
+                        spacewire_update_hk_lfr_link_state( &housekeeping_packet.lfr_status_word[0] );
                         spacewire_read_statistics();
                         update_hk_with_grspw_stats();
             void set_hk_lfr_reset_cause( enum lfr_reset_cause_t lfr_reset_cause )
             {
+                housekeeping_packet.lfr_status_word[1] = housekeeping_packet.lfr_status_word[1] & 0xf8; // [1111 1000]
                 housekeeping_packet.lfr_status_word[1] = housekeeping_packet.lfr_status_word[1]
                         | (lfr_reset_cause & 0x07 );   // [0000 0111]
             }
             void hk_lfr_le_me_he_update()

src/fsw_spacewire.c +13 0

@@ -800,6 +800,19 void update_hk_with_grspw_stats( void )
800	housekeeping_packet.hk_lfr_dpu_spw_rx_too_big = (unsigned char) grspw_stats.rx_truncated;	800	housekeeping_packet.hk_lfr_dpu_spw_rx_too_big = (unsigned char) grspw_stats.rx_truncated;
801	}	801	}
802		802
		803	void spacewire_update_hk_lfr_link_state( unsigned char *hk_lfr_status_word_0 )
		804	{
		805	unsigned int *statusRegisterPtr;
		806	unsigned char linkState;
		807
		808	statusRegisterPtr = (unsigned int *) (REGS_ADDR_GRSPW + APB_OFFSET_GRSPW_STATUS_REGISTER);
		809	linkState = (unsigned char) ( ( (*statusRegisterPtr) >> 21) & 0x07); // [0000 0111]
		810
		811	hk_lfr_status_word_0 = hk_lfr_status_word_0 & 0xf8; // [1111 1000] set link state to 0
		812
		813	hk_lfr_status_word_0 = hk_lfr_status_word_0 \| linkState; // update hk_lfr_dpu_spw_link_state
		814	}
		815
803	void increase_unsigned_char_counter( unsigned char *counter )	816	void increase_unsigned_char_counter( unsigned char *counter )
804	{	817	{
805	// update the number of valid timecodes that have been received	818	// update the number of valid timecodes that have been received

General Comments 0

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

No TODOs yet

	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