Commit Graph

338 Commits

Author SHA1 Message Date
Tom Rondeau a75112feb7 Merge branch 'master' of gnuradio.org:gnuradio 2011-03-20 12:31:10 -04:00
Tom Rondeau d694deb33b Fixing missing header file (in prep for future GCC's). ptrdiff_t is defined in stddef.h. 2011-02-27 17:35:05 -05:00
Eric Blossom f2857f1818 Merge branch 'next' into guile-next
* next: (116 commits)
  Adding new example script for using the new PFB arbitrary resampler interface. One resampler takes user-generated taps and another resampler just takes the resampling rate. Both input and output signals are plotted.
  Modifying blsk2 wrapper for PFB arbitrary resampler to allow the user to just specify the requested resampling rate without providing their own filter taps.
  uhd: reverting tag changes on uhd single usrp source, there seems to be issues with the work() logic
  uhd: removed default value chan=0 in the cc files
  WITH_INCLUDES _must_ be last
  uhd: replaced CFLAGS with CPPFLAGS variable, and fixed swig args FIXME
  uhd: default channel params to zero for single source and sink blocks
  Revert "Removed usrp2-firmware from being automatically built."
  Remove generated file from repo
  Removed usrp2-firmware from being automatically built.
  uhd: added libdir to UHD CFLAGS (shared by lib and swig)
  Swapping out preset keys until I work out some of their issues.
  Modifying QA tests for the sample tags. By default, it only checks the sizes of the tags since order is not specified or guarenteed.
  Block is a gr_block, so this sets its relative rate. Was required for using in the QA of the sample tags code.
  Removing global pmt constants. Were causing segfaults during make check. Must fix this later.
  Fixing up the UHD sample tag example to take command line options.
  Swapping order of testing rrate.
  Changing propagation policy enum type name and making a few other minor edits.
  Changing API for gr_skiphead to use uint64_t for the offset instead of size_t (still unsigned). Fixes issue #304.
  Adding typedef for uint64_t and int64_t so we can use them through SWIG.
  ...

Passes make distcheck.
2010-12-06 23:16:25 -08:00
Tom Rondeau 1cab2ce245 Merge branch 'master' into next
* master:
  Adding new example script for using the new PFB arbitrary resampler interface. One resampler takes user-generated taps and another resampler just takes the resampling rate. Both input and output signals are plotted.
  Modifying blks2 wrapper for PFB arbitrary resampler to allow the user to just specify the requested resampling rate without providing their own filter taps.
  Changing API for gr_skiphead to use uint64_t for the offset instead of size_t (still unsigned). Fixes issue #304.
  Adding typedef for uint64_t and int64_t so we can use them through SWIG.
  Removing warnings in portaudio source/sink.
  Fixing output types from tap_type to o_type in gr_single_pole_iir.h. Doesn't make a difference in the current uses of this class, but could in the future. Thanks to Achilleas Anastasopoulos for pointing this out.
  first shot at Windows-compatible LIBUSB check
  Tweak LIBUSB m4 script to not check for 'usb_debug' symbol on Windows, because the symbol does not exist for that platform (only, it seems)
  Removing autogenerated file.
  Updated doxygen Doxyfile for newer versions.
  Adding file operations result checking.
  Updating audio_jack to new interface for creating a client. Fixes depricated warning.
  Potential fix to MSDD warnings by setting sequence number from buffer more explicitly.
  Adding a bit more checking on file operations.
  Fixing copyright date.
  Fixed warning re defining GNU_SOURCE. Can probably just remove it since it's defined in config, but this won't hurt anyone.
  Fixing signed/unsigned warnings.
  first shot at Windows-compatible LIBUSB check
  Tweak LIBUSB m4 script to not check for 'usb_debug' symbol on Windows, because the symbol does not exist for that platform (only, it seems)

Conflicts:
	gnuradio-core/src/lib/swig/gnuradio.i
2010-12-06 20:57:40 -05:00
Eric Blossom 6f9d7add08 Regenerated Makefile.swig.gen's 2010-12-03 23:34:24 -08:00
Eric Blossom f0e7635c6a Update .gitignore's 2010-11-24 19:13:33 -08:00
Eric Blossom dc2588910e Major Makefile.am housecleaning. Passes distcheck.
Move all occurrences of swig_built_sources out of Makefile.am's.
Move all SWIG related use of BUILT_SOURCES out of Makefile.am's.
Clean up 'if PYTHON' conditionalization in gr-*

Still left to do: fix Makefile.swig CLEANFILES and no_dist_files
such that they remove exactly the generated files.
2010-11-24 17:29:11 -08:00
Rob Savoye 005c0c55a5 regenerated 2010-11-19 08:07:52 -07:00
Eric Blossom 5c9d25a206 Merge remote branch 'gnuradio.org/next' into test
* gnuradio.org/next:
  distcheck fix for gr-uhd
  Keep doxygen 1.7.1 from crashing.
  uhd: swig changes for templated ranges
2010-11-17 19:00:12 -08:00
Eric Blossom 3ce5c6a3f0 Keep doxygen 1.7.1 from crashing. 2010-11-17 18:52:05 -08:00
Eric Blossom 01f050a935 Fix guile related problem with gr-usrp 2010-11-16 21:40:55 -08:00
Eric Blossom f741fdab2b regenerated 2010-11-16 21:33:50 -08:00
Eric Blossom a52aed2448 regenerated 2010-11-10 13:01:38 -08:00
Rob Savoye 3f60d7f0ee regenerated 2010-11-10 12:15:43 -08:00
Eric Blossom 1b40745d32 additional regenerated files 2010-11-10 12:15:42 -08:00
Eric Blossom 234fd45233 regenerate 2010-11-10 12:13:53 -08:00
Eric Blossom b1f86e8b1a Rengenerate Makefile.swig.gen's 2010-11-10 12:13:53 -08:00
Eric Blossom 347bb61cf1 gitignore swig generated files 2010-11-10 12:10:45 -08:00
Eric Blossom 3699771aa9 Update generated files 2010-11-10 12:10:45 -08:00
Rob Savoye 6f86a68513 regenerated after changes to the template 2010-11-10 12:10:44 -08:00
Tom Rondeau c12f11bb72 Updated doxygen Doxyfile for newer versions. 2010-11-10 00:25:37 -05:00
Michael Dickens c6f56e4d15 rearrange includes to always be: internal GR, external, with GR. 2010-10-09 21:10:10 -04:00
Johnathan Corgan 32a1f42db7 Merge branch 'maint'
* maint:
  usrp2: fixes for gcc 4.5.0 compatibility
  formatting change: move break statements
  Fix unitialized variable pointed to by compiler warning
2010-08-04 18:54:55 -07:00
Eric Blossom d2529be51b formatting change: move break statements 2010-08-04 11:08:11 -07:00
Eric Blossom 50684991ff Fix unitialized variable pointed to by compiler warning 2010-08-04 11:05:38 -07:00
Jason Abele 266afda280 Add RFX2200 to burn-db-eeprom 2010-06-21 17:04:47 -07:00
Jason Abele b84513988d Copy paste for RFX2200 in USRP1 2010-06-21 17:04:47 -07:00
Jason Abele 0994dfe70c Fixed WBX RX PLL enable 2010-06-04 22:38:39 -07:00
Jason Abele aff599e832 Refactor WBX and adf4350 to avoid passing usrp pointer 2010-06-04 22:38:39 -07:00
Jason Abele 87bbd984a5 Clean up annoying class structure in wbx 2010-06-04 22:38:39 -07:00
Jason Abele 0ba8eaa142 Fixing wbx to use _refclk_freq() 2010-06-04 22:38:39 -07:00
Jason Abele a27a7bb1f6 Typo in error message 2010-06-04 22:38:39 -07:00
Johnathan Corgan d6a7626bab Make C++ shared libraries versioned 2010-05-28 20:02:38 -07:00
Eric Blossom deea1393ef Remove bogus check for existence of prefix directory. 2010-05-19 15:26:08 -07:00
Johnathan Corgan fa46b23ddb Merge branch 'master' into wip/burx_support
* master: (39 commits)
  Add gru.hexshort to deal with short hex constants
  Assign USB PID for Hans de Bok
  Add missing buffer allocator hint to gr_ofdm_sampler.cc
  Really fix the missing include for boost::bind
  gr-wxgui: Added additional color table entries
  Missed updates for omnithread/mblock removal
  Remove omnithreads library.
  Remove mblock library.  We hardly knew 'ye.
  Convert gr-audio-portaudio to Boost via gruel
  Further updates for removing omnithreads
  Update build configuration for OSX omnithreads changeover
  Add missing include file for boost::bind
  Convert gcell to use boost::threads instead of omnithread.
  Fix sequence error indication after stopping then restarting streaming on USRP2.
  initial move from mld_threads to gruel:: namespace threads and such
  Initial changes to remove mld_thread and instead use gruel:: namespace classes
  Fixing doxygen warnings from arb_resampler. Also, removed set_taps from public
  Fixing doxygen warnings from channelizer block.
  Fixing documentation to get rid of doxygen warnings.
  Adding documentation for fff version of othe PFB clock sync algorithm.
  ...
2010-05-11 18:00:19 -07:00
Johnathan Corgan dd4afa6919 usrp: Cleanup for merge of bitshark daughterboard code
Removed unused variable
Set default bandwidth to 8M in constructor
2010-05-11 14:13:52 -07:00
Eric Blossom 6f3ac452ba Assign USB PID for Hans de Bok 2010-05-10 10:42:32 -07:00
Johnathan Corgan 1815e30065 Remove mblock library. We hardly knew 'ye. 2010-04-26 22:41:19 -07:00
Johnathan Corgan 6ef29ec6b2 Further updates for removing omnithreads
Updates README
Removes Darwin specific variable in usrp.pc
2010-04-26 13:04:23 -07:00
Michael Dickens 5dbc6a3bcf initial move from mld_threads to gruel:: namespace threads and such 2010-04-19 15:35:07 -06:00
Johnathan Corgan b91b8b79ae Merge commit 'jabele/wbx_tuning'
* commit 'jabele/wbx_tuning':
  Fix WBX tuning to allow DDC use in reaching 50MHz
2010-04-16 15:32:55 -07:00
Jason Abele 2e21a12b62 Fix WBX tuning to allow DDC use in reaching 50MHz 2010-04-16 15:00:51 -07:00
Johnathan Corgan 01f334c712 Merge branch 'usrp-eeprom' of git://gnuradio.org/jabele
* 'usrp-eeprom' of git://gnuradio.org/jabele:
  Increase sleep to prevent eeprom problems
2010-04-15 08:05:23 -07:00
Jason Abele 57e1f688e6 Increase sleep to prevent eeprom problems 2010-04-14 15:07:24 -07:00
Eric Blossom 9f813ee505 Add pid for ThinkRF 2010-04-14 13:55:46 -07:00
JohnOrlando 656f2df789 Add support for the Bitshark USRP RX (BURX) daughterboard for the USRP1. 2010-03-30 19:54:39 -05:00
Johnathan Corgan 9d191f5951 Add README for new FPGA hosting location 2010-03-02 08:08:18 -08:00
Johnathan Corgan dc8d1a4973 Remove usrp1 and usrp2 FPGA files. These are now hosted at:
git://ettus.sourcerepo.com/ettus/fpga.git

...under the 'usrp1' and 'usrp2' top-level directories.
2010-02-28 12:47:43 -08:00
Jason Abele acd46373d4 Clarified copyright and licensing 2010-02-19 15:39:01 -08:00
Jason Abele c61b82ff55 Fixed creation of burn-usrp2-eeprom, burn-usrp4-eeprom
Added $prefix from configure to paths
2010-02-10 10:01:47 -08:00