Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

AD7616: Add AXI ADC support #1477

Merged
merged 3 commits into from
Dec 9, 2024
Merged

AD7616: Add AXI ADC support #1477

merged 3 commits into from
Dec 9, 2024

Conversation

PIoandan
Copy link
Collaborator

@PIoandan PIoandan commented Oct 1, 2024 •
edited
Loading

PR Description

Add AXI ADC support to existing AD7616 PIF project.
Update AD7616 project to account for the changes (add CPACK core, fix DMA connections).
Update AXI_AD7616 and AD7616 (project) documentation and block diagrams

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

@PIoandan PIoandan marked this pull request as draft October 1, 2024 07:23
sarpadi
sarpadi reviewed Nov 27, 2024
View reviewed changes
library/axi_ad7616/axi_ad7616_pif.v Outdated
@@ -67,7 +82,7 @@ module axi_ad7616_pif #(
input rd_req,
input wr_req,
input [15:0] wr_data,
output reg [15:0] rd_data,
output reg [15:0] rd_data = 'ha1b2,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove / fix initialization

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

library/axi_ad7616/axi_ad7616_pif.v Outdated
@@ -96,10 +111,20 @@ module axi_ad7616_pif #(

reg rd_valid_d = 1'h0;

reg [ 4:0] channel_counter = 5'h0;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fix spacing, separate reg from wire reclarations, initializations

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

library/axi_ad7616/axi_ad7616_pif.v Outdated
rd_req_edge_d <= rd_req_edge;
end

//channel_counter
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

irrelevant comment. delete or elaborate

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed.

library/axi_ad7616/axi_ad7616.v Outdated

wire [255:0] adc_data_s;

wire [ 7:0] adc_custom_control;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

spacing cleanup

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

library/axi_ad7616/axi_ad7616.v Outdated
end
endgenerate

axi_ad7616_pif #(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fix indentation

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

library/axi_ad7616/axi_ad7616.v Outdated
assign adc_data_1 = dma_data[14*16+15:14*16];
assign adc_data_0 = dma_data[15*16+15:15*16];

wire [31:0] adc_config_ctrl;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

move declaration

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

@sarpadi
Copy link
Contributor

sarpadi commented Nov 27, 2024

Update system_project.tcl with newer build parameter handling

@sarpadi
Copy link
Contributor

sarpadi commented Nov 27, 2024

fix conflicts

sarpadi
sarpadi reviewed Nov 27, 2024
View reviewed changes
projects/ad7616_sdz/common/ad7616_bd.tcl Outdated
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove 100MHz clock gen core and use PS clk (sys_clk) instead

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

@PIoandan PIoandan force-pushed the dev_axi_ad7616 branch 3 times, most recently from 5711fcc to 14394f4 Compare November 28, 2024 12:18
@PIoandan PIoandan marked this pull request as ready for review November 28, 2024 12:20
@PIoandan PIoandan requested a review from sarpadi November 28, 2024 12:20
@PIoandan
Copy link
Collaborator Author

Made a squash for all three categories of files.

IuliaCMoldovan
IuliaCMoldovan requested changes Dec 4, 2024
View reviewed changes
docs/library/axi_ad7616/index.rst Outdated Show resolved Hide resolved
docs/library/axi_ad7616/index.rst Show resolved Hide resolved
docs/library/axi_ad7616/index.rst Show resolved Hide resolved
projects/ad7616_sdz/zed/Makefile Show resolved Hide resolved
docs/projects/ad7616_sdz/index.rst Outdated Show resolved Hide resolved
library/axi_ad7616/axi_ad7616.v Outdated Show resolved Hide resolved
library/axi_ad7616/axi_ad7616_ip.tcl Outdated Show resolved Hide resolved
@PIoandan
library: axi_ad7616: Add AXI ADC
4d2fd5a 
Signed-off-by: Pop Ioan Daniel <[email protected]>
@PIoandan
docs: Update ad7616 documentation
fb24929 
Signed-off-by: Pop Ioan Daniel <[email protected]>
@PIoandan PIoandan merged commit 71f59dc into main Dec 9, 2024
2 of 5 checks passed
@PIoandan PIoandan deleted the dev_axi_ad7616 branch December 9, 2024 14:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@IuliaCMoldovan IuliaCMoldovan IuliaCMoldovan approved these changes

@sarpadi sarpadi sarpadi approved these changes

@gastmaier gastmaier Awaiting requested review from gastmaier gastmaier is a code owner

@StancaPop StancaPop Awaiting requested review from StancaPop StancaPop is a code owner

@LBFFilho LBFFilho Awaiting requested review from LBFFilho LBFFilho is a code owner

@alin724 alin724 Awaiting requested review from alin724

@ladace ladace Awaiting requested review from ladace ladace is a code owner

Assignees
No one assigned
Labels
doc enhancement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@PIoandan @sarpadi @IuliaCMoldovan