diff --git a/header/tc_load_dump_parameters.h b/header/tc_load_dump_parameters.h --- a/header/tc_load_dump_parameters.h +++ b/header/tc_load_dump_parameters.h @@ -19,6 +19,7 @@ #define DELTAF_F0 96. #define DELTAF_F1 16. #define DELTAF_F2 1. +#define DELTAF_DIV 2. #define BIT_RW1_F1 0x80 #define BIT_RW1_F2 0x40 @@ -93,7 +94,7 @@ unsigned int check_update_info_hk_thr_mo void set_hk_lfr_sc_rw_f_flag( unsigned char wheel, unsigned char freq, float value ); void set_hk_lfr_sc_rw_f_flags( void ); void getReactionWheelsFrequencies( ccsdsTelecommandPacket_t *TC ); -void setFBinMask(unsigned char *fbins_mask, float rw_f, unsigned char deltaFreq, float k ); +void setFBinMask(unsigned char *fbins_mask, float rw_f, unsigned char deltaFreq, float kcoeff ); void build_sy_lfr_rw_mask( unsigned int channel ); void build_sy_lfr_rw_masks(); void merge_fbins_masks( void ); diff --git a/src/tc_load_dump_parameters.c b/src/tc_load_dump_parameters.c --- a/src/tc_load_dump_parameters.c +++ b/src/tc_load_dump_parameters.c @@ -1080,7 +1080,7 @@ void getReactionWheelsFrequencies( ccsds } -void setFBinMask(unsigned char *fbins_mask, float rw_f, unsigned char deltaFreq, float k ) +void setFBinMask(unsigned char *fbins_mask, float rw_f, unsigned char deltaFreq, float kcoeff ) { /** This function executes specific actions when a TC_LFR_UPDATE_INFO TeleCommand has been received. * @@ -1122,8 +1122,8 @@ void setFBinMask(unsigned char *fbins_ma { // compute the frequency range to filter [ rw_f - delta_f/2; rw_f + delta_f/2 ] - f_RW_min = rw_f - (filterPar.sy_lfr_sc_rw_delta_f / 2.); - f_RW_MAX = rw_f + (filterPar.sy_lfr_sc_rw_delta_f / 2.); + f_RW_min = rw_f - ( (filterPar.sy_lfr_sc_rw_delta_f * kcoeff) / DELTAF_DIV); + f_RW_MAX = rw_f + ( (filterPar.sy_lfr_sc_rw_delta_f * kcoeff) / DELTAF_DIV); // compute the index of the frequency bin immediately below rw_f binBelow = (int) ( floor( ((double) rw_f) / ((double) deltaFreq)) ); @@ -1192,8 +1192,6 @@ void build_sy_lfr_rw_mask( unsigned int double deltaF; unsigned k; - k = 0; - maskPtr = NULL; deltaF = DELTAF_F2;