# HG changeset patch # User paul # Date 2016-04-22 08:22:08 # Node ID 81c3289ebd2a13e3b3147acdf60e34678378f905 # Parent c3197ff831df5057bdd145a4efd94ded0618661f TC_types removed from the repo because it is not used by the flight software ICD 4.1 taken into account diff --git a/TC_types.h b/TC_types.h deleted file mode 100644 --- a/TC_types.h +++ /dev/null @@ -1,245 +0,0 @@ -#ifndef TC_TYPES_H -#define TC_TYPES_H - -#include - -#define PROTOCOLE_IDENTIFIER 0x02 - -// PACKET ID -#define TC_LFR_PACKET_ID 0x1ccc // PID 76 CAT 12 - -#define PACKET_LENGTH_TC_LFR_RESET (12 - CCSDS_TC_TM_PACKET_OFFSET) -#define PACKET_LENGTH_TC_LFR_LOAD_COMMON_PAR (14 - CCSDS_TC_TM_PACKET_OFFSET) -#define PACKET_LENGTH_TC_LFR_LOAD_NORMAL_PAR (22 - CCSDS_TC_TM_PACKET_OFFSET) -#define PACKET_LENGTH_TC_LFR_LOAD_BURST_PAR (14 - CCSDS_TC_TM_PACKET_OFFSET) -#define PACKET_LENGTH_TC_LFR_LOAD_SBM1_PAR (14 - CCSDS_TC_TM_PACKET_OFFSET) -#define PACKET_LENGTH_TC_LFR_LOAD_SBM2_PAR (14 - CCSDS_TC_TM_PACKET_OFFSET) -#define PACKET_LENGTH_TC_LFR_DUMP_PAR (12 - CCSDS_TC_TM_PACKET_OFFSET) -#define PACKET_LENGTH_TC_LFR_ENTER_MODE (20 - CCSDS_TC_TM_PACKET_OFFSET) -#define PACKET_LENGTH_TC_LFR_UPDATE_INFO (110- CCSDS_TC_TM_PACKET_OFFSET) -#define PACKET_LENGTH_TC_LFR_ENABLE_CALIBRATION (12 - CCSDS_TC_TM_PACKET_OFFSET) -#define PACKET_LENGTH_TC_LFR_DISABLE_CALIBRATION (12 - CCSDS_TC_TM_PACKET_OFFSET) -#define PACKET_LENGTH_TC_LFR_DUMP_KCOEFFICIENTS (12 - CCSDS_TC_TM_PACKET_OFFSET) -#define PACKET_LENGTH_TC_LFR_UPDATE_TIME (18 - CCSDS_TC_TM_PACKET_OFFSET) - -// TC TYPES -#define TC_TYPE_DEFAULT 181 -#define TC_TYPE_LFR_UPDATE_TIME 9 - -// TC SUBTYPES -#define TC_SUBTYPE_RESET 1 -#define TC_SUBTYPE_LOAD_COMMON_PAR 11 -#define TC_SUBTYPE_LOAD_NORMAL_PAR 13 -#define TC_SUBTYPE_LOAD_BURST_PAR 19 -#define TC_SUBTYPE_LOAD_SBM1_PAR 25 -#define TC_SUBTYPE_LOAD_SBM2_PAR 27 -#define TC_SUBTYPE_DUMP_PAR 31 -#define TC_SUBTYPE_ENTER_MODE 41 -#define TC_SUBTYPE_UPDATE_INFO 51 -#define TC_SUBTYPE_ENABLE_CALIBRATION 61 -#define TC_SUBTYPE_DISABLE_CALIBRATION 63 -#define TC_SUBTYPE_UPDATE_TIME 129 - -// OTHER CONSTANTS -#define TC_LFR_PACKET_SEQUENCE_CONTROL 0xc000 // PID 76 CAT 12 -#define TC_LFR_DATA_FIELD_HEADER0 0x19 -#define TC_LFR_LOAD_COMMON_PAR_SPARE 0x00 - -typedef struct -{ // the CCSDS header is added by LPPMON - unsigned char packetID[2]; - unsigned char packetSequenceControl[2]; - unsigned char packetLength[2]; - // DATA FIELD HEADER - unsigned char ccsdsSecHeaderFlag_pusVersion_ack; - unsigned char serviceType; - unsigned char serviceSubType; - unsigned char sourceID; - unsigned char crc[2]; -} Packet_TC_LFR_RESET_t; - -typedef struct -{ // the CCSDS header is added by LPPMON - unsigned char packetID[2]; - unsigned char packetSequenceControl[2]; - unsigned char packetLength[2]; - // DATA FIELD HEADER - unsigned char ccsdsSecHeaderFlag_pusVersion_ack; - unsigned char serviceType; - unsigned char serviceSubType; - unsigned char sourceID; - unsigned char spare; - unsigned char mode; - unsigned char enterModeTime[6]; - unsigned char crc[2]; -} Packet_TC_LFR_ENTER_MODE_t; - -typedef struct -{ // the CCSDS header is added by LPPMON - unsigned char packetID[2]; - unsigned char packetSequenceControl[2]; - unsigned char packetLength[2]; - // DATA FIELD HEADER - unsigned char ccsdsSecHeaderFlag_pusVersion_ack; - unsigned char serviceType; - unsigned char serviceSubType; - unsigned char sourceID; - unsigned char set1; - unsigned char set2; - unsigned char set3_bias_setting_set1[6]; - unsigned char set3_bias_setting_set2[6]; - unsigned char set3_bias_voltage[2]; - unsigned char set4[8]; - unsigned char set5; - unsigned char set6; - unsigned char set7[8]; - unsigned char set8_cp_rpw_sc_rw1_f1[4]; - unsigned char set8_cp_rpw_sc_rw1_f2[4]; - unsigned char set8_cp_rpw_sc_rw2_f1[4]; - unsigned char set8_cp_rpw_sc_rw2_f2[4]; - unsigned char set8_cp_rpw_sc_rw3_f1[4]; - unsigned char set8_cp_rpw_sc_rw3_f2[4]; - unsigned char set8_cp_rpw_sc_rw4_f1[4]; - unsigned char set8_cp_rpw_sc_rw4_f2[4]; - unsigned char set9_spare; - unsigned char set9_rw_f_flags; - unsigned char spare1[2]; - unsigned char spare2[2]; - unsigned char spare3[2]; - unsigned char spare4[2]; - unsigned char spare5[2]; - unsigned char spare6[2]; - unsigned char spare7[2]; - unsigned char spare8[2]; - unsigned char spare9[2]; - unsigned char spare10[2]; - unsigned char spare11[2]; - unsigned char spare12[2]; - unsigned char spare13[2]; - unsigned char spare14[2]; - unsigned char spare15[2]; - unsigned char crc[2]; -} Packet_TC_LFR_UPDATE_INFO_t; - -typedef struct -{ // the CCSDS header is added by LPPMON - unsigned char packetID[2]; - unsigned char packetSequenceControl[2]; - unsigned char packetLength[2]; - // DATA FIELD HEADER - unsigned char ccsdsSecHeaderFlag_pusVersion_ack; - unsigned char serviceType; - unsigned char serviceSubType; - unsigned char sourceID; - unsigned char crc[2]; -} Packet_TC_LFR_DUMP_PAR_t; - -typedef struct -{ // the CCSDS header is added by LPPMON - unsigned char packetID[2]; - unsigned char packetSequenceControl[2]; - unsigned char packetLength[2]; - // DATA FIELD HEADER - unsigned char ccsdsSecHeaderFlag_pusVersion_ack; - unsigned char serviceType; - unsigned char serviceSubType; - unsigned char sourceID; - unsigned char spare; - unsigned char bw_sp0_sp1_r0_r1_r2; - unsigned char crc[2]; -} Packet_TC_LFR_LOAD_COMMON_PAR_t; - -typedef struct -{ // the CCSDS header is added by LPPMON - unsigned char packetID[2]; - unsigned char packetSequenceControl[2]; - unsigned char packetLength[2]; - // DATA FIELD HEADER - unsigned char ccsdsSecHeaderFlag_pusVersion_ack; - unsigned char serviceType; - unsigned char serviceSubType; - unsigned char sourceID; - unsigned char sy_lfr_n_swf_l[2]; - unsigned char sy_lfr_n_swf_p[2]; - unsigned char sy_lfr_n_asm_p[2]; - unsigned char sy_lfr_n_bp_p0; - unsigned char sy_lfr_n_bp_p1; - unsigned char sy_lfr_n_cwf_long_f3; - unsigned char lfr_normal_parameters_spare; - unsigned char crc[2]; -} Packet_TC_LFR_LOAD_NORMAL_PAR_t; - -typedef struct -{ // the CCSDS header is added by LPPMON - unsigned char packetID[2]; - unsigned char packetSequenceControl[2]; - unsigned char packetLength[2]; - // DATA FIELD HEADER - unsigned char ccsdsSecHeaderFlag_pusVersion_ack; - unsigned char serviceType; - unsigned char serviceSubType; - unsigned char sourceID; - unsigned char sy_lfr_bp_p0; - unsigned char sy_lfr_bp_p1; - unsigned char crc[2]; -} Packet_TC_LFR_LOAD_BURST_SBM1_SBM2_PAR_t; - -typedef struct -{ // the CCSDS header is added by LPPMON - unsigned char packetID[2]; - unsigned char packetSequenceControl[2]; - unsigned char packetLength[2]; - // DATA FIELD HEADER - unsigned char ccsdsSecHeaderFlag_pusVersion_ack; - unsigned char serviceType; - unsigned char serviceSubType; - unsigned char sourceID; - unsigned char crc[2]; -} Packet_TC_LFR_ENABLE_DISABLE_CALIBRATION_t; - -typedef struct -{ // the CCSDS header is added by LPPMON - unsigned char packetID[2]; - unsigned char packetSequenceControl[2]; - unsigned char packetLength[2]; - // DATA FIELD HEADER - unsigned char ccsdsSecHeaderFlag_pusVersion_ack; - unsigned char serviceType; - unsigned char serviceSubType; - unsigned char sourceID; - unsigned char cp_rpw_time[6]; - unsigned char crc[2]; -} Packet_TC_LFR_UPDATE_TIME_t; - -typedef struct -{ // the CCSDS header is added by LPPMON - unsigned char packetID[2]; - unsigned char packetSequenceControl[2]; - unsigned char packetLength[2]; - // DATA FIELD HEADER - unsigned char ccsdsSecHeaderFlag_pusVersion_ack; - unsigned char serviceType; - unsigned char serviceSubType; - unsigned char sourceID; - unsigned char crc[2]; - -} Packet_TC_LFR_DUMP_KCOEFFICIENTS_t; - -typedef struct -{ // the CCSDS header is added by LPPMON - unsigned char packetID[2]; - unsigned char packetSequenceControl[2]; - unsigned char packetLength[2]; - // DATA FIELD HEADER - unsigned char ccsdsSecHeaderFlag_pusVersion_ack; - unsigned char serviceType; - unsigned char serviceSubType; - unsigned char sourceID; - unsigned char spare_sy_lfr_pas_filter_enabled; - unsigned char sy_lfr_pas_filter_modulus; - unsigned char sy_lfr_pas_filter_nstd; - unsigned char sy_lfr_pas_filter_offset; - unsigned char crc[2]; -} Packet_TC_LFR_LOAD_PAS_FILTER_t; - -#endif // TC_TYPES_H diff --git a/ccsds_types.h b/ccsds_types.h --- a/ccsds_types.h +++ b/ccsds_types.h @@ -87,7 +87,7 @@ #define TC_SUBTYPE_LOAD_K 93 #define TC_SUBTYPE_DUMP_K 95 #define TC_SUBTYPE_LOAD_FBINS 91 -#define TC_SUBTYPE_LOAD_PAS_FILTER_PAR 97 +#define TC_SUBTYPE_LOAD_FILTER_PAR 97 #define TC_SUBTYPE_UPDT_TIME 129 // TC LEN @@ -105,7 +105,7 @@ #define TC_LEN_LOAD_K 142 #define TC_LEN_DUMP_K 12 #define TC_LEN_LOAD_FBINS 60 -#define TC_LEN_LOAD_PAS_FILTER_PAR 16 +#define TC_LEN_LOAD_FILTER_PAR 28 #define TC_LEN_UPDT_TIME 18 // PACKET CODES @@ -245,7 +245,7 @@ enum apid_destid{ #define PACKET_LENGTH_TC_EXE_ERROR (24 - CCSDS_TC_TM_PACKET_OFFSET) #define PACKET_LENGTH_TC_EXE_CORRUPTED (32 - CCSDS_TC_TM_PACKET_OFFSET) #define PACKET_LENGTH_HK (136 - CCSDS_TC_TM_PACKET_OFFSET) -#define PACKET_LENGTH_PARAMETER_DUMP (88 - CCSDS_TC_TM_PACKET_OFFSET) +#define PACKET_LENGTH_PARAMETER_DUMP (148 - CCSDS_TC_TM_PACKET_OFFSET) #define PACKET_LENGTH_K_DUMP (3920 - CCSDS_TC_TM_PACKET_OFFSET) // SCIENCE ASM #define PACKET_LENGTH_TM_LFR_SCIENCE_ASM_F0_1 (3230 - CCSDS_TC_TM_PACKET_OFFSET) // 32 * 25 * 4 + 30 => 32 bins (32 + 32 + 24 ), 3 packets @@ -451,7 +451,7 @@ typedef struct { unsigned char time[6]; // AUXILIARY HEADER unsigned char sid; - unsigned char hkBIA; + unsigned char pa_bia_status_info; unsigned char sy_lfr_common_parameters_spare; unsigned char sy_lfr_common_parameters; unsigned char pktCnt; @@ -476,7 +476,7 @@ typedef struct { unsigned char time[6]; // AUXILIARY DATA HEADER unsigned char sid; - unsigned char hkBIA; + unsigned char pa_bia_status_info; unsigned char sy_lfr_common_parameters_spare; unsigned char sy_lfr_common_parameters; unsigned char acquisitionTime[6]; @@ -499,7 +499,7 @@ typedef struct { unsigned char time[6]; // AUXILIARY HEADER unsigned char sid; - unsigned char biaStatusInfo; + unsigned char pa_bia_status_info; unsigned char sy_lfr_common_parameters_spare; unsigned char sy_lfr_common_parameters; unsigned char pa_lfr_pkt_cnt_asm; @@ -524,7 +524,7 @@ typedef struct { unsigned char time[6]; // AUXILIARY HEADER unsigned char sid; - unsigned char biaStatusInfo; + unsigned char pa_bia_status_info; unsigned char sy_lfr_common_parameters_spare; unsigned char sy_lfr_common_parameters; unsigned char acquisitionTime[6]; @@ -548,7 +548,7 @@ typedef struct { unsigned char time[6]; // AUXILIARY HEADER unsigned char sid; - unsigned char biaStatusInfo; + unsigned char pa_bia_status_info; unsigned char sy_lfr_common_parameters_spare; unsigned char sy_lfr_common_parameters; unsigned char acquisitionTime[6]; @@ -675,7 +675,7 @@ typedef struct { unsigned char hk_lfr_ahb_correctable; unsigned char hk_lfr_ahb_uncorrectable; // reaction wheel frequency - unsigned char hk_lfr_sw_rw_f_flags; + unsigned char hk_lfr_sc_rw_f_flags; } Packet_TM_LFR_HK_t; typedef struct { @@ -743,8 +743,24 @@ typedef struct { // PAS FILTER PARAMETERS unsigned char spare_sy_lfr_pas_filter_enabled; unsigned char sy_lfr_pas_filter_modulus; - unsigned char sy_lfr_pas_filter_nstd; + unsigned char sy_lfr_pas_filter_tbad[4]; unsigned char sy_lfr_pas_filter_offset; + unsigned char sy_lfr_pas_filter_shift[4]; + unsigned char sy_lfr_sc_rw_delta_f[4]; + + // LFR_RW_MASK + unsigned char sy_lfr_rw_mask_f0_word1[4]; + unsigned char sy_lfr_rw_mask_f0_word2[4]; + unsigned char sy_lfr_rw_mask_f0_word3[4]; + unsigned char sy_lfr_rw_mask_f0_word4[4]; + unsigned char sy_lfr_rw_mask_f1_word1[4]; + unsigned char sy_lfr_rw_mask_f1_word2[4]; + unsigned char sy_lfr_rw_mask_f1_word3[4]; + unsigned char sy_lfr_rw_mask_f1_word4[4]; + unsigned char sy_lfr_rw_mask_f2_word1[4]; + unsigned char sy_lfr_rw_mask_f2_word2[4]; + unsigned char sy_lfr_rw_mask_f2_word3[4]; + unsigned char sy_lfr_rw_mask_f2_word4[4]; // SPARE unsigned char source_data_spare; diff --git a/fsw_params_nb_bytes.h b/fsw_params_nb_bytes.h --- a/fsw_params_nb_bytes.h +++ b/fsw_params_nb_bytes.h @@ -28,10 +28,19 @@ #define DATAFIELD_POS_SY_LFR_S2_BP_P1 1 // TC_LFR_UPDATE_INFO -#define BYTE_POS_UPDATE_INFO_PARAMETERS_SET1 10 -#define BYTE_POS_UPDATE_INFO_PARAMETERS_SET2 11 -#define BYTE_POS_UPDATE_INFO_PARAMETERS_SET5 34 -#define BYTE_POS_UPDATE_INFO_PARAMETERS_SET6 35 +#define BYTE_POS_UPDATE_INFO_PARAMETERS_SET1 10 +#define BYTE_POS_UPDATE_INFO_PARAMETERS_SET2 11 +#define BYTE_POS_UPDATE_INFO_PARAMETERS_SET5 34 +#define BYTE_POS_UPDATE_INFO_PARAMETERS_SET6 35 +#define BYTE_POS_UPDATE_INFO_CP_RPW_SC_RW1_F1 44 +#define BYTE_POS_UPDATE_INFO_CP_RPW_SC_RW1_F2 48 +#define BYTE_POS_UPDATE_INFO_CP_RPW_SC_RW2_F1 52 +#define BYTE_POS_UPDATE_INFO_CP_RPW_SC_RW2_F2 56 +#define BYTE_POS_UPDATE_INFO_CP_RPW_SC_RW3_F1 60 +#define BYTE_POS_UPDATE_INFO_CP_RPW_SC_RW3_F2 64 +#define BYTE_POS_UPDATE_INFO_CP_RPW_SC_RW4_F1 68 +#define BYTE_POS_UPDATE_INFO_CP_RPW_SC_RW4_F2 72 +#define BYTE_POS_UPDATE_INFO_CP_RPW_SC_RW_F_FLAGS 77 // TC_LFR_ENTER_MODE #define BYTE_POS_CP_MODE_LFR_SET 11 @@ -42,11 +51,14 @@ #define NB_BYTES_PER_FREQ_MASK 16 #define NB_BYTES_PER_FBINS_MASK 4 -// TC_LFR_LOAD_PAS_FILTER_PAR -#define DATAFIELD_POS_SY_LFR_PAS_FILTER_ENABLED 0 -#define DATAFIELD_POS_SY_LFR_PAS_FILTER_MODULUS 1 -#define DATAFIELD_POS_SY_LFR_PAS_FILTER_NSTD 2 -#define DATAFIELD_POS_SY_LFR_PAS_FILTER_OFFSET 3 +// TC_LFR_LOAD_FILTER_PAR +#define DATAFIELD_POS_PA_RPW_SPARE8_2 0 // 8 bits +#define DATAFIELD_POS_SY_LFR_PAS_FILTER_ENABLED 1 // 8 bits +#define DATAFIELD_POS_SY_LFR_PAS_FILTER_MODULUS 2 // 8 bits +#define DATAFIELD_POS_SY_LFR_PAS_FILTER_TBAD 3 // 32 bits +#define DATAFIELD_POS_SY_LFR_PAS_FILTER_OFFSET 7 // 8 bits +#define DATAFIELD_POS_SY_LFR_PAS_FILTER_SHIFT 8 // 32 bits +#define DATAFIELD_POS_SY_LFR_SC_RW_DELTA_F 12 // 32 bits // TC_LFR_LOAD_KCOEFFICIENTS #define NB_BYTES_PER_FLOAT 4