diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-08-09 14:21:01 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-08-09 14:21:01 -0700 |
| commit | a446c76cb10dd7eb7770d6cfdbf0c5cb278d1d39 (patch) | |
| tree | 93317838ab60e73635b6feb9bead6499cf9e2404 | |
| parent | fc1a6a88483120921936e415aba4d5d1a9b42d96 (diff) | |
| parent | e106376bfc380abe3e0df3504da34e1982f9feee (diff) | |
Merge branch 'master' into next
| -rw-r--r-- | gr-digital/lib/clock_recovery_mm_cc_impl.cc | 1 | ||||
| -rw-r--r-- | gr-digital/lib/clock_recovery_mm_ff_impl.cc | 1 | ||||
| -rw-r--r-- | gr-dtv/grc/dtv_dvb_bbscrambler_bb.xml | 10 | ||||
| -rw-r--r-- | gr-dtv/grc/dtv_dvb_bch_bb.xml | 10 | ||||
| -rw-r--r-- | gr-dtv/grc/dtv_dvbt2_freqinterleaver_cc.xml | 4 | ||||
| -rw-r--r-- | gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.cc | 13 | ||||
| -rwxr-xr-x | gr-uhd/apps/uhd_siggen_gui | 2 |
7 files changed, 22 insertions, 19 deletions
diff --git a/gr-digital/lib/clock_recovery_mm_cc_impl.cc b/gr-digital/lib/clock_recovery_mm_cc_impl.cc index f51fba4803..c6a1a66c22 100644 --- a/gr-digital/lib/clock_recovery_mm_cc_impl.cc +++ b/gr-digital/lib/clock_recovery_mm_cc_impl.cc @@ -67,6 +67,7 @@ namespace gr { set_omega(omega); // also sets min and max omega set_relative_rate(1.0 / omega); set_history(3); // ensure 2 extra input samples are available + enable_update_rate(true); // fixes tag propagation through variable rate block } clock_recovery_mm_cc_impl::~clock_recovery_mm_cc_impl() diff --git a/gr-digital/lib/clock_recovery_mm_ff_impl.cc b/gr-digital/lib/clock_recovery_mm_ff_impl.cc index 17377a22bb..57578bca28 100644 --- a/gr-digital/lib/clock_recovery_mm_ff_impl.cc +++ b/gr-digital/lib/clock_recovery_mm_ff_impl.cc @@ -60,6 +60,7 @@ namespace gr { set_omega(omega); // also sets min and max omega set_relative_rate (1.0 / omega); + enable_update_rate(true); // fixes tag propagation through variable rate block } clock_recovery_mm_ff_impl::~clock_recovery_mm_ff_impl() diff --git a/gr-dtv/grc/dtv_dvb_bbscrambler_bb.xml b/gr-dtv/grc/dtv_dvb_bbscrambler_bb.xml index 1dbf39611e..2fba572d39 100644 --- a/gr-dtv/grc/dtv_dvb_bbscrambler_bb.xml +++ b/gr-dtv/grc/dtv_dvb_bbscrambler_bb.xml @@ -16,17 +16,17 @@ $framesize2.val, #slurp #end if #if str($standard) == 'STANDARD_DVBT2' #if str($framesize1) == 'FECFRAME_NORMAL' -$rate1.val, #slurp +$rate1.val#slurp #else -$rate2.val, #slurp +$rate2.val#slurp #end if #else #if str($framesize2) == 'FECFRAME_NORMAL' -$rate3.val, #slurp +$rate3.val#slurp #else if str($framesize2) == 'FECFRAME_MEDIUM' -$rate4.val, #slurp +$rate4.val#slurp #else -$rate5.val, #slurp +$rate5.val#slurp #end if #end if )</make> diff --git a/gr-dtv/grc/dtv_dvb_bch_bb.xml b/gr-dtv/grc/dtv_dvb_bch_bb.xml index 12ac8c6cbb..01b446b7ca 100644 --- a/gr-dtv/grc/dtv_dvb_bch_bb.xml +++ b/gr-dtv/grc/dtv_dvb_bch_bb.xml @@ -16,17 +16,17 @@ $framesize2.val, #slurp #end if #if str($standard) == 'STANDARD_DVBT2' #if str($framesize1) == 'FECFRAME_NORMAL' -$rate1.val, #slurp +$rate1.val#slurp #else -$rate2.val, #slurp +$rate2.val#slurp #end if #else #if str($framesize2) == 'FECFRAME_NORMAL' -$rate3.val, #slurp +$rate3.val#slurp #else if str($framesize2) == 'FECFRAME_MEDIUM' -$rate4.val, #slurp +$rate4.val#slurp #else -$rate5.val, #slurp +$rate5.val#slurp #end if #end if )</make> diff --git a/gr-dtv/grc/dtv_dvbt2_freqinterleaver_cc.xml b/gr-dtv/grc/dtv_dvbt2_freqinterleaver_cc.xml index 3bbcd840cf..bd7ba2bbfa 100644 --- a/gr-dtv/grc/dtv_dvbt2_freqinterleaver_cc.xml +++ b/gr-dtv/grc/dtv_dvbt2_freqinterleaver_cc.xml @@ -16,9 +16,9 @@ $paprmode2.val, #slurp #end if $version.val, #slurp #if str($version) == 'VERSION_111' -$preamble1.val, #slurp +$preamble1.val#slurp #else -$preamble2.val, #slurp +$preamble2.val#slurp #end if )</make> <param> diff --git a/gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.cc b/gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.cc index 4f38581e5b..d6c338695a 100644 --- a/gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.cc +++ b/gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.cc @@ -54,7 +54,7 @@ namespace gr { type = 0; if (rate == C2_9_VLSNR) { frame_size = (FRAME_SIZE_NORMAL - NORMAL_PUNCTURING) + (EXTRA_PILOT_SYMBOLS_SET1 * 2); - type = 1; /* force pilots on for VL-SNR */ + pilots = PILOTS_ON; /* force pilots on for VL-SNR */ } } @@ -63,16 +63,16 @@ namespace gr { type = 2; if (rate == C1_5_VLSNR_SF2 || rate == C11_45_VLSNR_SF2) { frame_size = ((FRAME_SIZE_SHORT - SHORT_PUNCTURING_SET1) * 2) + EXTRA_PILOT_SYMBOLS_SET1; - type = 1; /* force pilots on for VL-SNR */ + pilots = PILOTS_ON; /* force pilots on for VL-SNR */ } if (rate == C1_5_VLSNR || rate == C4_15_VLSNR || rate == C1_3_VLSNR) { frame_size = (FRAME_SIZE_SHORT - SHORT_PUNCTURING_SET2) + EXTRA_PILOT_SYMBOLS_SET2; - type = 1; /* force pilots on for VL-SNR */ + pilots = PILOTS_ON; /* force pilots on for VL-SNR */ } } else { frame_size = FRAME_SIZE_MEDIUM - MEDIUM_PUNCTURING + EXTRA_PILOT_SYMBOLS_SET1; - type = 1; /* force pilots on for VL-SNR */ + pilots = PILOTS_ON; /* force pilots on for VL-SNR */ } pilot_mode = pilots; @@ -808,8 +808,7 @@ namespace gr { int consumed = 0; int produced = 0; int slot_count, n; - int group; - int symbols = 0; + int group, symbols; gr_complex tempin, tempout; if (vlsnr_set == VLSNR_OFF) { @@ -873,6 +872,7 @@ namespace gr { n = 0; slot_count = 10; group = 0; + symbols = 0; for (int plh = 0; plh < 90; plh++) { out[produced++] = m_pl[plh]; out[produced++] = m_zero; @@ -1079,6 +1079,7 @@ namespace gr { n = 0; slot_count = 10; group = 0; + symbols = 0; for (int plh = 0; plh < 90; plh++) { out[produced++] = m_pl[plh]; out[produced++] = m_zero; diff --git a/gr-uhd/apps/uhd_siggen_gui b/gr-uhd/apps/uhd_siggen_gui index c5528f3777..9a57aa65ae 100755 --- a/gr-uhd/apps/uhd_siggen_gui +++ b/gr-uhd/apps/uhd_siggen_gui @@ -428,7 +428,7 @@ class uhd_siggen_gui(Qt.QWidget): def set_lo_locked_probe_0(self, lo_locked_probe_0): Qt.QMetaObject.invokeMethod( self._lo_locked_probe_0_label, "setText", - Qt.Q_ARG("QString", str(self.lo_locked_probe_0)) + Qt.Q_ARG("QString", str(lo_locked_probe_0)) ) |