diff --git a/.gitignore b/.gitignore index 488d631..7747d92 100644 --- a/.gitignore +++ b/.gitignore @@ -42,7 +42,6 @@ *.qws *.wdf *.lpr -*.xdc *.bxml @@ -76,6 +75,7 @@ vivado*.backup.log **/design/**/synth/ **/design/**/ui/ **/design/**/hw_handoff/ +**/design/**/*.xdc # Other files **/test/*.zip \ No newline at end of file diff --git a/LAB2/design/lab_2/hdl/lab_2_wrapper.vhd b/LAB2/design/lab_2/hdl/lab_2_wrapper.vhd index 794efb5..f0aac0e 100644 --- a/LAB2/design/lab_2/hdl/lab_2_wrapper.vhd +++ b/LAB2/design/lab_2/hdl/lab_2_wrapper.vhd @@ -1,8 +1,8 @@ --Copyright 1986-2020 Xilinx, Inc. All Rights Reserved. ---------------------------------------------------------------------------------- --Tool Version: Vivado v.2020.2 (win64) Build 3064766 Wed Nov 18 09:12:45 MST 2020 ---Date : Fri Apr 25 22:08:38 2025 ---Host : DavideASUS running 64-bit major release (build 9200) +--Date : Mon May 12 14:33:04 2025 +--Host : Davide-Samsung running 64-bit major release (build 9200) --Command : generate_target lab_2_wrapper.bd --Design : lab_2_wrapper --Purpose : IP block netlist diff --git a/LAB2/design/lab_2/lab_2.bd b/LAB2/design/lab_2/lab_2.bd index 556d62b..5c8e70f 100644 --- a/LAB2/design/lab_2/lab_2.bd +++ b/LAB2/design/lab_2/lab_2.bd @@ -1176,11 +1176,11 @@ "system_ila_0/SLOT_2_AXIS" ] }, - "img_conv_0_m_axis": { + "Conn": { "interface_ports": [ - "img_conv_0/m_axis", - "packetizer_0/s_axis", - "system_ila_0/SLOT_1_AXIS" + "rgb2gray_0/s_axis", + "depacketizer_0/m_axis", + "system_ila_0/SLOT_0_AXIS" ] }, "AXI4Stream_UART_0_UART": { @@ -1201,11 +1201,11 @@ "AXI4Stream_UART_0/S00_AXIS_TX" ] }, - "Conn": { + "img_conv_0_m_axis": { "interface_ports": [ - "rgb2gray_0/s_axis", - "depacketizer_0/m_axis", - "system_ila_0/SLOT_0_AXIS" + "img_conv_0/m_axis", + "packetizer_0/s_axis", + "system_ila_0/SLOT_1_AXIS" ] } }, diff --git a/LAB2/design/lab_2/lab_2.bda b/LAB2/design/lab_2/lab_2.bda index d2be325..8223b12 100644 --- a/LAB2/design/lab_2/lab_2.bda +++ b/LAB2/design/lab_2/lab_2.bda @@ -21,22 +21,22 @@ - active 2 - PM + lab_2 + VR lab_2 BC + active 2 - lab_2 - VR + PM - + - + diff --git a/LAB2/vivado/lab2/lab2.xpr b/LAB2/vivado/lab2/lab2.xpr index 17e57a7..51e444c 100644 --- a/LAB2/vivado/lab2/lab2.xpr +++ b/LAB2/vivado/lab2/lab2.xpr @@ -55,13 +55,13 @@