HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/DEV_PLE Commit - r330:cd97edc61709

Commit before going back to Rev 326

paul -

r330:cd97edc61709 R3++

parent child

Context file:

r330:cd97edc61709

header/tc_load_dump_parameters.h +2 -1

             #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
             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 );

src/tc_load_dump_parameters.c +3 -5

             }
-            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.
                  *
                 {
                     // 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_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 / 2.);
+                    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)) );
                 double deltaF;
                 unsigned k;
-                k = 0;
                 maskPtr = NULL;
                 deltaF = DELTAF_F2;

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages