Ad7606 serial/parallel interface #1206

PIoandan · 2023-10-31T14:31:21Z

PR Description

I unified the ad7606x_fmc project, where both the serial interface and the parallel interface are implemented. I tested the linux part for both the serial and parallel interface and worked well.

PR Type

Bug fix (change that fixes an issue)
New feature (change that adds new functionality)
Breaking change (has dependencies in other repos or will cause CI to fail)

PR Checklist

I have followed the code style guidelines
I have performed a self-review of changes
I have compiled all hdl projects and libraries affected by this PR
I have tested in hardware affected projects, at least on relevant boards
I have commented my code, at least hard-to-understand parts
I have signed off all commits from this PR
I have updated the documentation (wiki pages, ReadMe files, Copyright etc)
I have not introduced new Warnings/Critical Warnings on compilation
I have added new hdl testbenches or updated existing ones

projects/ad7606x_fmc/Readme.md

IuliaCMoldovan · 2023-11-20T09:25:57Z

Could you check the messages given by the Guideline checker action? There are a few changes that need to be done

projects/ad7606x_fmc/zed/Makefile

projects/ad7606x_fmc/zed/system_top_si.v

projects/ad7606x_fmc/common/ad7606x_fmc.txt

projects/ad7606x_fmc/zed/system_project.tcl

PopPaul2021

When building the project for the serial interface with make INTF=1 the project implementation fails, and it's caused by placement errors.

PIoandan · 2024-02-08T13:59:56Z

When building the project for the serial interface with make INTF=1 the project implementation fails, and it's caused by placement errors.

Fixed.

I unified the ad7606x_fmc project, where both the serial interface and the parallel interface are implemented. Signed-off-by: Ioan-daniel Pop <[email protected]>

It was modified Readme.md file. Signed-off-by: Ioan-daniel Pop <[email protected]>

Guideline check errors fixed Signed-off-by: Ioan-daniel Pop <[email protected]>

Updated the axi_pwm_gen IP address for parallel interface Signed-off-by: Ioan-daniel Pop <[email protected]>

Regenerate Makefile Signed-off-by: Ioan-daniel Pop <[email protected]>

I have updated some pins type according to the datasheet for serial and parallel interface. Signed-off-by: Ioan-daniel Pop <[email protected]>

Fixed the case when it is make build without any parameter. Also updated the Copyright and Readme.md file. Signed-off-by: Ioan-daniel Pop <[email protected]>

Fixed some Critical Warnings related to the set_multicycle_path in system_constr.tcl file. Signed-off-by: Ioan-daniel Pop <[email protected]>

IuliaCMoldovan

Could you replace in all the license headers the word "master" with "main"?

library/axi_ad7606x/axi_ad7606x.v

projects/ad7606x_fmc/zed/system_project.tcl

PIoandan · 2024-02-16T09:52:19Z

Could you replace in all the license headers the word "master" with "main"?

Sure.

projects/ad7606x_fmc/zed/system_top_pi.v

Requested changes. Signed-off-by: Ioan-daniel Pop <[email protected]>

IuliaCMoldovan

I built the project in Vivado 2023.2 as well, and it looks ok.

sarpadi · 2024-04-02T11:49:34Z

library/axi_ad7606x/Makefile

@@ -1,5 +1,5 @@
 ####################################################################################
-## Copyright (c) 2018 - 2023 Analog Devices, Inc.
+## Copyright (c) 2018 - 2024 Analog Devices, Inc.


should be reverted

sarpadi · 2024-04-02T11:51:34Z

library/axi_ad7606x/axi_ad7606x.v

@@ -39,7 +39,7 @@ module axi_ad7606x #(

  parameter       ID = 0,
  parameter       DEV_CONFIG = 0,
-  parameter       ADC_CH_DW = 16,
+  parameter       ADC_TO_DMA_N_BITS = 16,


too many whitespaces in declarations

sarpadi · 2024-04-02T11:52:21Z

library/axi_ad7606x/axi_ad7606x_16b_pif.v

@@ -1,6 +1,6 @@
 // ***************************************************************************
 // ***************************************************************************
-// Copyright (C) 2023 Analog Devices, Inc. All rights reserved.
+// Copyright (C) 2023-2024 Analog Devices, Inc. All rights reserved.


should be reverted

sarpadi · 2024-04-02T11:52:26Z

library/axi_ad7606x/axi_ad7606x_18b_pif.v

@@ -1,6 +1,6 @@
 // ***************************************************************************
 // ***************************************************************************
-// Copyright (C) 2023 Analog Devices, Inc. All rights reserved.
+// Copyright (C) 2023-2024 Analog Devices, Inc. All rights reserved.


should be reverted

sarpadi · 2024-04-02T11:52:38Z

library/axi_ad7606x/axi_ad7606x_ip.tcl

@@ -1,5 +1,5 @@
 ###############################################################################
-## Copyright (C) 2023 Analog Devices, Inc. All rights reserved.
+## Copyright (C) 2023-2024 Analog Devices, Inc. All rights reserved.


should be reverted

sarpadi · 2024-04-02T12:35:27Z

projects/ad7606x_fmc/zed/system_constr.tcl

+
+switch $INTF {
+  0 {
+    set_property -dict {PACKAGE_PIN N19     IOSTANDARD LVCMOS25} [get_ports adc_db[0] ]         ; ## D08 FMC_LPC_LA01_CC_P


fix whitespaces

sarpadi · 2024-04-02T12:35:31Z

projects/ad7606x_fmc/zed/system_constr.tcl

+
+    switch $NUM_OF_SDI {
+      1 {
+        set_property -dict {PACKAGE_PIN M20     IOSTANDARD LVCMOS25} [get_ports ad7606_spi_sdi[0]]  ; ## G07 FMC_LPC_LA00_CC_N


fix whitespaces

sarpadi · 2024-04-02T12:35:35Z

projects/ad7606x_fmc/zed/system_constr.tcl

+      }
+    }
+
+    set_property -dict {PACKAGE_PIN M19     IOSTANDARD LVCMOS25} [get_ports ad7606_spi_sclk]    ; ## G06 FMC_LPC_LA00_CC_P


fix whitespaces

sarpadi · 2024-04-02T12:35:38Z

projects/ad7606x_fmc/zed/system_constr.tcl

+
+# control lines
+
+set_property -dict {PACKAGE_PIN K19     IOSTANDARD LVCMOS25} [get_ports adc_serpar]         ; ## C18 FMC_LPC_LA14_P 


fix whitespaces

sarpadi · 2024-04-02T12:36:46Z

projects/ad7606x_fmc/zed/system_top_si.v

+    .dio_o(gpio_i[31:0]),
+    .dio_p(gpio_bd));
+
+  assign gpio_i[63:40] = gpio_o[63:40];


move assign to a different location (i.e. after wire declarations)

Final requested changes. Signed-off-by: Ioan-daniel Pop <[email protected]>

sarpadi · 2024-04-17T06:17:28Z

projects/ad7606x_fmc/common/ad7606x_bd.tcl

+    }
+
+    # interconnect
+    ad_cpu_interconnect  0x44a00000 axi_ad7606x


Not done. There are still instances where double white spaces are used

sarpadi · 2024-04-17T06:19:23Z

projects/ad7606x_fmc/zed/system_constr.tcl

+
+switch $INTF {
+  0 {
+    set_property -dict {PACKAGE_PIN N19     IOSTANDARD LVCMOS25} [get_ports adc_db[0] ]; ## D08 FMC_LPC_LA01_CC_P


fix whitespaces

sarpadi · 2024-04-17T06:19:36Z

projects/ad7606x_fmc/zed/system_constr.tcl

+
+    switch $NUM_OF_SDI {
+      1 {
+        set_property -dict {PACKAGE_PIN M20     IOSTANDARD LVCMOS25} [get_ports ad7606_spi_sdi[0]]; ## G07 FMC_LPC_LA00_CC_N


fix whitespaces

sarpadi · 2024-04-17T06:19:42Z

projects/ad7606x_fmc/zed/system_constr.tcl

+
+# control lines
+
+set_property -dict {PACKAGE_PIN K19     IOSTANDARD LVCMOS25} [get_ports adc_serpar];     ## C18 FMC_LPC_LA14_P 


fix whitespaces

sarpadi · 2024-04-17T06:20:34Z

projects/ad7606x_fmc/common/ad7606x_bd.tcl

+      ad_ip_parameter adc_clk_generator CONFIG.CLKIN1_UI_JITTER 0
+      ad_ip_parameter adc_clk_generator CONFIG.PRIM_IN_FREQ 100.000
+
+      ad_connect  sys_cpu_clk adc_clk_generator/clk_in1


sarpadi · 2024-04-17T08:41:08Z

projects/ad7606x_fmc/Readme.md

Please add more details regarding the valid combinations of build parameters. you can use this readme as reference
https://github.com/analogdevicesinc/hdl/blob/main/projects/ad4630_fmc/zed/README.md

Fix whitespaces. Update readme. Signed-off-by: Ioan-daniel Pop <[email protected]>

gastmaier

Successfully synthesized with INTF=0 and INTF=1.

projects/ad7606x_fmc/common/ad7606x_bd.tcl

projects/ad7606x_fmc/zed/system_bd.tcl

Fix trailing whitespaces. Signed-off-by: Ioan-daniel Pop <[email protected]>

StancaPop

Looks good.

alin724

LGTM

Notes:

double instances of mem_addr_space assignment [s_axi_clk connection] as in case of axi_dmac|pwm_gen can be removed [line124] (by using a single instance outside of switch instance as in [line25]);
name of final commit can be something like [ad7606x: Add configurable digital interface [+serial interface] support];

PIoandan requested review from acostina, AndreiGrozav and PopPaul2021 as code owners October 31, 2023 14:31

PIoandan force-pushed the update_ad7606_spi_engine branch from 1e01d64 to 8c214ac Compare November 13, 2023 12:03

PIoandan changed the title ~~Update ad7606 SPIE serial interface/split ad7606~~ Ad7606 serial/parallel interface Nov 13, 2023

PIoandan force-pushed the update_ad7606_spi_engine branch 3 times, most recently from 1ad3c33 to c40f1c7 Compare November 14, 2023 13:07

StancaPop requested changes Nov 17, 2023

View reviewed changes

projects/ad7606x_fmc/Readme.md Outdated Show resolved Hide resolved

projects/ad7606x_fmc/Readme.md Outdated Show resolved Hide resolved

projects/ad7606x_fmc/Readme.md Show resolved Hide resolved

IuliaCMoldovan mentioned this pull request Nov 17, 2023

docs: Add ad7606 documentation #1223

Merged

12 tasks

PIoandan requested a review from StancaPop November 17, 2023 12:45

PIoandan requested a review from IuliaCMoldovan November 20, 2023 11:35

IuliaCMoldovan added the new feature label Nov 20, 2023

IuliaCMoldovan requested changes Nov 22, 2023

View reviewed changes

projects/ad7606x_fmc/zed/Makefile Outdated Show resolved Hide resolved

projects/ad7606x_fmc/zed/system_top_si.v Outdated Show resolved Hide resolved

projects/ad7606x_fmc/common/ad7606x_fmc.txt Outdated Show resolved Hide resolved

PIoandan requested a review from IuliaCMoldovan November 23, 2023 07:03

PIoandan requested a review from alin724 December 18, 2023 13:45

PopPaul2021 requested changes Feb 6, 2024

View reviewed changes

projects/ad7606x_fmc/zed/system_project.tcl Outdated Show resolved Hide resolved

PopPaul2021 self-requested a review February 6, 2024 13:06

PopPaul2021 requested changes Feb 6, 2024

View reviewed changes

PIoandan added 7 commits February 8, 2024 16:01

Ad7606 serial/parallel interface

a0f8990

I unified the ad7606x_fmc project, where both the serial interface and the parallel interface are implemented. Signed-off-by: Ioan-daniel Pop <[email protected]>

V2: Ad7606 serial/parallel interface

4fa1035

It was modified Readme.md file. Signed-off-by: Ioan-daniel Pop <[email protected]>

V3: Ad7606 serial/parallel interface

5e931ff

Guideline check errors fixed Signed-off-by: Ioan-daniel Pop <[email protected]>

V4: Ad7606 serial/parallel interface

bb060ac

Updated the axi_pwm_gen IP address for parallel interface Signed-off-by: Ioan-daniel Pop <[email protected]>

V5: Ad7606 serial/parallel interface

19ce016

Regenerate Makefile Signed-off-by: Ioan-daniel Pop <[email protected]>

V6: Ad7606 serial/parallel interface

8917daf

I have updated some pins type according to the datasheet for serial and parallel interface. Signed-off-by: Ioan-daniel Pop <[email protected]>

V7: Ad7606 serial/parallel interface

f45ece3

Fixed the case when it is make build without any parameter. Also updated the Copyright and Readme.md file. Signed-off-by: Ioan-daniel Pop <[email protected]>

PIoandan force-pushed the update_ad7606_spi_engine branch from 168e7cd to f45ece3 Compare February 8, 2024 14:04

PIoandan requested a review from PopPaul2021 February 8, 2024 14:05

PIoandan requested review from StancaPop and PopPaul2021 February 14, 2024 09:17

V9: Ad7606 serial/parallel interface

12c9770

Fixed some Critical Warnings related to the set_multicycle_path in system_constr.tcl file. Signed-off-by: Ioan-daniel Pop <[email protected]>

IuliaCMoldovan requested changes Feb 16, 2024

View reviewed changes

library/axi_ad7606x/axi_ad7606x.v Outdated Show resolved Hide resolved

projects/ad7606x_fmc/zed/system_project.tcl Outdated Show resolved Hide resolved

PIoandan requested a review from IuliaCMoldovan February 16, 2024 09:53

IuliaCMoldovan reviewed Feb 16, 2024

View reviewed changes

projects/ad7606x_fmc/zed/system_top_pi.v Outdated Show resolved Hide resolved

V10: Ad7606 serial/parallel interface

831abd4

Requested changes. Signed-off-by: Ioan-daniel Pop <[email protected]>

PIoandan force-pushed the update_ad7606_spi_engine branch from 4d280cd to 831abd4 Compare February 16, 2024 10:06

PIoandan requested a review from IuliaCMoldovan February 16, 2024 10:07

IuliaCMoldovan previously approved these changes Feb 16, 2024

View reviewed changes

sarpadi reviewed Apr 2, 2024

View reviewed changes

V11: Ad7606 serial/parallel interface

ea88bcb

Final requested changes. Signed-off-by: Ioan-daniel Pop <[email protected]>

PIoandan dismissed IuliaCMoldovan’s stale review via ea88bcb April 15, 2024 07:46

PIoandan requested review from sarpadi and IuliaCMoldovan April 15, 2024 07:48

sarpadi requested a review from gastmaier April 17, 2024 08:39

sarpadi requested changes Apr 17, 2024

View reviewed changes

V12: Ad7606 serial/parallel interface

da0c422

Fix whitespaces. Update readme. Signed-off-by: Ioan-daniel Pop <[email protected]>

PIoandan requested a review from sarpadi April 18, 2024 05:56

gastmaier requested changes Apr 23, 2024

View reviewed changes

projects/ad7606x_fmc/common/ad7606x_bd.tcl Outdated Show resolved Hide resolved

projects/ad7606x_fmc/zed/system_bd.tcl Outdated Show resolved Hide resolved

projects/ad7606x_fmc/zed/system_bd.tcl Outdated Show resolved Hide resolved

V13: Ad7606 serial/parallel interface

3a9e018

Fix trailing whitespaces. Signed-off-by: Ioan-daniel Pop <[email protected]>

PIoandan requested a review from gastmaier April 24, 2024 13:14

sarpadi approved these changes Apr 25, 2024

View reviewed changes

gastmaier approved these changes Apr 25, 2024

View reviewed changes

StancaPop approved these changes Apr 25, 2024

View reviewed changes

alin724 approved these changes Apr 26, 2024

View reviewed changes

PIoandan merged commit 606551b into main Apr 26, 2024
1 of 3 checks passed

PIoandan deleted the update_ad7606_spi_engine branch April 26, 2024 09:03

gastmaier mentioned this pull request Jun 10, 2024

ad7606x: Fix serial bug #1348

Merged

11 tasks


		# control lines

		set_property -dict {PACKAGE_PIN K19 IOSTANDARD LVCMOS25} [get_ports adc_serpar] ; ## C18 FMC_LPC_LA14_P

Ad7606 serial/parallel interface #1206

Ad7606 serial/parallel interface #1206

Conversation

PIoandan commented Oct 31, 2023 • edited Loading

PR Description

PR Type

PR Checklist

IuliaCMoldovan commented Nov 20, 2023

PopPaul2021 left a comment

Choose a reason for hiding this comment

PIoandan commented Feb 8, 2024

IuliaCMoldovan left a comment

Choose a reason for hiding this comment

PIoandan commented Feb 16, 2024

IuliaCMoldovan left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gastmaier left a comment

Choose a reason for hiding this comment

StancaPop left a comment

Choose a reason for hiding this comment

alin724 left a comment • edited Loading

Choose a reason for hiding this comment

PIoandan commented Oct 31, 2023 •

edited

Loading

alin724 left a comment •

edited

Loading