[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] git://gnuradio.org/jblum branch, digital, updated. e6e
|
From: |
git version control |
|
Subject: |
[Commit-gnuradio] git://gnuradio.org/jblum branch, digital, updated. e6ed4fa7bb0d253adbf0cf2ae4da7c301b3c971f |
|
Date: |
Wed, 17 Aug 2011 18:55:58 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "git://gnuradio.org/jblum".
The branch, digital has been updated
via e6ed4fa7bb0d253adbf0cf2ae4da7c301b3c971f (commit)
via ed564be6c78a3e22b3c98862834192f8b20bc551 (commit)
via 7e47bddafc6b27c623137c6d76f460e608952fcc (commit)
via 6bd1605b265b5dff8cbdca0b20b0c5685c752ec7 (commit)
via 4ea3b61709d2a2c747e8690c4062ac75c09cf9ac (commit)
via 25a0f8cc6aeb4ce8d11d643f6f8b2d9552002709 (commit)
via 57860e0199c005f26b4942cc7ed5e5acf829a68b (commit)
via 612be3956603941f6cf530c090eba02d26d33bcd (commit)
via aed7404ad43d5e0c5dd2c79a7d205ea6748cff28 (commit)
via 61db1684fdda602d18134b2e8c510bb7e33245fc (commit)
via 386a73c53aeb36bdf10e28fc5366385faebe78b2 (commit)
via 594cc158335fe4b25c251fe4698ccb6a35ed170f (commit)
via b6fd6bb30811a1a6cd039a13003cdc819d8f2141 (commit)
via d8942c7b6a2889ef56ee5c3533503528fb07be15 (commit)
via 605f4a3b71dc57264131dce81321550169a6e1f4 (commit)
via 42c894fbd0a43f216975275d25e2cb02d38c0961 (commit)
via 6fd12da36b2a790fe536a0f621f04513a6762374 (commit)
via a6fa43a9075e5123c741090622c80598a7e84c3a (commit)
via 6876cd276ed2e3f74161b2301f33941218fc7882 (commit)
via a3551b0a34b02fcdb0f339b3bdb16b31c47dc1a3 (commit)
via 3a7aaf7885dd5c2014a090ce197b317dcd99cad5 (commit)
via 5d5abdb77fef4daafcfec88aaac76995a2c0884a (commit)
via 68dc13c1557cb15f842315022142acbae2f348d9 (commit)
via 0eb52f1683ea6c5869e1c8141a3f756e1dc8997a (commit)
via e1b4e60823c2b938500932b0868d88698e48d525 (commit)
from 40a9071074b2ec0f6daf74e50e131b89b9f66226 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e6ed4fa7bb0d253adbf0cf2ae4da7c301b3c971f
Merge: 40a9071 ed564be
Author: Josh Blum <address@hidden>
Date: Wed Aug 17 11:56:33 2011 -0700
Merge branch 'digital' of https://github.com/trondeau/gnuradio into digital
Conflicts:
gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h
gnuradio-core/src/lib/general/gr_fll_band_edge_cc.h
gnuradio-core/src/lib/general/gr_pll_refout_cc.h
gr-digital/lib/digital_constellation_receiver_cb.cc
gr-digital/lib/digital_constellation_receiver_cb.h
gr-digital/lib/digital_costas_loop_cc.h
commit ed564be6c78a3e22b3c98862834192f8b20bc551
Author: Tom Rondeau <address@hidden>
Date: Sun Aug 14 22:32:01 2011 -0400
digital: cleaned up Costas loop code by switching over to the
gri_control_loop class to handle the inner loop. Had to add it to
digital_swig.i to properly wrap the parent functions into Python.
commit 7e47bddafc6b27c623137c6d76f460e608952fcc
Author: Tom Rondeau <address@hidden>
Date: Sun Aug 14 22:07:43 2011 -0400
Convering the PLL refout block to use the gri_control_loop class to take
care of the internal loop. The error and what to do with the phase and freq are
left to this block. It also changes the interface so that the PLL's gains are
determined by the loop bandwidth.
commit 6bd1605b265b5dff8cbdca0b20b0c5685c752ec7
Author: Tom Rondeau <address@hidden>
Date: Sun Aug 14 22:05:48 2011 -0400
Adding a control_loop class that takes care of setting the loop gains and
the standard loop advance function. This should be used as a parent class of
any block that uses a 2nd order control loop (like the PLL, clock recovery, etc
blocks).
commit 4ea3b61709d2a2c747e8690c4062ac75c09cf9ac
Author: Tom Rondeau <address@hidden>
Date: Wed Aug 10 22:42:58 2011 -0400
digital: fixing naming of logging files.
commit 25a0f8cc6aeb4ce8d11d643f6f8b2d9552002709
Author: Tom Rondeau <address@hidden>
Date: Wed Aug 10 22:38:13 2011 -0400
fixing constellation plotter to gracefully handle the end of a file.
commit 57860e0199c005f26b4942cc7ed5e5acf829a68b
Author: Tom Rondeau <address@hidden>
Date: Wed Aug 10 22:37:51 2011 -0400
Cleaning up; adding a different dbpsk that uses differential coding. The
normal bpsk is non-differential by default, but can be set to use differential
with the right flag.
commit 612be3956603941f6cf530c090eba02d26d33bcd
Author: Tom Rondeau <address@hidden>
Date: Wed Aug 10 22:35:17 2011 -0400
digital: updated constellation receiver to use loop bandwidth and damping
factor instead of setting alpha and beta independently. Also cleaning up Costas
loop a bit more.
commit aed7404ad43d5e0c5dd2c79a7d205ea6748cff28
Author: Tom Rondeau <address@hidden>
Date: Tue Aug 9 22:18:19 2011 -0400
digital: fixing up receiver code. Almost there...
commit 61db1684fdda602d18134b2e8c510bb7e33245fc
Author: Tom Rondeau <address@hidden>
Date: Tue Aug 9 21:50:13 2011 -0400
digital: setting up receive path to use new timing loop API, FLL API, new
gain names/settings. Also added concept of gray coding to generic mod/demod and
reworked bpsk/qpsk modulators so both work.
commit 386a73c53aeb36bdf10e28fc5366385faebe78b2
Author: Tom Rondeau <address@hidden>
Date: Tue Aug 9 20:55:47 2011 -0400
digital: fixed complex M&M to output the error signal as a float. Also
changed the error value limit since we were hitting it constantly before.
commit 594cc158335fe4b25c251fe4698ccb6a35ed170f
Author: Tom Rondeau <address@hidden>
Date: Tue Aug 9 20:54:48 2011 -0400
digital: added M&M clock recovery loop as an option to compare against
polyphase filterbank.
commit b6fd6bb30811a1a6cd039a13003cdc819d8f2141
Author: Tom Rondeau <address@hidden>
Date: Mon Aug 8 22:31:51 2011 -0400
digital: adding a timing offset example.
commit d8942c7b6a2889ef56ee5c3533503528fb07be15
Author: Tom Rondeau <address@hidden>
Date: Mon Aug 8 22:25:48 2011 -0400
digital: reworking pfb_clock_sync block for better construction of diff
taps, more accesors.
commit 605f4a3b71dc57264131dce81321550169a6e1f4
Author: Tom Rondeau <address@hidden>
Date: Sat Jul 30 17:09:48 2011 -0400
updating PFB clock sync to use loop bandwidth and damping factor instead of
setting gains independently.
commit 42c894fbd0a43f216975275d25e2cb02d38c0961
Author: Tom Rondeau <address@hidden>
Date: Sat Jul 30 17:04:28 2011 -0400
digital: update documentation.
commit 6fd12da36b2a790fe536a0f621f04513a6762374
Author: Tom Rondeau <address@hidden>
Date: Sat Jul 30 16:04:12 2011 -0400
digital: Add a costas loop example program. Updates FLL example program to
include phase offset setting.
commit a6fa43a9075e5123c741090622c80598a7e84c3a
Author: Tom Rondeau <address@hidden>
Date: Sat Jul 30 15:59:44 2011 -0400
digital: updated Costas loop again. The damping factor is now set by
default and is no longer part of the constructor. All variables are exposed in
gets and sets, though, for any purposes.
commit 6876cd276ed2e3f74161b2301f33941218fc7882
Author: Tom Rondeau <address@hidden>
Date: Sat Jul 30 15:58:40 2011 -0400
digital: better behavior of FLL code and added gets and sets for the
frequency and phase estimates.
commit a3551b0a34b02fcdb0f339b3bdb16b31c47dc1a3
Author: Tom Rondeau <address@hidden>
Date: Sat Jul 30 15:57:23 2011 -0400
digital: cut down number of samples in constellation_receiver QA code to
make shorter test time.
commit 3a7aaf7885dd5c2014a090ce197b317dcd99cad5
Author: Tom Rondeau <address@hidden>
Date: Sat Jul 30 13:12:18 2011 -0400
digtial: Added an example script to show/test the behavior of the FLL.
commit 5d5abdb77fef4daafcfec88aaac76995a2c0884a
Author: Tom Rondeau <address@hidden>
Date: Sat Jul 30 12:41:58 2011 -0400
digital: added QA code for FLL algorithm. Updated generic_mod_demod to use
new FLL in digital instead of gr.
commit 68dc13c1557cb15f842315022142acbae2f348d9
Author: Tom Rondeau <address@hidden>
Date: Sat Jul 30 12:41:09 2011 -0400
digital: moved fll_band_edge into gr-digital.
commit 0eb52f1683ea6c5869e1c8141a3f756e1dc8997a
Author: Tom Rondeau <address@hidden>
Date: Sat Jul 30 12:40:03 2011 -0400
digital: moved fll_band_edge out of gnruadio-core.
commit e1b4e60823c2b938500932b0868d88698e48d525
Author: Tom Rondeau <address@hidden>
Date: Sat Jul 30 11:28:47 2011 -0400
core: made significant improvements in FLL algorithm. Now converges very
nicely.
-----------------------------------------------------------------------
Summary of changes:
gnuradio-core/src/guile/tests/general_ctors.test | 3 -
.../src/lib/filter/gr_pfb_clock_sync_ccf.cc | 205 ++++++++---
.../src/lib/filter/gr_pfb_clock_sync_ccf.h | 178 +++++++--
.../src/lib/filter/gr_pfb_clock_sync_ccf.i | 23 +-
gnuradio-core/src/lib/general/CMakeLists.txt | 4 +-
gnuradio-core/src/lib/general/Makefile.am | 6 +-
gnuradio-core/src/lib/general/general.i | 4 +-
.../src/lib/general/gr_fll_band_edge_cc.cc | 214 -----------
.../src/lib/general/gr_fll_band_edge_cc.h | 140 -------
.../src/lib/general/gr_fll_band_edge_cc.i | 41 --
gnuradio-core/src/lib/general/gr_pll_refout_cc.cc | 23 +-
gnuradio-core/src/lib/general/gr_pll_refout_cc.h | 20 +-
gnuradio-core/src/lib/general/gr_pll_refout_cc.i | 10 +-
gnuradio-core/src/lib/general/gri_control_loop.cc | 183 +++++++++
gnuradio-core/src/lib/general/gri_control_loop.h | 203 ++++++++++
gnuradio-core/src/lib/general/gri_control_loop.i | 57 +++
gr-digital/examples/Makefile.am | 3 +
gr-digital/examples/benchmark_rx.py | 5 +-
gr-digital/examples/benchmark_tx.py | 2 +-
gr-digital/examples/example_costas.py | 116 ++++++
gr-digital/examples/example_fll.py | 126 +++++++
gr-digital/examples/example_timing.py | 211 +++++++++++
gr-digital/examples/receive_path.py | 18 +-
gr-digital/examples/transmit_path.py | 17 +-
gr-digital/lib/CMakeLists.txt | 3 +
gr-digital/lib/Makefile.am | 2 +
gr-digital/lib/digital_clock_recovery_mm_cc.cc | 8 +-
.../lib/digital_constellation_receiver_cb.cc | 135 +++++++-
gr-digital/lib/digital_constellation_receiver_cb.h | 159 +++++++--
gr-digital/lib/digital_costas_loop_cc.cc | 74 +---
gr-digital/lib/digital_costas_loop_cc.h | 49 +--
gr-digital/lib/digital_fll_band_edge_cc.cc | 390 ++++++++++++++++++++
gr-digital/lib/digital_fll_band_edge_cc.h | 323 ++++++++++++++++
gr-digital/python/Makefile.am | 1 +
gr-digital/python/bpsk.py | 81 ++++-
gr-digital/python/generic_mod_demod.py | 146 ++++----
gr-digital/python/modulation_utils2.py | 1 +
gr-digital/python/qa_constellation_receiver.py | 2 +-
gr-digital/python/qa_costas_loop_cc.py | 17 +-
gr-digital/python/qa_fll_band_edge.py | 83 +++++
gr-digital/python/qam.py | 4 +-
gr-digital/python/qpsk.py | 17 +-
gr-digital/swig/CMakeLists.txt | 1 +
gr-digital/swig/Makefile.am | 1 +
.../swig/digital_constellation_receiver_cb.i | 27 +-
gr-digital/swig/digital_costas_loop_cc.i | 17 +-
gr-digital/swig/digital_fll_band_edge_cc.i | 60 +++
gr-digital/swig/digital_swig.i | 4 +
gr-utils/src/python/gr_plot_const.py | 27 +-
49 files changed, 2621 insertions(+), 823 deletions(-)
delete mode 100644 gnuradio-core/src/lib/general/gr_fll_band_edge_cc.cc
delete mode 100644 gnuradio-core/src/lib/general/gr_fll_band_edge_cc.h
delete mode 100644 gnuradio-core/src/lib/general/gr_fll_band_edge_cc.i
create mode 100644 gnuradio-core/src/lib/general/gri_control_loop.cc
create mode 100644 gnuradio-core/src/lib/general/gri_control_loop.h
create mode 100644 gnuradio-core/src/lib/general/gri_control_loop.i
create mode 100755 gr-digital/examples/example_costas.py
create mode 100755 gr-digital/examples/example_fll.py
create mode 100755 gr-digital/examples/example_timing.py
create mode 100644 gr-digital/lib/digital_fll_band_edge_cc.cc
create mode 100644 gr-digital/lib/digital_fll_band_edge_cc.h
create mode 100644 gr-digital/python/qa_fll_band_edge.py
create mode 100644 gr-digital/swig/digital_fll_band_edge_cc.i
hooks/post-receive
--
git://gnuradio.org/jblum
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] git://gnuradio.org/jblum branch, digital, updated. e6ed4fa7bb0d253adbf0cf2ae4da7c301b3c971f,
git version control <=