[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r4248 - gnuradio/branches/developers/trondeau/digital-
From: |
trondeau |
Subject: |
[Commit-gnuradio] r4248 - gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl |
Date: |
Sun, 7 Jan 2007 12:04:54 -0700 (MST) |
Author: trondeau
Date: 2007-01-07 12:04:54 -0700 (Sun, 07 Jan 2007)
New Revision: 4248
Modified:
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/d8psk.py
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/psk.py
Log:
working d8psk modulators/demodulators
Modified:
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/d8psk.py
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/d8psk.py
2007-01-07 18:30:43 UTC (rev 4247)
+++
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/d8psk.py
2007-01-07 19:04:54 UTC (rev 4248)
@@ -39,8 +39,8 @@
_def_verbose = False
_def_log = False
-_def_costas_alpha = 0.15
-_def_gain_mu = 0.1
+_def_costas_alpha = 0.5
+_def_gain_mu = 0.3
_def_mu = 0.5
_def_omega_relative_limit = 0.005
@@ -234,8 +234,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(0.6e-1, 1e-3, 1, 1, 100)
- self.agc = gr.feedforward_agc_cc(16, 1.0)
+ #self.agc = gr.agc2_cc(1e-1, 1e-3, 1, 1, 100)
+ #self.agc = gr.feedforward_agc_cc(16, 1.0)
+ self.agc = gr.multiply_const_cc(6)
# RRC data filter
ntaps = 11 * samples_per_symbol
Modified:
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/psk.py
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/psk.py
2007-01-07 18:30:43 UTC (rev 4247)
+++
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/psk.py
2007-01-07 19:04:54 UTC (rev 4248)
@@ -60,14 +60,14 @@
binary_to_gray = {
2 : range(2),
4 : [0,1,3,2],
- 8 : range(8)
+ 8 : [0, 1, 3, 2, 7, 6, 4, 5]
}
# gray to binary
gray_to_binary = {
2 : range(2),
4 : [0,1,3,2],
- 8 : range(8)
+ 8 : [0, 1, 3, 2, 6, 7, 5, 4]
}
# -----------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r4248 - gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl,
trondeau <=