[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next |
|
Date: |
Mon, 3 Apr 2017 23:52:16 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit 49735ce352c3dae4ae8fbfaca318be4ba1467cdb
Merge: 078022c 8a65da6
Author: Johnathan Corgan <address@hidden>
Date: Mon Apr 3 16:45:15 2017 -0700
Merge branch 'master' into next
gr-dtv/examples/CMakeLists.txt | 29 +
gr-dtv/examples/README.dvbt2 | 43 +-
gr-dtv/examples/{vv018-miso.grc => germany-g1.grc} | 1636 ++++++++++++-------
.../examples/{vv018-miso.grc => germany-g10.grc} | 1636 ++++++++++++-------
gr-dtv/examples/{vv018-miso.grc => germany-g2.grc} | 1636 ++++++++++++-------
gr-dtv/examples/{vv018-miso.grc => germany-g3.grc} | 1610 +++++++++++++------
gr-dtv/examples/{vv018-miso.grc => germany-g4.grc} | 1644 ++++++++++++-------
gr-dtv/examples/{vv018-miso.grc => germany-g5.grc} | 1636 ++++++++++++-------
gr-dtv/examples/{vv018-miso.grc => germany-g6.grc} | 1634 ++++++++++++-------
gr-dtv/examples/{vv018-miso.grc => germany-g7.grc} | 1610 +++++++++++++------
gr-dtv/examples/{vv018-miso.grc => germany-g8.grc} | 1610 +++++++++++++------
gr-dtv/examples/{vv018-miso.grc => germany-g9.grc} | 1636 ++++++++++++-------
gr-dtv/examples/{vv018-miso.grc => vv001-cr35.grc} | 1628 +++++++++++++------
gr-dtv/examples/vv003-cr23.grc | 1062 ++++++++++++-
.../examples/{vv018-miso.grc => vv004-8kfft.grc} | 1638 ++++++++++++-------
.../examples/{vv018-miso.grc => vv005-8kfft.grc} | 1618 +++++++++++++------
.../examples/{vv018-miso.grc => vv007-16kfft.grc} | 1638 ++++++++++++-------
.../examples/{vv018-miso.grc => vv008-16kfft.grc} | 1630 +++++++++++++------
gr-dtv/examples/vv009-4kfft.grc | 1076 ++++++++++++-
.../examples/{vv018-miso.grc => vv010-2kfft.grc} | 1630 +++++++++++++------
.../examples/{vv018-miso.grc => vv011-1kfft.grc} | 1644 ++++++++++++-------
.../examples/{vv018-miso.grc => vv012-64qam45.grc} | 1617 +++++++++++++------
.../examples/{vv018-miso.grc => vv013-64qam56.grc} | 1605 +++++++++++++------
.../examples/{vv018-miso.grc => vv014-64qam34.grc} | 1617 +++++++++++++------
.../examples/{vv018-miso.grc => vv015-8kfft.grc} | 1630 +++++++++++++------
.../{vv018-miso.grc => vv016-256qam34.grc} | 1605 +++++++++++++------
.../examples/{vv018-miso.grc => vv017-paprtr.grc} | 1583 +++++++++++++------
gr-dtv/examples/vv018-miso.grc | 709 ++++-----
.../examples/{vv018-miso.grc => vv019-norot.grc} | 1632 +++++++++++++------
.../examples/{vv018-miso.grc => vv034-dtg016.grc} | 1656 +++++++++++++-------
.../examples/{vv018-miso.grc => vv035-dtg052.grc} | 1629 +++++++++++++------
.../examples/{vv018-miso.grc => vv036-dtg091.grc} | 1601 +++++++++++++------
32 files changed, 32629 insertions(+), 14179 deletions(-)
diff --cc gr-dtv/examples/CMakeLists.txt
index 884d1da,569cad0..77e74cc
--- a/gr-dtv/examples/CMakeLists.txt
+++ b/gr-dtv/examples/CMakeLists.txt
@@@ -40,10 -42,39 +41,38 @@@ install
file_atsc_rx.grc
file_atsc_tx.grc
uhd_atsc_capture.grc
+ uhd_atsc_tx.grc
uhd_rx_atsc.grc
+ vv001-cr35.grc
vv003-cr23.grc
+ vv004-8kfft.grc
+ vv005-8kfft.grc
+ vv007-16kfft.grc
+ vv008-16kfft.grc
vv009-4kfft.grc
+ vv010-2kfft.grc
+ vv011-1kfft.grc
+ vv012-64qam45.grc
+ vv013-64qam56.grc
+ vv014-64qam34.grc
+ vv015-8kfft.grc
+ vv016-256qam34.grc
+ vv017-paprtr.grc
vv018-miso.grc
+ vv019-norot.grc
+ vv034-dtg016.grc
+ vv035-dtg052.grc
+ vv036-dtg091.grc
+ germany-g1.grc
+ germany-g2.grc
+ germany-g3.grc
+ germany-g4.grc
+ germany-g5.grc
+ germany-g6.grc
+ germany-g7.grc
+ germany-g8.grc
+ germany-g9.grc
+ germany-g10.grc
catv_tx_64qam.grc
DESTINATION ${GR_PKG_DTV_EXAMPLES_DIR}
- COMPONENT "dtv_python"
)