summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2010-06-21Add RFX2200 to burn-db-eepromJason Abele
2010-06-21Copy paste for RFX2200 in USRP2Jason Abele
2010-06-21Copy paste for RFX2200 in USRP1Jason Abele
2010-06-21Merge branch 'master' into nextJohnathan Corgan
* master: grc: fix broken variable config when using bool type
2010-06-21Merge branch 'maint'Johnathan Corgan
* maint: grc: fix broken variable config when using bool type
2010-06-21grc: fix broken variable config when using bool typeJohann Chiang
2010-06-19Merge branch 'master' into nextJohnathan Corgan
* master: gr-usrp2: implement start_streaming_at(usrp2::fpga_timestamp time)
2010-06-19gr-usrp2: implement start_streaming_at(usrp2::fpga_timestamp time)Johnathan Corgan
This new method on usrp2.sink_* causes the first TX sample data to be sent at the FPGA clock time specified, with all further data immediately following. u = usrp2.sink_32fc() # or 16sc ...configure sink here... u.sync_to_pps() ...delay a second for PPS to have happened u.start_streaming_at(int(100e6)) # start TX stream one second later ...start flowgraph here... If this function is not called, all transmit data will be sent immediately (the prior behavior).
2010-06-13Merge branch 'master' into nextJohnathan Corgan
* master: Fixes gr-qtgui make distcheck failure when QT is not installed.
2010-06-13Merge branch 'maint'Johnathan Corgan
* maint: Fixes gr-qtgui make distcheck failure when QT is not installed.
2010-06-13Merge remote branch 'trondeau/qtmake' into maintJohnathan Corgan
* trondeau/qtmake: Fixes gr-qtgui make distcheck failure when QT is not installed.
2010-06-13Fixes gr-qtgui make distcheck failure when QT is not installed.Tom Rondeau
2010-06-04Merge branch 'master' into nextJohnathan Corgan
* master: Fixed WBX RX PLL enable Refactor WBX and adf4350 to avoid passing usrp pointer Clean up annoying class structure in wbx Fixing wbx to use _refclk_freq() Typo in error message
2010-06-04Merge branch 'maint'Johnathan Corgan
* maint: Fixed WBX RX PLL enable Refactor WBX and adf4350 to avoid passing usrp pointer Clean up annoying class structure in wbx Fixing wbx to use _refclk_freq() Typo in error message
2010-06-04Merge branch 'fix/wbx_refclock' into maintJohnathan Corgan
* fix/wbx_refclock: Fixed WBX RX PLL enable Refactor WBX and adf4350 to avoid passing usrp pointer Clean up annoying class structure in wbx Fixing wbx to use _refclk_freq() Typo in error message
2010-06-04Fixed WBX RX PLL enableJason Abele
2010-06-04Refactor WBX and adf4350 to avoid passing usrp pointerJason Abele
2010-06-04Clean up annoying class structure in wbxJason Abele
2010-06-04Fixing wbx to use _refclk_freq()Jason Abele
2010-06-04Typo in error messageJason Abele
2010-06-03Merge branch 'master' into nextJohnathan Corgan
Merge made by '-s ours'
2010-06-03Update revision to 3.3.1gitJohnathan Corgan