diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-01-23 10:18:17 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-01-23 10:51:26 +0100 |
| commit | e12c679b8cc8a263507c556cb24819dc0d5559b9 (patch) | |
| tree | 8f2cd06710d15ca64a4a86c1ce52bc975ec3f2b0 /doc/example.ini | |
| parent | d82422fbb3d9d34a0566197245376548ce3ef14e (diff) | |
| parent | 94c1f63b6fd07d74f3325274dd19fd6beaf53965 (diff) | |
| download | dabmod-e12c679b8cc8a263507c556cb24819dc0d5559b9.tar.gz dabmod-e12c679b8cc8a263507c556cb24819dc0d5559b9.tar.bz2 dabmod-e12c679b8cc8a263507c556cb24819dc0d5559b9.zip | |
Merge raspine's ZeroMQ RC and UHD staticdelay
Merge raspine/master pull request, fix indentation, code style, and two
minor conflicts in:
doc/example.ini
src/DabMod.cpp
Diffstat (limited to 'doc/example.ini')
| -rw-r--r-- | doc/example.ini | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/doc/example.ini b/doc/example.ini index ecb7440..3c81c04 100644 --- a/doc/example.ini +++ b/doc/example.ini @@ -129,8 +129,11 @@ filename=/dev/stdout ; or even a higher factor. ; ; Settings for a USRP B100: -;device=master_clock_rate=32768000,type=b100 -;txgain=2 +device= +; you can put additional UHD device settings here +master_clock_rate=32768000 +type=b100 +txgain=2.0 ; Try first with small gain values ; Also set rate to 2048000 @@ -139,9 +142,10 @@ filename=/dev/stdout ; http://opendigitalradio.org/index.php/USRP_B200_Measurements ; ; Settings: -device=master_clock_rate=2048000,type=b200 -;device=master_clock_rate=20480000,type=b200 -txgain=40 +;device= +;master_clock_rate=20480000 +;type=b200 +;txgain=40 ; The B200 needs larger gains (up to 89dB) but, ; "Gain settings are application specific, but it is recommended that users ; consider using at least half of the available gain to get reasonable dynamic @@ -151,7 +155,8 @@ txgain=40 ; For the USRP1 -;device=type=usrp1 +;device= +;type=usrp1 ; the usrp1 can have two daughterboards, the subdevice parameter allows you ; to choose which one to use ;subdevice=A:0 |