diff --git a/ccsds_types.h b/ccsds_types.h --- a/ccsds_types.h +++ b/ccsds_types.h @@ -18,15 +18,11 @@ #define CCSDS_PROTOCOLE_EXTRA_BYTES 4 #define CCSDS_TC_TM_PACKET_OFFSET 7 #define PROTID_RES_APP 3 -#define CCSDS_TELEMETRY_HEADER_LENGTH (16+4) #define CCSDS_TC_HEADER_LENGTH 10 -#define CCSDS_TM_PKT_MAX_SIZE 4412 -#define CCSDS_TELECOMMAND_HEADER_LENGTH (10+4) #define CCSDS_TC_PKT_MAX_SIZE 232 // (228+3) with 3 for Prot ID, Reserved and User App bytes, SHALL BE A MULTIPLE OF 4 #define CCSDS_TC_PKT_MIN_SIZE 16 #define CCSDS_PROCESS_ID 76 #define CCSDS_PACKET_CATEGORY 12 -#define CCSDS_NODE_ADDRESS 0xfe #define CCSDS_USER_APP 0x00 #define DEFAULT_SPARE1_PUSVERSION_SPARE2 0x10 @@ -34,24 +30,13 @@ #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 -// 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] -#define TM_PACKET_SEQ_CTRL_FIRST 0x40 // [0100 0000] -#define TM_PACKET_SEQ_CTRL_LAST 0x80 // [1000 0000] #define TM_PACKET_SEQ_CTRL_STANDALONE 0xc0 // [1100 0000] #define TM_PACKET_SEQ_CNT_DEFAULT 0x00 // [0000 0000] #define TM_PACKET_SEQ_SHIFT 8 @@ -61,16 +46,6 @@ // DESTINATION ID #define TM_DESTINATION_ID_GROUND 0 -#define TM_DESTINATION_ID_MISSION_TIMELINE 110 -#define TM_DESTINATION_ID_TC_SEQUENCES 111 -#define TM_DESTINATION_ID_RECOVERY_ACTION_COMMAND 112 -#define TM_DESTINATION_ID_BACKUP_MISSION_TIMELINE 113 -#define TM_DESTINATION_ID_DIRECT_CMD 120 -#define TM_DESTINATION_ID_SPARE_GRD_SRC1 121 -#define TM_DESTINATION_ID_SPARE_GRD_SRC2 122 -#define TM_DESTINATION_ID_OBCP 15 -#define TM_DESTINATION_ID_SYSTEM_CONTROL 14 -#define TM_DESTINATION_ID_AOCS 11 //********************************************************* //*** /!\ change CCSDS_DESTINATION_ID before flight /!\ *** @@ -84,10 +59,6 @@ #define CCSDS_RESERVED 0x00 #define CCSDS_USER_APP 0x00 -#define SIZE_TM_LFR_TC_EXE_NOT_IMPLEMENTED 24 -#define SIZE_TM_LFR_TC_EXE_CORRUPTED 32 -#define SIZE_HK_PARAMETERS 112 - // TC TYPES #define TC_TYPE_GEN 181 #define TC_TYPE_TIME 9 @@ -158,7 +129,6 @@ #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 @@ -250,7 +220,6 @@ enum apid_destid{ #define SID_K_DUMP 11 // HEADER_LENGTH -//#define TM_HEADER_LEN 16 #define HEADER_LENGTH_TM_LFR_SCIENCE_CWF 32 #define HEADER_LENGTH_TM_LFR_SCIENCE_SWF 34 #define HEADER_LENGTH_TM_LFR_SCIENCE_ASM 34 @@ -263,7 +232,6 @@ enum apid_destid{ #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 (212 - 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 #define PACKET_LENGTH_TM_LFR_SCIENCE_ASM_F0_2 (2430 - CCSDS_TC_TM_PACKET_OFFSET) // 24 * 25 * 4 + 30 => 24 bins (32 + 32 + 24 ), 3 packets @@ -635,9 +603,7 @@ typedef struct { #define STATUS_WORD_LINK_STATE_BITS 0x07 // [0000 0111] #define STATUS_WORD_LINK_STATE_MASK 0xf8 // [1111 1000] #define STATUS_WORD_LFR_MODE_SHIFT 4 -#define STATUS_WORD_LFR_MODE_BITS 0xf0 // [1111 0000] #define STATUS_WORD_LFR_MODE_MASK 0x0f // [0000 1111] -#define STATUS_WORD_0_DEFAULT 0x0d // [0000 1101] typedef struct { unsigned char targetLogicalAddress; diff --git a/fsw_params.h b/fsw_params.h --- a/fsw_params.h +++ b/fsw_params.h @@ -8,7 +8,6 @@ #include "stdint.h" #define GRSPW_DEVICE_NAME "/dev/grspw0" -#define UART_DEVICE_NAME "/dev/console" //******* // MACROS @@ -46,10 +45,10 @@ #define CONST_2048 2048 // 2^11 #define CONST_512 512 // 2^9 #define CONST_256 256 // 2^8 -#define CONST_128 128 // 2^7 -#define UINT8_MAX 255 +#ifndef UINT8_MAX + #define UINT8_MAX 255 +#endif -#define FLOAT_MSBYTE 0 #define FLOAT_LSBYTE 3 #define BITS_PER_BYTE 8 #define INIT_FLOAT 0. @@ -68,7 +67,6 @@ #define SHIFT_3_BITS 3 #define SHIFT_4_BITS 4 #define SHIFT_5_BITS 5 -#define SHIFT_6_BITS 6 #define SHIFT_7_BITS 7 #define BYTE_0 0 #define BYTE_1 1 @@ -110,7 +108,6 @@ typedef struct ring_node #define NB_PACKETS_PER_GROUP_OF_CWF_LIGHT 4 // 4 packets containing 672 blk #define NB_SAMPLES_PER_SNAPSHOT 2688 // 336 * 8 = 672 * 4 = 2688 #define TIME_OFFSET 2 -#define TIME_OFFSET_IN_BYTES 8 #define NB_BYTES_SWF_BLK (2 * 6) #define NB_WORDS_SWF_BLK 3 #define NB_BYTES_CWF3_LIGHT_BLK 6 @@ -138,10 +135,8 @@ typedef struct ring_node #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 #define RTEMS_EVENT_MODE_BURST RTEMS_EVENT_2 -#define RTEMS_EVENT_MODE_SBM1 RTEMS_EVENT_3 #define RTEMS_EVENT_MODE_SBM2 RTEMS_EVENT_4 #define RTEMS_EVENT_MODE_NORM_S1_S2 RTEMS_EVENT_5 #define RTEMS_EVENT_NORM_BP1_F0 RTEMS_EVENT_6 @@ -182,7 +177,6 @@ typedef struct ring_node #define DFLT_SY_LFR_N_BP_P0 4 // sec #define DFLT_SY_LFR_N_BP_P1 20 // sec #define DFLT_SY_LFR_N_CWF_LONG_F3 0 // 0 => production of light continuous waveforms at f3 -#define MIN_DELTA_SNAPSHOT 16 // sec // BURST #define DEFAULT_SY_LFR_B_BP_P0 1 // sec @@ -197,10 +191,6 @@ typedef struct ring_node #define DEFAULT_SY_LFR_S2_BP_P0 1 // sec #define DEFAULT_SY_LFR_S2_BP_P1 5 // sec -// ADDITIONAL PARAMETERS -#define TIME_BETWEEN_TWO_SWF_PACKETS 30 // nb x 10 ms => 300 ms -#define TIME_BETWEEN_TWO_CWF3_PACKETS 1000 // nb x 10 ms => 10 s - // STATUS WORD #define DEFAULT_STATUS_WORD_BYTE0 0x0d // [0000] [1] [101] mode 4 bits / SPW enabled 1 bit / state is run 3 bits @@ -215,7 +205,6 @@ typedef struct ring_node #define MIN_PAS_FILTER_SHIFT 0.0 #define MAX_PAS_FILTER_SHIFT 1.0 #define MIN_SY_LFR_SC_RW_DELTA_F 0 -#define MIN_SY_LFR_RW_K 0 #define MIN_SY_LFR_RW_F 0 // #define SY_LFR_DPU_CONNECT_TIMEOUT 100 // 100 * 10 ms = 1 s @@ -230,7 +219,6 @@ typedef struct ring_node #define APB_OFFSET_GRSPW_STATUS_REGISTER 0x04 #define APB_OFFSET_GRSPW_TIME_REGISTER 0x14 #define REGS_ADDR_TIME_MANAGEMENT 0x80000600 -#define REGS_ADDR_GRGPIO 0x80000b00 #define REGS_ADDR_SPECTRAL_MATRIX 0x80000f00 #define REGS_ADDR_WAVEFORM_PICKER 0x80000f54 // PDB >= 0.1.28 @@ -269,7 +257,6 @@ typedef struct ring_node #define LFR_SUCCESSFUL 0 #define LFR_DEFAULT 1 #define LFR_EXE_ERROR 2 -#define LFR_DEFAULT_ALT -1 //****** // RTEMS @@ -336,9 +323,6 @@ typedef struct ring_node #define QUEUE_PRC0 2 #define QUEUE_PRC1 3 #define QUEUE_PRC2 4 -#define QUEUE_CALI 5 - -#define CPU_USAGE_REPORT_PERIOD 6 // * 10 s = period struct param_local_str{ unsigned int local_sbm1_nb_cwf_sent; 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 @@ -71,7 +71,6 @@ // TC_LFR_LOAD_FILTER_PAR #define NB_RW_K_COEFFS 16 #define NB_BYTES_PER_RW_K_COEFF 4 -#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 diff --git a/fsw_params_processing.h b/fsw_params_processing.h --- a/fsw_params_processing.h +++ b/fsw_params_processing.h @@ -8,7 +8,6 @@ #define NB_SM_PER_S_F0 96 #define NB_SM_PER_S_F1 16 -#define NB_SM_PER_S_F2 1 #define NB_SM_PER_S1_BP_P0 24 #define ASM_COMP_B1B2 1 @@ -31,10 +30,6 @@ #define NB_BINS_PER_SM 128 #define NB_VALUES_PER_SM 25 #define TOTAL_SIZE_SM 3200 // 25 * 128 = 0xC80 -#define TOTAL_SIZE_NORM_BP1_F0 99 // 11 * 9 = 99 -#define TOTAL_SIZE_NORM_BP1_F1 117 // 13 * 9 = 117 -#define TOTAL_SIZE_NORM_BP1_F2 108 // 12 * 9 = 108 -#define TOTAL_SIZE_SBM1_BP1_F0 198 // 22 * 9 = 198 // F0 #define NB_RING_NODES_SM_F0 20 // AT LEAST 8 due to the way the averaging is done #define NB_RING_NODES_ASM_BURST_SBM_F0 10 // AT LEAST 3 @@ -50,21 +45,18 @@ #define NB_RING_NODES_ASM_NORM_F2 3 // AT LEAST 3 #define NB_RING_NODES_ASM_F2 3 // AT LEAST 3 // -#define NB_BINS_PER_ASM_F0 88 #define NB_BINS_PER_PKT_ASM_F0_1 32 #define NB_BINS_PER_PKT_ASM_F0_2 24 #define DLEN_ASM_F0_PKT_1 3200 // 32 * 25 * 4, 25 components per matrix, 4 bytes per float #define DLEN_ASM_F0_PKT_2 2400 // 24 * 25 * 4, 25 components per matrix, 4 bytes per float #define ASM_F0_INDICE_START 16 // 17 - 1, (-1) due to the VHDL behaviour // -#define NB_BINS_PER_ASM_F1 104 #define NB_BINS_PER_PKT_ASM_F1_1 36 #define NB_BINS_PER_PKT_ASM_F1_2 32 #define DLEN_ASM_F1_PKT_1 3600 // 36 * 25 * 4, 25 components per matrix, 4 bytes per float #define DLEN_ASM_F1_PKT_2 3200 // 32 * 25 * 4, 25 components per matrix, 4 bytes per float #define ASM_F1_INDICE_START 5 // 6 - 1, (-1) due to the VHDL behaviour // -#define NB_BINS_PER_ASM_F2 96 #define NB_BINS_PER_PKT_ASM_F2 32 #define DLEN_ASM_F2_PKT 3200 // 32 * 25 * 4, 25 components per matrix, 4 bytes per float #define ASM_F2_INDICE_START 6 // 7 - 1, (-1) due to the VHDL behaviour @@ -77,26 +69,18 @@ #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 -// -#define NB_BYTES_PER_BP1 9 -#define NB_BYTES_PER_BP2 30 // #define NB_BINS_TO_AVERAGE_ASM_F0 8 #define NB_BINS_TO_AVERAGE_ASM_F1 8 #define NB_BINS_TO_AVERAGE_ASM_F2 8 #define NB_BINS_TO_AVERAGE_ASM_SBM_F0 4 #define NB_BINS_TO_AVERAGE_ASM_SBM_F1 4 -#define NB_BINS_TO_AVERAGE_ASM_SBM_F2 4 // #define TOTAL_SIZE_COMPRESSED_ASM_NORM_F0 275 // 11 * 25 WORDS #define TOTAL_SIZE_COMPRESSED_ASM_NORM_F1 325 // 13 * 25 WORDS #define TOTAL_SIZE_COMPRESSED_ASM_NORM_F2 300 // 12 * 25 WORDS #define TOTAL_SIZE_COMPRESSED_ASM_SBM_F0 550 // 22 * 25 WORDS #define TOTAL_SIZE_COMPRESSED_ASM_SBM_F1 650 // 26 * 25 WORDS -#define TOTAL_SIZE_BP1_NORM_F0 99 // 9 * 11 UNSIGNED CHAR -#define TOTAL_SIZE_BP2_NORM_F0 330 // 30 * 11 UNSIGNED CHAR -#define TOTAL_SIZE_BP1_SBM_F0 198 // 9 * 22 UNSIGNED CHAR // GENERAL #define NB_SM_BEFORE_AVF0_F1 8 // must be 8 due to the SM_average() function #define NB_SM_BEFORE_AVF2 1 // must be 1 due to the SM_average_f2() function diff --git a/tm_byte_positions.h b/tm_byte_positions.h --- a/tm_byte_positions.h +++ b/tm_byte_positions.h @@ -1,14 +1,7 @@ #ifndef TM_BYTE_POSITIONS_H #define TM_BYTE_POSITIONS_H -#define BYTE_POS_CP_LFR_MODE 11 - // TC_LFR_LOAD_NORMAL_PAR -#define BYTE_POS_SY_LFR_N_SWF_L 0 -#define BYTE_POS_SY_LFR_N_SWF_P 2 -#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 // TM_LFR_HK