# HG changeset patch # User paul # Date 2015-04-13 12:48:08 # Node ID 66b92cfa53b5be9f8f61d83de8e13397d0198b56 # Parent d700fe1774be46689e78de1efae2ed50655b0f1c sync diff --git a/TC_types.h b/TC_types.h --- a/TC_types.h +++ b/TC_types.h @@ -19,6 +19,7 @@ #define PACKET_LENGTH_TC_LFR_UPDATE_INFO (46 - 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 @@ -44,7 +45,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 +56,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 +72,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 +94,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]; @@ -109,11 +107,9 @@ struct Packet_TC_LFR_DUMP_PAR_str unsigned char serviceSubType; unsigned char sourceID; unsigned char crc[2]; +} Packet_TC_LFR_DUMP_PAR_t; -}; -typedef struct Packet_TC_LFR_DUMP_PAR_str 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]; @@ -126,11 +122,9 @@ struct Packet_TC_LFR_LOAD_COMMON_PAR_str unsigned char spare; unsigned char bw_sp0_sp1_r0_r1; unsigned char crc[2]; +} Packet_TC_LFR_LOAD_COMMON_PAR_t; -}; -typedef struct Packet_TC_LFR_LOAD_COMMON_PAR_str 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 +142,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 +157,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 +170,9 @@ 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]; @@ -193,7 +184,20 @@ 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; + +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; #endif // TC_TYPES_H diff --git a/ccsds_types.h b/ccsds_types.h --- a/ccsds_types.h +++ b/ccsds_types.h @@ -18,12 +18,19 @@ #define DEFAULT_HKBIA 0x1e // 0001 1110 // PACKET ID +#define TM_PACKET_PID_DEFAULT 76 +#define TM_PACKET_PID_BURST_SBM1_SBM2 79 #define APID_TM_TC_EXE 0x0cc1 // PID 76 CAT 1 #define APID_TM_HK 0x0cc4 // PID 76 CAT 4 #define APID_TM_SCIENCE_NORMAL_BURST 0x0ccc // PID 76 CAT 12 #define APID_TM_SCIENCE_SBM1_SBM2 0x0cfc // PID 79 CAT 12 #define APID_TM_PARAMETER_DUMP 0x0cc6 // PID 76 CAT 6 #define APID_TM_KCOEFFICIENTS_DUMP 0x0cc6 // PID 76 CAT 6 +// PACKET CAT +#define TM_PACKET_CAT_TC_EXE 1 +#define TM_PACKET_CAT_HK 4 +#define TM_PACKET_CAT_SCIENCE 12 +#define TM_PACKET_CAT_DUMP 6 // PACKET SEQUENCE CONTROL #define TM_PACKET_SEQ_CTRL_CONTINUATION 0x00 // [0000 0000] @@ -104,7 +111,7 @@ #define TM_TYPE_HK 3 #define TM_TYPE_LFR_SCIENCE 21 #define TM_TYPE_PARAMETER_DUMP 181 -#define TM_TYPE_KCOEFFICIENTD_DUMP 181 +#define TM_TYPE_KCOEFFICIENT_DUMP 181 // TM SUBTYPES #define TM_SUBTYPE_EXE_OK 7