# HG changeset patch # User chust # Date 2014-12-19 15:17:34 # Node ID fc753d9d5cc7a3f6a46982da93b8815be7252ce6 # Parent 68af26bd1355e3585fd5af35d6690dfbf8fe361f version 1.6 suite a diff --git a/basic_parameters.c b/basic_parameters.c --- a/basic_parameters.c +++ b/basic_parameters.c @@ -9,9 +9,11 @@ #include -#include "basic_parameters_utilities.h" +#include "basic_parameters_params.h" -void init_k_coefficients_f0( void ) +void init_k_coefficients( float *k_coefficients_f0, \ + float *k_coefficients_f1, \ + float *k_coefficients_f2 ) { uint16_t i; // 16 bits unsigned diff --git a/basic_parameters.h b/basic_parameters.h --- a/basic_parameters.h +++ b/basic_parameters.h @@ -19,7 +19,7 @@ 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( void ); +void init_k_coefficients( float *k_coefficients_f0, float *k_coefficients_f1, float *k_coefficients_f2 ); //*********************************** // STATIC INLINE FUNCTION DEFINITIONS diff --git a/basic_parameters_params.h b/basic_parameters_params.h --- a/basic_parameters_params.h +++ b/basic_parameters_params.h @@ -7,6 +7,8 @@ #define NB_VALUES_PER_SPECTRAL_MATRIX 25 #define NB_BINS_COMPRESSED_MATRIX_f0 1 +#define NB_BINS_COMPRESSED_MATRIX_f1 13 +#define NB_BINS_COMPRESSED_MATRIX_f2 12 #define NB_BYTES_BP1 9 #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 @@ -10,6 +10,8 @@ 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]; +float k_coefficients_f2[NB_BINS_COMPRESSED_MATRIX_f2 * 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]; diff --git a/main.c b/main.c --- a/main.c +++ b/main.c @@ -32,7 +32,7 @@ int main(void) filename="sm_test2.dat"; lecture_file_sm(filename); - init_k_coefficients_f0(); + init_k_coefficients(k_coefficients_f0, k_coefficients_f1, k_coefficients_f2); printf("\n"); diff --git a/tests4.pro b/tests4.pro new file mode 100755 --- /dev/null +++ b/tests4.pro @@ -0,0 +1,20 @@ +TEMPLATE = app +CONFIG += console +CONFIG -= app_bundle +CONFIG -= qt + +DEFINES += DEBUG_TCH +#DEFINES += MSB_FIRST_TCH # SPARC convention +DEFINES += LSB_FIRST_TCH # PC convention + +SOURCES += main.c \ + basic_parameters.c \ + file_utilities.c + +HEADERS += \ + basic_parameters.h \ + basic_parameters_params.h \ + basic_parameters_utilities.h \ + file_utilities.h + +