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

Nk/servo #19

Merged
merged 33 commits into from
Jul 7, 2022
Merged

Nk/servo #19

merged 33 commits into from
Jul 7, 2022

Conversation

nkrackow
Copy link
Contributor

This PR implements a servo on the RF outputs usind the ADCs and a iterative first order IIR.

nkrackow and others added 21 commits June 2, 2022 14:16
@nkrackow
add iir and testbench
083e16b
@nkrackow
fix rounding and add nonfunctional test
56a21a3
@nkrackow
add adc and test. vcd looks sensible but not tested and code needs cl…
4cb18a0 
…eanup
@nkrackow
just wild try hacking in adc samples to dac. mostly to see what synth…
e55d0a9 
… does.
@nkrackow
fix pin name
e641a84
@nkrackow
comment out failing test for now
db774de
@nkrackow
put signals on testpoints. signals look coorect, just channels are sw…
5805781 
…apped
@nkrackow
adc -> dac trough working
931c6a6
@nkrackow
flip channels as on schematic and add timing comments
23c5c69
@nkrackow
commit status with nonfunctional adc module.
e3e9e7a
@nkrackow
adc data valid with 6 cycles t_rtt. Give up on constraining the CDC
17d071b
@nkrackow
use barrel shifter in adc and stick to 6 cycles t_rtt for now.
639ddcb
@nkrackow
fixed coeff filter seems to be working, no data infra yet
d6644b5
@nkrackow
adapt comment about out of range mux selector
71b0c08
@nkrackow
add phaser CSRs and optimize iir. synth meets timing but registers un…
d9366be 
…tested.
@nkrackow
use actual reg
f8cc1ec
@nkrackow
fix profile selection and write tests
4f4269d
@nkrackow
iir with registers from kasli working. more testing to do.
7ad1017
@nkrackow
fix output assignment bug
8476f6e
@nkrackow
implement servo multiplier
3e96feb
@nkrackow
small changes and cleanup
862f56a
nkrackow
nkrackow commented Jun 15, 2022
View reviewed changes
adc.py Outdated Show resolved Hide resolved
nkrackow
nkrackow commented Jun 15, 2022
View reviewed changes
iir.py Outdated Show resolved Hide resolved
nkrackow
nkrackow commented Jun 15, 2022
View reviewed changes
test_iir.py Outdated Show resolved Hide resolved
nkrackow
nkrackow commented Jun 15, 2022
View reviewed changes
phaser.py Outdated Show resolved Hide resolved
@nkrackow
Copy link
Contributor Author

I still need to test the latest changes, especially hold on HW.

jordens
jordens requested changes Jun 22, 2022
View reviewed changes
iir.py Outdated Show resolved Hide resolved
phaser.py Outdated Show resolved Hide resolved
phaser.py Outdated Show resolved Hide resolved
iir.py Outdated Show resolved Hide resolved
iir.py Outdated Show resolved Hide resolved
phaser.py Outdated Show resolved Hide resolved
iir.py Show resolved Hide resolved
iir.py Show resolved Hide resolved
iir.py Outdated Show resolved Hide resolved
iir.py Outdated Show resolved Hide resolved
@nkrackow nkrackow requested a review from jordens June 23, 2022 14:49
jordens
jordens approved these changes Jul 6, 2022
View reviewed changes
Copy link
Member

@jordens jordens left a comment

Choose a reason for hiding this comment

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

Do the test benches still work?
Otherwise LGTM

jordens
jordens approved these changes Jul 6, 2022
View reviewed changes
Copy link
Member

@jordens jordens left a comment

Choose a reason for hiding this comment

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

Do the test benches still work?
Otherwise LGTM

@nkrackow
Copy link
Contributor Author

nkrackow commented Jul 7, 2022

Yes, they were passing but I cleaned them up a bit.

@jordens jordens merged commit 41a7bd1 into master Jul 7, 2022
@jordens jordens deleted the nk/servo branch July 7, 2022 08:35
@jordens jordens mentioned this pull request Jul 7, 2022
Closed
13 tasks
@nkrackow nkrackow mentioned this pull request Jul 7, 2022
Merged
11 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jordens jordens jordens approved these changes

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

Successfully merging this pull request may close these issues.
2 participants
@nkrackow @jordens