Commit Graph

307 Commits

Author SHA1 Message Date
jcorgan 707f3cef77 Merged r11377:11390 from jcorgan/usrp-headers in to trunk.
* Public USRP(1) header files are now in their own source directory
  and install into $(includedir)/usrp.  This was done to avoid name
  clashes in the top-level include directory.

  Only users who are developing directly to libusrp in C++ are
  affected; the GNU Radio C++ and Python APIs are unchanged.

  The simple change required by this update is to change:

  #include <usrp_*.h> 

  to #include 

  <usrp/usrp_*.h> 

  ...in your source code.

* Removed usrp-inband code from tree (put into limbo directory.)
  This code has become unmaintained and has started to suffer
  from bitrot.  A checkpoint tag has been made for anyone still
  needing to use it:

  http://gnuradio.org/svn/gnuradio/tags/checkpoints/trunk-20090708-pre-usrp-reorg

  The plan during the 3.2->3.3 development cycle is to replace the
  functions done by the in-band code with extensions to the existing
  gr-usrp blocks using the new message passing architecture.

  The USRP hardware FPGA code that provided the inband interface
  has not been removed; however, it too has become unmaintained and
  will likely be rewritten/replaced during the 3.3 timeframe.

The trunk passes distcheck.




git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11394 221aa14e-8319-0410-a670-987f0aec2ac5
2009-07-09 02:55:51 +00:00
anastas 3aafe2583c added include <cstdio> statements in several files to make it compatible with g++ 4.4
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11266 221aa14e-8319-0410-a670-987f0aec2ac5
2009-06-23 15:28:50 +00:00
jcorgan c84380718a Merged r11123:11148 from jcorgan/np into trunk.
Adds --enable-python option to configure (defaults to yes).

Using --disable-python or --enable-python=no will cause only
C++ API targets to be created and installed.

Several new shared libraries are now created.  Where in the past,
the C++ objects of the actual gnuradio blocks that were in a component
were hidden inside their corresponding Python extension modules, these
are now split out into a libgnuradio-foo.so library, and the _foo.so
Python module is linked to that.  This has been the way several top-
level components have operated for some time, such as gr-audio-alsa
and gr-usrp and gr-usrp2.  This changeset applies that pattern to all
components.

C++ API users can use pkg-config to discover the cflags and libs 
parameters needed to include and link against these libraries.

These components have not been tested:

gr-comedi
gr-audio-osx
gr-audio-windows

Passes distcheck.



git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11150 221aa14e-8319-0410-a670-987f0aec2ac5
2009-05-27 01:54:41 +00:00
eb 88f53a140b Doc fixes.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11088 221aa14e-8319-0410-a670-987f0aec2ac5
2009-05-22 21:22:22 +00:00
eb 0ee8968fef doc fixes! work-in-progress
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11085 221aa14e-8319-0410-a670-987f0aec2ac5
2009-05-22 16:11:15 +00:00
eb be771f5eda Fixes ticket:364, ticket:365. Merged eb/t364 -r11015:11017 to trunk.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11018 221aa14e-8319-0410-a670-987f0aec2ac5
2009-05-13 05:29:11 +00:00
eb 18784d3fa6 Built and checked in new rbfs that fix ticket:248 and ticket:290.
The rbfs are built from r11012 and were compiled using Quartus II
Version 7.1 build 178 06/25/2007 SP 1 SJ Web Edition.

ticket:248 was actually fixed in [9485], but the updated rbfs were
never checked in.  Ticket:290 wasn't really a bug.  The host code has
always been correct.



git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11014 221aa14e-8319-0410-a670-987f0aec2ac5
2009-05-12 21:17:27 +00:00
jcorgan d587580615 Merged r10948:10959 from jcorgan/deb into trunk. Trunk passes
distcheck.

Part 1 of Debian/Ubuntu binary packaging update for 3.2 release. 
Creates all C++ API binary and dev packages, with their associated
runtime dependencies.

* Runtime shared-library packages:

-libgruel
-libgnuradio-omnithread
-libpmt
-libmblock
-libgnuradio-core
-libgnuradio-alsa
-libgnuradio-qtgui
-libusrp
-libusrp2
-libgnuradio-usrp
-libgnuradio-usrp2

* C++ development headers and pkg-config files for the above:

-libgruel-dev
-libgnuradio-omnithread-dev
-libpmt-dev
-libmblock-dev
-libgnuradio-core-dev
-libgnuradio-alsa-dev
-libgnuradio-qtgui-dev
-libusrp-dev
-libusrp2-dev

NOTE: For consistency, libqtgui.so has been renamed to libgnuradio-qtgui.so,
and libgr-usrp2.so has been renamed to libgnuradio-usrp2.so.

A 'gnuradio-dev' virtual package will be created that will depend upon the
above -dev packages, so installing that one package will pull in all that is needed
to do pure C++ development in GNU Radio.




git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10981 221aa14e-8319-0410-a670-987f0aec2ac5
2009-05-07 00:11:08 +00:00
eb c12d497f44 Additional change for ticket:371 (also fixes broken trunk ;-)
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10975 221aa14e-8319-0410-a670-987f0aec2ac5
2009-05-06 01:11:54 +00:00
eb ef4dfafb05 Fix for ticket:371.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10972 221aa14e-8319-0410-a670-987f0aec2ac5
2009-05-06 00:35:04 +00:00
jblum 3ad264f067 XCVR2450 tranceive hackish fix. Re-write the atr mask, io, and oe registers in the set_gpio().
usrp basic overwrites the registers on init and can be harmful to an app that uses both RX and TX.
set_gpio will be called when the frequency is set so tuning after initialization is required.
Also, the custom xcvr set register methods were replaced will calls to common_*



git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10853 221aa14e-8319-0410-a670-987f0aec2ac5
2009-04-15 23:10:36 +00:00
eb e24d153baa Merged remainder of eb/t348 10637:10648. This adds a -N <nsamples>
argument to usrp_siggen.py, usrp_siggen.cc and test_usrp_standard_tx.cc.



git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10650 221aa14e-8319-0410-a670-987f0aec2ac5
2009-03-19 19:59:48 +00:00
jcorgan dca27489c5 Merged r10554:10595 from michaelld/am_swig_4 into trunk. Major overhaul of SWIG usage in build system, also fixes ticket:130. Trunk passes distcheck.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10596 221aa14e-8319-0410-a670-987f0aec2ac5
2009-03-14 02:28:41 +00:00
eb e22428eef7 New standalone firmware, burn_dbsrx_eeprom, that burns new dbid into
modified DBS Rx daughterboard.



git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10560 221aa14e-8319-0410-a670-987f0aec2ac5
2009-03-05 01:21:44 +00:00
jcorgan d375ce46a3 Merged r10504:10528 from michaelld/fix_local_data_install into trunk. Trunk passes distcheck.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10529 221aa14e-8319-0410-a670-987f0aec2ac5
2009-02-26 23:39:17 +00:00
jcorgan 682fe8be0d Merged r10501:10505 from michaelld/omnithread into trunk. Moves omnithread header files into /gnuradio. Trunk passes distcheck.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10506 221aa14e-8319-0410-a670-987f0aec2ac5
2009-02-25 19:04:35 +00:00
jblum e0af1f6b42 dont check this
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10458 221aa14e-8319-0410-a670-987f0aec2ac5
2009-02-18 01:45:41 +00:00
jblum 104c065cbe usrp methods for computing the mux for dual subdevices
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10457 221aa14e-8319-0410-a670-987f0aec2ac5
2009-02-17 23:03:39 +00:00
jblum 83fbc910f5 kludge the legacy: usrp subdevice 2, the 3rd subdevice
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10448 221aa14e-8319-0410-a670-987f0aec2ac5
2009-02-17 02:33:08 +00:00
jcorgan 21a2fdc950 Merged r10385:10413 from michaelld/swig_tweaks into trunk. Passes distcheck.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10414 221aa14e-8319-0410-a670-987f0aec2ac5
2009-02-10 04:53:37 +00:00
jblum 709583cf9b whoops, restored comment
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10400 221aa14e-8319-0410-a670-987f0aec2ac5
2009-02-05 22:55:06 +00:00
jblum 81dc463a81 PYTHON_CHECK_MODULE: added extra argument for assertion tests (ex: version testing)
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10399 221aa14e-8319-0410-a670-987f0aec2ac5
2009-02-05 22:51:03 +00:00
jcorgan 187055ba6f Merged r10288:10370 from michaelld/swigpythonargs into trunk. Passes distcheck.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10371 221aa14e-8319-0410-a670-987f0aec2ac5
2009-02-02 14:27:28 +00:00
matt 369e25864a much better register settings, should work all the time
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10348 221aa14e-8319-0410-a670-987f0aec2ac5
2009-01-31 00:31:14 +00:00
jcorgan 85c56a3e99 General housekeeping--removing ancient cruft mostly.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10315 221aa14e-8319-0410-a670-987f0aec2ac5
2009-01-27 18:00:05 +00:00
gnychis 5c080ce80a merging -r10252:10253 from developer branch to kick RX gain down in half on default
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10254 221aa14e-8319-0410-a670-987f0aec2ac5
2009-01-17 19:59:28 +00:00
gnychis 0ea823b97e merging from developer branch to fix manual frequency setting problem, for real this time
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10250 221aa14e-8319-0410-a670-987f0aec2ac5
2009-01-17 04:46:33 +00:00
gnychis d7747c8b87 seriously, sorry... tried to ctrl+c that but didnt get in time
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10249 221aa14e-8319-0410-a670-987f0aec2ac5
2009-01-17 04:42:26 +00:00
gnychis 54ccb14b50 merging r10246:10247 from developer branch to fix manual frequency setting problem
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10248 221aa14e-8319-0410-a670-987f0aec2ac5
2009-01-17 04:39:52 +00:00
gnychis b66d4cbf19 merging 10218 to 10241 for full daughterboard support with in-band project
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10244 221aa14e-8319-0410-a670-987f0aec2ac5
2009-01-16 18:51:42 +00:00
jcorgan a327116b57 Fixes in-band code for new daughterboard API (Stefan Bruens)
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10208 221aa14e-8319-0410-a670-987f0aec2ac5
2009-01-12 21:31:44 +00:00
matt db324b7c17 added frequency offset
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10204 221aa14e-8319-0410-a670-987f0aec2ac5
2009-01-09 03:43:19 +00:00
matt e1b63aaac9 fix for xcvr.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10203 221aa14e-8319-0410-a670-987f0aec2ac5
2009-01-09 03:33:16 +00:00
jcorgan 10ac5e95ab More XCVR2450 fixes.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10202 221aa14e-8319-0410-a670-987f0aec2ac5
2009-01-09 02:33:04 +00:00
jcorgan 33256a6840 Fix sign error in XCVR2450 code
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10201 221aa14e-8319-0410-a670-987f0aec2ac5
2009-01-08 23:50:42 +00:00
jcorgan 509e84becd Allow setting of non-standard FPGA master clock frequency for USRP1
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10193 221aa14e-8319-0410-a670-987f0aec2ac5
2009-01-05 18:05:17 +00:00
jcorgan 27ef52aac9 Fix missing set_bw call in new daughterboard API. Reconciled implementations between different boards to return true or false (success).
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10168 221aa14e-8319-0410-a670-987f0aec2ac5
2008-12-26 19:31:44 +00:00
jcorgan c513881b33 Merged r10071:10164 from features/cppdb-test into trunk. Implements the fully native C++ API for the USRP.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10165 221aa14e-8319-0410-a670-987f0aec2ac5
2008-12-24 08:10:48 +00:00
jcorgan f3f0aafed4 Move mblock library include files into separate library. Updates to usrp in-band code to accommodate. Tested with out-of-tree mblock application builds. Trunk passes distcheck.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10144 221aa14e-8319-0410-a670-987f0aec2ac5
2008-12-20 20:54:52 +00:00
jcorgan 93bb2af3f4 Merged r9881:9917 from jcorgan/deb-wip into trunk. Updates Debian/Ubuntu packaging system to build trunk code on Ubuntu 8.10.
Several new trunk components still need debs created.

Impact on non-packaging code:

* Renamed libgr_audio_alsa.so to libgnuradio-audio-alsa.so

* Renamed libusrp_inband.so to libusrp-inband.so

* Added PYTHON_CHECK_MODULE to build system to simplify Python dependency verification

Packaging code updates:

* Updated build-depends and package dependencies to be current with trunk

* Added package for libgruel and libgruel-dev

* Renamed library packages to use simplified names, removing the 0 or 0c2a suffix. This may not follow Debian policy, but we can revisit this if we ever go into official Debian or Ubuntu.

* Remove gr-comedi from packaging

* Restructured sections to eliminate 'contrib'.  Since we're not official Debian, we don't need to deal with the sdcc-nf issue.

* Consolidated usrp firmware packages into corresponding main packages (same as previous).



git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9918 221aa14e-8319-0410-a670-987f0aec2ac5
2008-11-03 20:08:39 +00:00
eb a3d0baf2c7 trial fix for ticket:288; merged eb/fusb 9543:9544 to trunk
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9545 221aa14e-8319-0410-a670-987f0aec2ac5
2008-09-09 15:19:00 +00:00
eb d40a1ee503 make warning go away
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9491 221aa14e-8319-0410-a670-987f0aec2ac5
2008-09-03 15:36:34 +00:00
matt 2fefe2b723 Allows for changing the interpolation rate dynamically. Stop the pipeline, set the rate, restart the pipeline. Fixes bug #248.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9485 221aa14e-8319-0410-a670-987f0aec2ac5
2008-09-02 19:50:09 +00:00
jcorgan 0b7d2189c1 Fix compiler warnings across the tree. Adds --enable-warnings-as-errors configure option. Currently compiles with no warnings with GCC 4.2.3 on Ubuntu 8.04.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9396 221aa14e-8319-0410-a670-987f0aec2ac5
2008-08-24 17:41:07 +00:00
jcorgan 6f9aca985c Merged changeset r9285:9377 from jblum/grc into trunk, with distcheck fixes
and local modifications.

Integrates previously separate GNU Radio Companion into top-level component
'grc'.  (Josh Blum)


git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9378 221aa14e-8319-0410-a670-987f0aec2ac5
2008-08-23 02:26:15 +00:00
eb 05efd5100f Merged features/mp-sched -r8915:9335 into the trunk. The trunk now
contains the SMP aware scheduler.  This changeset
introduces a dependency on boost 1.35 or later.
See source:gnuradio/trunk/README.building-boost for additional info.



git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9336 221aa14e-8319-0410-a670-987f0aec2ac5
2008-08-19 23:09:56 +00:00
eb f93a67807b Allow odd decimation if halfband filter is disabled. Thanks Firas!
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@8996 221aa14e-8319-0410-a670-987f0aec2ac5
2008-07-24 17:48:46 +00:00
eb e16ac750ba Fixed spelling error: s/writeable/writable/g
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@8727 221aa14e-8319-0410-a670-987f0aec2ac5
2008-06-26 18:17:15 +00:00
matt 720063a4f7 new experimental daughterboards with other tuners
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@8687 221aa14e-8319-0410-a670-987f0aec2ac5
2008-06-24 19:40:47 +00:00
jcorgan 4823541eb9 Make fpga register definition header files installed.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@8573 221aa14e-8319-0410-a670-987f0aec2ac5
2008-06-10 19:52:55 +00:00