Skip to content

Commit

Permalink
analog: remove wrapped inherited methods from control_loop
Browse files Browse the repository at this point in the history 
Signed-off-by: Josh Morman <[email protected]>
  • Loading branch information
@mormj
mormj committed Nov 9, 2022
1 parent 67627ac commit 60e4df3
Show file tree
Hide file tree
Showing 10 changed files with 2 additions and 479 deletions.
18 changes: 0 additions & 18 deletions gr-analog/include/gnuradio/analog/pll_carriertracking_cc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,24 +53,6 @@ class ANALOG_API pll_carriertracking_cc : virtual public sync_block,
virtual bool lock_detector(void) = 0;
virtual bool squelch_enable(bool) = 0;
virtual float set_lock_threshold(float) = 0;

void set_loop_bandwidth(float bw) override = 0;
virtual void set_damping_factor(float df) = 0;
virtual void set_alpha(float alpha) = 0;
virtual void set_beta(float beta) = 0;
virtual void set_frequency(float freq) = 0;
virtual void set_phase(float phase) = 0;
virtual void set_min_freq(float freq) = 0;
virtual void set_max_freq(float freq) = 0;

virtual float get_loop_bandwidth() const = 0;
virtual float get_damping_factor() const = 0;
virtual float get_alpha() const = 0;
virtual float get_beta() const = 0;
virtual float get_frequency() const = 0;
virtual float get_phase() const = 0;
virtual float get_min_freq() const = 0;
virtual float get_max_freq() const = 0;
};

} /* namespace analog */
Expand Down
18 changes: 0 additions & 18 deletions gr-analog/include/gnuradio/analog/pll_freqdet_cf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,24 +48,6 @@ class ANALOG_API pll_freqdet_cf : virtual public sync_block,
* \param min_freq: minimum (normalized) frequency PLL will lock to.
*/
static sptr make(float loop_bw, float max_freq, float min_freq);

void set_loop_bandwidth(float bw) override = 0;
virtual void set_damping_factor(float df) = 0;
virtual void set_alpha(float alpha) = 0;
virtual void set_beta(float beta) = 0;
virtual void set_frequency(float freq) = 0;
virtual void set_phase(float phase) = 0;
virtual void set_min_freq(float freq) = 0;
virtual void set_max_freq(float freq) = 0;

virtual float get_loop_bandwidth() const = 0;
virtual float get_damping_factor() const = 0;
virtual float get_alpha() const = 0;
virtual float get_beta() const = 0;
virtual float get_frequency() const = 0;
virtual float get_phase() const = 0;
virtual float get_min_freq() const = 0;
virtual float get_max_freq() const = 0;
};

} /* namespace analog */
Expand Down
81 changes: 0 additions & 81 deletions gr-analog/lib/pll_carriertracking_cc_impl.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,86 +83,5 @@ int pll_carriertracking_cc_impl::work(int noutput_items,
return noutput_items;
}

void pll_carriertracking_cc_impl::set_loop_bandwidth(float bw)
{
blocks::control_loop::set_loop_bandwidth(bw);
}

void pll_carriertracking_cc_impl::set_damping_factor(float df)
{
blocks::control_loop::set_damping_factor(df);
}

void pll_carriertracking_cc_impl::set_alpha(float alpha)
{
blocks::control_loop::set_alpha(alpha);
}

void pll_carriertracking_cc_impl::set_beta(float beta)
{
blocks::control_loop::set_beta(beta);
}

void pll_carriertracking_cc_impl::set_frequency(float freq)
{
blocks::control_loop::set_frequency(freq);
}

void pll_carriertracking_cc_impl::set_phase(float phase)
{
blocks::control_loop::set_phase(phase);
}

void pll_carriertracking_cc_impl::set_min_freq(float freq)
{
blocks::control_loop::set_min_freq(freq);
}

void pll_carriertracking_cc_impl::set_max_freq(float freq)
{
blocks::control_loop::set_max_freq(freq);
}


float pll_carriertracking_cc_impl::get_loop_bandwidth() const
{
return blocks::control_loop::get_loop_bandwidth();
}

float pll_carriertracking_cc_impl::get_damping_factor() const
{
return blocks::control_loop::get_damping_factor();
}

float pll_carriertracking_cc_impl::get_alpha() const
{
return blocks::control_loop::get_alpha();
}

float pll_carriertracking_cc_impl::get_beta() const
{
return blocks::control_loop::get_beta();
}

float pll_carriertracking_cc_impl::get_frequency() const
{
return blocks::control_loop::get_frequency();
}

float pll_carriertracking_cc_impl::get_phase() const
{
return blocks::control_loop::get_phase();
}

float pll_carriertracking_cc_impl::get_min_freq() const
{
return blocks::control_loop::get_min_freq();
}

float pll_carriertracking_cc_impl::get_max_freq() const
{
return blocks::control_loop::get_max_freq();
}

} /* namespace analog */
} /* namespace gr */
18 changes: 0 additions & 18 deletions gr-analog/lib/pll_carriertracking_cc_impl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,24 +50,6 @@ class pll_carriertracking_cc_impl : public pll_carriertracking_cc
bool squelch_enable(bool) override;
float set_lock_threshold(float) override;

void set_loop_bandwidth(float bw) override;
void set_damping_factor(float df) override;
void set_alpha(float alpha) override;
void set_beta(float beta) override;
void set_frequency(float freq) override;
void set_phase(float phase) override;
void set_min_freq(float freq) override;
void set_max_freq(float freq) override;

float get_loop_bandwidth() const override;
float get_damping_factor() const override;
float get_alpha() const override;
float get_beta() const override;
float get_frequency() const override;
float get_phase() const override;
float get_min_freq() const override;
float get_max_freq() const override;

int work(int noutput_items,
gr_vector_const_void_star& input_items,
gr_vector_void_star& output_items) override;
Expand Down
69 changes: 0 additions & 69 deletions gr-analog/lib/pll_freqdet_cf_impl.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,74 +74,5 @@ int pll_freqdet_cf_impl::work(int noutput_items,
return noutput_items;
}

void pll_freqdet_cf_impl::set_loop_bandwidth(float bw)
{
blocks::control_loop::set_loop_bandwidth(bw);
}

void pll_freqdet_cf_impl::set_damping_factor(float df)
{
blocks::control_loop::set_damping_factor(df);
}

void pll_freqdet_cf_impl::set_alpha(float alpha)
{
blocks::control_loop::set_alpha(alpha);
}

void pll_freqdet_cf_impl::set_beta(float beta) { blocks::control_loop::set_beta(beta); }

void pll_freqdet_cf_impl::set_frequency(float freq)
{
blocks::control_loop::set_frequency(freq);
}

void pll_freqdet_cf_impl::set_phase(float phase)
{
blocks::control_loop::set_phase(phase);
}

void pll_freqdet_cf_impl::set_min_freq(float freq)
{
blocks::control_loop::set_min_freq(freq);
}

void pll_freqdet_cf_impl::set_max_freq(float freq)
{
blocks::control_loop::set_max_freq(freq);
}


float pll_freqdet_cf_impl::get_loop_bandwidth() const
{
return blocks::control_loop::get_loop_bandwidth();
}

float pll_freqdet_cf_impl::get_damping_factor() const
{
return blocks::control_loop::get_damping_factor();
}

float pll_freqdet_cf_impl::get_alpha() const { return blocks::control_loop::get_alpha(); }

float pll_freqdet_cf_impl::get_beta() const { return blocks::control_loop::get_beta(); }

float pll_freqdet_cf_impl::get_frequency() const
{
return blocks::control_loop::get_frequency();
}

float pll_freqdet_cf_impl::get_phase() const { return blocks::control_loop::get_phase(); }

float pll_freqdet_cf_impl::get_min_freq() const
{
return blocks::control_loop::get_min_freq();
}

float pll_freqdet_cf_impl::get_max_freq() const
{
return blocks::control_loop::get_max_freq();
}

} /* namespace analog */
} /* namespace gr */
18 changes: 0 additions & 18 deletions gr-analog/lib/pll_freqdet_cf_impl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,24 +22,6 @@ class pll_freqdet_cf_impl : public pll_freqdet_cf
pll_freqdet_cf_impl(float loop_bw, float max_freq, float min_freq);
~pll_freqdet_cf_impl() override;

void set_loop_bandwidth(float bw) override;
void set_damping_factor(float df) override;
void set_alpha(float alpha) override;
void set_beta(float beta) override;
void set_frequency(float freq) override;
void set_phase(float phase) override;
void set_min_freq(float freq) override;
void set_max_freq(float freq) override;

float get_loop_bandwidth() const override;
float get_damping_factor() const override;
float get_alpha() const override;
float get_beta() const override;
float get_frequency() const override;
float get_phase() const override;
float get_min_freq() const override;
float get_max_freq() const override;

int work(int noutput_items,
gr_vector_const_void_star& input_items,
gr_vector_void_star& output_items) override;
Expand Down
69 changes: 0 additions & 69 deletions gr-analog/lib/pll_refout_cc_impl.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,74 +59,5 @@ int pll_refout_cc_impl::work(int noutput_items,
return noutput_items;
}

void pll_refout_cc_impl::set_loop_bandwidth(float bw)
{
blocks::control_loop::set_loop_bandwidth(bw);
}

void pll_refout_cc_impl::set_damping_factor(float df)
{
blocks::control_loop::set_damping_factor(df);
}

void pll_refout_cc_impl::set_alpha(float alpha)
{
blocks::control_loop::set_alpha(alpha);
}

void pll_refout_cc_impl::set_beta(float beta) { blocks::control_loop::set_beta(beta); }

void pll_refout_cc_impl::set_frequency(float freq)
{
blocks::control_loop::set_frequency(freq);
}

void pll_refout_cc_impl::set_phase(float phase)
{
blocks::control_loop::set_phase(phase);
}

void pll_refout_cc_impl::set_min_freq(float freq)
{
blocks::control_loop::set_min_freq(freq);
}

void pll_refout_cc_impl::set_max_freq(float freq)
{
blocks::control_loop::set_max_freq(freq);
}


float pll_refout_cc_impl::get_loop_bandwidth() const
{
return blocks::control_loop::get_loop_bandwidth();
}

float pll_refout_cc_impl::get_damping_factor() const
{
return blocks::control_loop::get_damping_factor();
}

float pll_refout_cc_impl::get_alpha() const { return blocks::control_loop::get_alpha(); }

float pll_refout_cc_impl::get_beta() const { return blocks::control_loop::get_beta(); }

float pll_refout_cc_impl::get_frequency() const
{
return blocks::control_loop::get_frequency();
}

float pll_refout_cc_impl::get_phase() const { return blocks::control_loop::get_phase(); }

float pll_refout_cc_impl::get_min_freq() const
{
return blocks::control_loop::get_min_freq();
}

float pll_refout_cc_impl::get_max_freq() const
{
return blocks::control_loop::get_max_freq();
}

} /* namespace analog */
} /* namespace gr */
18 changes: 0 additions & 18 deletions gr-analog/lib/pll_refout_cc_impl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,24 +42,6 @@ class pll_refout_cc_impl : public pll_refout_cc
pll_refout_cc_impl(float loop_bw, float max_freq, float min_freq);
~pll_refout_cc_impl() override;

void set_loop_bandwidth(float bw) override;
void set_damping_factor(float df);
void set_alpha(float alpha);
void set_beta(float beta);
void set_frequency(float freq);
void set_phase(float phase);
void set_min_freq(float freq);
void set_max_freq(float freq);

float get_loop_bandwidth() const;
float get_damping_factor() const;
float get_alpha() const;
float get_beta() const;
float get_frequency() const;
float get_phase() const;
float get_min_freq() const;
float get_max_freq() const;

int work(int noutput_items,
gr_vector_const_void_star& input_items,
gr_vector_void_star& output_items) override;
Expand Down
Loading

0 comments on commit 60e4df3

Please sign in to comment.