@@ -19,6 +19,7 | |||
|
19 | 19 | #define DELTAF_F0 96. |
|
20 | 20 | #define DELTAF_F1 16. |
|
21 | 21 | #define DELTAF_F2 1. |
|
22 | #define DELTAF_DIV 2. | |
|
22 | 23 | |
|
23 | 24 | #define BIT_RW1_F1 0x80 |
|
24 | 25 | #define BIT_RW1_F2 0x40 |
@@ -93,7 +94,7 unsigned int check_update_info_hk_thr_mo | |||
|
93 | 94 | void set_hk_lfr_sc_rw_f_flag( unsigned char wheel, unsigned char freq, float value ); |
|
94 | 95 | void set_hk_lfr_sc_rw_f_flags( void ); |
|
95 | 96 | void getReactionWheelsFrequencies( ccsdsTelecommandPacket_t *TC ); |
|
96 | void setFBinMask(unsigned char *fbins_mask, float rw_f, unsigned char deltaFreq, float k ); | |
|
97 | void setFBinMask(unsigned char *fbins_mask, float rw_f, unsigned char deltaFreq, float kcoeff ); | |
|
97 | 98 | void build_sy_lfr_rw_mask( unsigned int channel ); |
|
98 | 99 | void build_sy_lfr_rw_masks(); |
|
99 | 100 | void merge_fbins_masks( void ); |
@@ -1080,7 +1080,7 void getReactionWheelsFrequencies( ccsds | |||
|
1080 | 1080 | |
|
1081 | 1081 | } |
|
1082 | 1082 | |
|
1083 | void setFBinMask(unsigned char *fbins_mask, float rw_f, unsigned char deltaFreq, float k ) | |
|
1083 | void setFBinMask(unsigned char *fbins_mask, float rw_f, unsigned char deltaFreq, float kcoeff ) | |
|
1084 | 1084 | { |
|
1085 | 1085 | /** This function executes specific actions when a TC_LFR_UPDATE_INFO TeleCommand has been received. |
|
1086 | 1086 | * |
@@ -1122,8 +1122,8 void setFBinMask(unsigned char *fbins_ma | |||
|
1122 | 1122 | { |
|
1123 | 1123 | |
|
1124 | 1124 | // compute the frequency range to filter [ rw_f - delta_f/2; rw_f + delta_f/2 ] |
|
1125 |
f_RW_min = rw_f - (filterPar.sy_lfr_sc_rw_delta_f / |
|
|
1126 |
f_RW_MAX = rw_f + (filterPar.sy_lfr_sc_rw_delta_f / |
|
|
1125 | f_RW_min = rw_f - ( (filterPar.sy_lfr_sc_rw_delta_f * kcoeff) / DELTAF_DIV); | |
|
1126 | f_RW_MAX = rw_f + ( (filterPar.sy_lfr_sc_rw_delta_f * kcoeff) / DELTAF_DIV); | |
|
1127 | 1127 | |
|
1128 | 1128 | // compute the index of the frequency bin immediately below rw_f |
|
1129 | 1129 | binBelow = (int) ( floor( ((double) rw_f) / ((double) deltaFreq)) ); |
@@ -1192,8 +1192,6 void build_sy_lfr_rw_mask( unsigned int | |||
|
1192 | 1192 | double deltaF; |
|
1193 | 1193 | unsigned k; |
|
1194 | 1194 | |
|
1195 | k = 0; | |
|
1196 | ||
|
1197 | 1195 | maskPtr = NULL; |
|
1198 | 1196 | deltaF = DELTAF_F2; |
|
1199 | 1197 |
General Comments 0
You need to be logged in to leave comments.
Login now