HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/DEV_PLE Commit - r265:09ea64972ca9

two fields added to the housekeeping parameters:...

paul -

r265:09ea64972ca9 R3a

parent child

Context file:

r265:09ea64972ca9

Collapse all files

header/fsw_spacewire.h 0 -1

             #include "fsw_init.h"
             extern spw_stats grspw_stats;
-            extern spw_stats spw_backup;
             extern rtems_name timecode_timer_name;
             extern rtems_id timecode_timer_id;

src/fsw_globals.c 0 -3

             unsigned short sequenceCounters_TM_DUMP[SEQ_CNT_NB_DEST_ID];
             unsigned short sequenceCounterHK;
             spw_stats grspw_stats;
-            spw_stats spw_backup;

src/fsw_spacewire.c +11 0

@@ -567,6 +567,17 void spacewire_set_RE( unsigned char val
567		567
568	void spacewire_read_statistics( void )	568	void spacewire_read_statistics( void )
569	{	569	{
		570	/** This function reads the SpaceWire statistics from the grspw RTEMS driver.
		571	*
		572	* @param void
		573	*
		574	* @return void
		575	*
		576	* Once they are read, the counters are stored in a global variable used during the building of the
		577	* HK packets.
		578	*
		579	*/
		580
570	rtems_status_code status;	581	rtems_status_code status;
571	spw_stats current;	582	spw_stats current;
572		583

src/processing/fsw_processing.c +19 -8

             //***********************************************************
             // Interrupt Service Routine for spectral matrices processing
-            void spectral_matrices_isr_f0( unsigned char statusReg )
+            void spectral_matrices_isr_f0( int statusReg )
             {
                 unsigned char status;
                 rtems_status_code status_code;
                 ring_node *full_ring_node;
-                status = statusReg & 0x03;   // [0011] get the status_ready_matrix_f0_x bits
+                status = (unsigned char) (statusReg & 0x03);   // [0011] get the status_ready_matrix_f0_x bits
                 switch(status)
                 {
                 }
             }
-            void spectral_matrices_isr_f1( unsigned char statusReg )
+            void spectral_matrices_isr_f1( int statusReg )
             {
                 rtems_status_code status_code;
                 unsigned char status;
                 ring_node *full_ring_node;
-                status = (statusReg & 0x0c) >> 2;   // [1100] get the status_ready_matrix_f1_x bits
+                status = (unsigned char) ((statusReg & 0x0c) >> 2);   // [1100] get the status_ready_matrix_f1_x bits
                 switch(status)
                 {
                 }
             }
-            void spectral_matrices_isr_f2( unsigned char statusReg )
+            void spectral_matrices_isr_f2( int statusReg )
             {
                 unsigned char status;
                 rtems_status_code status_code;
-                status = (statusReg & 0x30) >> 4;   // [0011 0000] get the status_ready_matrix_f2_x bits
+                status = (unsigned char) ((statusReg & 0x30) >> 4);   // [0011 0000] get the status_ready_matrix_f2_x bits
                 switch(status)
                 {
                 }
             }
-            void spectral_matrix_isr_error_handler( unsigned char statusReg )
+            void spectral_matrix_isr_error_handler( int statusReg )
             {
+                // STATUS REGISTER
+                // input_fifo_write(2) *** input_fifo_write(1) *** input_fifo_write(0)
+                //           10                    9                       8
+                // buffer_full ** bad_component_err ** f2_1 ** f2_0 ** f1_1 ** f1_0 ** f0_1 ** f0_0
+                //      7                  6             5       4       3       2       1       0
                 rtems_status_code status_code;
+                //***************************************************
+                // the ASM status register is copied in the HK packet
+                housekeeping_packet.hk_lfr_vhdl_aa_sm = (unsigned char) (statusReg & 0x7c0 >> 6);    // [0111 1100 0000]
                 if (statusReg & 0x7c0)    // [0111 1100 0000]
                 {
                     status_code = rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_8 );
                 }
                 spectral_matrix_regs->status = spectral_matrix_regs->status & 0x7c0;
             }
             rtems_isr spectral_matrices_isr( rtems_vector_number vector )
                 // buffer_full ** bad_component_err ** f2_1 ** f2_0 ** f1_1 ** f1_0 ** f0_1 ** f0_0
                 //      7                  6             5       4       3       2       1       0
-                unsigned char statusReg;
+                int statusReg;
                 static restartState state = WAIT_FOR_F2;

src/wf_handler.c +5 0

                 waveforms_isr_f3();
+                //*************************************************
+                // copy the status bits in the housekeeping packets
+                housekeeping_packet.hk_lfr_vhdl_iir_cal =
+                        (unsigned char) ((waveform_picker_regs->status & 0xff00) >> 8);
                 if ( (waveform_picker_regs->status & 0xff00) != 0x00)    // [1111 1111 0000 0000] check the error bits
                 {
                     spare_status = rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_10 );

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