Commit Graph

6 Commits (71adb7084498d70b403b20b07b1b051c0f668891)

Author SHA1 Message Date
Adrian Costina 7dddac84f1 motcon1_fmc: Fixed issue introduced by merge 2014-12-11 14:32:32 +02:00
Rejeesh Kutty 0a8fabe874 Merge branch 'hdl_2014_r2' into dev
Conflicts:
	projects/fmcadc5/common/fmcadc5_bd.tcl
	projects/motcon1_fmc/common/motcon1_fmc_bd.tcl
	projects/motcon1_fmc/zed/system_constr.xdc
	projects/motcon1_fmc/zed/system_top.v
2014-12-08 11:32:13 -05:00
Adrian Costina a558d4000d motcon1_fmc: Added XADC to the project, the external muxing is controlled by generic GPIO, not XADC GPIO 2014-12-08 11:27:47 +02:00
Adrian Costina e6e9c0058d motor_control: Updated project to Vivado 14.2. Temporary removed XADC
- fixed constraints
- updated interrupt system
- used ad_iobuf
- The XADC was removed because the XADC IPI generates vaux inputs 0 and 10 even if 0 and 8 are selected
2014-12-05 11:53:23 +02:00
Adrian Costina 4c05e8de5d motor_control: Updated project to Vivado 14.2. Temporary removed XADC
- fixed constraints
- updated interrupt system
- used ad_iobuf
- The XADC was removed because the XADC IPI generates vaux inputs 0 and 10 even if 0 and 8 are selected
2014-12-05 11:48:00 +02:00
acozma f1c5173a12 motor_control: Renamed the project to motcon1_fmc 2014-11-05 09:51:18 +02:00