diff --git a/basic_parameters.c b/basic_parameters.c --- a/basic_parameters.c +++ b/basic_parameters.c @@ -10,35 +10,43 @@ // version 1.8: 02/02/2015 (gestion des divisions par zéro) // In the frame of RPW LFR Sofware ICD Issue3 Rev6 (27/01/2015) => R3 FSW // version 2.0: 19/06/2015 +// version 2.1: 22/06/2015 (modifs de Paul) + #include #include #include "basic_parameters_params.h" -void init_k_coefficients_f0( float *k_coeff_intercalib, unsigned char nb_binscompressed_matrix ); -void init_k_coefficients_f1( float *k_coeff_intercalib, unsigned char nb_binscompressed_matrix ); -void init_k_coefficients_f2( float *k_coeff_intercalib, unsigned char nb_binscompressed_matrix ); - void init_k_coefficients(float *k_coefficients, unsigned char nb_binscompressed_matrix ) { - switch (nb_binscompressed_matrix) - { - case 11: - puts("F0 data: initialization of the intercalibration k-coefficients"); + { + case NB_BINS_COMPRESSED_MATRIX_f0: +#ifdef DEBUG_TCH + printf("F0 data: initialization of the intercalibration k-coefficients\n"); +#endif init_k_coefficients_f0(k_coefficients, nb_binscompressed_matrix); break; - case 13: - puts("F1 data: initialization of the intercalibration k-coefficients"); + + case NB_BINS_COMPRESSED_MATRIX_f1: +#ifdef DEBUG_TCH + printf("F1 data: initialization of the intercalibration k-coefficients\n"); +#endif init_k_coefficients_f1(k_coefficients, nb_binscompressed_matrix); break; - case 12: - printf("F2 data: initialization of the intercalibration k-coefficients"); + + case NB_BINS_COMPRESSED_MATRIX_f2: +#ifdef DEBUG_TCH + printf("F2 data: initialization of the intercalibration k-coefficients\n"); +#endif init_k_coefficients_f2(k_coefficients, nb_binscompressed_matrix); break; + default: - puts("there is a problème !!?"); +#ifdef DEBUG_TCH + printf("there is a problème !!?\n"); +#endif break; } } diff --git a/basic_parameters.h b/basic_parameters.h --- a/basic_parameters.h +++ b/basic_parameters.h @@ -10,6 +10,8 @@ // version 1.8: 02/02/2015 (gestion des divisions par zéro) // In the frame of RPW LFR Sofware ICD Issue3 Rev6 (27/01/2015) => R3 FSW // version 2.0: 19/06/2015 +// version 2.1: 22/06/2015 (modifs de Paul) + #ifndef BASIC_PARAMETERS_H_INCLUDED #define BASIC_PARAMETERS_H_INCLUDED @@ -23,6 +25,10 @@ static inline void BP1_set(float * compressed_spec_mat, float * k_coeff_intercalib, unsigned char nb_bins_compressed_spec_mat, unsigned char * lfr_bp1); static inline void BP2_set(float * compressed_spec_mat, unsigned char nb_bins_compressed_spec_mat, unsigned char * lfr_bp2); +void init_k_coefficients_f0( float *k_coeff_intercalib, unsigned char nb_binscompressed_matrix ); +void init_k_coefficients_f1( float *k_coeff_intercalib, unsigned char nb_binscompressed_matrix ); +void init_k_coefficients_f2( float *k_coeff_intercalib, unsigned char nb_binscompressed_matrix ); + void init_k_coefficients( float *k_coeff_intercalib, unsigned char nb_binscompressed_matrix ); //*********************************** diff --git a/basic_parameters_params.h b/basic_parameters_params.h --- a/basic_parameters_params.h +++ b/basic_parameters_params.h @@ -6,12 +6,18 @@ // version 1.8: 02/02/2015 (gestion des divisions par zéro) // In the frame of RPW LFR Sofware ICD Issue3 Rev6 (27/01/2015) => R3 FSW // version 2.0: 19/06/2015 +// version 2.1: 22/06/2015 (modifs de Paul) + #ifndef BASIC_PARAMETERS_PARAMS_H #define BASIC_PARAMETERS_PARAMS_H #define NB_VALUES_PER_SPECTRAL_MATRIX 25 +#define NB_BINS_COMPRESSED_MATRIX_f0 11 +#define NB_BINS_COMPRESSED_MATRIX_f1 13 +#define NB_BINS_COMPRESSED_MATRIX_f2 12 + #define NB_BYTES_BP1 11 #define NB_BYTES_BP2 30 diff --git a/basic_parameters_utilities.h b/basic_parameters_utilities.h --- a/basic_parameters_utilities.h +++ b/basic_parameters_utilities.h @@ -4,6 +4,8 @@ // version 1.8: 02/02/2015 (gestion des divisions par zéro) // In the frame of RPW LFR Sofware ICD Issue3 Rev6 (27/01/2015) => R3 FSW // version 2.0: 19/06/2015 +// version 2.1: 22/06/2015 (modifs de Paul) + #ifndef BASIC_PARAMETERS_UTILITIES_H #define BASIC_PARAMETERS_UTILITIES_H @@ -13,10 +15,6 @@ #include "basic_parameters_params.h" -#define NB_BINS_COMPRESSED_MATRIX_f0 11 -#define NB_BINS_COMPRESSED_MATRIX_f1 13 -#define NB_BINS_COMPRESSED_MATRIX_f2 12 - 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]; float k_coefficients_f1[NB_BINS_COMPRESSED_MATRIX_f1 * NB_K_COEFF_PER_BIN]; diff --git a/file_utilities.c b/file_utilities.c --- a/file_utilities.c +++ b/file_utilities.c @@ -10,6 +10,8 @@ // version 1.8: 02/02/2015 (gestion des divisions par zéro) // In the frame of RPW LFR Sofware ICD Issue3 Rev6 (27/01/2015) => R3 FSW // version 2.0: 19/06/2015 +// version 2.1: 22/06/2015 (modifs de Paul) + #include "basic_parameters_utilities.h" diff --git a/file_utilities.h b/file_utilities.h --- a/file_utilities.h +++ b/file_utilities.h @@ -10,6 +10,8 @@ // version 1.8: 02/02/2015 (gestion des divisions par zéro) // In the frame of RPW LFR Sofware ICD Issue3 Rev6 (27/01/2015) => R3 FSW // version 2.0: 19/06/2015 +// version 2.1: 22/06/2015 (modifs de Paul) + #ifndef FILE_UTILITIES_H #define FILE_UTILITIES_H diff --git a/main.c b/main.c --- a/main.c +++ b/main.c @@ -10,6 +10,7 @@ // version 1.8: 02/02/2015 (gestion des divisions par zéro) // In the frame of RPW LFR Sofware ICD Issue3 Rev6 (27/01/2015) => R3 FSW // version 2.0: 19/06/2015 +// version 2.1: 22/06/2015 (modifs de Paul) #include