Revision 3eeb2720

b/gnuradio-core/src/python/gnuradio/blks2impl/dqpsk.py
258 258
        fmin = -0.25
259 259
        fmax = 0.25
260 260
        
261
        #self.receiver=gr.mpsk_receiver_cc(arity, pi/4.0,
262
        #                                  self._costas_alpha, self._costas_beta,
263
        #                                  fmin, fmax,
264
        #                                  self._mm_mu, self._mm_gain_mu,
265
        #                                  self._mm_omega, self._mm_gain_omega,
266
        #                                  self._mm_omega_relative_limit)
267
        self.clock_recov = gr.costas_loop_cc(self._costas_alpha,
268
                                             self._costas_beta,
269
                                             fmax, fmin, arity)
270
        if 0:
271
            self.time_recov = gr.clock_recovery_mm_cc(self._mm_omega,
272
                                                      self._mm_gain_omega,
273
                                                      self._mm_mu,
274
                                                      self._mm_gain_mu,
275
                                                      self._mm_omega_relative_limit)
276
        else:
277
            ntaps = 32*ntaps
278
            taps = gr.firdes.root_raised_cosine(
279
                32, 1.0, 0.25/32.0, self._excess_bw, ntaps)
280
            self.time_recov = gr.pfb_clock_sync_ccf(self._mm_omega,
281
                                                    self._mm_gain_mu,
282
                                                    taps)
261
        self.receiver=gr.mpsk_receiver_cc(arity, pi/4.0,
262
                                          self._costas_alpha, self._costas_beta,
263
                                          fmin, fmax,
264
                                          self._mm_mu, self._mm_gain_mu,
265
                                          self._mm_omega, self._mm_gain_omega,
266
                                          self._mm_omega_relative_limit)
283 267
        
284 268
        # Perform Differential decoding on the constellation
285 269
        self.diffdec = gr.diff_phasor_cc()
......
304 288
            self._setup_logging()
305 289
 
306 290
        # Connect & Initialize base class
307
        self.connect(self, self.pre_scaler, self.agc, #self.rrc_filter, #self.receiver,
308
                     self.clock_recov, self.time_recov,
291
        self.connect(self, self.pre_scaler, self.agc, self.rrc_filter, #self.receiver,
309 292
                     self.diffdec, self.slicer, self.symbol_mapper, self.unpack, self)
310 293

311 294
    def samples_per_symbol(self):

Also available in: Unified diff