aboutsummaryrefslogtreecommitdiffstats
path: root/host
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge branch 'maint'Martin Braun2015-02-163-25/+31
| |\|
| | * usrp2: fixed image compatibility error messageNicholas Corgan2015-02-161-1/+1
| | | | | | | | | | | | * Point to usrp2_card_burner_gui.py instead of usrp2_card_burner.py
| | * UBX: Revert LO shutdown method in ubx_xcvr destructormichael-west2015-02-161-4/+4
| | |
| | * UBX: Serialize SPI transactionsmichael-west2015-02-161-27/+31
| | |
| | * Merge pull request #696 from EttusResearch/crymble/bug692Ashish Chaudhari2015-02-121-1/+3
| | |\ | | | | | | | | b200: Bugfix#692: b200_find now returns an empty device vector when hint...
| | | * b200: Bugfix#692: b200_find now returns an empty device vector when hint ↵mcrymble2015-02-061-1/+3
| | | | | | | | | | | | | | | | contains addr0/resource0/etc style keys.
| * | | multi_usrp: Added a normalized gain settingMartin Braun2015-02-122-0/+108
| | | | | | | | | | | | | | | | | | | | Adds more methods: {set,get}_normalized_{tx,rx}_gain() which allow changing and reading back the gain within [0, 1].
| * | | Merge branch 'maint'Martin Braun2015-02-1211-42/+44
| |\| | | | | | | | | | | | | | | | | | Conflicts: host/examples/rx_samples_to_file.cpp
| * | | Merge branch 'maint'Martin Braun2015-01-302-4/+5
| |\ \ \
| * \ \ \ Merge branch 'maint'Martin Braun2015-01-297-10/+28
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: fpga-src
| * \ \ \ \ Merge branch 'maint' into masterBen Hilburn2015-01-2812-176/+346
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolved Conflicts: host/docs/usrp_e3x0.dox host/include/uhd/utils/paths.hpp host/lib/transport/nirio/nifpga_lvbitx.cpp host/lib/usrp/b200/b200_impl.cpp host/lib/utils/paths.cpp
| * | | | | | convert: Added logging point in get_converter()Martin Braun2015-01-271-1/+16
| | | | | | |
| * | | | | | convert: Modifications to id_typeMartin Braun2015-01-272-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Converter ID symbols are exported - to_string() function for lighter feedback
| * | | | | | uhd: Added an update() method for dictsMartin Braun2015-01-274-1/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Very similar to Python's dict.update().
| * | | | | | Merge branch 'maint'Martin Braun2015-01-271-1/+36
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'maint'Martin Braun2015-01-278-45/+98
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: host/docs/usrp_e3x0.dox
| * \ \ \ \ \ \ \ Merge branch 'maint'Martin Braun2015-01-233-8/+17
| |\ \ \ \ \ \ \ \
| | * | | | | | | | fixup! ad9361: More check for interpolation/decim ratiosAshish Chaudhari2015-01-231-1/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch 'maint'Martin Braun2015-01-227-5/+1723
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'maint'Martin Braun2015-01-201-4/+4
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | e200: Expose temperature sensor through property tree (sensors/temp)Julian Arnold2015-01-204-1/+17
| | | | | | | | | | | |
| * | | | | | | | | | | b200: Expose temperature sensor through property tree (sensors/temp)Julian Arnold2015-01-201-0/+2
| | | | | | | | | | | |
| * | | | | | | | | | | ad9361: Added relative temperature sensorJulian Arnold2015-01-204-1/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows to read a relative temperature from an AD9361 device.
| * | | | | | | | | | | Merge branch 'maint'Martin Braun2015-01-206-12/+31
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: host/include/uhd/types/direction.hpp
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint'Martin Braun2015-01-1911-23/+237
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: host/include/uhd/types/CMakeLists.txt
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint'Martin Braun2015-01-166-280/+483
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint'Martin Braun2015-01-151-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint'Martin Braun2015-01-146-4/+118
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint'Martin Braun2015-01-143-1/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint'Martin Braun2015-01-141-13/+60
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #670 from EttusResearch/vkakade/list_NI_b200Ben Hilburn2015-01-131-10/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b2xx_fx3_utils corrections.
| | * | | | | | | | | | | | | | | | | | Corrected the function to construct EEPROM vector.vkakade2015-01-121-9/+9
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Added NI PID and VID to known values for easy enumeration.vkakade2015-01-121-1/+3
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'maint'Martin Braun2015-01-137-6/+84
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Added support for MinGW cross-compileNicholas Corgan2015-01-137-8/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added CMake toolchain file, compatible with different versions * No dependency on MinGW runtime, all statically linked * Misc coding tweaks to allow MinGW to compile
| * | | | | | | | | | | | | | | | | | | | Merge branch 'maint'Martin Braun2015-01-1310-5/+74
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'maint'Martin Braun2015-01-123-22/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint'Martin Braun2015-01-082-35/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #653 from EttusResearch/bprumo/120bwBen Hilburn2015-01-073-85/+103
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | x300: support new 120 MHz bandwidth versions of the NI-branded X310s
| | * | | | | | | | | | | | | | | | | | | | | | revert unnecessary change to the SR_LEDSBrooks Prumo2015-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | x300: support new 120 MHz bandwidth versions of the NI-branded X310sBrooks2014-12-223-85/+103
| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | math: fixed MSVC error regarding ambiguous std::log callNicholas Corgan2015-01-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint'Martin Braun2015-01-079-52/+306
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: host/docs/usrp_e3x0.dox
| * | | | | | | | | | | | | | | | | | | | | | | Adding support for NI VID + PIDs for USRP B2xx devices.Ben Hilburn2014-12-185-44/+134
| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint'Martin Braun2014-12-166-7/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | uhd: Renamed direction_t names to avoid namespace clashesMartin Braun2014-12-151-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint'Martin Braun2014-12-159-32/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: host/examples/rx_samples_to_file.cpp
| * | | | | | | | | | | | | | | | | | | | | | | | | uhd: Added direction_t for RX & TXMartin Braun2014-12-122-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint'Martin Braun2014-12-081-3/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | x300: Fixed minor issues in X300 clk codeAshish Chaudhari2014-12-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Bugfix for #638 - get_ref_locked will check lock status one last time before giving up