From 4fbcc3f0a8a582c729ed21533339e03de9ee5589 Mon Sep 17 00:00:00 2001 From: ha7ilm Date: Sun, 22 May 2016 18:35:26 +0200 Subject: [PATCH] Renamed loop filters --- csdr.c | 10 +++++----- libcsdr.c | 8 ++++---- libcsdr.h | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/csdr.c b/csdr.c index 0412f1b..d3da0c9 100644 --- a/csdr.c +++ b/csdr.c @@ -1962,24 +1962,24 @@ int main(int argc, char *argv[]) sscanf(argv[2],"%d",(int*)&pll.pll_type); //if(serial.samples_per_bits<1) return badsyntax("samples_per_bits should be at least 1."); //if(serial.samples_per_bits<5) fprintf(stderr, "serial_line_decoder_sy_u8: warning: this algorithm does not work well if samples_per_bits is too low. It should be at least 5.\n"); - if(pll.pll_type == PLL_1ST_ORDER_IIR_LOOP_FILTER) + if(pll.pll_type == PLL_P_CONTROLLER) { float alpha = 0.01; if(argc>3) sscanf(argv[3],"%f",&alpha); - pll_cc_init_1st_order_IIR(&pll, alpha); + pll_cc_init_p_controller(&pll, alpha); } - else if(pll.pll_type == PLL_2ND_ORDER_IIR_LOOP_FILTER) + else if(pll.pll_type == PLL_PI_CONTROLLER) { float bandwidth = 0.01, ko = 10, kd=0.1, damping_factor = 0.707; if(argc>3) sscanf(argv[3],"%f",&bandwidth); if(argc>4) sscanf(argv[4],"%f",&damping_factor); if(argc>5) sscanf(argv[5],"%f",&ko); if(argc>6) sscanf(argv[6],"%f",&kd); - pll_cc_init_2nd_order_IIR(&pll, bandwidth, ko, kd, damping_factor); + pll_cc_init_pi_controller(&pll, bandwidth, ko, kd, damping_factor); fprintf(stderr, "bw=%f damping=%f ko=%f kd=%f alpha=%f beta=%f\n", bandwidth, damping_factor, ko, kd, pll.alpha, pll.beta); // pll.filter_taps_a[0], pll.filter_taps_a[1], pll.filter_taps_a[2], pll.filter_taps_b[0], pll.filter_taps_b[1], pll.filter_taps_b[2]); } - else return badsyntax("invalid pll_type. Valid values are:\n\t1: PLL_1ST_ORDER_IIR_LOOP_FILTER\n\t2: PLL_2ND_ORDER_IIR_LOOP_FILTER"); + else return badsyntax("invalid pll_type. Valid values are:\n\t1: PLL_P_CONTROLLER\n\t2: PLL_PI_CONTROLLER"); if(!sendbufsize(initialize_buffers())) return -2; diff --git a/libcsdr.c b/libcsdr.c index 10f62ec..0a908e3 100644 --- a/libcsdr.c +++ b/libcsdr.c @@ -1336,7 +1336,7 @@ void binary_slicer_f_u8(float* input, unsigned char* output, int input_size) for(int i=0;i 0; } -void pll_cc_init_2nd_order_IIR(pll_t* p, float bandwidth, float ko, float kd, float damping_factor) +void pll_cc_init_pi_controller(pll_t* p, float bandwidth, float ko, float kd, float damping_factor) { //kd: detector gain //ko: VCO gain @@ -1347,7 +1347,7 @@ void pll_cc_init_2nd_order_IIR(pll_t* p, float bandwidth, float ko, float kd, fl p->iir_temp = p->dphase = p->output_phase = 0; } -void pll_cc_init_1st_order_IIR(pll_t* p, float alpha) +void pll_cc_init_p_controller(pll_t* p, float alpha) { p->alpha = alpha; p->dphase=p->output_phase=0; @@ -1379,7 +1379,7 @@ void pll_cc(pll_t* p, complexf* input, float* output_dphase, complexf* output_nc //output_nco[i] = multiply_result; //float new_dphase = absof(&multiply_result,0); - if(p->pll_type == PLL_2ND_ORDER_IIR_LOOP_FILTER) + if(p->pll_type == PLL_PI_CONTROLLER) { p->dphase = new_dphase * p->alpha + p->iir_temp; p->iir_temp += new_dphase * p->beta; @@ -1387,7 +1387,7 @@ void pll_cc(pll_t* p, complexf* input, float* output_dphase, complexf* output_nc while(p->dphase>PI) p->dphase-=2*PI; //ez nem fog kelleni while(p->dphase<-PI) p->dphase+=2*PI; } - else if(p->pll_type == PLL_1ST_ORDER_IIR_LOOP_FILTER) + else if(p->pll_type == PLL_P_CONTROLLER) { p->dphase = new_dphase * p->alpha; } diff --git a/libcsdr.h b/libcsdr.h index b05abb2..4af1c74 100644 --- a/libcsdr.h +++ b/libcsdr.h @@ -240,8 +240,8 @@ void binary_slicer_f_u8(float* input, unsigned char* output, int input_size); typedef enum pll_type_e { - PLL_1ST_ORDER_IIR_LOOP_FILTER=1, - PLL_2ND_ORDER_IIR_LOOP_FILTER=2 + PLL_P_CONTROLLER=1, + PLL_PI_CONTROLLER=2 } pll_type_t; typedef struct pll_s @@ -256,6 +256,6 @@ typedef struct pll_s float iir_temp; } pll_t; -void pll_cc_init_2nd_order_IIR(pll_t* p, float bandwidth, float ko, float kd, float damping_factor); -void pll_cc_init_1st_order_IIR(pll_t* p, float alpha); +void pll_cc_init_pi_controller(pll_t* p, float bandwidth, float ko, float kd, float damping_factor); +void pll_cc_init_p_controller(pll_t* p, float alpha); void pll_cc(pll_t* p, complexf* input, float* output_dphase, complexf* output_nco, int input_size);