summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-08-09Merge branch 'uhd' of git://gnuradio.org/jblum into nextJohnathan Corgan
2010-08-09uhd: generating mimo source and sink blocks, added subdev specJosh Blum
2010-08-05uhd: added subdev spec setting to gr-uhd blocks, and simple uhd grc wrappers ↵Josh Blum
(mimo coming)
2010-08-04Merge branch 'master' into nextJohnathan Corgan
* master: usrp2: fixes for gcc 4.5.0 compatibility formatting change: move break statements Fix unitialized variable pointed to by compiler warning
2010-08-04Merge branch 'maint'Johnathan Corgan
* maint: usrp2: fixes for gcc 4.5.0 compatibility formatting change: move break statements Fix unitialized variable pointed to by compiler warning
2010-08-04usrp2: fixes for gcc 4.5.0 compatibilityMoeller
2010-08-04formatting change: move break statementsEric Blossom
2010-08-04Fix unitialized variable pointed to by compiler warningEric Blossom
2010-08-03Merge branch 'master' into nextJohnathan Corgan
2010-08-03Merge branch 'maint'Johnathan Corgan
2010-08-03Modify all block factories to use gnuradio::get_initial_sptr.Eric Blossom
2010-08-03fix scoped_lock that didn't ref mutexEric Blossom
2010-08-02Merge branch 'master' into nextJohnathan Corgan
2010-08-02Revert "gnuradio-core: allows configuring FFTW to use ESTIMATE vs. MEASURE"Johnathan Corgan
This reverts commit f23a2b33ca1bebf0c3a5fa26fdcff11827744b77. This change introduced a segfault when calling into the gr_prefs module during the gri_fft helper class constructor. Until this is debugged, the functionality is being reverted.
2010-07-29Merge branch 'master' into nextJohnathan Corgan
* master: Fixes ./configure to allow grc to build without an X session
2010-07-29Merge branch 'maint'Johnathan Corgan
* maint: Fixes ./configure to allow grc to build without an X session
2010-07-29Fixes ./configure to allow grc to build without an X sessionJason Abele
Presently, a ./configure in a terminal with no X $DISPLAY will fail to build grc because import gtk fails with RuntimeError exception. This patch fixes this by catching just the ImportError and AssertionErrors we need for python module dependencies.
2010-07-29Merge branch 'uhd' of git://gnuradio.org/jblum into nextJohnathan Corgan
2010-07-28uhd: use time delay in proportion to the number of channelsJosh Blum
2010-07-22Merge remote branch 'jblum/uhd' into nextJohnathan Corgan
* jblum/uhd: uhd: better error messages for tune and set sample rate
2010-07-22uhd: better error messages for tune and set sample rateJosh Blum
2010-07-21Merge branch 'master' into nextJohnathan Corgan
* master: gnuradio-core: export missing public methods in gr.agc2 wxgui: fix to use wx.Colour which is the actual name of the class (wx python wrapper may be missing wx.Color wrapper) From my reading, we should never need to define the timespec struct (so we will wait until this bites me). Checking for clock_gettime and timespec defined; use gettimeofday if not, but put it into a timespec structure. Reformatting highResTimeFunction.h for better readibility.
2010-07-21Merge branch 'maint'Johnathan Corgan
* maint: wxgui: fix to use wx.Colour which is the actual name of the class (wx python wrapper may be missing wx.Color wrapper)
2010-07-21gnuradio-core: export missing public methods in gr.agc2Alexandru Csete
Alexandru Csete: The gr_agc2 block has public methods to set and get the AGC levels and rates; however, only a few of these interfaces are exported to Python and none of them are available in GRC. The attached patch adds the missing public methods to gri_agc2_cc.i and gri_agc2_ff.i and defines the corresponding callbacks in the gr_agc2_xx.xml GRC block.
2010-07-21Merge remote branch 'trondeau/qtclock'Johnathan Corgan
* trondeau/qtclock: From my reading, we should never need to define the timespec struct (so we will wait until this bites me). Checking for clock_gettime and timespec defined; use gettimeofday if not, but put it into a timespec structure. Reformatting highResTimeFunction.h for better readibility.
2010-07-21wxgui: fix to use wx.Colour which is the actual name of the class (wx python ↵Josh Blum
wrapper may be missing wx.Color wrapper)
2010-07-06Merge branch 'uhd_mimo' into uhdJosh Blum
2010-07-06uhd: added callbacks in the mimo grc blocksJosh Blum
2010-07-06uhd: mimo source and sink, stream in future, and lock the clocksJosh Blum
2010-07-05Merge branch 'master' into nextJohnathan Corgan
2010-07-05Merge branch 'maint'Johnathan Corgan
2010-07-05gr-utils: fix out of tree project generator to properly update tarfile nameMoritz Fischer
2010-07-05gr-wxgui: fix non-gl scope sink only updating one channelCatalin Patulea
This fixes a bug where, when using nongl scopesink, only the real part of a complex input is shown. After applying this patch, both Ch1 and Ch2 can be seen on the scope display.
2010-07-05Merge branch 'patches/marcus/stripchart'Johnathan Corgan
Conflicts: gr-wxgui/src/python/scope_window.py * Adds new scope window trigger, TRIG_MODE_STRIPCHART * Allows config file selection of whether background window sinks still run * Allows config file selection of default trigger mode * Allows config file selection of default waterfall sink color mode [wxgui] #Setting this to true prevents the window sinks from stopping when they #are not displayed, as when they are in a notebook with a hidden tab. run_always = False # Default scope trigger mode. # # 0 = Freerun # 1 = Auto (default) # 2 = Normal # 3 = Stripchart trig_mode = 1 # Default waterfall sink color mode. Valid choices are 'rgb1', 'rbg2', # 'rgb3', or 'gray' waterfall_color = rgb1
2010-07-05Merge branch 'patches/marcus/file_sink'Johnathan Corgan
2010-07-04uhd: added call to readback time registers, work on locking clocks in mimo ↵Josh Blum
config
2010-07-02uhd mimo: created mimo source and sink block for gr-uhdJosh Blum
2010-06-30uhd: added calls to set time and clock configJosh Blum
2010-06-29From my reading, we should never need to define the timespec struct (so we ↵Tom Rondeau
will wait until this bites me).
2010-06-27Checking for clock_gettime and timespec defined; use gettimeofday if not, ↵Tom Rondeau
but put it into a timespec structure.
2010-06-27Reformatting highResTimeFunction.h for better readibility.Tom Rondeau
2010-06-24Merge branch 'master' into nextJohnathan Corgan
* master: grc: move grc_setup_freedesktop into libexec directory (not in users path).
2010-06-24grc: move grc_setup_freedesktop into libexec directory (not in users path).Josh Blum
Renamed grc desktop file to simplify name and updated install script.
2010-06-24Merge branch 'master' into nextJohnathan Corgan
* master: added python script to fix copyright years based on git log grc: expanded nports ability to have multiple port duplicators per side
2010-06-24added python script to fix copyright years based on git logJosh Blum
2010-06-24grc: expanded nports ability to have multiple port duplicators per sideJosh Blum
2010-06-22Merge branch 'master' into nextJohnathan Corgan
2010-06-22Merge branch 'patches/marcus/fftw'Johnathan Corgan
* patches/marcus/fftw: gnuradio-core: allows configuring FFTW to use ESTIMATE vs. MEASURE
2010-06-22Merge branch 'patches/marcus/gr_and_const'Johnathan Corgan
* patches/marcus/gr_and_const: grc: adds gr.and_const to block tree
2010-06-21Merge branch 'master' into nextJohnathan Corgan
* master: Add RFX2200 to burn-db-eeprom Copy paste for RFX2200 in USRP2 Copy paste for RFX2200 in USRP1