HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r385:bd1252670981

Removed all remaining unused macros and fixed bug...

jeandet -

parent child

Context file:

r385:bd1252670981

.hgsubstate +1 -1

@@ -1,2 +1,2
1	3081d1f9bb20b2b64a192585337a292a9804e0c5 LFR_basic-parameters	1	3081d1f9bb20b2b64a192585337a292a9804e0c5 LFR_basic-parameters
2	0adeb6c86feb96a126ce48641604949b87c70481 header/lfr_common_headers	2	042275d1388a0f360073a0d85bf50d128f4b8cfc header/lfr_common_headers

src/CMakeLists.txt +4 -1

             set(SW_VERSION_N1 "3" CACHE STRING  "Choose N1 FSW Version." FORCE)
             set(SW_VERSION_N2 "2" CACHE STRING  "Choose N2 FSW Version." FORCE)
             set(SW_VERSION_N3 "0" CACHE STRING  "Choose N3 FSW Version." FORCE)
-            set(SW_VERSION_N4 "19" CACHE STRING  "Choose N4 FSW Version." FORCE)
+            set(SW_VERSION_N4 "20" CACHE STRING  "Choose N4 FSW Version." FORCE)
             if(FSW_verbose)
             	add_definitions(-DPRINT_MESSAGES_ON_CONSOLE)
             	add_definitions(-DDEBUG_TCH)
             endif()
             add_definitions(-DMSB_FIRST_TCH)
             add_definitions(-DSWVERSION=-1-0)
             add_definitions(-DSW_VERSION_N3=${SW_VERSION_N3})
             add_definitions(-DSW_VERSION_N4=${SW_VERSION_N4})
             add_executable(fsw ${SOURCES})
             if(fix-b2bst)

src/fsw_globals.c +3 -3

             #include "fsw_params.h"
             #include "fsw_params_wf_handler.h"
-            #define NB_OF_TASKS 20
             #define NB_OF_MISC_NAMES 5
             // RTEMS GLOBAL VARIABLES
             rtems_name  misc_name[NB_OF_MISC_NAMES] = {0};
-            rtems_name  Task_name[NB_OF_TASKS]      = {0};     /* array of task names */
+            rtems_name  Task_name[CONFIGURE_MAXIMUM_TASKS-1]      = {0};     /* array of task names */
-            rtems_id    Task_id[NB_OF_TASKS]        = {0};         /* array of task ids */
+            rtems_id    Task_id[CONFIGURE_MAXIMUM_TASKS-1]        = {0};         /* array of task ids */
             rtems_name timecode_timer_name          = 0;
             rtems_id timecode_timer_id              = RTEMS_ID_NONE;
             rtems_name name_hk_rate_monotonic       = 0;            // name of the HK rate monotonic

src/fsw_init.c +21 -19

             /* configuration information */
-            #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+            #include <fsw_params.h>
-            #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
-            #define CONFIGURE_MAXIMUM_TASKS 23 // number of tasks concurrently active including INIT
-            #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-            #define CONFIGURE_EXTRA_TASK_STACKS (3 * RTEMS_MINIMUM_STACK_SIZE)
-            #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 32
-            #define CONFIGURE_INIT_TASK_PRIORITY 1 // instead of 100
-            #define CONFIGURE_INIT_TASK_MODE (RTEMS_DEFAULT_MODES | RTEMS_NO_PREEMPT)
-            #define CONFIGURE_INIT_TASK_ATTRIBUTES (RTEMS_DEFAULT_ATTRIBUTES | RTEMS_FLOATING_POINT)
-            #define CONFIGURE_MAXIMUM_DRIVERS 16
-            #define CONFIGURE_MAXIMUM_PERIODS 6 // [hous] [load] [avgv]
-            #define CONFIGURE_MAXIMUM_TIMERS 6 // [spiq] [link] [spacewire_reset_link]
-            #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 5
-            #ifdef PRINT_STACK_REPORT
-                #define CONFIGURE_STACK_CHECKER_ENABLED
-            #endif
             #include <rtems/confdefs.h>
                 #endif
                 #define CONFIGURE_DRIVER_AMBAPP_GAISLER_GRSPW   /* GRSPW Driver */
                 #include <drvmgr/drvmgr_confdefs.h>
             #endif
                 return status;
             }
-            rtems_status_code create_message_queues( void ) // create the two message queues used in the software
+            rtems_status_code create_message_queues( void ) // create the five message queues used in the software
             {
                 rtems_status_code status_recv;
                 rtems_status_code status_send;
                 return status;
             }
+            /**
+             * @brief update_queue_max_count returns max(fifo_size_max, pending_messages + 1)
+             * @param queue_id
+             * @param fifo_size_max
+             */
             void update_queue_max_count( rtems_id queue_id, unsigned char*fifo_size_max )
             {
                 u_int32_t count;
                 }
             }
+            /**
+             * @brief init_ring initializes given ring buffer
+             * @param ring array of nodes to initialize
+             * @param nbNodes number of node in the ring buffer
+             * @param buffer memory space given to the ring buffer
+             * @param bufferSize size of the whole ring buffer memory space
+             *
+             * @details This function creates a circular buffer from a given number of nodes and a given memory space. It first sets all nodes attributes to thier defaults values
+             * and associates a portion of the given memory space with each node. Then it connects each nodes to build a circular buffer.
+             *
+             * Each node capacity will be bufferSize/nbNodes.
+             *
+             * https://en.wikipedia.org/wiki/Circular_buffer
+             */
             void init_ring(ring_node ring[], unsigned char nbNodes, volatile int buffer[], unsigned int bufferSize )
             {
                 unsigned char i;

src/fsw_spacewire.c +10 -35

@@ -285,7 +285,7 rtems_task send_task( rtems_task_argumen
285	{	285	{
286	spw_send_waveform_SWF( incomingRingNodePtr, &headerSWF );	286	spw_send_waveform_SWF( incomingRingNodePtr, &headerSWF );
287	}	287	}
288	else if ( (sid==SID_NORM_CWF_F3) )	288	else if (sid==SID_NORM_CWF_F3)
289	{	289	{
290	spw_send_waveform_CWF3_light( incomingRingNodePtr, &headerCWF );	290	spw_send_waveform_CWF3_light( incomingRingNodePtr, &headerCWF );
291	}	291	}
@@ -620,23 +620,6 void spacewire_read_statistics( void )
620	// clear the counters	620	// clear the counters
621	status = ioctl( fdSPW, SPACEWIRE_IOCTRL_CLR_STATISTICS );	621	status = ioctl( fdSPW, SPACEWIRE_IOCTRL_CLR_STATISTICS );
622		622
623	// typedef struct {
624	// unsigned int tx_link_err; // NOT IN HK
625	// unsigned int rx_rmap_header_crc_err; // NOT IN HK
626	// unsigned int rx_rmap_data_crc_err; // NOT IN HK
627	// unsigned int rx_eep_err;
628	// unsigned int rx_truncated;
629	// unsigned int parity_err;
630	// unsigned int escape_err;
631	// unsigned int credit_err;
632	// unsigned int write_sync_err;
633	// unsigned int disconnect_err;
634	// unsigned int early_ep;
635	// unsigned int invalid_address;
636	// unsigned int packets_sent;
637	// unsigned int packets_received;
638	// } spw_stats;
639
640	// rx_eep_err	623	// rx_eep_err
641	grspw_stats.rx_eep_err = grspw_stats.rx_eep_err + current.rx_eep_err;	624	grspw_stats.rx_eep_err = grspw_stats.rx_eep_err + current.rx_eep_err;
642	// rx_truncated	625	// rx_truncated
@@ -685,23 +668,6 void spacewire_get_last_error( void )
685	coarseTime = time_management_regs->coarse_time;	668	coarseTime = time_management_regs->coarse_time;
686	fineTime = time_management_regs->fine_time;	669	fineTime = time_management_regs->fine_time;
687		670
688	// typedef struct {
689	// unsigned int tx_link_err; // NOT IN HK
690	// unsigned int rx_rmap_header_crc_err; // NOT IN HK
691	// unsigned int rx_rmap_data_crc_err; // NOT IN HK
692	// unsigned int rx_eep_err;
693	// unsigned int rx_truncated;
694	// unsigned int parity_err;
695	// unsigned int escape_err;
696	// unsigned int credit_err;
697	// unsigned int write_sync_err;
698	// unsigned int disconnect_err;
699	// unsigned int early_ep;
700	// unsigned int invalid_address;
701	// unsigned int packets_sent;
702	// unsigned int packets_received;
703	// } spw_stats;
704
705	// tx_link_err *** no code associated to this field	671	// tx_link_err *** no code associated to this field
706	// rx_rmap_header_crc_err * LE * in HK	672	// rx_rmap_header_crc_err * LE * in HK
707	if (previous.rx_rmap_header_crc_err != current.rx_rmap_header_crc_err)	673	if (previous.rx_rmap_header_crc_err != current.rx_rmap_header_crc_err)
@@ -1539,6 +1505,11 void spw_send_asm_f1( ring_node *ring_no
1539	}	1505	}
1540	}	1506	}
1541		1507
		1508	/**
		1509	* @brief spw_send_asm_f2 Sends an ASM packet at F2 over spacewire
		1510	* @param ring_node_to_send node pointing to the actual buffer to send
		1511	* @param header
		1512	*/
1542	void spw_send_asm_f2( ring_node *ring_node_to_send,	1513	void spw_send_asm_f2( ring_node *ring_node_to_send,
1543	Header_TM_LFR_SCIENCE_ASM_t *header )	1514	Header_TM_LFR_SCIENCE_ASM_t *header )
1544	{	1515	{
@@ -1606,6 +1577,10 void spw_send_asm_f2( ring_node *ring_no
1606	}	1577	}
1607	}	1578	}
1608		1579
		1580	/**
		1581	* @brief spw_send_k_dump Sends k coefficients dump packet over spacewire
		1582	* @param ring_node_to_send node pointing to the actual buffer to send
		1583	*/
1609	void spw_send_k_dump( ring_node *ring_node_to_send )	1584	void spw_send_k_dump( ring_node *ring_node_to_send )
1610	{	1585	{
1611	rtems_status_code status;	1586	rtems_status_code status;

src/tc_load_dump_parameters.c 0 -4

                 {
                     kcoefficients_dump_1.kcoeff_blks[ (freq*KCOEFF_BLK_SIZE) + 1] = freq;
                     bin = freq;
-            //        printKCoefficients( freq, bin, k_coeff_intercalib_f0_norm);
                     for ( coeff=0; coeff<NB_K_COEFF_PER_BIN; coeff++ )
                     {
                         kCoeffDumpPtr = (unsigned char*) &kcoefficients_dump_1.kcoeff_blks[
                 {
                     kcoefficients_dump_1.kcoeff_blks[ (freq*KCOEFF_BLK_SIZE) + 1 ] = freq;
                     bin = freq - NB_BINS_COMPRESSED_SM_F0;
-            //        printKCoefficients( freq, bin, k_coeff_intercalib_f1_norm);
                     for ( coeff=0; coeff<NB_K_COEFF_PER_BIN; coeff++ )
                     {
                         kCoeffDumpPtr = (unsigned char*) &kcoefficients_dump_1.kcoeff_blks[
                 {
                     kcoefficients_dump_1.kcoeff_blks[ (freq * KCOEFF_BLK_SIZE) + 1 ] = freq;
                     bin = freq - (NB_BINS_COMPRESSED_SM_F0 + NB_BINS_COMPRESSED_SM_F1);
-            //        printKCoefficients( freq, bin, k_coeff_intercalib_f2);
                     for ( coeff = 0; coeff <NB_K_COEFF_PER_BIN; coeff++ )
                     {
                         kCoeffDumpPtr = (unsigned char*) &kcoefficients_dump_1.kcoeff_blks[
                 {
                     kcoefficients_dump_2.kcoeff_blks[ (freq*KCOEFF_BLK_SIZE) + 1 ] = KCOEFF_BLK_NR_PKT1 + freq;
                     bin = freq + KCOEFF_BLK_NR_PKT2;
-            //        printKCoefficients( freq, bin, k_coeff_intercalib_f2);
                     for ( coeff=0; coeff<NB_K_COEFF_PER_BIN; coeff++ )
                     {
                         kCoeffDumpPtr = (unsigned char*) &kcoefficients_dump_2.kcoeff_blks[

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