diff options
| author | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-02-04 23:06:02 +0000 |
|---|---|---|
| committer | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-02-04 23:06:02 +0000 |
| commit | 9b388ac1184c71449c49fb44551c5c38f8098d8e (patch) | |
| tree | 619f89d81e2030a831063415c29d78c739e47c1c /usrp2/firmware/lib/db_basic.c | |
| parent | 68282b6ffed904bb55700314a600fe5d731dd0ea (diff) | |
Merged r10383:10390 from jcorgan/u2-wip into trunk.
* Implements daughterboard independent LO offset tuning
* Removes RFX specific LO offset code
* Adds 'set_lo_offset' to libusrp2 and Python API
* Adds --lo-offset to usrp2_fft.py and usrp2_rx_cfile.py
* Ensures daughterboards are reset to default values at
startup.
Trunk passes distcheck.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10392 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'usrp2/firmware/lib/db_basic.c')
| -rw-r--r-- | usrp2/firmware/lib/db_basic.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usrp2/firmware/lib/db_basic.c b/usrp2/firmware/lib/db_basic.c index 0f1ad65044..2bd4ebfbe4 100644 --- a/usrp2/firmware/lib/db_basic.c +++ b/usrp2/firmware/lib/db_basic.c @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2008 Free Software Foundation, Inc. + * Copyright 2008,2009 Free Software Foundation, Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -42,7 +42,7 @@ struct db_basic db_basic_tx = { .base.is_quadrature = true, .base.i_and_q_swapped = false, .base.spectrum_inverted = false, - //.base.lo_offset = U2_DOUBLE_TO_FXPT_FREQ(0), + .base.default_lo_offset = U2_DOUBLE_TO_FXPT_FREQ(0), .base.atr_mask = 0, .base.atr_txval = 0, .base.atr_rxval = 0, @@ -68,7 +68,7 @@ struct db_basic db_basic_rx = { .base.is_quadrature = false, .base.i_and_q_swapped = false, .base.spectrum_inverted = false, - //.base.lo_offset = U2_DOUBLE_TO_FXPT_FREQ(0), + .base.default_lo_offset = U2_DOUBLE_TO_FXPT_FREQ(0), .base.atr_mask = 0, .base.atr_txval = 0, .base.atr_rxval = 0, @@ -94,7 +94,7 @@ struct db_basic db_lf_tx = { .base.is_quadrature = true, .base.i_and_q_swapped = false, .base.spectrum_inverted = false, - //.base.lo_offset = U2_DOUBLE_TO_FXPT_FREQ(0), + .base.default_lo_offset = U2_DOUBLE_TO_FXPT_FREQ(0), .base.atr_mask = 0, .base.atr_txval = 0, .base.atr_rxval = 0, @@ -120,7 +120,7 @@ struct db_basic db_lf_rx = { .base.is_quadrature = false, .base.i_and_q_swapped = false, .base.spectrum_inverted = false, - //.base.lo_offset = U2_DOUBLE_TO_FXPT_FREQ(0), + .base.default_lo_offset = U2_DOUBLE_TO_FXPT_FREQ(0), .base.atr_mask = 0, .base.atr_txval = 0, .base.atr_rxval = 0, |