[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r4219 - gnuradio/branches/developers/trondeau/digital-
From: |
trondeau |
Subject: |
[Commit-gnuradio] r4219 - gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl |
Date: |
Tue, 2 Jan 2007 16:57:09 -0700 (MST) |
Author: trondeau
Date: 2007-01-02 16:57:09 -0700 (Tue, 02 Jan 2007)
New Revision: 4219
Modified:
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
Log:
updates to default values and how differential decoding is done
Modified:
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
2007-01-02 23:53:48 UTC (rev 4218)
+++
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
2007-01-02 23:57:09 UTC (rev 4219)
@@ -39,7 +39,7 @@
_def_verbose = False
_def_log = False
-_def_costas_alpha = 0.01
+_def_costas_alpha = 0.05
_def_gain_mu = 0.05
_def_mu = 0.5
_def_omega_relative_limit = 0.005
@@ -253,8 +253,8 @@
self._mm_omega = self._samples_per_symbol
self._mm_gain_omega = .25 * self._mm_gain_mu * self._mm_gain_mu
self._costas_beta = 0.25 * self._costas_alpha * self._costas_alpha
- fmin = -0.05
- fmax = 0.05
+ fmin = -0.02
+ fmax = 0.02
self.receiver=gr.mpsk_receiver_cc(arity, 0,
self._costas_alpha, self._costas_beta,
@@ -268,8 +268,8 @@
rotated_const = map(lambda pt: pt * rot, psk.constellation[arity])
#print "rotated_const =", rotated_const
- self.diffdec = gr.diff_phasor_cc()
- #self.diffdec = gr.diff_decoder_bb(arity)
+ #self.diffdec = gr.diff_phasor_cc()
+ self.diffdec = gr.diff_decoder_bb(arity)
self.slicer = gr.constellation_decoder_cb(rotated_const, range(arity))
@@ -289,7 +289,7 @@
# Connect and Initialize base class
self._fg.connect(self.pre_scaler, self.agc, self.rrc_filter,
self.receiver,
- self.diffdec, self.slicer, self.symbol_mapper,
self.unpack)
+ self.slicer, self.diffdec, self.symbol_mapper,
self.unpack)
gr.hier_block.__init__(self, self._fg, self.pre_scaler, self.unpack)
def samples_per_symbol(self):
@@ -323,7 +323,7 @@
self._fg.connect(self.receiver,
gr.file_sink(gr.sizeof_gr_complex, "rx_receiver.dat"))
self._fg.connect(self.diffdec,
- gr.file_sink(gr.sizeof_gr_complex, "rx_diffdec.dat"))
+ gr.file_sink(gr.sizeof_char, "rx_diffdec.dat"))
self._fg.connect(self.slicer,
gr.file_sink(gr.sizeof_char, "rx_slicer.dat"))
self._fg.connect(self.symbol_mapper,
Modified:
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
2007-01-02 23:53:48 UTC (rev 4218)
+++
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
2007-01-02 23:57:09 UTC (rev 4219)
@@ -39,7 +39,7 @@
_def_verbose = False
_def_log = False
-_def_costas_alpha = 0.01
+_def_costas_alpha = 0.1
_def_gain_mu = 0.05
_def_mu = 0.5
_def_omega_relative_limit = 0.005
@@ -235,7 +235,8 @@
# Automatic gain control
scale = (1.0/16384.0)
self.pre_scaler = gr.multiply_const_cc(scale) # scale the signal
from full-range to +-1
- self.agc = gr.feedforward_agc_cc(16, 1.0)
+ self.agc = gr.agc2_cc(0.6e-1, 1e-3, 1, 1, 100)
+ #self.agc = gr.feedforward_agc_cc(8, 1.0)
# RRC data filter
ntaps = 11 * samples_per_symbol
@@ -251,8 +252,8 @@
self._mm_omega = self._samples_per_symbol
self._mm_gain_omega = .25 * self._mm_gain_mu * self._mm_gain_mu
self._costas_beta = 0.25 * self._costas_alpha * self._costas_alpha
- fmin = -0.05
- fmax = 0.05
+ fmin = -0.02
+ fmax = 0.02
self.receiver=gr.mpsk_receiver_cc(arity, pi/4.0,
self._costas_alpha,
self._costas_beta,
@@ -261,13 +262,13 @@
self._mm_omega, self._mm_gain_omega,
self._mm_omega_relative_limit)
- self.diffdec = gr.diff_decoder_bb(arity)
+ # Perform Differential decoding on the constellation
+ self.diffdec = gr.diff_phasor_cc()
# find closest constellation point
rot = 1
- rot = .707 + .707j
+ #rot = .707 + .707j
rotated_const = map(lambda pt: pt * rot, psk.constellation[arity])
-
self.slicer = gr.constellation_decoder_cb(rotated_const, range(arity))
if self._gray_code:
@@ -286,7 +287,7 @@
# Connect & Initialize base class
self._fg.connect(self.pre_scaler, self.agc, self.rrc_filter,
self.receiver,
- self.slicer, self.diffdec, self.symbol_mapper,
self.unpack)
+ self.diffdec, self.slicer, self.symbol_mapper,
self.unpack)
gr.hier_block.__init__(self, self._fg, self.pre_scaler, self.unpack)
def samples_per_symbol(self):
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r4219 - gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl,
trondeau <=