diff --git a/projects/daq2/common/daq2_bd.tcl b/projects/daq2/common/daq2_bd.tcl index c49e3deaec9..73ea01a5347 100644 --- a/projects/daq2/common/daq2_bd.tcl +++ b/projects/daq2/common/daq2_bd.tcl @@ -255,3 +255,24 @@ ad_cpu_interrupt ps-10 mb-15 axi_ad9144_jesd/irq ad_cpu_interrupt ps-11 mb-14 axi_ad9680_jesd/irq ad_cpu_interrupt ps-12 mb-13 axi_ad9144_dma/irq ad_cpu_interrupt ps-13 mb-12 axi_ad9680_dma/irq + + +## add sync + +ad_ip_instance ilvector_logic manual_sync_or [list \ + C_SIZE 1 \ + C_OPERATION {or} \ +] + +create_bd_port -dir I ext_sync_in +ad_ip_parameter axi_ad9680_tpl/adc_tpl_core CONFIG.EXT_SYNC 1 +ad_connect ext_sync_in axi_ad9680_tpl/adc_tpl_core/adc_sync_in +ad_connect axi_ad9680_tpl/adc_tpl_core/adc_sync_manual_req_out manual_sync_or/Op1 +ad_connect manual_sync_or/Res axi_ad9680_tpl/adc_tpl_core/adc_sync_manual_req_in + + + +ad_ip_parameter axi_ad9144_tpl/dac_tpl_core CONFIG.EXT_SYNC 1 +ad_connect manual_sync_or/Res axi_ad9144_tpl/dac_tpl_core/dac_sync_manual_req_in +ad_connect axi_ad9144_tpl/dac_tpl_core/dac_sync_manual_req_out manual_sync_or/Op2 +ad_connect ext_sync_in axi_ad9144_tpl/dac_tpl_core/dac_sync_in \ No newline at end of file diff --git a/projects/daq2/zcu102/system_top.v b/projects/daq2/zcu102/system_top.v index 30211420a33..aadb8d1f965 100644 --- a/projects/daq2/zcu102/system_top.v +++ b/projects/daq2/zcu102/system_top.v @@ -93,7 +93,7 @@ module system_top ( wire tx_ref_clk; wire tx_sysref; wire tx_sync; - + wire ext_sync_in; // spi assign spi_csn_adc = spi_csn[2]; @@ -148,7 +148,9 @@ module system_top ( .I (trig_p), .IB (trig_n), .O (trig)); - + + assign ext_sync_in = trig; + assign adc_pd = gpio_o[42]; assign dac_txen = gpio_o[41]; assign dac_reset = gpio_o[40]; @@ -156,7 +158,7 @@ module system_top ( assign gpio_bd_o = gpio_o[7:0]; assign gpio_i[94:44] = gpio_o[94:44]; - assign gpio_i[43:43] = trig; + assign gpio_i[43:43] = 0; assign gpio_i[42:37] = gpio_o[42:37]; assign gpio_i[36:36] = adc_fdb; assign gpio_i[35:35] = adc_fda; @@ -167,6 +169,7 @@ module system_top ( assign gpio_i[ 7: 0] = gpio_o[ 7: 0]; system_wrapper i_system_wrapper ( + .ext_sync_in(ext_sync_in), .gpio_i (gpio_i), .gpio_o (gpio_o), .gpio_t (),