From 80f72d52ea4d7cbcf29d7c2d14039e471cd5c7b6 Mon Sep 17 00:00:00 2001 From: Dimitri Stolnikov Date: Sun, 4 Aug 2013 22:28:55 +0200 Subject: [PATCH] grc: move around documentation --- README | 10 +++++----- grc/gen_osmosdr_blocks.py | 16 +++++----------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/README b/README index 34e3397..baa716a 100644 --- a/README +++ b/README @@ -4,13 +4,13 @@ as well supports: * FUNcube Dongle through libgnuradio-fcd * FUNcube Dongle Pro+ through gr-fcdproplus * sysmocom OsmoSDR Devices through libosmosdr - * Nuand LLC bladeRF through libbladeRF library - * Great Scott Gadgets HackRF through libhackrf - * Ettus USRP Devices through Ettus UHD library * RTL2832U based DVB-T dongles through librtlsdr * RTL-TCP spectrum server (see librtlsdr project) * MSi2500 based DVB-T dongles through libmirisdr * gnuradio .cfile input through libgnuradio-blocks + * Ettus USRP Devices through Ettus UHD library + * Great Scott Gadgets HackRF through libhackrf + * Nuand LLC bladeRF through libbladeRF library By using the OsmoSDR block you can take advantage of a common software api in your application(s) independent of the underlying radio hardware. @@ -18,11 +18,11 @@ your application(s) independent of the underlying radio hardware. For installation and usage guidelines please read the documentation available at http://sdr.osmocom.org/trac/wiki/GrOsmoSDR -For the impatient :) a short excerpt: +A short excerpt from the wiki: The Gnu Radio block requires a recent gnuradio (>= v3.7) to be installed. -Before building the block you have to make sure that all the dependencies +Before building the block you have to make sure that all dependencies (see list of supported devices above) you are intend to work with are properly installed. The build system of gr-osmosdr will recognize them and enable specific source/sink components thereafter. diff --git a/grc/gen_osmosdr_blocks.py b/grc/gen_osmosdr_blocks.py index dd12cd3..da28663 100644 --- a/grc/gen_osmosdr_blocks.py +++ b/grc/gen_osmosdr_blocks.py @@ -118,16 +118,14 @@ While primarily being developed for the OsmoSDR hardware, this block as well sup * FUNcube Dongle through libgnuradio-fcd * FUNcube Dongle Pro+ through gr-fcdproplus * sysmocom OsmoSDR Devices through libosmosdr -#end if - * Nuand LLC bladeRF through libbladeRF library - * Great Scott Gadgets HackRF through libhackrf - * Ettus USRP Devices through Ettus UHD library -#if $sourk == 'source': * RTL2832U based DVB-T dongles through librtlsdr * RTL-TCP spectrum server (see librtlsdr project) * MSi2500 based DVB-T dongles through libmirisdr * gnuradio .cfile input through libgnuradio-blocks #end if + * Ettus USRP Devices through Ettus UHD library + * Great Scott Gadgets HackRF through libhackrf + * Nuand LLC bladeRF through libbladeRF library By using the osmocom $sourk block you can take advantage of a common software api in your application(s) independent of the underlying radio hardware. @@ -145,22 +143,18 @@ Lines ending with ... mean it's possible to bind devices together by specifying #if $sourk == 'source': fcd=0[,device=hw:2][,type=2] - hackrf=0[,buffers=32] miri=0[,buffers=32] ... rtl=serial_number ... rtl=0[,rtl_xtal=28.8e6][,tuner_xtal=28.8e6] ... rtl=1[,buffers=32][,buflen=N*512] ... rtl=2[,direct_samp=0|1|2][,offset_tune=0|1] ... rtl_tcp=127.0.0.1:1234[,psize=16384][,direct_samp=0|1|2][,offset_tune=0|1] ... - uhd[,serial=...][,lo_offset=0][,mcr=52e6][,nchan=2][,subdev='\\\\'B:0 A:0\\\\''] ... - bladerf=0[,fpga='/path/to/the/bitstream.rbf'][,fw='/path/to/the/firmware.img'] osmosdr=0[,buffers=32][,buflen=N*512] ... file='/path/to/your file',rate=1e6[,freq=100e6][,repeat=true][,throttle=true] ... #end if -#if $sourk == 'sink': - hackrf=0[,buffers=32] + bladerf=0[,fpga='/path/to/the/bitstream.rbf'][,fw='/path/to/the/firmware.img'] uhd[,serial=...][,lo_offset=0][,mcr=52e6][,nchan=2][,subdev='\\\\'B:0 A:0\\\\''] ... -#end if + hackrf=0[,buffers=32] Num Channels: Selects the total number of channels in this multi-device configuration. Required when specifying multiple device arguments.