diff --git a/basic_parameters.c b/basic_parameters.c --- a/basic_parameters.c +++ b/basic_parameters.c @@ -5,5 +5,51 @@ // version 1.3: 02/05/2014 // version 1.4: 16/05/2014 // version 1.5: 20/05/2014 +// version 1.6: 19/12/2014 -// dans l'immédiat ne sert donc plus à rien ... +#include + +#include "basic_parameters_utilities.h" + +void init_k_coefficients_f0( void ) +{ + uint16_t i; // 16 bits unsigned + + for(i=0; i +#include + +#include "basic_parameters_params.h" + +float compressed_spectral_matrix_f0[NB_BINS_COMPRESSED_MATRIX_f0 * NB_VALUES_PER_SPECTRAL_MATRIX]; +float k_coefficients_f0[NB_BINS_COMPRESSED_MATRIX_f0 * NB_K_COEFF_PER_BIN]; + +unsigned char LFR_BP1_f0[NB_BINS_COMPRESSED_MATRIX_f0*NB_BYTES_BP1]; +unsigned char LFR_BP2_f0[NB_BINS_COMPRESSED_MATRIX_f0*NB_BYTES_BP2]; + +#endif // BASIC_PARAMETERS_UTILITIES_H diff --git a/file_utilities.c b/file_utilities.c --- a/file_utilities.c +++ b/file_utilities.c @@ -5,8 +5,9 @@ // version 1.3: 02/05/2014 // version 1.4: 16/05/2014 // version 1.5: 20/05/2014 +// version 1.6: 19/12/2014 -#include "file_utilities.h" +#include "basic_parameters_utilities.h" int lecture_file_sm(const char *fileName) { @@ -65,46 +66,5 @@ int lecture_file_sm(const char *fileName return 0; } -void init_k_coefficients_f0( void ) -{ - uint16_t i; // 16 bits unsigned - - for(i=0; i -#include - -#include "basic_parameters.h" - -float compressed_spectral_matrix_f0[NB_BINS_COMPRESSED_MATRIX_f0 * NB_VALUES_PER_SPECTRAL_MATRIX]; -float k_coefficients_f0[NB_BINS_COMPRESSED_MATRIX_f0 * NB_K_COEFF_PER_BIN]; - -unsigned char LFR_BP1_f0[NB_BINS_COMPRESSED_MATRIX_f0*NB_BYTES_BP1]; -unsigned char LFR_BP2_f0[NB_BINS_COMPRESSED_MATRIX_f0*NB_BYTES_BP2]; - -int lecture_file_sm(const char *fileName); - -void init_k_coefficients_f0( void ); - -#endif // FILE_UTILITIES_H +// In the frame of RPW LFR Sofware ICD Issue1 Rev8 (05/07/2013) +// version 1.0: 31/07/2013 +// version 1.1: 02/04/2014 +// version 1.2: 30/04/2014 +// version 1.3: 02/05/2014 +// version 1.4: 16/05/2014 +// version 1.5: 20/05/2014 +// version 1.6: 19/12/2014 + +#ifndef FILE_UTILITIES_H +#define FILE_UTILITIES_H + +int lecture_file_sm(const char *fileName); + +#endif // FILE_UTILITIES_H diff --git a/main.c b/main.c --- a/main.c +++ b/main.c @@ -5,10 +5,13 @@ // version 1.3: 02/05/2014 // version 1.4: 16/05/2014 // version 1.5: 20/05/2014 +// version 1.6: 19/12/2014 #include #include "file_utilities.h" +#include "basic_parameters_utilities.h" +#include "basic_parameters.h" int main(void) {