fix gr3.8+

vladisslav2011 · Apr 14, 2024 · d4a628b · d4a628b
1 parent 699104a
commit d4a628b
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/src/dsp/rx_rds.cpp b/src/dsp/rx_rds.cpp
@@ -29,7 +29,6 @@
 #include <gnuradio/blocks/complex_to_imag.h>
 #include <gnuradio/blocks/complex_to_real.h>
 #include <gnuradio/blocks/complex_to_magphase.h>
-#include <gnuradio/blocks/multiply_const_ff.h>
 #include <iostream>
 #include <stdio.h>
 #include <stdarg.h>
@@ -38,6 +37,9 @@
 
 #if GNURADIO_VERSION >= 0x030800
 #include <gnuradio/digital/timing_error_detector_type.h>
+#include <gnuradio/blocks/multiply_const.h>
+#else
+#include <gnuradio/blocks/multiply_const_ff.h>
 #endif
 
 
@@ -288,7 +290,8 @@ rx_rds::rx_rds(double sample_rate, bool encorr)
 
     d_agc = make_rx_agc_cc(0,40, agc_samp, 0, agc_samp*10, 0);
 
-    d_sync = gr::digital::symbol_sync_cc::make(gr::digital::TED_ZERO_CROSSING, 16, 0.01, 1, 1, 0.1, 1, p_c);
+    d_sync = gr::digital::symbol_sync_cc::make(gr::digital::TED_ZERO_CROSSING,
+        (d_sample_rate*d_interpolation*2.0)/(d_decimation*float(2375.f*decim1)), 0.01, 1, 1, 0.1, 1, p_c);
 #endif
 
     d_mpsk = gr::digital::constellation_decoder_cb::make(p_c);
@@ -329,10 +332,16 @@ rx_rds::rx_rds(double sample_rate, bool encorr)
 
     connect(d_ddbb, 0, self(), 0);
 #else
+#if GNURADIO_VERSION < 0x030800
     d_det=dbpsk_det_cb::make();
     connect(d_sync, 0, d_det, 0);
     connect(d_sync, 1, d_det, 1);
     connect(d_det, 0, self(), 0);
+#else
+    connect(d_sync, 0, d_mpsk, 0);
+    connect(d_mpsk, 0, d_ddbb, 0);
+    connect(d_ddbb, 0, self(), 0);
+#endif
 #endif
     #if 0
     {
@@ -423,10 +432,14 @@ rx_rds::~rx_rds ()
 
 void rx_rds::trig()
 {
+#if GNURADIO_VERSION < 0x030800
     changed_value(C_RDS_CR_OMEGA, d_index, d_sync->omega());
     changed_value(C_RDS_CR_MU, d_index, d_sync->mu());
     changed_value(C_RDS_CL_FREQ, d_index, d_costas_loop->get_frequency()*1000.f);
     changed_value(C_RDS_PHASE_SNR, d_index, phase_snr());
+#else
+    changed_value(C_RDS_CL_FREQ, d_index, d_costas_loop->get_frequency()*1000.);
+#endif
 }
 
 void rx_rds::update_fxff_taps()
@@ -444,12 +457,16 @@ void rx_rds::update_fxff_taps()
 
 void rx_rds::set_omega_lim(float v)
 {
+#if GNURADIO_VERSION < 0x030800
     d_sync->set_omega_lim(d_omega_lim=v);
+#endif
 }
 
 void rx_rds::set_dll_bw(float v)
 {
+#if GNURADIO_VERSION < 0x030800
     d_sync->set_dllbw(v);
+#endif
 }
 
 void rx_rds::set_cl_bw(float v)

diff --git a/src/dsp/rx_rds.h b/src/dsp/rx_rds.h
@@ -76,8 +76,13 @@ class rx_rds : public gr::hier_block2, public conf_notifier
 
     void set_index(int v) {d_index=v;}
     void set_agc_rate(float v) { }
+#if GNURADIO_VERSION < 0x030800
     void set_gain_mu(float v) {d_sync->set_gain_mu(d_gain_mu=v);}
     void set_gain_omega(float v) {d_sync->set_gain_omega(d_gain_omega=v);}
+#else
+    void set_gain_mu(float v) {}
+    void set_gain_omega(float v) {}
+#endif
     void trig();
     void set_fxff_bw(float bw) {d_fxff_bw=bw; update_fxff_taps();}
     void set_fxff_tw(float tw) {d_fxff_tw=tw; update_fxff_taps();}