paulmataruso/UHD-Fairwaves
1
0
Fork 0
mirror of https://github.com/fairwaves/UHD-Fairwaves.git synced 2025-11-02 21:13:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,364 Commits 9 Branches 20 Tags
e4dff6e07cb449d82e2867a3d522f4ca870bedad
Commit Graph

198 Commits

Author SHA1 Message Date
Josh Blum
06dc097530 Merge branch 'fpga_patch_release' into patch_release 2011-08-15 18:55:57 -07:00
Josh Blum
cf606156a0 Merge branch 'atr_fix_fpga' into atr_fix 2011-07-28 15:03:12 -07:00
Josh Blum
07c2e795b2 fpga: squashed new_work fpga changes onto uhd next 2011-07-19 14:18:58 -07:00
Josh Blum
3e1cf4b328 Merge branch 'fpga_next' into next 2011-07-08 13:06:31 -07:00
Josh Blum
17fabccfe4 Merge branch 'fpga_next' into next 2011-07-08 12:17:54 -07:00
Josh Blum
dd15793746 Merge branch 'fpga_next' into uhd_next 2011-06-14 17:29:21 -07:00
Josh Blum
7437b27a15 Merge branch 'fpga_next' into uhd_master 2011-05-23 10:40:42 -07:00
Josh Blum
204144fa84 Merge branch 'next' into use_vita_length 2011-05-16 11:56:48 -07:00
Josh Blum
91e32eaea2 Merge branch 'next' into use_vita_length 2011-05-09 16:47:04 -07:00
Josh Blum
fdee3ba82b Merge branch 'master' into next 
Conflicts:
	fpga/usrp2/top/u2plus/Makefile.N200
 2011-04-19 17:47:36 -07:00
Josh Blum
abb57f8661 usrp1: fix path to firmware files for fpga top level 2011-04-07 15:45:03 -05:00
Josh Blum
b7f1b87f05 Merge branch 'fpga_master' into n200_support 2011-03-25 11:35:23 -07:00
Josh Blum
ee424d797f Merge branch 'fpga_memory_reorg' into usrp2/new_reg_map 2011-03-17 13:53:48 -07:00
Josh Blum
414b7771e0 usrp-e100: fpga fix removed missing directory from include 2011-03-10 17:57:56 -08:00
Josh Blum
db2b80617d Merge branch 'packet_router_2nd_dsp' into next 2011-03-10 14:57:01 -08:00
Josh Blum
2d906e6708 Merge branch 'fpga_master' into next 2011-03-17 13:47:06 -07:00
Josh Blum
57b779c510 Merge branch 'packet_router_2nd_dsp' into usrp2_dual_dsp 2011-02-22 15:46:46 -08:00
Josh Blum
bce7a55ff9 Merge branch 'fpga_next' into usrp_e100_devel 2011-02-08 12:44:56 -08:00
Josh Blum
0094cf683c Merge branch 'fpga_fix' 2011-01-21 19:51:22 -08:00
Josh Blum
fbb96ac77f uhd: removed deleted fpga files removed from fpga repo 2011-01-19 19:55:15 -08:00
Josh Blum
72daf0902c Merge branch 'fpga_next' into uhd_with_fpga_next 2011-01-19 17:45:08 -08:00
Josh Blum
a86bdc1ab1 Merge branch 'fpga_next' into next 2010-12-29 14:13:10 -08:00
Josh Blum
bf8677c9a9 Merge branch 'fpga_next' into uhd_next 2010-12-27 16:57:00 -08:00
Josh Blum
aebd62b626 Merge branch 'fpga_next' into uhd_next 2010-12-22 19:25:06 -08:00
Josh Blum
fd0c2dc1c5 Merge branch 'fpga_ise12' 2010-12-13 16:47:48 -08:00
Josh Blum
cedb517a70 Merge branch 'fpga_ise12' 2010-12-09 15:23:16 -08:00
Josh Blum
905f42618d Merge branch 'fpga_flow_control' into next 2010-11-23 17:41:11 -08:00
Josh Blum
eb26e8adb4 uhd: added new hardware to readme 2010-11-23 14:43:02 -08:00
Josh Blum
18ce33d228 Merge branch 'fpga_next' into next 
Conflicts:
	fpga/usrp2/top/u1e_passthru/.gitignore
	fpga/usrp2/top/u1e_passthru/Makefile
	fpga/usrp2/top/u2plus/.gitignore
	fpga/usrp2/top/u2plus/Makefile
	usrp2/top/u1e_passthru/.gitignore
	usrp2/top/u1e_passthru/Makefile
 2010-11-23 13:53:14 -08:00
Josh Blum
30ce5acedd Merge branch 'usrp_e100' into next 
Conflicts:
	images/Makefile
 2010-11-23 13:50:37 -08:00
Josh Blum
bb0572a960 fpga: performed a forceful checkout of fpga to overwrite with current fpga code 2010-11-23 13:36:42 -08:00
Josh Blum
cfde84d8a1 Merge branch 'ue1_rev2' into usrp_e_next 2010-10-27 11:36:57 -07:00
Josh Blum
bd06eede24 Merge branch 'flow_control_fpga' into flow_ctrl 2010-10-22 16:13:35 -07:00
Josh Blum
26b7de0ac0 Merge branch 'flow_control' into flow_ctrl 2010-10-14 16:55:56 -07:00
Josh Blum
d5ffc2d767 Merge branch 'ise12' into next 2010-08-31 15:46:38 -07:00
Nick Foster
aa220cd313 Merge branch 'tx_policy' of ettus.sourcerepo.com:ettus/fpgapriv into premerge 2010-08-16 17:40:34 -07:00
Josh Blum
927e3a99a3 Merge branch 'features' into uhd_fpga_features 2010-08-09 18:24:44 -07:00
Josh Blum
349d99c988 Merge branch 'features' into uhd_fpga_features 
Conflicts:
	fpga/usrp2/vrt/vita_rx_control.v
 2010-08-09 16:56:53 -07:00
Josh Blum
19f825a068 Merge branch 'master' of ettus.sourcerepo.com:ettus/fpga into uhd_fpga_merge 2010-07-05 10:11:54 -07:00
Josh Blum
8d2dc63006 Merge branch 'master' of ettus.sourcerepo.com:ettus/fpga into uhd_fpga_merge 2010-06-24 11:33:45 -07:00
Josh Blum
edcc2df10b Merge branch 'master' of ettus.sourcerepo.com:ettus/fpga into uhd_master 
Conflicts:
	fpga/.gitignore
 2010-06-15 18:24:33 -07:00
Josh Blum
4db60e8d0e Merge branch 'udp' of git@ettus.sourcerepo.com:ettus/fpga into work 2010-05-18 18:12:14 -07:00
Josh Blum
650e0d9b35 Merge branch 'shrinkfw' into usrp2 2010-05-10 14:18:00 -07:00
Josh Blum
d4cbea8267 Merge branch 'udp' of git@ettus.sourcerepo.com:ettus/fpgapriv 2010-05-10 14:03:10 -07:00
Josh Blum
a7c230cb1f Added reload flag to the stream cmd. 
This reloads the last command to handle continuous streaming in hardware.
Moved rx control register setup and stream command issuing to the host.
 2010-04-28 16:35:22 -07:00
Josh Blum
3a196c5d61 Merge branch 'udp' 2010-04-15 11:24:41 -07:00
Josh Blum
05d77f7723 moved usrp1 and usrp2 fpga dirs into fpga subdirectory 2010-04-15 11:24:24 -07:00
Josh Blum
cbb8e474bb Reorganized structure into include, lib, test, firmware, fpga. 
The fpga and firmware are empty placeholders for now.
 2010-01-12 14:43:43 -08:00