HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r51:b0e1ec810ca1

fsw-0-20...

paul -

r51:b0e1ec810ca1 default

parent child

Context file:

r51:b0e1ec810ca1

Collapse all files

FSW-qt/Makefile +2 -2

             #############################################################################
             # Makefile for building: bin/fsw
-            # Generated by qmake (2.01a) (Qt 4.8.5) on: Sun Oct 27 15:33:40 2013
+            # Generated by qmake (2.01a) (Qt 4.8.5) on: Mon Nov 4 07:05:32 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=0 -DSW_VERSION_N4=19 -DPRINT_MESSAGES_ON_CONSOLE
+            DEFINES       = -DSW_VERSION_N1=0 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=20 -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/fsw binary modified 0 0

NO CONTENT: modified file, binary diff hidden

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

             include(./sparc.pri)
             # flight software version
-            SWVERSION=-0-19
+            SWVERSION=-0-20
             DEFINES += SW_VERSION_N1=0
             DEFINES += SW_VERSION_N2=0
             DEFINES += SW_VERSION_N3=0
-            DEFINES += SW_VERSION_N4=19
+            DEFINES += SW_VERSION_N4=20
             contains( CONFIG, verbose ) {
                 DEFINES += PRINT_MESSAGES_ON_CONSOLE

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

             <?xml version="1.0" encoding="UTF-8"?>
             <!DOCTYPE QtCreatorProject>
-            <!-- Written by QtCreator 2.8.0, 2013-10-27T14:25:30. -->
+            <!-- Written by QtCreator 2.8.0, 2013-11-04T07:04:49. -->
             <qtcreator>
              <data>
               <variable>ProjectExplorer.Project.ActiveTarget</variable>

header/ccsds_types.h +6 -4

             // FAILURE CODES
             #define ILLEGAL_APID        0
-            #define WRONG_LEN_PACKET    1
+            #define WRONG_LEN_PKT       1
             #define INCOR_CHECKSUM      2
             #define ILL_TYPE            3
             #define ILL_SUBTYPE         4
-            #define WRONG_APP_DATA      5           // 0x00 0x05
+            #define WRONG_APP_DATA      5       // 0x00 0x05
-            //
-            #define CCSDS_TM_VALID      7
             #define TC_NOT_EXE          42000   // 0xa4 0x10
+            #define WRONG_SRC_ID        42001   // 0xa4 0x11
             #define FUNCT_NOT_IMPL      42002   // 0xa4 0x12
             #define FAIL_DETECTED       42003   // 0xa4 0x13
+            #define NOT_ALLOWED         42004   // 0xa4 0x14
             #define CORRUPTED           42005   // 0xa4 0x15
+            #define CCSDS_TM_VALID      7
+            // TC SID
             #define SID_TC_DEFAULT      0       // the default SID for TC sent to the LFR
             #define SID_TC_GROUND       0
             #define SID_TC_MISSION_TIMELINE         110

header/grlib_regs.h +19 0

@@ -61,6 +61,25 struct waveform_picker_regs_str{
61	};	61	};
62	typedef struct waveform_picker_regs_str waveform_picker_regs_t;	62	typedef struct waveform_picker_regs_str waveform_picker_regs_t;
63		63
		64	struct waveform_picker_regs_str_alt{
		65	volatile int data_shaping; // 0x00 00 *** R1 R0 SP1 SP0 BW
		66	volatile int run_burst_enable; // 0x04 01 * [run * burst f2, f1, f0 *** enable f3, f2, f1, f0 ]
		67	volatile int addr_data_f0; // 0x08
		68	volatile int addr_data_f1; // 0x0c
		69	volatile int addr_data_f2; // 0x10
		70	volatile int addr_data_f3; // 0x14
		71	volatile int status; // 0x18
		72	volatile int delta_snapshot; // 0x1c
		73	volatile int delta_f0; // 0x20
		74	volatile int delta_f0_2;
		75	volatile int delta_f1;
		76	volatile int delta_f2;
		77	volatile int nb_data_by_buffer;
		78	volatile int snapshot_param;
		79	volatile int start_date;
		80	};
		81	typedef struct waveform_picker_regs_str_alt waveform_picker_regs_t_alt;
		82
64	struct spectral_matrix_regs_str{	83	struct spectral_matrix_regs_str{
65	volatile int config;	84	volatile int config;
66	volatile int status;	85	volatile int status;

header/wf_handler.h +1 0

             extern volatile int wf_cont_f3_bis[ ];
             extern char wf_cont_f3_light[ ];
             extern waveform_picker_regs_t *waveform_picker_regs;
+            extern waveform_picker_regs_t_alt *waveform_picker_regs_alt;
             extern time_management_regs_t *time_management_regs;
             extern Packet_TM_LFR_HK_t housekeeping_packet;
             extern Packet_TM_LFR_PARAMETER_DUMP_t parameter_dump_packet;

src/fsw_globals.c +1 0

             #ifdef GSA
             #else
                 waveform_picker_regs_t *waveform_picker_regs = (waveform_picker_regs_t*) REGS_ADDR_WAVEFORM_PICKER;
+                waveform_picker_regs_t_alt *waveform_picker_regs_alt = (waveform_picker_regs_t_alt*) REGS_ADDR_WAVEFORM_PICKER;
             #endif
             spectral_matrix_regs_t *spectral_matrix_regs = (spectral_matrix_regs_t*) REGS_ADDR_SPECTRAL_MATRIX;

src/fsw_init.c 0 -6

                     PRINTF1("in INIT *** in suspend_science_tasks *** ERR code: %d\n", status)
                 }
-                status = stop_current_mode();       // go in STANDBY mode
-                if (status != RTEMS_SUCCESSFUL)
-                    PRINTF1("in INIT *** ERR in stop_current_mode, code %d", status)
             #ifdef GSA
                 // mask IRQ lines
                 LEON_Mask_interrupt( IRQ_SM );

src/fsw_misc.c 0 -1

                 housekeeping_packet.lfr_sw_version[2] = SW_VERSION_N3;
                 housekeeping_packet.lfr_sw_version[3] = SW_VERSION_N4;
-                updateLFRCurrentMode();
             }

src/fsw_spacewire.c +18 -6

                     rtems_event_receive(SPW_LINKERR_EVENT, RTEMS_WAIT, RTEMS_NO_TIMEOUT, &event_out); // wait for an SPW_LINKERR_EVENT
                     PRINTF("in SPIQ *** got SPW_LINKERR_EVENT\n")
-                    // [0] SUSPEND RECV ADN SEND TASKS
+                    // [0] SUSPEND RECV AND SEND TASKS
                     rtems_task_suspend( Task_id[ TASKID_RECV ] );
                     rtems_task_suspend( Task_id[ TASKID_SEND ] );
                     }
                     else                                // [3.b] the link is not in run state, go in STANDBY mode
                     {
-                        status = enter_mode( LFR_MODE_STANDBY, NULL ); // enter the STANDBY mode
+                        status = stop_current_mode();
                         if ( status != RTEMS_SUCCESSFUL ) {
-                            PRINTF1("in SPIQ *** ERR enter_mode *** code %d\n", status)
+                            PRINTF1("in SPIQ *** ERR stop_current_mode *** code %d\n", status)
+                        }
+                        status = enter_standby_mode();
+                        if ( status != RTEMS_SUCCESSFUL ) {
+                            PRINTF1("in SPIQ *** ERR enter_standby_mode *** code %d\n", status)
                         }
                         // wake the WTDG task up to wait for the link recovery
                         status =  rtems_event_send ( Task_id[TASKID_WTDG], RTEMS_EVENT_0 );
                             currentTC_LEN_RCV[ 1 ] = (unsigned char) (currentTC_LEN_RCV_AsUnsignedInt     );
                             // CHECK THE TC
                             parserCode = tc_parser( &currentTC, currentTC_LEN_RCV_AsUnsignedInt, computed_CRC ) ;
-                            if ( (parserCode == ILLEGAL_APID) || (parserCode == WRONG_LEN_PACKET) || (parserCode == INCOR_CHECKSUM)
+                            if ( (parserCode == ILLEGAL_APID)       || (parserCode == WRONG_LEN_PKT)
-                                | (parserCode == ILL_TYPE) || (parserCode == ILL_SUBTYPE) || (parserCode == WRONG_APP_DATA) )
+                                 || (parserCode == INCOR_CHECKSUM)  || (parserCode == ILL_TYPE)
+                                 || (parserCode == ILL_SUBTYPE)     || (parserCode == WRONG_APP_DATA)
+                                 || (parserCode == WRONG_SRC_ID) )
                             { // send TM_LFR_TC_EXE_CORRUPTED
-                                send_tm_lfr_tc_exe_corrupted( &currentTC, queue_send_id, computed_CRC, currentTC_LEN_RCV );
+                                if ( !( (currentTC.serviceType==TC_TYPE_TIME) && (currentTC.serviceSubType==TC_SUBTYPE_UPDT_TIME) )
+                                     &&
+                                     !( (currentTC.serviceType==TC_TYPE_GEN) && (currentTC.serviceSubType==TC_SUBTYPE_UPDT_INFO))
+                                     )
+                                {
+                                    send_tm_lfr_tc_exe_corrupted( &currentTC, queue_send_id, computed_CRC, currentTC_LEN_RCV );
+                                }
                             }
                             else
                             { // send valid TC to the action launcher

src/tc_acceptance.c +17 -16

                  *
                  * @param D is the current byte of data.
                  * @param Chk is the current syndrom value.
+                 *
                  * @return the value of the new syndrome on two bytes.
                  *
                  */
                 if (status == CCSDS_TM_VALID)   // CHECK THE PACKET LENGTH FIELD AND THE ACTUAL LENGTH COMPLIANCE
                 {
                     if (length != TC_LEN_RCV ) {
-                        status = WRONG_LEN_PACKET;
+                        status = WRONG_LEN_PKT;
                     }
                 }
                 if (status == CCSDS_TM_VALID)   // CHECK THAT THE PACKET DOES NOT EXCEED THE MAX SIZE
                 {
                     if ( length >= CCSDS_TC_PKT_MAX_SIZE ) {
-                        status = WRONG_LEN_PACKET;
+                        status = WRONG_LEN_PKT;
                     }
                 }
                 if (status == CCSDS_TM_VALID)   // CHECK THE TYPE
                 }
                 else
                 {
-                    status = ILL_TYPE;
+                    status = ILL_SUBTYPE;
                 }
                 return status;
                 }
                 else
                 {
-                    status = CORRUPTED;
+                    status = WRONG_SRC_ID;
                 }
                 return status;
                 {
                 case TC_SUBTYPE_RESET:
                     if (length!=(TC_LEN_RESET-CCSDS_TC_TM_PACKET_OFFSET)) {
-                        status = WRONG_LEN_PACKET;
+                        status = WRONG_LEN_PKT;
                     }
                     else {
                         status = CCSDS_TM_VALID;
                     break;
                 case TC_SUBTYPE_LOAD_COMM:
                     if (length!=(TC_LEN_LOAD_COMM-CCSDS_TC_TM_PACKET_OFFSET)) {
-                        status = WRONG_LEN_PACKET;
+                        status = WRONG_LEN_PKT;
                     }
                     else {
                         status = CCSDS_TM_VALID;
                     break;
                 case TC_SUBTYPE_LOAD_NORM:
                     if (length!=(TC_LEN_LOAD_NORM-CCSDS_TC_TM_PACKET_OFFSET)) {
-                        status = WRONG_LEN_PACKET;
+                        status = WRONG_LEN_PKT;
                     }
                     else {
                         status = CCSDS_TM_VALID;
                     break;
                 case TC_SUBTYPE_LOAD_BURST:
                     if (length!=(TC_LEN_LOAD_BURST-CCSDS_TC_TM_PACKET_OFFSET)) {
-                        status = WRONG_LEN_PACKET;
+                        status = WRONG_LEN_PKT;
                     }
                     else {
                         status = CCSDS_TM_VALID;
                     break;
                 case TC_SUBTYPE_LOAD_SBM1:
                     if (length!=(TC_LEN_LOAD_SBM1-CCSDS_TC_TM_PACKET_OFFSET)) {
-                        status = WRONG_LEN_PACKET;
+                        status = WRONG_LEN_PKT;
                     }
                     else {
                         status = CCSDS_TM_VALID;
                     break;
                 case TC_SUBTYPE_LOAD_SBM2:
                     if (length!=(TC_LEN_LOAD_SBM2-CCSDS_TC_TM_PACKET_OFFSET)) {
-                        status = WRONG_LEN_PACKET;
+                        status = WRONG_LEN_PKT;
                     }
                     else {
                         status = CCSDS_TM_VALID;
                     break;
                 case TC_SUBTYPE_DUMP:
                     if (length!=(TC_LEN_DUMP-CCSDS_TC_TM_PACKET_OFFSET)) {
-                        status = WRONG_LEN_PACKET;
+                        status = WRONG_LEN_PKT;
                     }
                     else {
                         status = CCSDS_TM_VALID;
                     break;
                 case TC_SUBTYPE_ENTER:
                     if (length!=(TC_LEN_ENTER-CCSDS_TC_TM_PACKET_OFFSET)) {
-                        status = WRONG_LEN_PACKET;
+                        status = WRONG_LEN_PKT;
                     }
                     else {
                         status = CCSDS_TM_VALID;
                     break;
                 case TC_SUBTYPE_UPDT_INFO:
                     if (length!=(TC_LEN_UPDT_INFO-CCSDS_TC_TM_PACKET_OFFSET)) {
-                        status = WRONG_LEN_PACKET;
+                        status = WRONG_LEN_PKT;
                     }
                     else {
                         status = CCSDS_TM_VALID;
                     break;
                 case TC_SUBTYPE_EN_CAL:
                     if (length!=(TC_LEN_EN_CAL-CCSDS_TC_TM_PACKET_OFFSET)) {
-                        status = WRONG_LEN_PACKET;
+                        status = WRONG_LEN_PKT;
                     }
                     else {
                         status = CCSDS_TM_VALID;
                     break;
                 case TC_SUBTYPE_DIS_CAL:
                     if (length!=(TC_LEN_DIS_CAL-CCSDS_TC_TM_PACKET_OFFSET)) {
-                        status = WRONG_LEN_PACKET;
+                        status = WRONG_LEN_PKT;
                     }
                     else {
                         status = CCSDS_TM_VALID;
                     break;
                 case TC_SUBTYPE_UPDT_TIME:
                     if (length!=(TC_LEN_UPDT_TIME-CCSDS_TC_TM_PACKET_OFFSET)) {
-                        status = WRONG_LEN_PACKET;
+                        status = WRONG_LEN_PKT;
                     }
                     else {
                         status = CCSDS_TM_VALID;

src/tc_handler.c +8 -10

                 result = LFR_DEFAULT;
                 lfrMode = (housekeeping_packet.lfr_status_word[0] & 0xf0) >> 4;
-                if ( (lfrMode == LFR_MODE_STANDBY) | (lfrMode == LFR_MODE_BURST) | (lfrMode == LFR_MODE_SBM2) ) {
+                if ( (lfrMode == LFR_MODE_STANDBY) || (lfrMode == LFR_MODE_BURST) || (lfrMode == LFR_MODE_SBM2) ) {
                     send_tm_lfr_tc_exe_not_executable( TC, queue_id );
                     result = LFR_DEFAULT;
                 }
                 result = LFR_DEFAULT;
                 lfrMode = (housekeeping_packet.lfr_status_word[0] & 0xf0) >> 4;
-                if ( (lfrMode == LFR_MODE_STANDBY) | (lfrMode == LFR_MODE_BURST) | (lfrMode == LFR_MODE_SBM2) ) {
+                if ( (lfrMode == LFR_MODE_STANDBY) || (lfrMode == LFR_MODE_BURST) || (lfrMode == LFR_MODE_SBM2) ) {
                     send_tm_lfr_tc_exe_not_executable( TC, queue_id );
                     result = LFR_DEFAULT;
                 }
                 status = RTEMS_UNSATISFIED;
                 housekeeping_packet.lfr_status_word[0] = (unsigned char) ((mode << 4) + 0x0d);
-                lfrCurrentMode = mode;
+                updateLFRCurrentMode();
                 switch(mode){
                 case LFR_MODE_STANDBY:
-                    status = enter_standby_mode( TC );
+                    status = enter_standby_mode( );
                     break;
                 case LFR_MODE_NORMAL:
-                    status = enter_normal_mode( TC );
+                    status = enter_normal_mode( );
                     break;
                 case LFR_MODE_BURST:
-                    status = enter_burst_mode( TC );
+                    status = enter_burst_mode( );
                     break;
                 case LFR_MODE_SBM1:
-                    status = enter_sbm1_mode( TC );
+                    status = enter_sbm1_mode( );
                     break;
                 case LFR_MODE_SBM2:
-                    status = enter_sbm2_mode( TC );
+                    status = enter_sbm2_mode( );
                     break;
                 default:
                     status = RTEMS_UNSATISFIED;
             int enter_standby_mode()
             {
-                reset_waveform_picker_regs();
                 PRINTF1("maxCount = %d\n", maxCount)
             #ifdef PRINT_TASK_STATISTICS

src/tc_load_dump_parameters.c +2 -2

                 result = LFR_DEFAULT;
                 lfrMode = (housekeeping_packet.lfr_status_word[0] & 0xf0) >> 4;
-                if ( lfrMode == LFR_MODE_SBM1 ) {
+                if ( (lfrMode == LFR_MODE_SBM1) || (lfrMode == LFR_MODE_SBM2) ) {
                     send_tm_lfr_tc_exe_not_executable( TC, queue_id );
                     result = LFR_DEFAULT;
                 }
                 result = LFR_DEFAULT;
                 lfrMode = (housekeeping_packet.lfr_status_word[0] & 0xf0) >> 4;
-                if ( lfrMode == LFR_MODE_SBM2 ) {
+                if ( (lfrMode == LFR_MODE_SBM2) || (lfrMode == LFR_MODE_SBM2) ) {
                     send_tm_lfr_tc_exe_not_executable( TC, queue_id );
                     result = LFR_DEFAULT;
                 }

src/tm_lfr_tc_exe.c +1 -1

                 TM.spare1_pusVersion_spare2 = DEFAULT_SPARE1_PUSVERSION_SPARE2;
                 TM.serviceType = TM_TYPE_TC_EXE;
                 TM.serviceSubType = TM_SUBTYPE_EXE_OK;
-                TM.destinationID = TM_DESTINATION_ID_GROUND;    // default destination id
+                TM.destinationID = TC->sourceID;
                 TM.time[0] = (unsigned char) (time_management_regs->coarse_time>>24);
                 TM.time[1] = (unsigned char) (time_management_regs->coarse_time>>16);
                 TM.time[2] = (unsigned char) (time_management_regs->coarse_time>>8);

src/wf_handler.c +23 -2

             #ifdef GSA
             #else
                 reset_wfp_burst_enable();
-                set_wfp_data_shaping();
+                reset_wfp_status();
+                // set buffer addresses
                 waveform_picker_regs->addr_data_f0 = (int) (wf_snap_f0);    //
                 waveform_picker_regs->addr_data_f1 = (int) (wf_snap_f1);    //
                 waveform_picker_regs->addr_data_f2 = (int) (wf_snap_f2);    //
                 waveform_picker_regs->addr_data_f3 = (int) (wf_cont_f3);    //
+                // set other parameters
+                set_wfp_data_shaping();
                 set_wfp_delta_snapshot();                           // time in seconds between two snapshots
                 waveform_picker_regs->delta_f2_f1 = 0xffff;         // 0x16800 => 92160 (max 4 bytes)
                 waveform_picker_regs->delta_f2_f0 = 0x17c00;        // 97 280 (max 5 bytes)
                 waveform_picker_regs->nb_burst_available = 0x180;   // max 3 bytes, size of the buffer in burst (1 burst = 16 x 4 octets)
                 waveform_picker_regs->nb_snapshot_param = 0x7ff;    // max 3 octets, 2048 - 1
-                reset_wfp_status();
             #endif
             }
+            void reset_waveform_picker_regs_alt()
+            {
+                waveform_picker_regs_alt->data_shaping = 0x01;      // 0x00 00      *** R1 R0 SP1 SP0 BW
+                waveform_picker_regs_alt->run_burst_enable = 0x00;  // 0x04 01      *** [run *** burst f2, f1, f0 *** enable f3, f2, f1, f0 ]
+                waveform_picker_regs_alt->addr_data_f0 = (int) (wf_snap_f0);    // 0x08
+                waveform_picker_regs_alt->addr_data_f1 = (int) (wf_snap_f1);    // 0x0c
+                waveform_picker_regs_alt->addr_data_f2 = (int) (wf_snap_f2);    // 0x10
+                waveform_picker_regs_alt->addr_data_f3 = (int) (wf_cont_f3);    // 0x14
+                waveform_picker_regs_alt->status = 0x00;                        // 0x18
+                waveform_picker_regs_alt->delta_snapshot = 0x12800;             // 0x1c
+                waveform_picker_regs_alt->delta_f0 = 0x3f5;                     // 0x20 *** 1013
+                waveform_picker_regs_alt->delta_f0_2 = 0x7;                     // 0x24 *** 7
+                waveform_picker_regs_alt->delta_f1 = 0x3c0;                     // 0x28 *** 960
+                waveform_picker_regs_alt->delta_f2 = 0x12200;                   // 0x2c *** 74240
+                waveform_picker_regs_alt->nb_data_by_buffer = 0x1802;           // 0x30 *** 2048 * 3 + 2
+                waveform_picker_regs_alt->snapshot_param = 0x7ff;               // 0x34 *** 2048 -1
+                waveform_picker_regs_alt->start_date = 0x00;
+            }
             //*****************
             // local parameters
             void set_local_sbm1_nb_cwf_max()

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