M-Labs
/
artiq-zynq
12
0
Fork 15
Code Issues 12 Pull Requests 1 Releases Wiki Activity

Labels Milestones

117_rtio_channels #147

Merged
sb10q merged 10 commits from mwojcik/artiq-zynq:117_rtio_channels into master 2 years ago
Conversation 0 Commits 10 Files Changed 1
mwojcik commented 2 years ago
Owner

made two by mistake

made two by mistake
mwojcik added 7 commits 2 years ago
mwojcik closed this pull request 2 years ago
sb10q reviewed 2 years ago
src/gateware/zc706.py Outdated
@ -461,0 +501,4 @@
self.submodules += phy
rtio_channels.append(rtio.Channel.from_phy(phy, ififo_depth=512))
# could check the LED #
sb10q commented 2 years ago
Owner

What does this mean?

What does this mean?
mwojcik commented 2 years ago
Poster
Owner

I was wondering if the exact LED that gets controlled on board really matters. The index 2 of the user LED here was copied from kc705, maybe a different one would be any better?

I was wondering if the exact LED that gets controlled on board really matters. The index 2 of the user LED here was copied from kc705, maybe a different one would be any better?
sb10q commented 2 years ago
Owner

Can't recall why it's 2 on KC705. I suggest using the same LED index as in the former Simple target.

Can't recall why it's 2 on KC705. I suggest using the same LED index as in the former Simple target.
mwojcik commented 2 years ago
Poster
Owner

Former Simple target used all of them: ab0c205dd2/src/gateware/zc706.py (L510)

Former Simple target used all of them: https://git.m-labs.hk/M-Labs/artiq-zynq/src/commit/ab0c205dd23c8baa7070053e7f53cfa81e1755ed/src/gateware/zc706.py#L510
sb10q commented 2 years ago
Owner

Okay, then the example kernel used 0 :)

Okay, then the example kernel used 0 :)
sb10q reviewed 2 years ago
local_run.sh Outdated
@ -59,4 +59,3 @@
fi
artiq_netboot $load_bitstream_cmd -f $result_dir/$fwtype.bin -b $board_host
fi
sb10q commented 2 years ago
Owner

weird

weird
mwojcik commented 2 years ago
Poster
Owner

true, not sure where that came from, popped up after updating the branch (merging master in)

true, not sure where that came from, popped up after updating the branch (merging master in)
mwojcik reopened this pull request 2 years ago
mwojcik added 1 commit 2 years ago
mwojcik added 1 commit 2 years ago
sb10q merged commit 5c40115945 into master 2 years ago
The pull request has been merged as 5c40115945.
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b mwojcik-117_rtio_channels master
git pull 117_rtio_channels

Step 2:

Merge the changes and update on Gitea.
git checkout master
git merge --no-ff mwojcik-117_rtio_channels
git push origin master
Sign in to join this conversation.
Reviewers
Request review
No reviewers
Labels
Apply labels
Clear labels   
priority:critical
   
priority:high
   
priority:low
   
priority:medium
No Label
priority:critical
priority:high
priority:low
priority:medium
Milestone
Set milestone
Clear milestone
No items
No Milestone
Assignees
Assign users
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: M-Labs/artiq-zynq#147
Write Preview
Loading…
Cancel
Save
There is no content yet.
Delete Branch 'mwojcik/artiq-zynq:117_rtio_channels'

Deleting a branch is permanent. It CANNOT be undone. Continue?

No
Yes