zcy
/
pluto_hdl_adi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hdl_2016_r2' into dev 

Merging commmits : c455d2d, 8846141, 1515b6f, d5165ca, d962614
main
AndreiGrozav 2016-12-13 19:48:47 +02:00
parent 9fb7db97da d962614000
commit 905c7ccf99
5 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
projects/fmcadc2/vc707/system_project.tcl
View File

@ -13,6 +13,8 @@ adi_project_files fmcadc2_vc707 [list \
"$ad_hdl_dir/library/xilinx/common/ad_iobuf.v" \ "$ad_hdl_dir/library/xilinx/common/ad_iobuf.v" \
"$ad_hdl_dir/projects/common/vc707/vc707_system_constr.xdc" ] "$ad_hdl_dir/projects/common/vc707/vc707_system_constr.xdc" ]
set_property is_enabled false [get_files *system_axi*_spi*.xdc]
adi_project_run fmcadc2_vc707 adi_project_run fmcadc2_vc707

1
projects/fmcomms1/kc705/system_project.tcl
View File

@ -12,6 +12,7 @@ adi_project_files fmcomms1_kc705 [list \
set_property PROCESSING_ORDER EARLY [get_files $ad_hdl_dir/projects/common/kc705/kc705_system_constr.xdc] set_property PROCESSING_ORDER EARLY [get_files $ad_hdl_dir/projects/common/kc705/kc705_system_constr.xdc]
set_property PROCESSING_ORDER EARLY [get_files system_constr.xdc] set_property PROCESSING_ORDER EARLY [get_files system_constr.xdc]
set_property is_enabled false [get_files *system_axi*_spi*.xdc]
adi_project_run fmcomms1_kc705 adi_project_run fmcomms1_kc705

1
projects/fmcomms7/zc706/system_project.tcl
View File

@ -16,6 +16,7 @@ adi_project_files fmcomms7_zc706 [list \
set_property PROCESSING_ORDER EARLY [get_files $ad_hdl_dir/projects/common/zc706/zc706_system_constr.xdc] set_property PROCESSING_ORDER EARLY [get_files $ad_hdl_dir/projects/common/zc706/zc706_system_constr.xdc]
set_property PROCESSING_ORDER EARLY [get_files system_constr.xdc] set_property PROCESSING_ORDER EARLY [get_files system_constr.xdc]
set_property is_enabled false [get_files *system_axi*_spi*.xdc]
adi_project_run fmcomms7_zc706 adi_project_run fmcomms7_zc706

15
projects/motcon2_fmc/common/motcon2_fmc_bd.tcl
View File

@ -221,6 +221,10 @@
ad_connect current_monitor_m1_pack/adc_data current_monitor_m1_dma/fifo_wr_din ad_connect current_monitor_m1_pack/adc_data current_monitor_m1_dma/fifo_wr_din
ad_connect current_monitor_m1_pack/adc_valid current_monitor_m1_dma/fifo_wr_en ad_connect current_monitor_m1_pack/adc_valid current_monitor_m1_dma/fifo_wr_en
ad_connect current_monitor_m1_pack/adc_enable_3 GND
ad_connect current_monitor_m1_pack/adc_valid_3 GND
ad_connect current_monitor_m1_pack/adc_data_3 GND
# motor 2 # motor 2
ad_connect sys_cpu_clk current_monitor_m2/ref_clk ad_connect sys_cpu_clk current_monitor_m2/ref_clk
@ -246,6 +250,10 @@
ad_connect current_monitor_m2_pack/adc_valid current_monitor_m2_dma/fifo_wr_en ad_connect current_monitor_m2_pack/adc_valid current_monitor_m2_dma/fifo_wr_en
ad_connect current_monitor_m2_pack/adc_data current_monitor_m2_dma/fifo_wr_din ad_connect current_monitor_m2_pack/adc_data current_monitor_m2_dma/fifo_wr_din
ad_connect current_monitor_m2_pack/adc_enable_3 GND
ad_connect current_monitor_m2_pack/adc_valid_3 GND
ad_connect current_monitor_m2_pack/adc_data_3 GND
#controller #controller
# motor 1 # motor 1
ad_connect sys_cpu_clk controller_m1/ref_clk ad_connect sys_cpu_clk controller_m1/ref_clk
@ -262,6 +270,13 @@
ad_connect controller_m1/sensors_o speed_detector_m1/hall_bemf_i ad_connect controller_m1/sensors_o speed_detector_m1/hall_bemf_i
ad_connect controller_m1/position_i speed_detector_m1/position_o ad_connect controller_m1/position_i speed_detector_m1/position_o
ad_connect controller_m1/pwm_a_i GND
ad_connect controller_m1/pwm_b_i GND
ad_connect controller_m1/pwm_c_i GND
ad_connect controller_m2/pwm_a_i GND
ad_connect controller_m2/pwm_b_i GND
ad_connect controller_m2/pwm_c_i GND
# motor 2 # motor 2
ad_connect sys_cpu_clk controller_m2/ref_clk ad_connect sys_cpu_clk controller_m2/ref_clk
ad_connect controller_m2/ctrl_data_clk sys_audio_clkgen/clk_out5 ad_connect controller_m2/ctrl_data_clk sys_audio_clkgen/clk_out5

2
projects/usdrx1/zc706/system_project.tcl
View File

@ -14,6 +14,8 @@ adi_project_files usdrx1_zc706 [list \
"$ad_hdl_dir/projects/common/zc706/zc706_system_mig_constr.xdc" \ "$ad_hdl_dir/projects/common/zc706/zc706_system_mig_constr.xdc" \
"$ad_hdl_dir/projects/common/zc706/zc706_system_constr.xdc" ] "$ad_hdl_dir/projects/common/zc706/zc706_system_constr.xdc" ]
set_property is_enabled false [get_files *system_axi*_spi*.xdc]
adi_project_run usdrx1_zc706 adi_project_run usdrx1_zc706