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.

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

suservo: support operating with one urukul #1399

Merged
merged 1 commit into from
Dec 2, 2019
Merged

Conversation

jordens
Copy link
Member

@jordens jordens commented Dec 2, 2019

implemented by wiring up the second Urukul to dummy pins
tested on bonn1master/bonn1satellite

Signed-off-by: Robert Jördens [email protected]

ARTIQ Pull Request

Description of Changes

Related Issue

#1339 for more than two Urukul

Type of Changes

Type
✨ New feature
🔨 Refactoring

Steps (Choose relevant, delete irrelevant before submitting)

All Pull Requests

  • Use correct spelling and grammar.
  • [n/a] Update RELEASE_NOTES.md if there are noteworthy changes, especially if there are changes to existing APIs.
  • [n/a] Close/update issues.
  • [n/a] Check the copyright situation of your changes and sign off your patches (git commit --signoff, see copyright).

Code Changes

  • Run flake8 to check code style (follow PEP-8 style). flake8 has issues with parsing Migen/gateware code, ignore as necessary.
  • Test your changes or have someone test them. Mention what was tested and how.
  • Add and check docstrings and comments
  • Check, test, and update the unittests in /artiq/test/ or gateware simulations in /artiq/gateware/test

Documentation Changes

  • Check, test, and update the documentation in doc/. Build documentation (cd doc/manual/; make html) to ensure no errors.

Git Logistics

  • Split your contribution into logically separate changes (git rebase --interactive). Merge/squash/fixup commits that just fix or amend previous commits. Remove unintended changes & cleanup. See tutorial.
  • Write short & meaningful commit messages. Review each commit for messages (git show). Format:
    topic: description. < 50 characters total.
    
    Longer description. < 70 characters per line
    

Licensing

See copyright & licensing for more info.
ARTIQ files that do not contain a license header are copyrighted by M-Labs Limited and are licensed under LGPLv3+.

implemented by wiring up the second Urukul to dummy pins

Signed-off-by: Robert Jördens <[email protected]>
@jordens jordens merged commit 56074cf into master Dec 2, 2019
@jordens jordens deleted the suservo-one-urukul branch December 2, 2019 10:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant