HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/DEV_PLE Commit - r104:e5b7ab03049c

rev 1.0.0.2...

paul -

r104:e5b7ab03049c VHDLib206

parent child

Context file:

r104:e5b7ab03049c

Collapse all files

.hgsub +1 -1

	@@ -1,1 +1,1
	1	src/basic_parameters = https://~~leroy@~~hephaistos.lpp.polytechnique.fr/rhodecode/HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/LFR_basic-parameters		1	src/basic_parameters = https://hephaistos.lpp.polytechnique.fr/rhodecode/HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/LFR_basic-parameters

FSW-qt/Makefile +2 -2

             #############################################################################
             # Makefile for building: bin/fsw
-            # Generated by qmake (2.01a) (Qt 4.8.5) on: Fri Feb 21 15:32:25 2014
+            # Generated by qmake (2.01a) (Qt 4.8.5) on: Tue Mar 4 09:15:37 2014
             # 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=1 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=2 -DPRINT_MESSAGES_ON_CONSOLE
+            DEFINES       = -DSW_VERSION_N1=1 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=2 -DPRINT_MESSAGES_ON_CONSOLE -DDEBUG_MESSAGES
             CFLAGS        = -pipe -O3 -Wall $(DEFINES)
             CXXFLAGS      = -pipe -O3 -Wall $(DEFINES)
             INCPATH       = -I/usr/lib64/qt4/mkspecs/linux-g++ -I. -I../src -I../header -I../../LFR_basic-parameters

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

             TEMPLATE = app
             # CONFIG += console v8 sim
             # CONFIG options = verbose *** boot_messages *** debug_messages *** cpu_usage_report *** stack_report
-            CONFIG += console verbose
+            CONFIG += console verbose debug_messages
             CONFIG -= qt
             include(./sparc.pri)
                 ../header/ccsds_types.h \
                 ../header/fsw_params_processing.h \
                 ../header/fsw_spacewire.h \
-                ../header/tm_byte_positions.h \
                 ../header/tc_load_dump_parameters.h \
                 ../header/tm_lfr_tc_exe.h \
                 ../header/tc_acceptance.h \

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

             <?xml version="1.0" encoding="UTF-8"?>
             <!DOCTYPE QtCreatorProject>
-            <!-- Written by QtCreator 3.0.0, 2014-03-03T07:03:32. -->
+            <!-- Written by QtCreator 3.0.0, 2014-03-04T07:03:18. -->
             <qtcreator>
              <data>
               <variable>ProjectExplorer.Project.ActiveTarget</variable>

header/fsw_init.h +1 0

             int start_recv_send_tasks( void );
             //
             void init_local_mode_parameters( void );
+            void reset_local_time( void );
             extern int rtems_cpu_usage_report( void );
             extern int rtems_cpu_usage_reset( void );

header/fsw_params.h +15 -2

             #include "grlib_regs.h"
             #include "fsw_params_processing.h"
+            #include "fsw_params_nb_bytes.h"
             #include "tm_byte_positions.h"
             #include "ccsds_types.h"
             #define LFR_MODE_BURST      2
             #define LFR_MODE_SBM1       3
             #define LFR_MODE_SBM2       4
-            #define LFR_MODE_NORMAL_CWF_F3 5
+            #define TDS_MODE_LFM        5
+            #define TDS_MODE_STANDBY    0
+            #define TDS_MODE_NORMAL     1
+            #define TDS_MODE_BURST      2
+            #define TDS_MODE_SBM1       3
+            #define TDS_MODE_SBM2       4
+            #define THR_MODE_STANDBY    0
+            #define THR_MODE_NORMAL      1
+            #define THR_MODE_BURST      2
             #define RTEMS_EVENT_MODE_STANDBY        RTEMS_EVENT_0
             #define RTEMS_EVENT_MODE_NORMAL         RTEMS_EVENT_1
             // TIME
             #define CLKDIV_SM_SIMULATOR (10000 - 1)     // 10 ms
             #define TIMER_SM_SIMULATOR 1
-            #define HK_PERIOD 100 // 100 * 10ms => 1sec
+            #define HK_PERIOD                           100     // 100 * 10ms => 1s
+            #define SY_LFR_TIME_SYN_TIMEOUT_in_ms       2000
+            #define SY_LFR_TIME_SYN_TIMEOUT_in_ticks    200     // 200 * 10 ms = 2 s
             //**********
             // LPP CODES

header/fsw_params_nb_bytes.h +4 0

             #define BYTE_POS_SY_LFR_N_ASM_P 4
             #define BYTE_POS_SY_LFR_N_BP_P0 6
             #define BYTE_POS_SY_LFR_N_BP_P1 7
+            #define BYTE_POS_SY_LFR_N_CWF_LONG_F3 8
             // TC_LFR_LOAD_BURST_PAR
             // TC_LFR_LOAD_SBM2_PAR
+            // TC_LFR_UPDATE_INFO
+            #define BYTE_POS_HK_UPDATE_INFO_PAR_SET5    24  // 34 - 10
+            #define BYTE_POS_HK_UPDATE_INFO_PAR_SET6    25  // 35 - 10
             #endif // TM_BYTE_POSITIONS_H

header/tc_acceptance.h +1 -1

             // ACCEPTANCE FUNCTIONS
             int tc_parser(ccsdsTelecommandPacket_t * TCPacket, unsigned int TC_LEN_RCV, unsigned char *computed_CRC);
             int tc_check_type( unsigned char packetType );
-            int tc_check_subtype( unsigned char packetType );
+            int tc_check_type_subtype( unsigned char packetType, unsigned char packetSubType );
             int tc_check_sid( unsigned char sid );
             int tc_check_length( unsigned char packetType, unsigned int length );
             int tc_check_crc(ccsdsTelecommandPacket_t * TCPacket, unsigned int length , unsigned char *computed_CRC);

header/tc_handler.h +3 -3

             // other functions
             void updateLFRCurrentMode();
-            void update_last_TC_exe(ccsdsTelecommandPacket_t *TC, unsigned char *time);
+            void update_last_TC_exe(ccsdsTelecommandPacket_t *TC );
-            void update_last_TC_rej(ccsdsTelecommandPacket_t *TC, unsigned char *time);
+            void update_last_TC_rej(ccsdsTelecommandPacket_t *TC );
-            void close_action(ccsdsTelecommandPacket_t *TC, int result, rtems_id queue_id, unsigned char *time);
+            void close_action(ccsdsTelecommandPacket_t *TC, int result, rtems_id queue_id );
             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 );

header/tc_load_dump_parameters.h +5 0

             int set_sy_lfr_n_bp_p1( ccsdsTelecommandPacket_t *TC, rtems_id queue_id );
             int set_sy_lfr_n_cwf_long_f3(ccsdsTelecommandPacket_t *TC, rtems_id queue_id);
+            // TC_LFR_UPDATE_INFO
+            unsigned int check_update_info_hk_lfr_mode( unsigned char mode );
+            unsigned int check_update_info_hk_tds_mode( unsigned char mode );
+            unsigned int check_update_info_hk_thr_mode( unsigned char mode );
             void init_parameter_dump( void );
             #endif // TC_LOAD_DUMP_PARAMETERS_H

header/tm_lfr_tc_exe.h +4 -4

             extern unsigned short sequenceCounters_TC_EXE[];
-            int send_tm_lfr_tc_exe_success(ccsdsTelecommandPacket_t *TC, rtems_id queue_id, unsigned char *time);
+            int send_tm_lfr_tc_exe_success( ccsdsTelecommandPacket_t *TC, rtems_id queue_id );
             int send_tm_lfr_tc_exe_inconsistent( ccsdsTelecommandPacket_t *TC, rtems_id queue_id,
-                                                unsigned char byte_position, unsigned char rcv_value, unsigned char *time);
+                                                unsigned char byte_position, unsigned char rcv_value );
-            int send_tm_lfr_tc_exe_not_executable(ccsdsTelecommandPacket_t *TC, rtems_id queue_id, unsigned char *time);
+            int send_tm_lfr_tc_exe_not_executable( ccsdsTelecommandPacket_t *TC, rtems_id queue_id );
             int send_tm_lfr_tc_exe_not_implemented( ccsdsTelecommandPacket_t *TC, rtems_id queue_id, unsigned char *time );
             int send_tm_lfr_tc_exe_error( ccsdsTelecommandPacket_t *TC, rtems_id queue_id, unsigned char *time );
             int send_tm_lfr_tc_exe_corrupted( ccsdsTelecommandPacket_t *TC, rtems_id queue_id,
-                                             unsigned char *computed_CRC, unsigned char *currentTC_LEN_RCV, unsigned char destinationID, unsigned char *time);
+                                             unsigned char *computed_CRC, unsigned char *currentTC_LEN_RCV, unsigned char destinationID );
             void increment_seq_counter_destination_id( unsigned char *packet_sequence_control, unsigned char destination_id );

src/fsw_init.c +6 0

                  *
                  */
+                reset_local_time();
                 rtems_status_code status;
                 rtems_status_code status_spw;
                 sequenceCounters_SCIENCE_SBM1_SBM2 = 0x00;
             }
+            void reset_local_time( void )
+            {
+            }
             void create_names( void ) // create all names for tasks and queues
             {
                 /** This function creates all RTEMS names used in the software for tasks and queues.

src/fsw_misc.c +20 0

@@ -143,6 +143,7 rtems_task hous_task(rtems_task_argument
143	{	143	{
144	rtems_status_code status;	144	rtems_status_code status;
145	rtems_id queue_id;	145	rtems_id queue_id;
		146	rtems_rate_monotonic_period_status period_status;
146		147
147	status = get_message_queue_id_send( &queue_id );	148	status = get_message_queue_id_send( &queue_id );
148	if (status != RTEMS_SUCCESSFUL)	149	if (status != RTEMS_SUCCESSFUL)
@@ -183,6 +184,25 rtems_task hous_task(rtems_task_argument
183	DEBUG_PRINTF("OK * in HOUS * rtems_rate_monotonic_cancel(HK_id)\n")	184	DEBUG_PRINTF("OK * in HOUS * rtems_rate_monotonic_cancel(HK_id)\n")
184	}	185	}
185		186
		187	// startup phase
		188	status = rtems_rate_monotonic_period( HK_id, SY_LFR_TIME_SYN_TIMEOUT_in_ticks );
		189	status = rtems_rate_monotonic_get_status( HK_id, &period_status );
		190	DEBUG_PRINTF1("startup HK, HK_id status = %d\n", period_status.state)
		191	while(period_status.state != RATE_MONOTONIC_EXPIRED ) // after SY_LFR_TIME_SYN_TIMEOUT ms, starts HK anyway
		192	{
		193	if ((time_management_regs->coarse_time & 0x80000000) == 0x00000000) // check time synchronization
		194	{
		195	break; // break if LFR is synchronized
		196	}
		197	else
		198	{
		199	status = rtems_rate_monotonic_get_status( HK_id, &period_status );
		200	sched_yield();
		201	}
		202	}
		203	status = rtems_rate_monotonic_cancel(HK_id);
		204	DEBUG_PRINTF1("startup HK, HK_id status = %d\n", period_status.state)
		205
186	while(1){ // launch the rate monotonic task	206	while(1){ // launch the rate monotonic task
187	status = rtems_rate_monotonic_period( HK_id, HK_PERIOD );	207	status = rtems_rate_monotonic_period( HK_id, HK_PERIOD );
188	if ( status != RTEMS_SUCCESSFUL ) {	208	if ( status != RTEMS_SUCCESSFUL ) {

src/fsw_processing.c +3 0

                         ring_node_for_averaging_sm_f0 = ring_node_for_averaging_sm_f0->previous;
                         ring_node_tab[NB_SM_TO_RECEIVE_BEFORE_AVF0-i] = ring_node_for_averaging_sm_f0;
                     }
+                    averaged_sm_f0[0] = ( (int *) (ring_node_tab[7]->buffer_address) ) [0];
+                    averaged_sm_f0[1] = ( (int *) (ring_node_tab[7]->buffer_address) ) [1];
                     for(i=0; i<TOTAL_SIZE_SM; i++)
                     {
                         averaged_sm_f0[i] = ( (int *) (ring_node_tab[0]->buffer_address) ) [i + TIME_OFFSET]

src/fsw_spacewire.c +2 -2

                                         destinationID = currentTC.sourceID;
                                     }
                                     getTime( time );
-                                    close_action( &currentTC, LFR_DEFAULT, queue_send_id, time);
+                                    close_action( &currentTC, LFR_DEFAULT, queue_send_id );
                                     send_tm_lfr_tc_exe_corrupted( &currentTC, queue_send_id,
                                                                   computed_CRC, currentTC_LEN_RCV,
-                                                                  destinationID, time );
+                                                                  destinationID );
                                 }
                             }
                             else

src/tc_acceptance.c +26 -6

                 }
                 if (status == CCSDS_TM_VALID)   // CHECK THE SUBTYPE
                 {
-                    status = tc_check_subtype( packetSubtype );
+                    status = tc_check_type_subtype( packetType, packetSubtype );
                 }
                 if (status == CCSDS_TM_VALID)   // CHECK THE SID
                 {
                 return status;
             }
-            int tc_check_subtype( unsigned char packetSubType )
+            int tc_check_type_subtype( unsigned char packetType, unsigned char packetSubType )
             {
-                /** This function checks that the subtype of a TeleCommand is valid.
+                /** This function checks that the subtype of a TeleCommand is valid and coherent with the type.
                  *
+                 * @param packetType is the type of the TC.
                  * @param packetSubType is the subtype to check.
                  *
                  * @return Status code CCSDS_TM_VALID or ILL_SUBTYPE.
                 int status;
+                switch(packetType)
+                {
+                case TC_TYPE_GEN:
                     if ( (packetSubType == TC_SUBTYPE_RESET)
                          || (packetSubType == TC_SUBTYPE_LOAD_COMM)
                          || (packetSubType == TC_SUBTYPE_LOAD_NORM) || (packetSubType == TC_SUBTYPE_LOAD_BURST)
                          || (packetSubType == TC_SUBTYPE_LOAD_SBM1) || (packetSubType == TC_SUBTYPE_LOAD_SBM2)
                          || (packetSubType == TC_SUBTYPE_DUMP)
                          || (packetSubType == TC_SUBTYPE_ENTER)
-                     || (packetSubType == TC_SUBTYPE_UPDT_INFO) || (packetSubType == TC_SUBTYPE_UPDT_TIME)
+                         || (packetSubType == TC_SUBTYPE_UPDT_INFO)
                          || (packetSubType == TC_SUBTYPE_EN_CAL)    || (packetSubType == TC_SUBTYPE_DIS_CAL) )
                     {
                         status = CCSDS_TM_VALID;
                     {
                         status = ILL_SUBTYPE;
                     }
+                    break;
+                case TC_TYPE_TIME:
+                    if (packetSubType == TC_SUBTYPE_UPDT_TIME)
+                    {
+                        status = CCSDS_TM_VALID;
+                    }
+                    else
+                    {
+                        status = ILL_SUBTYPE;
+                    }
+                    break;
+                default:
+                    status = ILL_SUBTYPE;
+                    break;
+                }
                 return status;
             }
                 int status;
-                if ( (sid == SID_TC_GROUND)
+                if ( (sid == SID_TC_MISSION_TIMELINE) || (sid == SID_TC_TC_SEQUENCES)   || (sid == SID_TC_RECOVERY_ACTION_CMD)
-                     || (sid == SID_TC_MISSION_TIMELINE) || (sid == SID_TC_TC_SEQUENCES)   || (sid == SID_TC_RECOVERY_ACTION_CMD)
                      || (sid == SID_TC_BACKUP_MISSION_TIMELINE)
                      || (sid == SID_TC_DIRECT_CMD)       || (sid == SID_TC_SPARE_GRD_SRC1) || (sid == SID_TC_SPARE_GRD_SRC2)
                      || (sid == SID_TC_OBCP)             || (sid == SID_TC_SYSTEM_CONTROL) || (sid == SID_TC_AOCS)

src/tc_handler.c +54 -46

                         {
                             case TC_SUBTYPE_RESET:
                                 result = action_reset( &TC, queue_snd_id, time );
-                                close_action( &TC, result, queue_snd_id, time );
+                                close_action( &TC, result, queue_snd_id );
                                 break;
                                 //
                             case TC_SUBTYPE_LOAD_COMM:
                                 result = action_load_common_par( &TC );
-                                close_action( &TC, result, queue_snd_id, time );
+                                close_action( &TC, result, queue_snd_id );
                                 break;
                                 //
                             case TC_SUBTYPE_LOAD_NORM:
                                 result = action_load_normal_par( &TC, queue_snd_id, time );
-                                close_action( &TC, result, queue_snd_id, time );
+                                close_action( &TC, result, queue_snd_id );
                                 break;
                                 //
                             case TC_SUBTYPE_LOAD_BURST:
                                 result = action_load_burst_par( &TC, queue_snd_id, time );
-                                close_action( &TC, result, queue_snd_id, time );
+                                close_action( &TC, result, queue_snd_id );
                                 break;
                                 //
                             case TC_SUBTYPE_LOAD_SBM1:
                                 result = action_load_sbm1_par( &TC, queue_snd_id, time );
-                                close_action( &TC, result, queue_snd_id, time );
+                                close_action( &TC, result, queue_snd_id );
                                 break;
                                 //
                             case TC_SUBTYPE_LOAD_SBM2:
                                 result = action_load_sbm2_par( &TC, queue_snd_id, time );
-                                close_action( &TC, result, queue_snd_id, time );
+                                close_action( &TC, result, queue_snd_id );
                                 break;
                                 //
                             case TC_SUBTYPE_DUMP:
                                 result = action_dump_par( queue_snd_id );
-                                close_action( &TC, result, queue_snd_id, time );
+                                close_action( &TC, result, queue_snd_id );
                                 break;
                                 //
                             case TC_SUBTYPE_ENTER:
                                 result = action_enter_mode( &TC, queue_snd_id, time );
-                                close_action( &TC, result, queue_snd_id, time );
+                                close_action( &TC, result, queue_snd_id );
                                 break;
                                 //
                             case TC_SUBTYPE_UPDT_INFO:
                                 result = action_update_info( &TC, queue_snd_id );
-                                close_action( &TC, result, queue_snd_id, time );
+                                close_action( &TC, result, queue_snd_id );
                                 break;
                                 //
                             case TC_SUBTYPE_EN_CAL:
                                 result = action_enable_calibration( &TC, queue_snd_id, time );
-                                close_action( &TC, result, queue_snd_id, time );
+                                close_action( &TC, result, queue_snd_id );
                                 break;
                                 //
                             case TC_SUBTYPE_DIS_CAL:
                                 result = action_disable_calibration( &TC, queue_snd_id, time );
-                                close_action( &TC, result, queue_snd_id, time );
+                                close_action( &TC, result, queue_snd_id );
                                 break;
                                 //
                             case TC_SUBTYPE_UPDT_TIME:
                                 result = action_update_time( &TC );
-                                close_action( &TC, result, queue_snd_id, time );
+                                close_action( &TC, result, queue_snd_id );
                                 break;
                                 //
                             default:
                      && (requestedMode != LFR_MODE_SBM1) && (requestedMode != LFR_MODE_SBM2) )
                 {
                     status = RTEMS_UNSATISFIED;
-                    send_tm_lfr_tc_exe_inconsistent( TC, queue_id, BYTE_POS_CP_LFR_MODE, requestedMode, time );
+                    send_tm_lfr_tc_exe_inconsistent( TC, queue_id, BYTE_POS_CP_LFR_MODE, requestedMode );
                 }
                 else
                 {
                     else
                     {
                         PRINTF("ERR *** in action_enter *** transition rejected\n")
-                        send_tm_lfr_tc_exe_not_executable( TC, queue_id, time );
+                        send_tm_lfr_tc_exe_not_executable( TC, queue_id );
                     }
                 }
                 unsigned int val;
                 int result;
+                unsigned int status;
+                unsigned char mode;
-                result = LFR_SUCCESSFUL;
+                // check LFR MODE
+                mode = (TC->dataAndCRC[ BYTE_POS_HK_UPDATE_INFO_PAR_SET5 ] & 0x1e) >> 1;
+                status = check_update_info_hk_lfr_mode( mode );
+                if (status != LFR_DEFAULT)  // check TDS mode
+                {
+                    mode = (TC->dataAndCRC[ BYTE_POS_HK_UPDATE_INFO_PAR_SET6 ] & 0xf0) >> 4;
+                    status = check_update_info_hk_tds_mode( mode );
+                }
+                if (status != LFR_DEFAULT)  // check THR mode
+                {
+                    mode = (TC->dataAndCRC[ BYTE_POS_HK_UPDATE_INFO_PAR_SET6 ] & 0x0f);
+                    status = check_update_info_hk_thr_mode( mode );
+                }
+                if (status != LFR_DEFAULT)  // if the parameter check is successful
+                {
                     val = housekeeping_packet.hk_lfr_update_info_tc_cnt[0] * 256
                             + housekeeping_packet.hk_lfr_update_info_tc_cnt[1];
                     val++;
                     housekeeping_packet.hk_lfr_update_info_tc_cnt[0] = (unsigned char) (val >> 8);
                     housekeeping_packet.hk_lfr_update_info_tc_cnt[1] = (unsigned char) (val);
+                }
+                result = status;
                 return result;
             }
                 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) ) {
-                    send_tm_lfr_tc_exe_not_executable( TC, queue_id, time );
-                    result = LFR_DEFAULT;
-                else {
                 send_tm_lfr_tc_exe_not_implemented( TC, queue_id, time );
                 result = LFR_DEFAULT;
                 return result;
             }
                 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) ) {
-                    send_tm_lfr_tc_exe_not_executable( TC, queue_id, time );
-                    result = LFR_DEFAULT;
-                else {
                 send_tm_lfr_tc_exe_not_implemented( TC, queue_id, time );
                 result = LFR_DEFAULT;
                 return result;
             }
             //****************
             // CLOSING ACTIONS
-            void update_last_TC_exe(ccsdsTelecommandPacket_t *TC, unsigned char *time)
+            void update_last_TC_exe(ccsdsTelecommandPacket_t *TC)
             {
                 /** This function is used to update the HK packets statistics after a successful TC execution.
                  *
                 housekeeping_packet.hk_lfr_last_exe_tc_type[1] = TC->serviceType;
                 housekeeping_packet.hk_lfr_last_exe_tc_subtype[0] = 0x00;
                 housekeeping_packet.hk_lfr_last_exe_tc_subtype[1] = TC->serviceSubType;
-                housekeeping_packet.hk_lfr_last_exe_tc_time[0] = time[0];
+                housekeeping_packet.hk_lfr_last_exe_tc_time[0] = (unsigned char) (time_management_regs->coarse_time>>24);
-                housekeeping_packet.hk_lfr_last_exe_tc_time[1] = time[1];
+                housekeeping_packet.hk_lfr_last_exe_tc_time[1] = (unsigned char) (time_management_regs->coarse_time>>16);
-                housekeeping_packet.hk_lfr_last_exe_tc_time[2] = time[2];
+                housekeeping_packet.hk_lfr_last_exe_tc_time[2] = (unsigned char) (time_management_regs->coarse_time>>8);
-                housekeeping_packet.hk_lfr_last_exe_tc_time[3] = time[3];
+                housekeeping_packet.hk_lfr_last_exe_tc_time[3] = (unsigned char) (time_management_regs->coarse_time);
-                housekeeping_packet.hk_lfr_last_exe_tc_time[4] = time[4];
+                housekeeping_packet.hk_lfr_last_exe_tc_time[4] = (unsigned char) (time_management_regs->fine_time>>8);
-                housekeeping_packet.hk_lfr_last_exe_tc_time[5] = time[5];
+                housekeeping_packet.hk_lfr_last_exe_tc_time[5] = (unsigned char) (time_management_regs->fine_time);
             }
-            void update_last_TC_rej(ccsdsTelecommandPacket_t *TC, unsigned char *time)
+            void update_last_TC_rej(ccsdsTelecommandPacket_t *TC )
             {
                 /** This function is used to update the HK packets statistics after a TC rejection.
                  *
                 housekeeping_packet.hk_lfr_last_rej_tc_type[1] = TC->serviceType;
                 housekeeping_packet.hk_lfr_last_rej_tc_subtype[0] = 0x00;
                 housekeeping_packet.hk_lfr_last_rej_tc_subtype[1] = TC->serviceSubType;
-                housekeeping_packet.hk_lfr_last_rej_tc_time[0] = time[0];
+                housekeeping_packet.hk_lfr_last_rej_tc_time[0] = (unsigned char) (time_management_regs->coarse_time>>24);
-                housekeeping_packet.hk_lfr_last_rej_tc_time[1] = time[1];
+                housekeeping_packet.hk_lfr_last_rej_tc_time[1] = (unsigned char) (time_management_regs->coarse_time>>16);
-                housekeeping_packet.hk_lfr_last_rej_tc_time[2] = time[2];
+                housekeeping_packet.hk_lfr_last_rej_tc_time[2] = (unsigned char) (time_management_regs->coarse_time>>8);
-                housekeeping_packet.hk_lfr_last_rej_tc_time[3] = time[3];
+                housekeeping_packet.hk_lfr_last_rej_tc_time[3] = (unsigned char) (time_management_regs->coarse_time);
-                housekeeping_packet.hk_lfr_last_rej_tc_time[4] = time[4];
+                housekeeping_packet.hk_lfr_last_rej_tc_time[4] = (unsigned char) (time_management_regs->fine_time>>8);
-                housekeeping_packet.hk_lfr_last_rej_tc_time[5] = time[5];
+                housekeeping_packet.hk_lfr_last_rej_tc_time[5] = (unsigned char) (time_management_regs->fine_time);
             }
-            void close_action(ccsdsTelecommandPacket_t *TC, int result, rtems_id queue_id, unsigned char *time)
+            void close_action(ccsdsTelecommandPacket_t *TC, int result, rtems_id queue_id )
             {
                 /** This function is the last step of the TC execution workflow.
                  *
                          !( (TC->serviceType==TC_TYPE_GEN) && (TC->serviceSubType==TC_SUBTYPE_UPDT_INFO))
                          )
                     {
-                        send_tm_lfr_tc_exe_success( TC, queue_id, time );
+                        send_tm_lfr_tc_exe_success( TC, queue_id );
                     }
-                    update_last_TC_exe( TC, time );
+                    update_last_TC_exe( TC );
                     val = housekeeping_packet.hk_lfr_exe_tc_cnt[0] * 256 + housekeeping_packet.hk_lfr_exe_tc_cnt[1];
                     val++;
                     housekeeping_packet.hk_lfr_exe_tc_cnt[0] = (unsigned char) (val >> 8);
                 }
                 else
                 {
-                    update_last_TC_rej( TC, time );
+                    update_last_TC_rej( TC );
                     val = housekeeping_packet.hk_lfr_rej_tc_cnt[0] * 256 + housekeeping_packet.hk_lfr_rej_tc_cnt[1];
                     val++;
                     housekeeping_packet.hk_lfr_rej_tc_cnt[0] = (unsigned char) (val >> 8);

src/tc_load_dump_parameters.c +63 -7

@@ -46,7 +46,7 int action_load_normal_par(ccsdsTelecomm
46		46
47	if ( (lfrCurrentMode == LFR_MODE_NORMAL) \|\|	47	if ( (lfrCurrentMode == LFR_MODE_NORMAL) \|\|
48	(lfrCurrentMode == LFR_MODE_SBM1) \|\| (lfrCurrentMode == LFR_MODE_SBM2) ) {	48	(lfrCurrentMode == LFR_MODE_SBM1) \|\| (lfrCurrentMode == LFR_MODE_SBM2) ) {
49	status = send_tm_lfr_tc_exe_not_executable( TC, queue_id, ~~time~~ );	49	status = send_tm_lfr_tc_exe_not_executable( TC, queue_id );
50	flag = LFR_DEFAULT;	50	flag = LFR_DEFAULT;
51	}	51	}
52		52
@@ -136,7 +136,7 int action_load_burst_par(ccsdsTelecomma
136	lfrMode = (housekeeping_packet.lfr_status_word[0] & 0xf0) >> 4;	136	lfrMode = (housekeeping_packet.lfr_status_word[0] & 0xf0) >> 4;
137		137
138	if ( lfrMode == LFR_MODE_BURST ) {	138	if ( lfrMode == LFR_MODE_BURST ) {
139	status = send_tm_lfr_tc_exe_not_executable( TC, queue_id, ~~time~~ );	139	status = send_tm_lfr_tc_exe_not_executable( TC, queue_id );
140	result = LFR_DEFAULT;	140	result = LFR_DEFAULT;
141	}	141	}
142	else {	142	else {
@@ -165,7 +165,7 int action_load_sbm1_par(ccsdsTelecomman
165	lfrMode = (housekeeping_packet.lfr_status_word[0] & 0xf0) >> 4;	165	lfrMode = (housekeeping_packet.lfr_status_word[0] & 0xf0) >> 4;
166		166
167	if ( (lfrMode == LFR_MODE_SBM1) \|\| (lfrMode == LFR_MODE_SBM2) ) {	167	if ( (lfrMode == LFR_MODE_SBM1) \|\| (lfrMode == LFR_MODE_SBM2) ) {
168	status = send_tm_lfr_tc_exe_not_executable( TC, queue_id, ~~time~~ );	168	status = send_tm_lfr_tc_exe_not_executable( TC, queue_id );
169	result = LFR_DEFAULT;	169	result = LFR_DEFAULT;
170	}	170	}
171	else {	171	else {
@@ -194,8 +194,8 int action_load_sbm2_par(ccsdsTelecomman
194	result = LFR_DEFAULT;	194	result = LFR_DEFAULT;
195	lfrMode = (housekeeping_packet.lfr_status_word[0] & 0xf0) >> 4;	195	lfrMode = (housekeeping_packet.lfr_status_word[0] & 0xf0) >> 4;
196		196
197	if ( (lfrMode == LFR_MODE_SBM2) \|\| (lfrMode == LFR_MODE_SBM2) ) {	197	if ( (lfrMode == LFR_MODE_SBM1) \|\| (lfrMode == LFR_MODE_SBM2) ) {
198	status = send_tm_lfr_tc_exe_not_executable( TC, queue_id, ~~time~~ );	198	status = send_tm_lfr_tc_exe_not_executable( TC, queue_id );
199	result = LFR_DEFAULT;	199	result = LFR_DEFAULT;
200	}	200	}
201	else {	201	else {
@@ -271,7 +271,7 int set_sy_lfr_n_swf_l( ccsdsTelecommand
271		271
272	if ( (tmp < 16) \|\| (tmp > 2048) ) // the snapshot period is a multiple of 16	272	if ( (tmp < 16) \|\| (tmp > 2048) ) // the snapshot period is a multiple of 16
273	{ // 2048 is the maximum limit due to the size of the buffers	273	{ // 2048 is the maximum limit due to the size of the buffers
274	status = send_tm_lfr_tc_exe_inconsistent( TC, queue_id, BYTE_POS_SY_LFR_N_SWF_L+10, lsb, ~~time~~ );	274	status = send_tm_lfr_tc_exe_inconsistent( TC, queue_id, BYTE_POS_SY_LFR_N_SWF_L+10, lsb );
275	result = WRONG_APP_DATA;	275	result = WRONG_APP_DATA;
276	}	276	}
277	else if (tmp != 2048)	277	else if (tmp != 2048)
@@ -311,7 +311,7 int set_sy_lfr_n_swf_p(ccsdsTelecommandP
311		311
312	if ( tmp < 16 )	312	if ( tmp < 16 )
313	{	313	{
314	status = send_tm_lfr_tc_exe_inconsistent( TC, queue_id, BYTE_POS_SY_LFR_N_SWF_P+10, lsb, ~~time~~ );	314	status = send_tm_lfr_tc_exe_inconsistent( TC, queue_id, BYTE_POS_SY_LFR_N_SWF_P+10, lsb );
315	result = WRONG_APP_DATA;	315	result = WRONG_APP_DATA;
316	}	316	}
317	else	317	else
@@ -410,6 +410,62 int set_sy_lfr_n_cwf_long_f3(ccsdsTeleco
410	//*********************	410	//*********************
411	// SBM2 MODE PARAMETERS	411	// SBM2 MODE PARAMETERS
412		412
		413	//*******************
		414	// TC_LFR_UPDATE_INFO
		415	unsigned int check_update_info_hk_lfr_mode( unsigned char mode )
		416	{
		417	unsigned int status;
		418
		419	if ( (mode == LFR_MODE_STANDBY) \|\| (mode == LFR_MODE_NORMAL)
		420	\|\| (mode = LFR_MODE_BURST)
		421	\|\| (mode == LFR_MODE_SBM1) \|\| (mode == LFR_MODE_SBM2))
		422	{
		423	status = LFR_SUCCESSFUL;
		424	}
		425	else
		426	{
		427	status = LFR_DEFAULT;
		428	}
		429
		430	return status;
		431	}
		432
		433	unsigned int check_update_info_hk_tds_mode( unsigned char mode )
		434	{
		435	unsigned int status;
		436
		437	if ( (mode == TDS_MODE_STANDBY) \|\| (mode == TDS_MODE_NORMAL)
		438	\|\| (mode = TDS_MODE_BURST)
		439	\|\| (mode == TDS_MODE_SBM1) \|\| (mode == TDS_MODE_SBM2)
		440	\|\| (mode == TDS_MODE_LFM))
		441	{
		442	status = LFR_SUCCESSFUL;
		443	}
		444	else
		445	{
		446	status = LFR_DEFAULT;
		447	}
		448
		449	return status;
		450	}
		451
		452	unsigned int check_update_info_hk_thr_mode( unsigned char mode )
		453	{
		454	unsigned int status;
		455
		456	if ( (mode == THR_MODE_STANDBY) \|\| (mode == THR_MODE_NORMAL)
		457	\|\| (mode = THR_MODE_BURST))
		458	{
		459	status = LFR_SUCCESSFUL;
		460	}
		461	else
		462	{
		463	status = LFR_DEFAULT;
		464	}
		465
		466	return status;
		467	}
		468
413	//**********	469	//**********
414	// init dump	470	// init dump
415		471

src/tm_lfr_tc_exe.c +19 -20

             #include "tm_lfr_tc_exe.h"
-            int send_tm_lfr_tc_exe_success( ccsdsTelecommandPacket_t *TC, rtems_id queue_id, unsigned char *time )
+            int send_tm_lfr_tc_exe_success( ccsdsTelecommandPacket_t *TC, rtems_id queue_id )
             {
                 /** This function sends a TM_LFR_TC_EXE_SUCCESS packet in the dedicated RTEMS message queue.
                  *
                 TM.serviceType = TM_TYPE_TC_EXE;
                 TM.serviceSubType = TM_SUBTYPE_EXE_OK;
                 TM.destinationID = TC->sourceID;
-                TM.time[0] = time[0];
+                TM.time[0] = (unsigned char) (time_management_regs->coarse_time>>24);
-                TM.time[1] = time[1];
+                TM.time[1] = (unsigned char) (time_management_regs->coarse_time>>16);
-                TM.time[2] = time[2];
+                TM.time[2] = (unsigned char) (time_management_regs->coarse_time>>8);
-                TM.time[3] = time[3];
+                TM.time[3] = (unsigned char) (time_management_regs->coarse_time);
-                TM.time[4] = time[4];
+                TM.time[4] = (unsigned char) (time_management_regs->fine_time>>8);
-                TM.time[5] = time[5];
+                TM.time[5] = (unsigned char) (time_management_regs->fine_time);
                 //
                 TM.telecommand_pkt_id[0] = TC->packetID[0];
                 TM.telecommand_pkt_id[1] = TC->packetID[1];
             }
             int send_tm_lfr_tc_exe_inconsistent( ccsdsTelecommandPacket_t *TC, rtems_id queue_id,
-                                                unsigned char byte_position, unsigned char rcv_value,
+                                                unsigned char byte_position, unsigned char rcv_value )
-                                                 unsigned char *time)
             {
                 /** This function sends a TM_LFR_TC_EXE_INCONSISTENT packet in the dedicated RTEMS message queue.
                  *
                 return status;
             }
-            int send_tm_lfr_tc_exe_not_executable( ccsdsTelecommandPacket_t *TC, rtems_id queue_id, unsigned char *time )
+            int send_tm_lfr_tc_exe_not_executable( ccsdsTelecommandPacket_t *TC, rtems_id queue_id )
             {
                 /** This function sends a TM_LFR_TC_EXE_NOT_EXECUTABLE packet in the dedicated RTEMS message queue.
                  *
             int send_tm_lfr_tc_exe_corrupted(ccsdsTelecommandPacket_t *TC, rtems_id queue_id,
                                              unsigned char *computed_CRC, unsigned char *currentTC_LEN_RCV,
-                                             unsigned char destinationID, unsigned char *time)
+                                             unsigned char destinationID )
             {
                 /** This function sends a TM_LFR_TC_EXE_CORRUPTED packet in the dedicated RTEMS message queue.
                  *
                     break;
                 }
-                segmentation_grouping_flag  = TM_PACKET_SEQ_CTRL_STANDALONE << 8;
+                // increment the sequence counter
-                sequence_cnt                = sequenceCounters_TC_EXE[ i ] & 0x3fff;
-                new_packet_sequence_control = segmentation_grouping_flag | sequence_cnt ;
-                packet_sequence_control[0] = (unsigned char) (new_packet_sequence_control >> 8);
-                packet_sequence_control[1] = (unsigned char) (new_packet_sequence_control     );
-                // increment the sequence counter for the next packet
                 if ( sequenceCounters_TC_EXE[ i ] < SEQ_CNT_MAX )
                 {
                     sequenceCounters_TC_EXE[ i ] = sequenceCounters_TC_EXE[ i ] + 1;
                     sequenceCounters_TC_EXE[ i ] = 0;
                 }
+                segmentation_grouping_flag  = TM_PACKET_SEQ_CTRL_STANDALONE << 8;
+                sequence_cnt                = sequenceCounters_TC_EXE[ i ] & 0x3fff;
+                new_packet_sequence_control = segmentation_grouping_flag | sequence_cnt ;
+                packet_sequence_control[0] = (unsigned char) (new_packet_sequence_control >> 8);
+                packet_sequence_control[1] = (unsigned char) (new_packet_sequence_control     );
             }

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