[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r5167 - in gnuradio/branches/developers/jcorgan/hb: gn
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r5167 - in gnuradio/branches/developers/jcorgan/hb: gnuradio-core/src/python/gnuradio/blksimpl2 gnuradio-examples/python/hier/digital |
|
Date: |
Fri, 27 Apr 2007 18:33:58 -0600 (MDT) |
Author: jcorgan
Date: 2007-04-27 18:33:58 -0600 (Fri, 27 Apr 2007)
New Revision: 5167
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/python/gnuradio/blksimpl2/d8psk.py
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/python/gnuradio/blksimpl2/dbpsk.py
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/python/gnuradio/blksimpl2/dqpsk.py
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/python/gnuradio/blksimpl2/gmsk.py
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/python/gnuradio/blksimpl2/pkt.py
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/digital/
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/digital/Makefile.am
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/digital/benchmark_loopback.py
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/digital/benchmark_rx.py
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/digital/benchmark_tx.py
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/digital/receive_path.py
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/digital/receive_path_lb.py
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/digital/transmit_path.py
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/digital/transmit_path_lb.py
Log:
Converted hier2 digital examples to new API.
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/python/gnuradio/blksimpl2/d8psk.py
===================================================================
---
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/python/gnuradio/blksimpl2/d8psk.py
2007-04-28 00:32:59 UTC (rev 5166)
+++
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/python/gnuradio/blksimpl2/d8psk.py
2007-04-28 00:33:58 UTC (rev 5167)
@@ -1,5 +1,5 @@
#
-# Copyright 2005,2006 Free Software Foundation, Inc.
+# Copyright 2005,2006,2007 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -115,21 +115,9 @@
self.rrc_filter = gr.interp_fir_filter_ccf(self._samples_per_symbol,
self.rrc_taps)
- # Define components from objects
- self.define_component("bytes2chunks", self.bytes2chunks)
- self.define_component("symbol_mapper", self.symbol_mapper)
-# self.define_component("diffenc", self.diffenc)
- self.define_component("chunks2symbols", self.chunks2symbols)
- self.define_component("rrc_filter", self.rrc_filter)
-
# Connect components
- self.connect("self", 0, "bytes2chunks", 0)
- self.connect("bytes2chunks", 0, "symbol_mapper", 0)
-# self.connect("symbol_mapper", 0, "diffenc", 0)
-# self.connect("diffenc", 0, "chunks2symbols", 0)
- self.connect("symbol_mapper", 0, "chunks2symbols", 0)
- self.connect("chunks2symbols", 0, "rrc_filter", 0)
- self.connect("rrc_filter", 0, "self", 0)
+ self.connect(self, self.bytes2chunks, self.symbol_mapper,
self.chunks2symbols,
+ self.rrc_filter, self)
if verbose:
self._print_verbage()
@@ -153,18 +141,11 @@
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.connect(self.bytes2chunks, gr.file_sink(gr.sizeof_char,
"tx_bytes2chunks.dat"))
+ self.connect(self.symbol_mapper, gr.file_sink(gr.sizeof_char,
"tx_symbol_mapper.dat"))
+ self.connect(self.chunks2symbols, gr.file_sink(gr.sizeof_gr_complex,
"tx_chunks2symbols.dat"))
+ self.connect(self.rrc_filter, 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)
-# self.connect("diffenc", 0, "diffenc_dat", 0)
- self.connect("chunks2symbols", 0, "chunks2symbols_dat", 0)
- self.connect("rrc_filter", 0, "rrc_filter_dat", 0)
-
def add_options(parser):
"""
Adds 8PSK modulation-specific options to the standard parser
@@ -295,27 +276,9 @@
self.unpack = gr.unpack_k_bits_bb(self.bits_per_symbol())
- # Define components
- 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("receiver", self.receiver)
- self.define_component("slicer", self.slicer)
- #self.define_component("diffdec", self.diffdec)
- self.define_component("symbol_mapper", self.symbol_mapper)
- self.define_component("unpack", self.unpack)
-
# Connect and Initialize base class
- 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, "receiver", 0)
- self.connect("receiver", 0, "slicer", 0)
- #self.connect("slicer", 0, "diffdec", 0)
- #self.connect("diffdec", 0, "symbol_mapper", 0)
- self.connect("slicer", 0, "symbol_mapper", 0)
- self.connect("symbol_mapper", 0, "unpack", 0)
- self.connect("unpack", 0, "self", 0)
+ self.connect(self, self.pre_scaler, self.agc, self.rrc_filter,
self.receiver,
+ self.slicer, self.symbol_mapper, self.unpack, self)
if verbose:
self._print_verbage()
@@ -347,32 +310,14 @@
def _setup_logging(self):
print "Demodulation logging turned on."
- self.define_component("prescaler_dat",
- gr.file_sink(gr.sizeof_gr_complex,
"rx_prescaler.dat"))
- self.define_component("agc_dat",
- 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("receiver_dat",
- gr.file_sink(gr.sizeof_gr_complex,
"rx_receiver.dat"))
- self.define_component("slicer_dat",
- gr.file_sink(gr.sizeof_char, "rx_slicer.dat"))
-# self.define_component("diffdec_dat",
-# gr.file_sink(gr.sizeof_char, "rx_diffdec.dat"))
- self.define_component("symbol_mapper_dat",
- gr.file_sink(gr.sizeof_char,
"rx_symbol_mapper.dat"))
- self.define_component("unpack_dat",
- gr.file_sink(gr.sizeof_char, "rx_unpack.dat"))
+ self.connect(self.pre_scaler, gr.file_sink(gr.sizeof_gr_complex,
"rx_prescaler.dat"))
+ self.connect(self.agc, gr.file_sink(gr.sizeof_gr_complex,
"rx_agc.dat"))
+ self.connect(self.rrc_filter, gr.file_sink(gr.sizeof_gr_complex,
"rx_rrc_filter.dat"))
+ self.connect(self.receiver, gr.file_sink(gr.sizeof_gr_complex,
"rx_receiver.dat"))
+ self.connect(self.slicer, gr.file_sink(gr.sizeof_char,
"rx_slicer.dat"))
+ self.connect(self.symbol_mapper, gr.file_sink(gr.sizeof_char,
"rx_symbol_mapper.dat"))
+ self.connect(self.unpack, gr.file_sink(gr.sizeof_char,
"rx_unpack.dat"))
- 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("receiver", 0, "receiver_dat", 0)
- self.connect("slicer", 0, "slicer_dat", 0)
-# self.connect("diffdec", 0, "diffdec_dat", 0)
- self.connect("symbol_mapper", 0, "symbol_mapper_dat", 0)
- self.connect("unpack", 0, "unpack_dat", 0)
-
def add_options(parser):
"""
Adds modulation-specific options to the standard parser
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/python/gnuradio/blksimpl2/dbpsk.py
===================================================================
---
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/python/gnuradio/blksimpl2/dbpsk.py
2007-04-28 00:32:59 UTC (rev 5166)
+++
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/python/gnuradio/blksimpl2/dbpsk.py
2007-04-28 00:33:58 UTC (rev 5167)
@@ -1,5 +1,5 @@
#
-# Copyright 2005,2006 Free Software Foundation, Inc.
+# Copyright 2005,2006,2007 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -113,19 +113,9 @@
self.rrc_filter = gr.interp_fir_filter_ccf(self._samples_per_symbol,
self.rrc_taps)
- self.define_component("bytes2chunks", self.bytes2chunks)
- self.define_component("symbol_mapper", self.symbol_mapper)
- self.define_component("diffenc", self.diffenc)
- self.define_component("chunks2symbols", self.chunks2symbols)
- self.define_component("rrc_filter", self.rrc_filter)
-
# Connect components
- self.connect("self", 0, "bytes2chunks", 0)
- self.connect("bytes2chunks", 0, "symbol_mapper", 0)
- self.connect("symbol_mapper", 0, "diffenc", 0)
- self.connect("diffenc", 0, "chunks2symbols", 0)
- self.connect("chunks2symbols", 0, "rrc_filter", 0)
- self.connect("rrc_filter", 0, "self", 0)
+ self.connect(self, self.bytes2chunks, self.symbol_mapper, self.diffenc,
+ self.chunks2symbols, self.rrc_filter, self)
if verbose:
self._print_verbage()
@@ -168,22 +158,11 @@
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.connect("bytes2chunks", 0, "bytes2chunks_dat", 0)
- self.connect("symbol_mapper", 0, "symbol_mapper_dat", 0)
- self.connect("diffenc", 0, "diffenc_dat", 0)
- self.connect("chunks2symbols", 0, "chunks2symbols_dat", 0)
- self.connect("rrc_filter", 0, "rrc_filter_dat", 0)
+ self.connect(self.bytes2chunks, gr.file_sink(gr.sizeof_char,
"tx_bytes2chunks.dat"))
+ self.connect(self.symbol_mapper, gr.file_sink(gr.sizeof_char,
"tx_symbol_mapper.dat"))
+ self.connect(self.diffenc, gr.file_sink(gr.sizeof_char,
"tx_diffenc.dat"))
+ self.connect(self.chunks2symbols, gr.file_sink(gr.sizeof_gr_complex,
"tx_chunks2symbols.dat"))
+ self.connect(self.rrc_filter, gr.file_sink(gr.sizeof_gr_complex,
"tx_rrc_filter.dat"))
# /////////////////////////////////////////////////////////////////////////////
@@ -295,27 +274,10 @@
# unpack the k bit vector into a stream of bits
self.unpack = gr.unpack_k_bits_bb(self.bits_per_symbol())
- # Define components
- 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("receiver", self.receiver)
- self.define_component("slicer", self.slicer)
- self.define_component("diffdec", self.diffdec)
- self.define_component("symbol_mapper", self.symbol_mapper)
- self.define_component("unpack", self.unpack)
-
# Connect and Initialize base class
- 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, "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)
- self.connect("unpack", 0, "self", 0)
-
+ self.connect(self, self.pre_scaler, self.agc, self.rrc_filter,
self.receiver,
+ self.diffdec, self.slicer, self.symbol_mapper,
self.unpack, self)
+
if verbose:
self._print_verbage()
@@ -344,32 +306,14 @@
def _setup_logging(self):
print "Demodulation logging turned on."
- self.define_component("prescaler_dat",
- gr.file_sink(gr.sizeof_gr_complex,
"rx_prescaler.dat"))
- self.define_component("agc_dat",
- 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("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",
- gr.file_sink(gr.sizeof_char, "rx_slicer.dat"))
- self.define_component("symbol_mapper_dat",
- gr.file_sink(gr.sizeof_char,
"rx_symbol_mapper.dat"))
- self.define_component("unpack_dat",
- gr.file_sink(gr.sizeof_char, "rx_unpack.dat"))
-
- 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("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)
- self.connect("unpack", 0, "unpack_dat", 0)
-
+ self.connect(self.pre_scaler, gr.file_sink(gr.sizeof_gr_complex,
"rx_prescaler.dat"))
+ self.connect(self.agc, gr.file_sink(gr.sizeof_gr_complex,
"rx_agc.dat"))
+ self.connect(self.rrc_filter, gr.file_sink(gr.sizeof_gr_complex,
"rx_rrc_filter.dat"))
+ self.connect(self.receiver, gr.file_sink(gr.sizeof_gr_complex,
"rx_receiver.dat"))
+ self.connect(self.diffdec, gr.file_sink(gr.sizeof_gr_complex,
"rx_diffdec.dat"))
+ self.connect(self.slicer, gr.file_sink(gr.sizeof_char,
"rx_slicer.dat"))
+ self.connect(self.symbol_mapper, gr.file_sink(gr.sizeof_char,
"rx_symbol_mapper.dat"))
+ self.connect(self.unpack, gr.file_sink(gr.sizeof_char,
"rx_unpack.dat"))
def add_options(parser):
"""
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/python/gnuradio/blksimpl2/dqpsk.py
===================================================================
---
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/python/gnuradio/blksimpl2/dqpsk.py
2007-04-28 00:32:59 UTC (rev 5166)
+++
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/python/gnuradio/blksimpl2/dqpsk.py
2007-04-28 00:33:58 UTC (rev 5167)
@@ -1,5 +1,5 @@
#
-# Copyright 2005,2006 Free Software Foundation, Inc.
+# Copyright 2005,2006,2007 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -114,20 +114,9 @@
self.rrc_filter = gr.interp_fir_filter_ccf(self._samples_per_symbol,
self.rrc_taps)
- # Define components from objects
- self.define_component("bytes2chunks", self.bytes2chunks)
- self.define_component("symbol_mapper", self.symbol_mapper)
- self.define_component("diffenc", self.diffenc)
- self.define_component("chunks2symbols", self.chunks2symbols)
- self.define_component("rrc_filter", self.rrc_filter)
-
# Connect components
- self.connect("self", 0, "bytes2chunks", 0)
- self.connect("bytes2chunks", 0, "symbol_mapper", 0)
- self.connect("symbol_mapper", 0, "diffenc", 0)
- self.connect("diffenc", 0, "chunks2symbols", 0)
- self.connect("chunks2symbols", 0, "rrc_filter", 0)
- self.connect("rrc_filter", 0, "self", 0)
+ self.connect(self, self.bytes2chunks, self.symbol_mapper, self.diffenc,
+ self.chunks2symbols, self.rrc_filter, self)
if verbose:
self._print_verbage()
@@ -150,18 +139,12 @@
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.connect(self.bytes2chunks, gr.file_sink(gr.sizeof_char,
"tx_bytes2chunks.dat"))
+ self.connect(self.symbol_mapper, gr.file_sink(gr.sizeof_char,
"tx_symbol_mapper.dat"))
+ self.connect(self.diffenc, gr.file_sink(gr.sizeof_char,
"tx_diffenc.dat"))
+ self.connect(self.chunks2symbols, gr.file_sink(gr.sizeof_gr_complex,
"tx_chunks2symbols.dat"))
+ self.connect(self.rrc_filter, 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)
- self.connect("diffenc", 0, "diffenc_dat", 0)
- self.connect("chunks2symbols", 0, "chunks2symbols_dat", 0)
- self.connect("rrc_filter", 0, "rrc_filter_dat", 0)
-
def add_options(parser):
"""
Adds QPSK modulation-specific options to the standard parser
@@ -288,27 +271,10 @@
# unpack the k bit vector into a stream of bits
self.unpack = gr.unpack_k_bits_bb(self.bits_per_symbol())
-
- # Define components
- 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("receiver", self.receiver)
- self.define_component("diffdec", self.diffdec)
- self.define_component("slicer", self.slicer)
- self.define_component("symbol_mapper", self.symbol_mapper)
- self.define_component("unpack", self.unpack)
# Connect and Initialize base class
- 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, "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)
- self.connect("unpack", 0, "self", 0)
+ self.connect(self, self.pre_scaler, self.agc, self.rrc_filter,
self.receiver, self.diffdec,
+ self.slicer, self.symbol_mapper, self.unpack, self)
if verbose:
self._print_verbage()
@@ -338,32 +304,15 @@
def _setup_logging(self):
print "Demodulation logging turned on."
- self.define_component("prescaler_dat",
- gr.file_sink(gr.sizeof_gr_complex,
"rx_prescaler.dat"))
- self.define_component("agc_dat",
- 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("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",
- gr.file_sink(gr.sizeof_char, "rx_slicer.dat"))
- self.define_component("symbol_mapper_dat",
- gr.file_sink(gr.sizeof_char,
"rx_symbol_mapper.dat"))
- self.define_component("unpack_dat",
- gr.file_sink(gr.sizeof_char, "rx_unpack.dat"))
+ self.connect(self.pre_scaler, gr.file_sink(gr.sizeof_gr_complex,
"rx_prescaler.dat"))
+ self.connect(self.agc, gr.file_sink(gr.sizeof_gr_complex,
"rx_agc.dat"))
+ self.connect(self.rrc_filter, gr.file_sink(gr.sizeof_gr_complex,
"rx_rrc_filter.dat"))
+ self.connect(self.receiver, gr.file_sink(gr.sizeof_gr_complex,
"rx_receiver.dat"))
+ self.connect(self.diffdec, gr.file_sink(gr.sizeof_gr_complex,
"rx_diffdec.dat"))
+ self.connect(self.slicer, gr.file_sink(gr.sizeof_char,
"rx_slicer.dat"))
+ self.connect(self.symbol_mapper, gr.file_sink(gr.sizeof_char,
"rx_symbol_mapper.dat"))
+ self.connect(self.unpack, gr.file_sink(gr.sizeof_char,
"rx_unpack.dat"))
- 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("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)
- self.connect("unpack", 0, "unpack_dat", 0)
-
def add_options(parser):
"""
Adds modulation-specific options to the standard parser
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/python/gnuradio/blksimpl2/gmsk.py
===================================================================
---
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/python/gnuradio/blksimpl2/gmsk.py
2007-04-28 00:32:59 UTC (rev 5166)
+++
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/python/gnuradio/blksimpl2/gmsk.py
2007-04-28 00:33:58 UTC (rev 5167)
@@ -2,7 +2,7 @@
# GMSK modulation and demodulation.
#
#
-# Copyright 2005,2006 Free Software Foundation, Inc.
+# Copyright 2005,2006,2007 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -103,16 +103,8 @@
# FM modulation
self.fmmod = gr.frequency_modulator_fc(sensitivity)
- # Define components from objects
- self.define_component("nrz", self.nrz)
- self.define_component("gaussian_filter", self.gaussian_filter)
- self.define_component("fmmod", self.fmmod)
-
# Connect components
- self.connect("self", 0, "nrz", 0)
- self.connect("nrz", 0, "gaussian_filter", 0)
- self.connect("gaussian_filter", 0, "fmmod", 0)
- self.connect("fmmod", 0, "self", 0)
+ self.connect(self, self.nrz, self.gaussian_filter, self.fmmod, self)
if verbose:
self._print_verbage()
@@ -135,14 +127,10 @@
def _setup_logging(self):
print "Modulation logging turned on."
- self.define_component("nrz_dat", gr.file_sink(gr.sizeof_float,
"tx_nrz.dat"))
- self.define_component("gaussian_filter_dat",
gr.file_sink(gr.sizeof_float, "tx_gaussian_filter.dat"))
- self.define_component("fmmod_dat", gr.file_sink(gr.sizeof_gr_complex,
"tx_fmmod.dat"))
+ self.connect(self.nrz, gr.file_sink(gr.sizeof_float, "tx_nrz.dat"))
+ self.connect(self.gaussian_filter, gr.file_sink(gr.sizeof_float,
"tx_gaussian_filter.dat"))
+ self.connect(self.fmmod, gr.file_sink(gr.sizeof_gr_complex,
"tx_fmmod.dat"))
- self.connect("nrz", 0, "nrz_dat", 0)
- self.connect("gaussian_filter", 0, "gaussian_filter_dat", 0)
- self.connect("fmmod", 0, "fmmod_dat", 0)
-
def add_options(parser):
"""
Adds GMSK modulation-specific options to the standard parser
@@ -232,16 +220,8 @@
# slice the floats at 0, outputting 1 bit (the LSB of the output byte)
per sample
self.slicer = gr.binary_slicer_fb()
- # Define components from objects
- self.define_component("fmdemod", self.fmdemod)
- self.define_component("clock_recovery", self.clock_recovery)
- self.define_component("slicer", self.slicer)
-
# Connect components
- self.connect("self", 0, "fmdemod", 0)
- self.connect("fmdemod", 0, "clock_recovery", 0)
- self.connect("clock_recovery", 0, "slicer", 0)
- self.connect("slicer", 0, "self", 0)
+ self.connect(self, self.fmdemod, self.clock_recovery, self.slicer, self)
if verbose:
self._print_verbage()
@@ -267,14 +247,10 @@
def _setup_logging(self):
print "Demodulation logging turned on."
- self.define_component("fmdemod_dat", gr.file_sink(gr.sizeof_float,
"rx_fmdemod.dat"))
- self.define_component("clock_recovery_dat",
gr.file_sink(gr.sizeof_float, "rx_clock_recovery.dat"))
- self.define_component("slicer_dat", gr.file_sink(gr.sizeof_char,
"rx_slicer.dat"))
+ self.connect(self.fmdemod, gr.file_sink(gr.sizeof_float,
"rx_fmdemod.dat"))
+ self.connect(self.clock_recovery, gr.file_sink(gr.sizeof_float,
"rx_clock_recovery.dat"))
+ self.connect(self.slicer, gr.file_sink(gr.sizeof_char,
"rx_slicer.dat"))
- self.connect("fmdemod", 0, "fmdemod_dat", 0)
- self.connect("clock_recovery", 0, "clock_recovery_dat", 0)
- self.connect("slicer", 0, "slicer_dat", 0)
-
def add_options(parser):
"""
Adds GMSK demodulation-specific options to the standard parser
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/python/gnuradio/blksimpl2/pkt.py
===================================================================
---
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/python/gnuradio/blksimpl2/pkt.py
2007-04-28 00:32:59 UTC (rev 5166)
+++
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/python/gnuradio/blksimpl2/pkt.py
2007-04-28 00:33:58 UTC (rev 5167)
@@ -1,5 +1,5 @@
#
-# Copyright 2005,2006 Free Software Foundation, Inc.
+# Copyright 2005,2006,2007 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -67,12 +67,8 @@
# accepts messages from the outside world
self._pkt_input = gr.message_source(gr.sizeof_char, msgq_limit)
- self.define_component("packet_source", self._pkt_input)
- self.define_component("modulator", self._modulator)
+ self.connect(self._pkt_input, self._modulator, self)
- self.connect("packet_source", 0, "modulator", 0)
- self.connect("modulator", 0, "self", 0)
-
def send_pkt(self, payload='', eof=False):
"""
Send the payload.
@@ -136,14 +132,10 @@
self._rcvd_pktq = gr.msg_queue() # holds packets from the PHY
- self.define_component("demodulator", self._demodulator)
- self.define_component("correlator",
gr.correlate_access_code_bb(access_code, threshold))
- self.define_component("framer_sink", gr.framer_sink_1(self._rcvd_pktq))
+ self._correlator = gr.correlate_access_code_bb(access_code, threshold)
+ self._framer_sink = gr.framer_sink_1(self._rcvd_pktq)
+ self.connect(self, self._demodulator, self._correlator,
self._framer_sink)
- self.connect("self", 0, "demodulator",0)
- self.connect("demodulator", 0, "correlator", 0)
- self.connect("correlator", 0, "framer_sink", 0)
-
self._watcher = _queue_watcher_thread(self._rcvd_pktq, callback)
Property changes on:
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/digital
___________________________________________________________________
Name: svn:ignore
- Makefile
Makefile.in
+ Makefile
Makefile.in
*.pyc
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/digital/Makefile.am
===================================================================
---
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/digital/Makefile.am
2007-04-28 00:32:59 UTC (rev 5166)
+++
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/digital/Makefile.am
2007-04-28 00:33:58 UTC (rev 5167)
@@ -33,3 +33,5 @@
transmit_path_lb.py \
tunnel.py \
tx_voice.py
+
+MOSTLYCLEANFILES = *~ *.pyc *.dat
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/digital/benchmark_loopback.py
===================================================================
---
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/digital/benchmark_loopback.py
2007-04-28 00:32:59 UTC (rev 5166)
+++
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/digital/benchmark_loopback.py
2007-04-28 00:33:58 UTC (rev 5167)
@@ -1,7 +1,7 @@
#!/usr/bin/env python
#!/usr/bin/env python
#
-# Copyright 2005, 2006 Free Software Foundation, Inc.
+# Copyright 2005, 2006,2007 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -45,27 +45,23 @@
else:
rseed = int(time.time())
self.noise = gr.noise_source_c(gr.GR_GAUSSIAN, noise_voltage,
rseed)
- self.define_component("noise", self.noise)
- self.define_component("adder", gr.add_cc())
+ self.adder = gr.add_cc()
# Create the frequency offset
- self.define_component("offset", gr.sig_source_c((sample_rate*1.0),
gr.GR_SIN_WAVE,
- frequency_offset, 1.0,
0.0))
- self.define_component("mixer", gr.multiply_cc())
+ self.offset = gr.sig_source_c((sample_rate*1.0), gr.GR_SIN_WAVE,
frequency_offset, 1.0, 0.0)
+ self.mixer = gr.multiply_cc()
# Connect the components
- self.connect("self", 0, "mixer", 0)
- self.connect("offset", 0, "mixer", 1)
- self.connect("mixer", 0, "adder", 0)
- self.connect("noise", 0, "adder", 1)
- self.connect("adder", 0, "self", 0)
+ self.connect(self, (self.mixer, 0))
+ self.connect(self.offset, (self.mixer, 1))
+ self.connect(self.mixer, (self.adder, 0))
+ self.connect(self.noise, (self.adder, 1))
+ self.connect(self.adder, self)
-class my_graph(gr.hier_block2):
+class my_graph(gr.top_block):
def __init__(self, mod_class, demod_class, rx_callback, options):
- gr.hier_block2.__init__(self, "my_graph",
- gr.io_signature(0,0,0), # Input signature
- gr.io_signature(0,0,0)) # Output signature
+ gr.top_block.__init__(self, "my_graph")
channelon = True;
@@ -82,28 +78,10 @@
if channelon:
self.channel = awgn_channel(options.sample_rate, noise_voltage,
frequency_offset, options.seed)
-
- # Define the components
- self.define_component("txpath", self.txpath)
- self.define_component("throttle", self.throttle)
- self.define_component("channel", self.channel)
- self.define_component("rxpath", self.rxpath)
-
- # Connect components
- self.connect("txpath", 0, "throttle", 0)
- self.connect("throttle", 0, "channel", 0)
- self.connect("channel", 0, "rxpath", 0)
+ self.connect(self.txpath, self.throttle, self.channel, self.rxpath)
else:
- # Define the components
- self.define_component("txpath", self.txpath)
- self.define_component("throttle", self.throttle)
- self.define_component("rxpath", self.rxpath)
-
- # Connect components
- self.connect("txpath", 0, "throttle", 0)
- self.connect("throttle", 0, "rxpath", 0)
+ self.connect(self.txpath, self.throttle, self.rxpath)
-
# /////////////////////////////////////////////////////////////////////////////
# main
# /////////////////////////////////////////////////////////////////////////////
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/digital/benchmark_rx.py
===================================================================
---
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/digital/benchmark_rx.py
2007-04-28 00:32:59 UTC (rev 5166)
+++
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/digital/benchmark_rx.py
2007-04-28 00:33:58 UTC (rev 5167)
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright 2005,2006 Free Software Foundation, Inc.
+# Copyright 2005,2006,2007 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -38,16 +38,6 @@
#print os.getpid()
#raw_input('Attach and press enter: ')
-
-class my_graph(gr.hier_block2):
- def __init__(self, demod_class, rx_callback, options):
- gr.hier_block2.__init__(self, "my_graph",
- gr.io_signature(0,0,0), # Input signature
- gr.io_signature(0,0,0)) # Output signature
- self.rxpath = receive_path(demod_class, rx_callback, options)
- self.define_component("rxpath", self.rxpath)
-
-
# /////////////////////////////////////////////////////////////////////////////
# main
# /////////////////////////////////////////////////////////////////////////////
@@ -104,7 +94,7 @@
print "Warning: Failed to enable realtime scheduling."
# Create an instance of a hierarchical block
- top_block = my_graph(demods[options.modulation], rx_callback, options)
+ top_block = receive_path(demods[options.modulation], rx_callback, options)
# Create an instance of a runtime, passing it the top block
runtime = gr.runtime(top_block)
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/digital/benchmark_tx.py
===================================================================
---
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/digital/benchmark_tx.py
2007-04-28 00:32:59 UTC (rev 5166)
+++
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/digital/benchmark_tx.py
2007-04-28 00:33:58 UTC (rev 5167)
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright 2005, 2006 Free Software Foundation, Inc.
+# Copyright 2005, 2006,2007 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -36,15 +36,6 @@
#print os.getpid()
#raw_input('Attach and press enter')
-class my_graph(gr.hier_block2):
- def __init__(self, mod_class, options):
- gr.hier_block2.__init__(self, "my_graph",
- gr.io_signature(0,0,0), # Input signature
- gr.io_signature(0,0,0)) # Output signature
- self.txpath = transmit_path(mod_class, options)
- self.define_component("txpath", self.txpath)
-
-
# /////////////////////////////////////////////////////////////////////////////
# main
# /////////////////////////////////////////////////////////////////////////////
@@ -52,7 +43,7 @@
def main():
def send_pkt(payload='', eof=False):
- return top_block.txpath.send_pkt(payload, eof)
+ return top_block.send_pkt(payload, eof)
def rx_callback(ok, payload):
print "ok = %r, payload = '%s'" % (ok, payload)
@@ -96,7 +87,7 @@
print "Warning: failed to enable realtime scheduling"
# Create an instance of a hierarchical block
- top_block = my_graph(mods[options.modulation], options)
+ top_block = transmit_path(mods[options.modulation], options)
# Create an instance of a runtime, passing it the top block
runtime = gr.runtime(top_block)
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/digital/receive_path.py
===================================================================
---
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/digital/receive_path.py
2007-04-28 00:32:59 UTC (rev 5166)
+++
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/digital/receive_path.py
2007-04-28 00:33:58 UTC (rev 5167)
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright 2005,2006 Free Software Foundation, Inc.
+# Copyright 2005,2006,2007 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -33,12 +33,9 @@
# receive path
# /////////////////////////////////////////////////////////////////////////////
-class receive_path(gr.hier_block2):
+class receive_path(gr.top_block):
def __init__(self, demod_class, rx_callback, options):
- gr.hier_block2.__init__(self, "receive_path",
- gr.io_signature(0,0,0), # Input signature
- gr.io_signature(0,0,0)) # Output signature
-
+ gr.top_block.__init__(self, "receive_path")
options = copy.copy(options) # make a copy so we can destructively
modify
self._verbose = options.verbose
@@ -112,18 +109,13 @@
if self._verbose:
self._print_verbage()
- # Define the components
- self.define_component("usrp", self.u)
- self.define_component("channel_filter", gr.fft_filter_ccc(sw_decim,
chan_coeffs))
- self.define_component("channel_probe", self.probe)
- self.define_component("packet_receiver", self.packet_receiver)
+ self.channel_filter = gr.fft_filter_ccc(sw_decim, chan_coeffs)
# connect the channel input filter to the carrier power detector
- self.connect("usrp", 0, "channel_filter", 0)
- self.connect("channel_filter", 0, "channel_probe", 0)
+ self.connect(self.u, self.channel_filter, self.probe)
# connect channel filter to the packet receiver
- self.connect("channel_filter", 0, "packet_receiver", 0)
+ self.connect(self.channel_filter, self.packet_receiver)
def _setup_usrp_source(self):
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/digital/receive_path_lb.py
===================================================================
---
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/digital/receive_path_lb.py
2007-04-28 00:32:59 UTC (rev 5166)
+++
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/digital/receive_path_lb.py
2007-04-28 00:33:58 UTC (rev 5167)
@@ -71,17 +71,13 @@
if self._verbose:
self._print_verbage()
- # Define the components
- self.define_component("channel_filter", gr.fft_filter_ccc(sw_decim,
chan_coeffs))
- self.define_component("channel_probe", self.probe)
- self.define_component("packet_receiver", self.packet_receiver)
+ self.channel_filter = gr.fft_filter_ccc(sw_decim, chan_coeffs)
# connect the channel input filter to the carrier power detector
- self.connect("self", 0, "channel_filter", 0)
- self.connect("channel_filter", 0, "channel_probe", 0)
+ self.connect(self, self.channel_filter, self.probe)
# connect channel filter to the packet receiver
- self.connect("channel_filter", 0, "packet_receiver", 0)
+ self.connect(self.channel_filter, self.packet_receiver)
def bitrate(self):
return self._bitrate
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/digital/transmit_path.py
===================================================================
---
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/digital/transmit_path.py
2007-04-28 00:32:59 UTC (rev 5166)
+++
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/digital/transmit_path.py
2007-04-28 00:33:58 UTC (rev 5167)
@@ -1,5 +1,5 @@
#
-# Copyright 2005,2006 Free Software Foundation, Inc.
+# Copyright 2005,2006,2007 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -33,16 +33,13 @@
# transmit path
# /////////////////////////////////////////////////////////////////////////////
-class transmit_path(gr.hier_block2):
+class transmit_path(gr.top_block):
def __init__(self, modulator_class, options):
'''
See below for what options should hold
'''
- gr.hier_block2.__init__(self, "transmit_path",
- gr.io_signature(0,0,0), # Input signature
- gr.io_signature(0,0,0)) # Output signature
-
+ gr.top_block.__init__(self, "transmit_path")
options = copy.copy(options) # make a copy so we can destructively
modify
self._verbose = options.verbose
@@ -99,15 +96,8 @@
if self._verbose:
self._print_verbage()
- # Define the components
- self.define_component("packet_transmitter", self.packet_transmitter)
- self.define_component("amp", self.amp)
- self.define_component("usrp", self.u)
+ self.connect(self.packet_transmitter, self.amp, self.u)
- # Connect components in the flowgraph; set amp component to the output
of this block
- self.connect("packet_transmitter", 0, "amp", 0)
- self.connect("amp", 0, "usrp", 0)
-
def _setup_usrp_sink(self):
"""
Creates a USRP sink, determines the settings for best bitrate,
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/digital/transmit_path_lb.py
===================================================================
---
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/digital/transmit_path_lb.py
2007-04-28 00:32:59 UTC (rev 5166)
+++
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/digital/transmit_path_lb.py
2007-04-28 00:33:58 UTC (rev 5167)
@@ -1,5 +1,5 @@
#
-# Copyright 2005,2006 Free Software Foundation, Inc.
+# Copyright 2005,2006,2007 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -65,14 +65,9 @@
if self._verbose:
self._print_verbage()
- # Define the components
- self.define_component("packet_transmitter", self.packet_transmitter)
- self.define_component("amp", self.amp)
+ # Connect blocks in the flowgraph; set amp component to the output of
this block
+ self.connect(self.packet_transmitter, self.amp, self)
- # Connect components in the flowgraph; set amp component to the output
of this block
- self.connect("packet_transmitter", 0, "amp", 0)
- self.connect("amp", 0, "self", 0)
-
def set_tx_amplitude(self, ampl):
"""
Sets the transmit amplitude sent to the USRP
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r5167 - in gnuradio/branches/developers/jcorgan/hb: gnuradio-core/src/python/gnuradio/blksimpl2 gnuradio-examples/python/hier/digital,
jcorgan <=