# HG changeset patch # User paul # Date 2015-04-10 07:21:40 # Node ID ddd0a6fe16cc1861ad679bf646663e070189e037 # Parent d700fe1774be46689e78de1efae2ed50655b0f1c sync diff --git a/TC_types.h b/TC_types.h --- a/TC_types.h +++ b/TC_types.h @@ -44,7 +44,7 @@ #define TC_LFR_DATA_FIELD_HEADER0 0x19 #define TC_LFR_LOAD_COMMON_PAR_SPARE 0x00 -struct Packet_TC_LFR_RESET_str +typedef struct { // the CCSDS header is added by LPPMON unsigned char packetID[2]; unsigned char packetSequenceControl[2]; @@ -55,10 +55,9 @@ struct Packet_TC_LFR_RESET_str unsigned char serviceSubType; unsigned char sourceID; unsigned char crc[2]; -}; -typedef struct Packet_TC_LFR_RESET_str Packet_TC_LFR_RESET_t; +} Packet_TC_LFR_RESET_t; -struct Packet_TC_LFR_ENTER_MODE_str +typedef struct { // the CCSDS header is added by LPPMON unsigned char packetID[2]; unsigned char packetSequenceControl[2]; @@ -72,10 +71,9 @@ struct Packet_TC_LFR_ENTER_MODE_str unsigned char mode; unsigned char enterModeTime[6]; unsigned char crc[2]; -}; -typedef struct Packet_TC_LFR_ENTER_MODE_str Packet_TC_LFR_ENTER_MODE_t; +} Packet_TC_LFR_ENTER_MODE_t; -struct Packet_TC_LFR_UPDATE_INFO_str +typedef struct { // the CCSDS header is added by LPPMON unsigned char packetID[2]; unsigned char packetSequenceControl[2]; @@ -95,10 +93,9 @@ struct Packet_TC_LFR_UPDATE_INFO_str unsigned char set6; unsigned char set7[8]; unsigned char crc[2]; -}; -typedef struct Packet_TC_LFR_UPDATE_INFO_str Packet_TC_LFR_UPDATE_INFO_t; +} Packet_TC_LFR_UPDATE_INFO_t; -struct Packet_TC_LFR_DUMP_PAR_str +typedef struct { // the CCSDS header is added by LPPMON unsigned char packetID[2]; unsigned char packetSequenceControl[2]; @@ -110,10 +107,9 @@ struct Packet_TC_LFR_DUMP_PAR_str unsigned char sourceID; unsigned char crc[2]; -}; -typedef struct Packet_TC_LFR_DUMP_PAR_str Packet_TC_LFR_DUMP_PAR_t; +} Packet_TC_LFR_DUMP_PAR_t; -struct Packet_TC_LFR_LOAD_COMMON_PAR_str +typedef struct { // the CCSDS header is added by LPPMON unsigned char packetID[2]; unsigned char packetSequenceControl[2]; @@ -127,10 +123,9 @@ struct Packet_TC_LFR_LOAD_COMMON_PAR_str unsigned char bw_sp0_sp1_r0_r1; unsigned char crc[2]; -}; -typedef struct Packet_TC_LFR_LOAD_COMMON_PAR_str Packet_TC_LFR_LOAD_COMMON_PAR_t; +} Packet_TC_LFR_LOAD_COMMON_PAR_t; -struct Packet_TC_LFR_LOAD_NORMAL_PAR_str +typedef struct { // the CCSDS header is added by LPPMON unsigned char packetID[2]; unsigned char packetSequenceControl[2]; @@ -148,10 +143,9 @@ struct Packet_TC_LFR_LOAD_NORMAL_PAR_str unsigned char sy_lfr_n_cwf_long_f3; unsigned char lfr_normal_parameters_spare; unsigned char crc[2]; -}; -typedef struct Packet_TC_LFR_LOAD_NORMAL_PAR_str Packet_TC_LFR_LOAD_NORMAL_PAR_t; +} Packet_TC_LFR_LOAD_NORMAL_PAR_t; -struct Packet_TC_LFR_LOAD_BURST_SBM1_SBM2_PAR_str +typedef struct { // the CCSDS header is added by LPPMON unsigned char packetID[2]; unsigned char packetSequenceControl[2]; @@ -164,10 +158,9 @@ struct Packet_TC_LFR_LOAD_BURST_SBM1_SBM unsigned char sy_lfr_bp_p0; unsigned char sy_lfr_bp_p1; unsigned char crc[2]; -}; -typedef struct Packet_TC_LFR_LOAD_BURST_SBM1_SBM2_PAR_str Packet_TC_LFR_LOAD_BURST_SBM1_SBM2_PAR_t; +} Packet_TC_LFR_LOAD_BURST_SBM1_SBM2_PAR_t; -struct Packet_TC_LFR_ENABLE_DISABLE_CALIBRATION_str +typedef struct { // the CCSDS header is added by LPPMON unsigned char packetID[2]; unsigned char packetSequenceControl[2]; @@ -178,10 +171,24 @@ struct Packet_TC_LFR_ENABLE_DISABLE_CALI unsigned char serviceSubType; unsigned char sourceID; unsigned char crc[2]; -}; -typedef struct Packet_TC_LFR_ENABLE_DISABLE_CALIBRATION_str Packet_TC_LFR_ENABLE_DISABLE_CALIBRATION_t; +} Packet_TC_LFR_ENABLE_DISABLE_CALIBRATION_t; -struct Packet_TC_LFR_UPDATE_TIME_str +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; + unsigned char crc[2]; +} Packet_TC_LFR_LOAD_KCOEFFICIENT_t; + +typedef struct { // the CCSDS header is added by LPPMON unsigned char packetID[2]; unsigned char packetSequenceControl[2]; @@ -193,7 +200,6 @@ struct Packet_TC_LFR_UPDATE_TIME_str unsigned char sourceID; unsigned char cp_rpw_time[6]; unsigned char crc[2]; -}; -typedef struct Packet_TC_LFR_UPDATE_TIME_str Packet_TC_LFR_UPDATE_TIME_t; +} Packet_TC_LFR_UPDATE_TIME_t; #endif // TC_TYPES_H diff --git a/fsw_params_processing.h b/fsw_params_processing.h --- a/fsw_params_processing.h +++ b/fsw_params_processing.h @@ -44,6 +44,7 @@ #define NB_BINS_COMPRESSED_SM_F0 11 #define NB_BINS_COMPRESSED_SM_F1 13 #define NB_BINS_COMPRESSED_SM_F2 12 +#define NB_BINS_COMPRESSED_SM 36 // 11 + 12 + 13 #define NB_BINS_COMPRESSED_SM_SBM_F0 22 #define NB_BINS_COMPRESSED_SM_SBM_F1 26 #define NB_BINS_COMPRESSED_SM_SBM_F2 24