From 0b8585a6f11355fa6ddd7e70df95d6c00d41ce81 Mon Sep 17 00:00:00 2001
From: PopPaul2021 <93918446+PopPaul2021@users.noreply.github.com>
Date: Thu, 2 Jun 2022 14:09:36 +0300
Subject: [PATCH] PN mismatch DAQ2, DAQ3 and FMCJESDADC1 fix (#950)

The AD9680 is a dual 14-bit ADC.
Software sets the output format to offset binary before performing the PN tests.
---
 projects/daq2/common/daq2_bd.tcl               | 2 ++
 projects/daq2/common/daq2_qsys.tcl             | 4 ++--
 projects/daq3/common/daq3_bd.tcl               | 2 ++
 projects/daq3/common/daq3_qsys.tcl             | 4 ++--
 projects/fmcjesdadc1/common/fmcjesdadc1_bd.tcl | 1 +
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/projects/daq2/common/daq2_bd.tcl b/projects/daq2/common/daq2_bd.tcl
index 69ce7d294..8ac6072ae 100644
--- a/projects/daq2/common/daq2_bd.tcl
+++ b/projects/daq2/common/daq2_bd.tcl
@@ -89,6 +89,8 @@ adi_tpl_jesd204_rx_create axi_ad9680_tpl $RX_NUM_OF_LANES \
                                          $RX_NUM_OF_CONVERTERS \
                                          $RX_SAMPLES_PER_FRAME \
                                          $RX_SAMPLE_WIDTH \
+ad_ip_parameter axi_ad9680_tpl/adc_tpl_core CONFIG.CONVERTER_RESOLUTION 14
+ad_ip_parameter axi_ad9680_tpl/adc_tpl_core CONFIG.TWOS_COMPLEMENT 0
 
 ad_ip_instance util_cpack2 axi_ad9680_cpack [list \
   NUM_OF_CHANNELS $RX_NUM_OF_CONVERTERS \
diff --git a/projects/daq2/common/daq2_qsys.tcl b/projects/daq2/common/daq2_qsys.tcl
index beb5ae0bc..17e85fed2 100644
--- a/projects/daq2/common/daq2_qsys.tcl
+++ b/projects/daq2/common/daq2_qsys.tcl
@@ -136,8 +136,8 @@ set_instance_parameter_value axi_ad9680 {ID} {0}
 set_instance_parameter_value axi_ad9680 {NUM_CHANNELS} $RX_NUM_OF_CONVERTERS
 set_instance_parameter_value axi_ad9680 {NUM_LANES} $RX_NUM_OF_LANES
 set_instance_parameter_value axi_ad9680 {BITS_PER_SAMPLE} $RX_SAMPLE_WIDTH
-set_instance_parameter_value axi_ad9680 {CONVERTER_RESOLUTION} $RX_SAMPLE_WIDTH
-set_instance_parameter_value axi_ad9680 {TWOS_COMPLEMENT} {1}
+set_instance_parameter_value axi_ad9680 {CONVERTER_RESOLUTION} {14}
+set_instance_parameter_value axi_ad9680 {TWOS_COMPLEMENT} {0}
 
 add_connection ad9680_jesd204.link_clk axi_ad9680.link_clk
 add_connection ad9680_jesd204.link_sof axi_ad9680.if_link_sof
diff --git a/projects/daq3/common/daq3_bd.tcl b/projects/daq3/common/daq3_bd.tcl
index a8e099443..6e3d45bc5 100644
--- a/projects/daq3/common/daq3_bd.tcl
+++ b/projects/daq3/common/daq3_bd.tcl
@@ -81,6 +81,8 @@ adi_tpl_jesd204_rx_create axi_ad9680_tpl_core $RX_NUM_OF_LANES \
                                                $RX_NUM_OF_CONVERTERS \
                                                $RX_SAMPLES_PER_FRAME \
                                                $RX_SAMPLE_WIDTH
+ad_ip_parameter axi_ad9680_tpl_core/adc_tpl_core CONFIG.CONVERTER_RESOLUTION 14
+ad_ip_parameter axi_ad9680_tpl_core/adc_tpl_core CONFIG.TWOS_COMPLEMENT 0                                              
 
 ad_ip_instance util_cpack2 axi_ad9680_cpack [list \
   NUM_OF_CHANNELS $RX_NUM_OF_CONVERTERS \
diff --git a/projects/daq3/common/daq3_qsys.tcl b/projects/daq3/common/daq3_qsys.tcl
index 9e1e62481..b57ff229e 100644
--- a/projects/daq3/common/daq3_qsys.tcl
+++ b/projects/daq3/common/daq3_qsys.tcl
@@ -131,8 +131,8 @@ set_instance_parameter_value axi_ad9680_tpl {ID} {0}
 set_instance_parameter_value axi_ad9680_tpl {NUM_CHANNELS} $RX_NUM_OF_CONVERTERS
 set_instance_parameter_value axi_ad9680_tpl {NUM_LANES} $RX_NUM_OF_LANES
 set_instance_parameter_value axi_ad9680_tpl {BITS_PER_SAMPLE} $RX_SAMPLE_WIDTH
-set_instance_parameter_value axi_ad9680_tpl {CONVERTER_RESOLUTION} $RX_SAMPLE_WIDTH
-set_instance_parameter_value axi_ad9680_tpl {TWOS_COMPLEMENT} {1}
+set_instance_parameter_value axi_ad9680_tpl {CONVERTER_RESOLUTION} {14}
+set_instance_parameter_value axi_ad9680_tpl {TWOS_COMPLEMENT} {0}
 
 add_connection ad9680_jesd204.link_clk axi_ad9680_tpl.link_clk
 add_connection ad9680_jesd204.link_sof axi_ad9680_tpl.if_link_sof
diff --git a/projects/fmcjesdadc1/common/fmcjesdadc1_bd.tcl b/projects/fmcjesdadc1/common/fmcjesdadc1_bd.tcl
index eb09ce3c8..7d6ad6ce3 100644
--- a/projects/fmcjesdadc1/common/fmcjesdadc1_bd.tcl
+++ b/projects/fmcjesdadc1/common/fmcjesdadc1_bd.tcl
@@ -34,6 +34,7 @@ adi_tpl_jesd204_rx_create axi_ad9250_core $RX_NUM_OF_LANES \
                                           $RX_SAMPLES_PER_FRAME \
                                           $RX_SAMPLE_WIDTH
 ad_ip_parameter axi_ad9250_core/adc_tpl_core CONFIG.CONVERTER_RESOLUTION 14
+ad_ip_parameter axi_ad9250_core/adc_tpl_core CONFIG.TWOS_COMPLEMENT 0
 
 ad_ip_instance util_cpack2 axi_ad9250_cpack [list \
   NUM_OF_CHANNELS $RX_NUM_OF_CONVERTERS \