commit-gnuradio
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] [gnuradio] 82/148: Merge branch 'merge_usrp2' into wip


From: git
Subject: [Commit-gnuradio] [gnuradio] 82/148: Merge branch 'merge_usrp2' into wip/usrp2
Date: Mon, 15 Aug 2016 00:47:27 +0000 (UTC)

This is an automated email from the git hooks/post-receive script.

nwest pushed a commit to annotated tag old_usrp_devel_udp
in repository gnuradio.

commit 70b06b5a2519344af62f0f638e88e68e39bdcd31
Merge: 1fdc5d7 5232a54
Author: Josh Blum <address@hidden>
Date:   Tue Dec 15 14:17:34 2009 -0800

    Merge branch 'merge_usrp2' into wip/usrp2

 config/grc_gr_pager.m4                             |   12 +-
 docs/howto-write-a-block/.gitignore                |   17 +
 .../doc => docs/howto-write-a-block}/Makefile.am   |    0
 docs/howto-write-a-block/README                    |    4 +-
 .../howto-write-a-block}/howto-write-a-block.xml   |    0
 .../doc => docs/howto-write-a-block}/howto_1.i     |    0
 .../howto-write-a-block}/make_numbered_listing.py  |    0
 .../doc => docs/howto-write-a-block}/qa_howto_1.py |    0
 .../howto-write-a-block}/src_lib_Makefile_1.am     |    0
 .../howto-write-a-block}/src_lib_Makefile_2.am     |    0
 gnuradio-core/src/lib/general/gr_head.cc           |    6 +-
 gnuradio-core/src/lib/general/gr_head.h            |   10 +-
 gnuradio-core/src/lib/general/gr_head.i            |    2 +-
 .../src/python/gnuradio/blks2impl/dbpsk2.py        |   22 +-
 .../src/python/gnuradio/blks2impl/dqpsk2.py        |   14 +-
 gnuradio-examples/grc/Makefile.am                  |    2 +
 .../grc/usrp/usrp_rx_dpsk.grc                      |  559 ++++----
 gnuradio-examples/grc/usrp/usrp_tx_dpsk.grc        |  583 +++++++++
 gr-howto-write-a-block/Makefile.am                 |    6 +-
 gr-howto-write-a-block/Makefile.common             |    3 +
 gr-howto-write-a-block/README                      |   15 +-
 gr-howto-write-a-block/README.hacking              |   95 ++
 gr-howto-write-a-block/apps/.gitignore             |    2 +
 .../{python => apps}/Makefile.am                   |   14 +-
 gr-howto-write-a-block/apps/howto_square.grc       |  325 +++++
 gr-howto-write-a-block/apps/howto_square.py        |   77 ++
 gr-howto-write-a-block/config/gr_standalone.m4     |    8 +
 gr-howto-write-a-block/configure.ac                |    2 +
 gr-howto-write-a-block/grc/.gitignore              |    2 +
 gr-howto-write-a-block/{python => grc}/Makefile.am |   13 +-
 gr-howto-write-a-block/grc/howto_square2_ff.xml    |   18 +
 gr-howto-write-a-block/grc/howto_square_ff.xml     |   18 +
 gr-howto-write-a-block/lib/.gitignore              |    1 +
 gr-howto-write-a-block/lib/Makefile.am             |   42 +-
 .../lib/qa_howto.cc                                |   25 +-
 .../lib/qa_howto.h                                 |   24 +-
 .../lib/qa_howto_square2_ff.cc                     |   25 +-
 .../lib/qa_howto_square2_ff.h                      |   29 +-
 .../lib/qa_howto_square_ff.cc                      |   25 +-
 .../lib/qa_howto_square_ff.h                       |   29 +-
 .../lib/test_all.cc                                |   20 +-
 gr-howto-write-a-block/limbo/doc/.gitignore        |   18 -
 gr-howto-write-a-block/limbo/doc/README            |    1 -
 gr-howto-write-a-block/python/Makefile.am          |   11 +-
 gr-howto-write-a-block/python/__init__.py          |   49 +
 gr-howto-write-a-block/python/qa_howto.py          |    6 +-
 gr-howto-write-a-block/swig/.gitignore             |    4 +-
 gr-howto-write-a-block/swig/Makefile.am            |    3 +-
 gr-howto-write-a-block/swig/Makefile.swig.gen      |   22 +-
 gr-msdd6000/src/.gitignore                         |    2 +
 gr-msdd6000/src/Makefile.am                        |   26 +-
 gr-msdd6000/src/Makefile.swig.gen                  |  193 ++-
 gr-msdd6000/src/msdd6000_rs.cc                     |  286 ++++
 gr-msdd6000/src/msdd6000_rs.h                      |   66 +
 gr-msdd6000/src/msdd_rs.i                          |   93 ++
 gr-msdd6000/src/msdd_rs_source_simple.cc           |  237 ++++
 gr-msdd6000/src/msdd_rs_source_simple.h            |   87 ++
 gr-msdd6000/src/python-examples/msdd_rs_spec_an.py |  350 +++++
 gr-noaa/README                                     |    2 +-
 gr-noaa/apps/.gitignore                            |    3 +-
 gr-noaa/apps/Makefile.am                           |    6 +-
 gr-noaa/apps/file_rx_hrpt.grc                      |  543 ++++----
 gr-noaa/apps/file_rx_hrpt.py                       |   56 +-
 gr-noaa/apps/hrpt_decode.grc                       |  428 ++++++
 gr-noaa/apps/hrpt_decode.py                        |   98 ++
 .../apps/{demod_hrpt_file.grc => hrpt_demod.grc}   |  421 +++---
 gr-noaa/apps/{demod_hrpt_file.py => hrpt_demod.py} |   52 +-
 gr-noaa/apps/usrp_rx_hrpt.grc                      |  438 ++++---
 gr-noaa/apps/usrp_rx_hrpt.py                       |   60 +-
 gr-noaa/apps/usrp_rx_hrpt_nogui.grc                |  418 +++---
 gr-noaa/apps/usrp_rx_hrpt_nogui.py                 |   60 +-
 gr-noaa/grc/noaa_hrpt_decoder.xml                  |   15 +-
 gr-noaa/lib/Makefile.am                            |    3 +
 .../{swig/noaa_hrpt_decoder.i => lib/noaa_hrpt.h}  |   23 +-
 gr-noaa/lib/noaa_hrpt_decoder.cc                   |  167 ++-
 gr-noaa/lib/noaa_hrpt_decoder.h                    |   39 +-
 gr-noaa/lib/noaa_hrpt_deframer.cc                  |   26 +-
 gr-noaa/lib/noaa_hrpt_deframer.h                   |    4 -
 gr-noaa/oct/frames_to_ppm.m                        |    2 +-
 gr-noaa/swig/noaa_hrpt_decoder.i                   |    2 +-
 gr-pager/Makefile.am                               |    6 +-
 gr-pager/apps/.gitignore                           |    2 +
 {gr-noaa => gr-pager}/apps/Makefile.am             |   19 +-
 gr-pager/{src => apps}/usrp_flex.py                |    0
 gr-pager/{src => apps}/usrp_flex_all.py            |    0
 gr-pager/{src => apps}/usrp_flex_band.py           |    0
 .../apps/usrp_rx_flex.grc                          | 1368 +++++++++++++-------
 gr-pager/apps/usrp_rx_flex.py                      |  434 +++++++
 gr-pager/grc/.gitignore                            |    1 +
 .../python => gr-pager/grc}/Makefile.am            |   15 +-
 gr-pager/grc/pager_flex_deinterleave.xml           |   23 +
 gr-pager/grc/pager_flex_sync.xml                   |   36 +
 gr-pager/grc/pager_slicer_fb.xml                   |   31 +
 {gr-msdd6000/src => gr-pager/lib}/.gitignore       |    6 +-
 gr-pager/{src => lib}/Makefile.am                  |   50 -
 gr-pager/{src => lib}/Makefile.swig.gen            |    0
 gr-pager/{src => lib}/pager_flex_deinterleave.cc   |    0
 gr-pager/{src => lib}/pager_flex_deinterleave.h    |    0
 gr-pager/{src => lib}/pager_flex_frame.cc          |    0
 gr-pager/{src => lib}/pager_flex_frame.h           |    0
 gr-pager/{src => lib}/pager_flex_parse.cc          |    0
 gr-pager/{src => lib}/pager_flex_parse.h           |    0
 gr-pager/{src => lib}/pager_flex_sync.cc           |    0
 gr-pager/{src => lib}/pager_flex_sync.h            |    0
 gr-pager/{src => lib}/pager_slicer_fb.cc           |    0
 gr-pager/{src => lib}/pager_slicer_fb.h            |    0
 gr-pager/{src => lib}/pageri_bch3221.cc            |    0
 gr-pager/{src => lib}/pageri_bch3221.h             |    0
 gr-pager/{src => lib}/pageri_flex_modes.cc         |    0
 gr-pager/{src => lib}/pageri_flex_modes.h          |    0
 gr-pager/{src => lib}/pageri_util.cc               |    0
 gr-pager/{src => lib}/pageri_util.h                |    0
 gr-pager/python/.gitignore                         |    2 +
 .../python/Makefile.am                             |   19 +-
 gr-pager/{src => python}/__init__.py               |    0
 gr-pager/{src => python}/flex_demod.py             |    0
 gr-pager/{src => python}/pager_utils.py            |    0
 gr-pager/{src => python}/qa_pager.py               |    0
 gr-pager/{src => python}/run_tests.in              |    0
 gr-pager/src/pager_swig.i                          |   89 --
 gr-pager/{src => swig}/.gitignore                  |    2 -
 gr-pager/{src => swig}/Makefile.am                 |   65 +-
 gr-pager/{src => swig}/Makefile.swig.gen           |    0
 gr-pager/swig/pager_flex_deinterleave.i            |   11 +
 gr-pager/{src => swig}/pager_flex_frame.i          |    0
 gr-pager/swig/pager_flex_parse.i                   |   11 +
 gr-pager/swig/pager_flex_sync.i                    |   11 +
 gr-pager/swig/pager_slicer_fb.i                    |   12 +
 .../{src/pager_flex_frame.i => swig/pager_swig.i}  |   29 +-
 grc/base/Block.py                                  |    2 -
 grc/base/FlowGraph.py                              |    2 -
 grc/blocks/Makefile.am                             |    2 +
 ...lks2_dxpsk_demod.xml => blks2_dxpsk2_demod.xml} |   54 +-
 .../{blks2_dxpsk_mod.xml => blks2_dxpsk2_mod.xml}  |   14 +-
 grc/blocks/blks2_dxpsk_demod.xml                   |    2 +-
 grc/blocks/blks2_dxpsk_mod.xml                     |    2 +-
 grc/blocks/block_tree.xml                          |    3 +
 grc/blocks/pad_sink.xml                            |   15 +-
 grc/blocks/pad_source.xml                          |   16 +-
 grc/freedesktop/grc_setup_freedesktop.in           |    9 +-
 grc/grc_gnuradio/usrp/dual_usrp.py                 |    2 +-
 grc/grc_gnuradio/usrp/simple_usrp.py               |    2 +-
 grc/grc_gnuradio/wxgui/top_block_gui.py            |    1 -
 grc/gui/ActionHandler.py                           |    1 -
 grc/gui/Block.py                                   |   21 +-
 grc/gui/Dialogs.py                                 |    1 -
 grc/gui/Element.py                                 |    3 -
 grc/gui/FlowGraph.py                               |    1 -
 grc/gui/Param.py                                   |   36 +-
 grc/gui/Port.py                                    |   13 +-
 grc/gui/Utils.py                                   |   23 +
 grc/python/Constants.py                            |    1 -
 grc/python/FlowGraph.py                            |   36 +-
 grc/python/Param.py                                |    1 -
 grc/python/convert_hier.py                         |   14 +-
 grc/python/flow_graph.tmpl                         |   18 +-
 run_tests.sh.in                                    |    2 +-
 usrp/firmware/include/usrp_ids.h                   |    1 +
 usrp/host/lib/db_xcvr2450.cc                       |    4 +-
 usrp/host/lib/usrp_prims_libusb0.cc                |    2 +-
 usrp2/firmware/lib/db_init.c                       |    2 +
 usrp2/firmware/lib/db_tvrx.c                       |   32 +-
 usrp2/firmware/lib/db_xcvr2450.c                   |    4 +-
 usrp2/fpga/sdr_lib/dsp_core_tx.v                   |   11 +-
 usrp2/fpga/top/u2_core/u2_core.v                   |    6 +-
 usrp2/fpga/vrt/vita_tx_control.v                   |   31 +-
 vrt/lib/copiers.cc                                 |    2 +
 vrt/lib/expanded_header.cc                         |    6 -
 vrt/lib/rx.cc                                      |   36 +-
 169 files changed, 6507 insertions(+), 2538 deletions(-)




reply via email to

[Prev in Thread] Current Thread [Next in Thread]