[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r3645 - gnuradio/branches/developers/eb/digital-wip/gn
From: |
eb |
Subject: |
[Commit-gnuradio] r3645 - gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl |
Date: |
Mon, 25 Sep 2006 15:48:18 -0600 (MDT) |
Author: eb
Date: 2006-09-25 15:48:18 -0600 (Mon, 25 Sep 2006)
New Revision: 3645
Modified:
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
Log:
now uses gr.feedforward_agc_cc, default costas_alpha = 0.10
Modified:
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
===================================================================
---
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
2006-09-25 21:47:30 UTC (rev 3644)
+++
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
2006-09-25 21:48:18 UTC (rev 3645)
@@ -39,7 +39,7 @@
_def_verbose = False
_def_log = False
-_def_costas_alpha = 0.05
+_def_costas_alpha = 0.10
_def_gain_mu = 0.03
_def_mu = 0.05
_def_omega_relative_limit = 0.005
@@ -236,7 +236,9 @@
# 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.agc2_cc(1e-1, 1e-3, 1, 1, 1000)
+ #self.agc = gr.agc2_cc(0.6e-1, 1e-3, 1, 1, 100)
+ self.agc = gr.feedforward_agc_cc(16, 1.0)
+
# Costas loop (carrier tracking)
# FIXME: need to decide how to handle this more generally; do we pull
it from higher layer?
@@ -307,6 +309,8 @@
def _setup_logging(self):
print "Modulation logging turned on."
+ self._fg.connect(self.pre_scaler,
+ gr.file_sink(gr.sizeof_gr_complex, "prescaler.dat"))
self._fg.connect(self.agc,
gr.file_sink(gr.sizeof_gr_complex, "agc.dat"))
self._fg.connect(self.costas_loop,
Modified:
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
===================================================================
---
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
2006-09-25 21:47:30 UTC (rev 3644)
+++
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
2006-09-25 21:48:18 UTC (rev 3645)
@@ -39,7 +39,7 @@
_def_verbose = False
_def_log = False
-_def_costas_alpha = 0.05
+_def_costas_alpha = 0.10
_def_gain_mu = 0.03
_def_mu = 0.05
_def_omega_relative_limit = 0.005
@@ -234,13 +234,15 @@
# 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.agc2_cc(1e-1, 1e-3, 1, 1, 1000)
+ #self.agc = gr.agc2_cc(0.6e-1, 1e-3, 1, 1, 100)
+ self.agc = gr.feedforward_agc_cc(16, 1.0)
# Costas loop (carrier tracking)
# FIXME: need to decide how to handle this more generally; do we pull
it from higher layer?
costas_order = 4
beta = .25 * self._costas_alpha * self._costas_alpha
- self.costas_loop = gr.costas_loop_cc(self._costas_alpha, beta, 0.1,
-0.1, costas_order)
+ #self.costas_loop = gr.costas_loop_cc(self._costas_alpha, beta, 0.1,
-0.1, costas_order)
+ self.costas_loop = gr.costas_loop_cc(self._costas_alpha, beta, 0.005,
-0.005, costas_order)
# RRC data filter
ntaps = 11 * samples_per_symbol
@@ -307,6 +309,8 @@
def _setup_logging(self):
print "Modulation logging turned on."
+ self._fg.connect(self.pre_scaler,
+ gr.file_sink(gr.sizeof_gr_complex, "prescaler.dat"))
self._fg.connect(self.agc,
gr.file_sink(gr.sizeof_gr_complex, "agc.dat"))
self._fg.connect(self.costas_loop,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r3645 - gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl,
eb <=