[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r4229 - gnuradio/branches/developers/trondeau/digital-
From: |
trondeau |
Subject: |
[Commit-gnuradio] r4229 - gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2 |
Date: |
Sat, 6 Jan 2007 14:08:39 -0700 (MST) |
Author: trondeau
Date: 2007-01-06 14:08:38 -0700 (Sat, 06 Jan 2007)
New Revision: 4229
Modified:
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/dbpsk.py
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/pkt.py
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/psk.py
Log:
Making fixes from blksimpl to these guys for USRP tests
Modified:
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/dbpsk.py
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/dbpsk.py
2007-01-06 00:40:24 UTC (rev 4228)
+++
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/dbpsk.py
2007-01-06 21:08:38 UTC (rev 4229)
@@ -39,8 +39,8 @@
_def_verbose = False
_def_log = False
-_def_costas_alpha = 0.01
-_def_gain_mu = 0.05
+_def_costas_alpha = 0.15
+_def_gain_mu = 0.1
_def_mu = 0.5
_def_omega_relative_limit = 0.005
@@ -100,7 +100,6 @@
self.diffenc = gr.diff_encoder_bb(arity)
- print psk.constellation[arity]
self.chunks2symbols = gr.chunks_to_symbols_bc(psk.constellation[arity])
# pulse shaping filter
@@ -169,11 +168,16 @@
def _setup_logging(self):
print "Modulation logging turned on."
- self.define_component("bytes2chunks_dat", gr.file_sink(gr.sizeof_char,
"tx_bytes2chunks.dat"))
- self.define_component("symbol_mapper_dat",
gr.file_sink(gr.sizeof_char, "tx_symbol_mapper.dat"))
- self.define_component("diffenc_dat", gr.file_sink(gr.sizeof_char,
"tx_diffenc.dat"))
- self.define_component("chunks2symbols_dat",
gr.file_sink(gr.sizeof_gr_complex, "tx_chunks2symbols.dat"))
- self.define_component("rrc_filter_dat",
gr.file_sink(gr.sizeof_gr_complex, "tx_rrc_filter.dat"))
+ self.define_component("bytes2chunks_dat",
+ gr.file_sink(gr.sizeof_char,
"tx_bytes2chunks.dat"))
+ self.define_component("symbol_mapper_dat",
+ gr.file_sink(gr.sizeof_char,
"tx_symbol_mapper.dat"))
+ self.define_component("diffenc_dat",
+ gr.file_sink(gr.sizeof_char, "tx_diffenc.dat"))
+ self.define_component("chunks2symbols_dat",
+ gr.file_sink(gr.sizeof_gr_complex,
"tx_chunks2symbols.dat"))
+ self.define_component("rrc_filter_dat",
+ gr.file_sink(gr.sizeof_gr_complex,
"tx_rrc_filter.dat"))
self.connect("bytes2chunks", 0, "bytes2chunks_dat", 0)
self.connect("symbol_mapper", 0, "symbol_mapper_dat", 0)
@@ -265,25 +269,22 @@
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.receier=gr.mpsk_receiver_cc(arity, 0,
- self._costas_alpha, self._costas_beta,
- fmin, fmax,
- self._mm_mu, self._mm_gain_mu,
- self._mm_omega, self._mm_gain_omega,
- self._mm_omega_relative_limit)
+ self.receiver=gr.mpsk_receiver_cc(arity, 0,
+ self._costas_alpha,
self._costas_beta,
+ fmin, fmax,
+ self._mm_mu, self._mm_gain_mu,
+ self._mm_omega, self._mm_gain_omega,
+ self._mm_omega_relative_limit)
+ # Using differential decoding
+ self.diffdec = gr.diff_phasor_cc()
+
# find closest constellation point
rot = 1
rotated_const = map(lambda pt: pt * rot, psk.constellation[arity])
- #print "rotated_const =", rotated_const
-
- # Using differential decoding
- self.diffdec = gr.diff_phasor_cc()
- #self.diffdec = gr.diff_decoder_bb(arity)
-
self.slicer = gr.constellation_decoder_cb(rotated_const, range(arity))
if self._gray_code:
@@ -298,7 +299,7 @@
self.define_component("pre_scaler", self.pre_scaler)
self.define_component("agc", self.agc)
self.define_component("rrc_filter", self.rrc_filter)
- self.define_component("receier", self.receier)
+ self.define_component("receiver", self.receiver)
self.define_component("slicer", self.slicer)
self.define_component("diffdec", self.diffdec)
self.define_component("symbol_mapper", self.symbol_mapper)
@@ -308,8 +309,8 @@
self.connect("self", 0, "pre_scaler", 0)
self.connect("pre_scaler", 0, "agc", 0)
self.connect("agc", 0, "rrc_filter", 0)
- self.connect("rrc_filter", 0, "receier", 0)
- self.connect("receier", 0, "diffdec", 0)
+ self.connect("rrc_filter", 0, "receiver", 0)
+ self.connect("receiver", 0, "diffdec", 0)
self.connect("diffdec", 0, "slicer", 0)
self.connect("slicer", 0, "symbol_mapper", 0)
self.connect("symbol_mapper", 0, "unpack", 0)
@@ -349,8 +350,8 @@
gr.file_sink(gr.sizeof_gr_complex, "rx_agc.dat"))
self.define_component("rrc_filter_dat",
gr.file_sink(gr.sizeof_gr_complex,
"rx_rrc_filter.dat"))
- self.define_component("receier_dat",
- gr.file_sink(gr.sizeof_gr_complex,
"rx_receier.dat"))
+ self.define_component("receiver_dat",
+ gr.file_sink(gr.sizeof_gr_complex,
"rx_receiver.dat"))
self.define_component("diffdec_dat",
gr.file_sink(gr.sizeof_gr_complex,
"rx_diffdec.dat"))
self.define_component("slicer_dat",
@@ -363,7 +364,7 @@
self.connect("pre_scaler", 0, "prescaler_dat", 0)
self.connect("agc", 0, "agc_dat", 0)
self.connect("rrc_filter", 0, "rrc_filter_dat", 0)
- self.connect("receier", 0, "receier_dat", 0)
+ self.connect("receiver", 0, "receiver_dat", 0)
self.connect("diffdec", 0, "diffdec_dat", 0)
self.connect("slicer", 0, "slicer_dat", 0)
self.connect("symbol_mapper", 0, "symbol_mapper_dat", 0)
@@ -394,7 +395,7 @@
Given command line options, create dictionary suitable for passing to
__init__
"""
return modulation_utils.extract_kwargs_from_options(
- dbpsk_demod.__init__, ('self', 'fg'), options)
+ dbpsk_demod.__init__, ('self'), options)
extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
#
# Add these to the mod/demod registry
Modified:
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/pkt.py
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/pkt.py
2007-01-06 00:40:24 UTC (rev 4228)
+++
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/pkt.py
2007-01-06 21:08:38 UTC (rev 4229)
@@ -159,7 +159,9 @@
def run(self):
while self.keep_running:
+ print "hello? 1"
msg = self.rcvd_pktq.delete_head()
+ print "hello? 2"
ok, payload = packet_utils.unmake_packet(msg.to_string())
if self.callback:
self.callback(ok, payload)
Modified:
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/psk.py
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/psk.py
2007-01-06 00:40:24 UTC (rev 4228)
+++
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/psk.py
2007-01-06 21:08:38 UTC (rev 4229)
@@ -56,14 +56,14 @@
# binary to gray coding -- constellation does Gray coding
binary_to_gray = {
2 : range(2),
- 4 : range(4),
+ 4 : [0,1,3,2],
8 : range(8)
}
# gray to binary
gray_to_binary = {
2 : range(2),
- 4 : range(4),
+ 4 : [0,1,3,2],
8 : range(8)
}
@@ -73,7 +73,7 @@
# identity mapping
binary_to_ungray = {
2 : range(2),
- 4 : range(4), #[0, 1, 3, 2],
+ 4 : range(4),
8 : range(8)
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r4229 - gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2,
trondeau <=