HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/DEV_PLE Commit - r82:4237b1096e59

fsw-1-0...

paul -

r82:4237b1096e59 VHDLib206

parent child

Context file:

r82:4237b1096e59

Collapse all files

FSW-qt/Makefile +2 -2

             #############################################################################
             # Makefile for building: bin/fsw
-            # Generated by qmake (2.01a) (Qt 4.8.5) on: Fri Nov 15 17:09:56 2013
+            # Generated by qmake (2.01a) (Qt 4.8.5) on: Tue Nov 19 10:04:58 2013
             # Project:  fsw-qt.pro
             # Template: app
             # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile fsw-qt.pro
             CC            = sparc-rtems-gcc
             CXX           = sparc-rtems-g++
-            DEFINES       = -DSW_VERSION_N1=0 -DSW_VERSION_N2=0 -DSW_VERSION_N3=1 -DSW_VERSION_N4=0 -DPRINT_MESSAGES_ON_CONSOLE
+            DEFINES       = -DSW_VERSION_N1=1 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=0 -DPRINT_MESSAGES_ON_CONSOLE
             CFLAGS        = -pipe -O3 -Wall $(DEFINES)
             CXXFLAGS      = -pipe -O3 -Wall $(DEFINES)
             INCPATH       = -I/usr/lib64/qt4/mkspecs/linux-g++ -I. -I../src -I../header

FSW-qt/bin/Makefile +2 -2

             SREC_PREFIX = RpwLfrApp
-            SREC_COUNTER = 0001
+            SREC_COUNTER = 0002
-            SREC_FSW_REF = fsw-0-7
+            SREC_FSW_REF = fsw-1-0
             SREC_SUFFIX = .srec
             SREC_TEXT = $(SREC_PREFIX)_$(SREC_COUNTER)_text_$(SREC_FSW_REF)$(SREC_SUFFIX)
             SREC_DATA = $(SREC_PREFIX)_$(SREC_COUNTER)_data_$(SREC_FSW_REF)$(SREC_SUFFIX)

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

             # flight software version
             SWVERSION=-1-0
-            DEFINES += SW_VERSION_N1=0
+            DEFINES += SW_VERSION_N1=1 # major
-            DEFINES += SW_VERSION_N2=0
+            DEFINES += SW_VERSION_N2=0 # minor
-            DEFINES += SW_VERSION_N3=1
+            DEFINES += SW_VERSION_N3=0 # patch
-            DEFINES += SW_VERSION_N4=0
+            DEFINES += SW_VERSION_N4=0 # internal
             contains( CONFIG, verbose ) {
                 DEFINES += PRINT_MESSAGES_ON_CONSOLE

FSW-qt/fsw-qt.pro.user +2 -2

             <?xml version="1.0" encoding="UTF-8"?>
             <!DOCTYPE QtCreatorProject>
-            <!-- Written by QtCreator 2.8.1, 2013-11-15T17:08:10. -->
+            <!-- Written by QtCreator 2.8.1, 2013-11-19T10:04:48. -->
             <qtcreator>
              <data>
               <variable>ProjectExplorer.Project.ActiveTarget</variable>
                  <value type="int">13</value>
                  <value type="int">14</value>
                 </valuelist>
-                <value type="int" key="PE.EnvironmentAspect.Base">-1</value>
+                <value type="int" key="PE.EnvironmentAspect.Base">2</value>
                 <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
                 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">fsw-qt</value>
                 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>

header/fsw_init.h +5 0

             #include "fsw_spacewire.h"
+            extern rtems_name  Task_name[20];       /* array of task names */
+            extern rtems_id    Task_id[20];         /* array of task ids */
             // RTEMS TASKS
             rtems_task Init( rtems_task_argument argument);
             int start_all_tasks( void );
             //
             rtems_status_code create_message_queues( void );
+            rtems_status_code get_message_queue_id_send( rtems_id *queue_id );
+            rtems_status_code get_message_queue_id_recv( rtems_id *queue_id );
             //
             int start_recv_send_tasks( void );
             //

header/tc_handler.h +3 0

             void update_last_TC_rej(ccsdsTelecommandPacket_t *TC, unsigned char *time);
             void close_action(ccsdsTelecommandPacket_t *TC, int result, rtems_id queue_id, unsigned char *time);
+            extern rtems_status_code get_message_queue_id_send( rtems_id *queue_id );
+            extern rtems_status_code get_message_queue_id_recv( rtems_id *queue_id );
             #endif // TC_HANDLER_H_INCLUDED

header/wf_handler.h 0 -2

             extern unsigned short sequenceCounters_SCIENCE_NORMAL_BURST;
             extern unsigned short sequenceCounters_SCIENCE_SBM1_SBM2;
-            extern rtems_name  misc_name[5];
-            extern rtems_name  Task_name[20];       /* array of task ids */
             extern rtems_id    Task_id[20];         /* array of task ids */
             extern unsigned char lfrCurrentMode;

src/fsw_init.c +24 0

@@ -584,3 +584,27 rtems_status_code create_message_queues(
584		584
585	return ret;	585	return ret;
586	}	586	}
		587
		588	rtems_status_code get_message_queue_id_send( rtems_id *queue_id )
		589	{
		590	rtems_status_code status;
		591	rtems_name queue_name;
		592
		593	queue_name = rtems_build_name( 'Q', '_', 'S', 'D' );
		594
		595	status = rtems_message_queue_ident( queue_name, 0, queue_id );
		596
		597	return status;
		598	}
		599
		600	rtems_status_code get_message_queue_id_recv( rtems_id *queue_id )
		601	{
		602	rtems_status_code status;
		603	rtems_name queue_name;
		604
		605	queue_name = rtems_build_name( 'Q', '_', 'R', 'V' );
		606
		607	status = rtems_message_queue_ident( queue_name, 0, queue_id );
		608
		609	return status;
		610	}

src/fsw_misc.c +3 -3

                 rtems_status_code status;
                 rtems_id queue_id;
-                status =  rtems_message_queue_ident( misc_name[QUEUE_SEND], 0, &queue_id );
+                status =  get_message_queue_id_send( &queue_id );
                 if (status != RTEMS_SUCCESSFUL)
                 {
-                    PRINTF1("in HOUS *** ERR %d\n", status)
+                    PRINTF1("in HOUS *** ERR get_message_queue_id_send %d\n", status)
                 }
                 BOOT_PRINTF("in HOUS ***\n")
                 housekeeping_packet.serviceType = TM_TYPE_HK;
                 housekeeping_packet.serviceSubType = TM_SUBTYPE_HK;
                 housekeeping_packet.destinationID = TM_DESTINATION_ID_GROUND;
+                housekeeping_packet.sid = SID_HK;
                 status = rtems_rate_monotonic_cancel(HK_id);
                 if( status != RTEMS_SUCCESSFUL ) {
                         housekeeping_packet.time[3] = (unsigned char) (time_management_regs->coarse_time);
                         housekeeping_packet.time[4] = (unsigned char) (time_management_regs->fine_time>>8);
                         housekeeping_packet.time[5] = (unsigned char) (time_management_regs->fine_time);
-                        housekeeping_packet.sid = SID_HK;
                         spacewire_update_statistics();

src/fsw_processing.c +2 -2

                 init_header_asm( &headerASM );
-                status =  rtems_message_queue_ident( misc_name[QUEUE_SEND], 0, &queue_id );
+                status =  get_message_queue_id_send( &queue_id );
                 if (status != RTEMS_SUCCESSFUL)
                 {
-                    PRINTF1("in MATR *** ERR getting queue id, %d\n", status)
+                    PRINTF1("in MATR *** ERR get_message_queue_id_send %d\n", status)
                 }
                 BOOT_PRINTF("in MATR *** \n")

src/fsw_spacewire.c +6 -24

                 initLookUpTableForCRC(); // the table is used to compute Cyclic Redundancy Codes
-                status =  rtems_message_queue_ident( misc_name[QUEUE_RECV], 0, &queue_recv_id );
+                status =  get_message_queue_id_recv( &queue_recv_id );
                 if (status != RTEMS_SUCCESSFUL)
                 {
-                    PRINTF1("in RECV *** ERR getting QUEUE_RECV id, %d\n", status)
+                    PRINTF1("in RECV *** ERR get_message_queue_id_recv %d\n", status)
                 }
-                status =  rtems_message_queue_ident( misc_name[QUEUE_SEND], 0, &queue_send_id );
+                status =  get_message_queue_id_send( &queue_send_id );
                 if (status != RTEMS_SUCCESSFUL)
                 {
-                    PRINTF1("in RECV *** ERR getting QUEUE_SEND id, %d\n", status)
+                    PRINTF1("in RECV *** ERR get_message_queue_id_send %d\n", status)
                 }
                 BOOT_PRINTF("in RECV *** \n")
                 u_int32_t count;
                 rtems_id queue_id;
-                status =  rtems_message_queue_ident( misc_name[QUEUE_SEND], 0, &queue_id );
+                status =  get_message_queue_id_send( &queue_id );
                 if (status != RTEMS_SUCCESSFUL)
                 {
-                    PRINTF1("in SEND *** ERR getting queue id, %d\n", status)
+                    PRINTF1("in HOUS *** ERR get_message_queue_id_send %d\n", status)
                 }
                 BOOT_PRINTF("in SEND *** \n")
                     status = RTEMS_SUCCESSFUL;
                 }
             }
-            rtems_status_code rtems_message_queue_send_lfr( rtems_id id, const void *buffer, size_t size )
-                rtems_status_code status;
-                rtems_mode previous_mode_set;
-                // set the preemption OFF
-                status =  rtems_task_mode( RTEMS_NO_PREEMPT, RTEMS_PREEMPT_MASK, &previous_mode_set );
-                // use the message queue
-                status = rtems_message_queue_send_lfr( id, buffer, size );
-                // set the preemption ON
-                status =  rtems_task_mode( RTEMS_PREEMPT , RTEMS_PREEMPT_MASK, &previous_mode_set );
-                return status;

src/tc_handler.c +4 -4

                 rtems_id queue_rcv_id;
                 rtems_id queue_snd_id;
-                status =  rtems_message_queue_ident( misc_name[QUEUE_RECV], 0, &queue_rcv_id );
+                status =  get_message_queue_id_recv( &queue_rcv_id );
                 if (status != RTEMS_SUCCESSFUL)
                 {
-                    PRINTF1("in ACTN *** ERR getting queue_rcv_id %d\n", status)
+                    PRINTF1("in ACTN *** ERR get_message_queue_id_recv %d\n", status)
                 }
-                status =  rtems_message_queue_ident( misc_name[QUEUE_SEND], 0, &queue_snd_id );
+                status =  get_message_queue_id_send( &queue_snd_id );
                 if (status != RTEMS_SUCCESSFUL)
                 {
-                    PRINTF1("in ACTN *** ERR getting queue_snd_id %d\n", status)
+                    PRINTF1("in ACTN *** ERR get_message_queue_id_send %d\n", status)
                 }
                 result = LFR_SUCCESSFUL;

src/wf_handler.c +24 -20

                 rtems_event_set event_out;
                 rtems_id queue_id;
+                rtems_status_code status;
                 init_header_snapshot_wf_table( SID_NORM_SWF_F0, headerSWF_F0 );
                 init_header_snapshot_wf_table( SID_NORM_SWF_F1, headerSWF_F1 );
                 init_waveforms();
-                queue_id = get_pkts_queue_id();
+                status =  get_message_queue_id_send( &queue_id );
+                if (status != RTEMS_SUCCESSFUL)
+                {
+                    PRINTF1("in WFRM *** ERR get_message_queue_id_send %d\n", status)
+                }
                 BOOT_PRINTF("in WFRM ***\n")
                 rtems_event_set event_out;
                 rtems_id queue_id;
+                rtems_status_code status;
                 init_header_continuous_wf_table( SID_NORM_CWF_F3, headerCWF_F3 );
                 init_header_continuous_wf3_light_table( headerCWF_F3_light );
-                queue_id = get_pkts_queue_id();
+                status =  get_message_queue_id_send( &queue_id );
+                if (status != RTEMS_SUCCESSFUL)
+                {
+                    PRINTF1("in CWF3 *** ERR get_message_queue_id_send %d\n", status)
+                }
                 BOOT_PRINTF("in CWF3 ***\n")
                 rtems_event_set event_out;
                 rtems_id queue_id;
+                rtems_status_code status;
                 init_header_continuous_wf_table( SID_BURST_CWF_F2, headerCWF_F2_BURST );
                 init_header_continuous_wf_table( SID_SBM2_CWF_F2, headerCWF_F2_SBM2 );
-                queue_id = get_pkts_queue_id();
+                status =  get_message_queue_id_send( &queue_id );
+                if (status != RTEMS_SUCCESSFUL)
+                {
+                    PRINTF1("in CWF2 *** ERR get_message_queue_id_send %d\n", status)
+                }
                 BOOT_PRINTF("in CWF2 ***\n")
                 rtems_event_set event_out;
                 rtems_id queue_id;
+                rtems_status_code status;
                 init_header_continuous_wf_table( SID_SBM1_CWF_F1, headerCWF_F1 );
-                queue_id = get_pkts_queue_id();
+                status =  get_message_queue_id_send( &queue_id );
+                if (status != RTEMS_SUCCESSFUL)
+                {
+                    PRINTF1("in CWF1 *** ERR get_message_queue_id_send %d\n", status)
+                }
                 BOOT_PRINTF("in CWF1 ***\n")
                 param_local.local_sbm2_nb_cwf_sent = 0;
             }
-            rtems_id get_pkts_queue_id( void )
-                rtems_id queue_id;
-                rtems_status_code status;
-                rtems_name queue_send_name;
-                queue_send_name = rtems_build_name( 'Q', '_', 'S', 'D' );
-                status =  rtems_message_queue_ident( queue_send_name, 0, &queue_id );
-                if (status != RTEMS_SUCCESSFUL)
-                    PRINTF1("in get_pkts_queue_id *** ERR %d\n", status)
-                return queue_id;
             void increment_seq_counter_source_id( unsigned char *packet_sequence_control, unsigned int sid )
             {
                 unsigned short *sequence_cnt;

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