diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2011-10-19 15:10:58 -0700 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2011-10-19 15:10:58 -0700 |
| commit | e30b824e9165bff69f09121631c3d5a706cbbd39 (patch) | |
| tree | 62e29ee0f9e7d6139d73174a4bf31559c2db9fab /grc | |
| parent | 49a1ad2cd002200a3b37f40117cf69e1a07a9222 (diff) | |
Removing usrp, usrp2, gr-usrp, gr-usrp2. Everything is moving to using UHD. Also removes related M4 and dependency requirements for USRP-related libs.
Diffstat (limited to 'grc')
| -rw-r--r-- | grc/grc_gnuradio/README | 3 | ||||
| -rw-r--r-- | grc/python/extract_docs.py | 3 | ||||
| -rw-r--r-- | grc/todo.txt | 5 |
3 files changed, 1 insertions, 10 deletions
diff --git a/grc/grc_gnuradio/README b/grc/grc_gnuradio/README index 5a89da54a7..897eed65ca 100644 --- a/grc/grc_gnuradio/README +++ b/grc/grc_gnuradio/README @@ -7,8 +7,5 @@ The blk2s module wraps many blocks in blks2 and gives them streaming outputs. Will be phased-out by new message passing implementations. Other blks2 blocks will hopefully make their way into blks2impl. -The usrp module contains the simple and dual usrp wrappers. -Will be phased-out by generic usrp and/or new usrp api. - The wxgui module contains a top_block + wxgui frame. Will be phased-out by gui.py in wxgui and a new top block template. diff --git a/grc/python/extract_docs.py b/grc/python/extract_docs.py index be55fd239e..fe157a2216 100644 --- a/grc/python/extract_docs.py +++ b/grc/python/extract_docs.py @@ -26,7 +26,7 @@ DOXYGEN_NAME_XPATH = '/doxygen/compounddef/compoundname' DOXYGEN_BRIEFDESC_GR_XPATH = '/doxygen/compounddef/briefdescription' DOXYGEN_DETAILDESC_GR_XPATH = '/doxygen/compounddef/detaileddescription' -GROUP_KEYS = "gr|usrp2|trellis|noaa|vocoder|digital" +GROUP_KEYS = "gr|trellis|noaa|vocoder|digital" def extract_txt(xml): """ @@ -65,7 +65,6 @@ def _extract(key): #extract descriptions comp_name = extract_txt(xml.xpath(DOXYGEN_NAME_XPATH)[0]).strip() comp_name = ' --- ' + comp_name + ' --- ' -# if re.match('(gr|usrp2|trellis|noaa)_.*', key): if re.match(('(%s)_.*' % GROUP_KEYS), key): brief_desc = extract_txt(xml.xpath(DOXYGEN_BRIEFDESC_GR_XPATH)[0]).strip() detailed_desc = extract_txt(xml.xpath(DOXYGEN_DETAILDESC_GR_XPATH)[0]).strip() diff --git a/grc/todo.txt b/grc/todo.txt index 9dad057301..ccfaad72a6 100644 --- a/grc/todo.txt +++ b/grc/todo.txt @@ -9,19 +9,14 @@ ################################################## * probe: also non-float outputs * log slider gui control -* generic usrp (when its ready) * packet mod: whitening offset * wx min window size in options block * gr_adaptive_fir_ccf * ofdm * gr_ofdm_bpsk_demapper - * gr_ofdm_cyclic_prefixer * gr_ofdm_demapper_vcb - * gr_ofdm_frame_acquisition * gr_ofdm_frame_sink - * gr_ofdm_insert_preamble * gr_ofdm_mapper_bcv - * gr_ofdm_sampler * size params for the graphical sinks * callbacks for set average on fft, waterfall, number sinks * add units to params: Sps, Hz, dB... |