diff options
| author | Dimitri Stolnikov <horiz0n@gmx.net> | 2013-05-30 16:14:22 +0200 |
|---|---|---|
| committer | Dimitri Stolnikov <horiz0n@gmx.net> | 2013-05-30 16:14:22 +0200 |
| commit | 7e55cb9224fb7f1586a829f7321ef5b1bded88f5 (patch) | |
| tree | 42eb1dbd4d55538bf4e5207d69211c6b01b00375 /grc | |
| parent | 3e6a24e5d9e81878ac57281e7a9d3b23d3dbc6e8 (diff) | |
introduce osmosdr namespace, remove _c suffix
- the namespace conversion adopts the common gnuradio coding guidelines
- suffix removal is a preparation to support 8/16 bit complex data types
Diffstat (limited to 'grc')
| -rw-r--r-- | grc/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | grc/gen_osmosdr_blocks.py | 18 |
2 files changed, 12 insertions, 12 deletions
diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt index aa15df3..09838c1 100644 --- a/grc/CMakeLists.txt +++ b/grc/CMakeLists.txt @@ -32,9 +32,9 @@ macro(GEN_BLOCK_XML _generator _xml_block) ) endmacro(GEN_BLOCK_XML) -GEN_BLOCK_XML(gen_osmosdr_blocks.py rtlsdr_source_c.xml) -GEN_BLOCK_XML(gen_osmosdr_blocks.py osmosdr_source_c.xml) -GEN_BLOCK_XML(gen_osmosdr_blocks.py osmosdr_sink_c.xml) +GEN_BLOCK_XML(gen_osmosdr_blocks.py rtlsdr_source.xml) +GEN_BLOCK_XML(gen_osmosdr_blocks.py osmosdr_source.xml) +GEN_BLOCK_XML(gen_osmosdr_blocks.py osmosdr_sink.xml) add_custom_target(osmosdr_grc_xml_blocks ALL DEPENDS ${xml_blocks}) diff --git a/grc/gen_osmosdr_blocks.py b/grc/gen_osmosdr_blocks.py index 7b97d1b..c118b8c 100644 --- a/grc/gen_osmosdr_blocks.py +++ b/grc/gen_osmosdr_blocks.py @@ -22,11 +22,11 @@ MAIN_TMPL = """\ <?xml version="1.0"?> <block> <name>$(title) $sourk.title()</name> - <key>$(prefix)_$(sourk)_c</key> + <key>$(prefix)_$(sourk)</key> <category>$($sourk.title())s</category> <throttle>1</throttle> <import>import osmosdr</import> - <make>osmosdr.$(sourk)_c( args="nchan=" + str(\$nchan) + " " + \$args ) + <make>osmosdr.$(sourk)( args="nchan=" + str(\$nchan) + " " + \$args ) self.\$(id).set_sample_rate(\$sample_rate) #for $n in range($max_nchan) \#if \$nchan() > $n @@ -104,12 +104,12 @@ self.\$(id).set_bandwidth(\$bw$(n), $n) <nports>\$nchan</nports> </$sourk> <doc> -The OSMOCOM block: +The osmocom block: While primarily being developed for the OsmoSDR hardware, this block as well supports: * FunCube Dongle through libgnuradio-fcd - * OSMOCOM OsmoSDR Devices through libosmosdr + * sysmocom OsmoSDR Devices through libosmosdr * Great Scott Gadgets HackRF through libhackrf * Ettus USRP Devices through Ettus UHD library * RTL2832U based DVB-T dongles through librtlsdr @@ -192,9 +192,9 @@ Bandwidth: Set the bandpass filter on the radio frontend. To use the default (automatic) bandwidth filter setting, this should be zero. See the OsmoSDR project page for more detailed documentation: -http://sdr.osmocom.org/trac/ -http://sdr.osmocom.org/trac/wiki/rtl-sdr http://sdr.osmocom.org/trac/wiki/GrOsmoSDR +http://sdr.osmocom.org/trac/wiki/rtl-sdr +http://sdr.osmocom.org/trac/ </doc> </block> """ @@ -318,14 +318,14 @@ if __name__ == '__main__': title = 'RTL-SDR' prefix = 'rtlsdr' elif tail.startswith('osmosdr'): - title = 'OSMOCOM' + title = 'osmocom' prefix = 'osmosdr' else: raise Exception, 'file %s has wrong syntax!'%tail - if tail.endswith ('source_c.xml'): + if tail.endswith ('source.xml'): sourk = 'source' dir = 'out' - elif tail.endswith ('sink_c.xml'): + elif tail.endswith ('sink.xml'): sourk = 'sink' dir = 'in' else: raise Exception, 'is %s a source or sink?'%file |