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

Add ability to output slow PID on fast DACs #312

Merged
merged 43 commits into from
Mar 21, 2023
Merged

Add ability to output slow PID on fast DACs #312

merged 43 commits into from
Mar 21, 2023

Commits on Aug 24, 2022

  1. added ability to output slow_pid on fast-DACs

    @cmf84
    cmf84 committed Aug 24, 2022
    Configuration menu
    Copy the full SHA
    fd66562 View commit details
    Browse the repository at this point in the history

  2. updated fpga bitstream for pid_slow output on fast-outs

    @cmf84
    cmf84 committed Aug 24, 2022
    Configuration menu
    Copy the full SHA
    2656e46 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2023

  1. Merge branch 'pr/cmf84/284' into feature/slow-integrator-fast-dacs

    @bleykauf
    bleykauf committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    cf61773 View commit details
    Browse the repository at this point in the history

  2. Fix broken LFS files

    @bleykauf
    bleykauf committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    e385e5e View commit details
    Browse the repository at this point in the history

  3. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    9444c4d View commit details
    Browse the repository at this point in the history

  4. Revert "[pre-commit.ci] auto fixes from pre-commit.com hooks" 

    This reverts commit 9444c4d.
    @bleykauf
    bleykauf committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    6c05812 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into feature/slow-integrator-fast-dacs

    @bleykauf
    bleykauf committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    7d05328 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'develop' into feature/slow-integrator-fast-dacs

    @bleykauf
    bleykauf committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    7b53eaf View commit details
    Browse the repository at this point in the history

  7. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    6e295e9 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'develop' into feature/slow-integrator-fast-dacs

    @bleykauf
    bleykauf committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    d96881d View commit details
    Browse the repository at this point in the history

  9. suppress flake8 warning

    @bleykauf
    bleykauf committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    62fe858 View commit details
    Browse the repository at this point in the history

  10. build new gateware

    @bleykauf
    bleykauf committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    4724a4b View commit details
    Browse the repository at this point in the history

  11. Merge branch 'develop' into feature/slow-integrator-fast-dacs

    @bleykauf
    bleykauf committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    4c27a68 View commit details
    Browse the repository at this point in the history

  12. allow manual dispatching of pytest workflow

    @bleykauf
    bleykauf committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    7b66bb3 View commit details
    Browse the repository at this point in the history

  13. fix workflow

    @bleykauf
    bleykauf committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    00ac9cf View commit details
    Browse the repository at this point in the history

  14. fix slow integrator channel selection and rename some elements

    @bleykauf
    bleykauf committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    4191ada View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2023

  1. clarify slot function names

    @bleykauf
    bleykauf committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    f360082 View commit details
    Browse the repository at this point in the history

  2. remove reliance on ids property

    @bleykauf
    bleykauf committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    ea35908 View commit details
    Browse the repository at this point in the history

  3. perform small refactoring changes

    @bleykauf
    bleykauf committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    9034370 View commit details
    Browse the repository at this point in the history

  4. remove nested function definition

    @bleykauf
    bleykauf committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    2708604 View commit details
    Browse the repository at this point in the history

  5. fix function call

    @bleykauf
    bleykauf committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    dfe34f0 View commit details
    Browse the repository at this point in the history

  6. remove unneccesary signal and function

    @bleykauf
    bleykauf committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    05ed8eb View commit details
    Browse the repository at this point in the history

  7. replace bare except clause

    @bleykauf
    bleykauf committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    0da0d57 View commit details
    Browse the repository at this point in the history

  8. fix visibility of polarity settings

    @bleykauf
    bleykauf committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    2652edc View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2023

  1. update copyright notice

    @bleykauf
    bleykauf committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    ffd48dd View commit details
    Browse the repository at this point in the history

  2. merge master changes to installation script

    @bleykauf
    bleykauf committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    2deaa86 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2023

  1. clean up comments

    @bleykauf
    bleykauf committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    5f17651 View commit details
    Browse the repository at this point in the history

  2. turn COLORS into Enum

    @bleykauf
    bleykauf committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    7bfef01 View commit details
    Browse the repository at this point in the history

  3. fix typos

    @bleykauf
    bleykauf committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    58c2bef View commit details
    Browse the repository at this point in the history

  4. use constant for output channel number

    @bleykauf
    bleykauf committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    c755439 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2023

  1. use constant for output channel number

    @bleykauf
    bleykauf committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    c1e9585 View commit details
    Browse the repository at this point in the history

  2. rearrange linien logic

    @bleykauf
    bleykauf committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    42c58b6 View commit details
    Browse the repository at this point in the history

  3. some cosmetic changes

    @bleykauf
    bleykauf committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    b71a7f9 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2023

  1. use better names for things related to 'slow' integrator

    @bleykauf
    bleykauf committed Mar 19, 2023
    Configuration menu
    Copy the full SHA
    bc848e1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into feature/slow-integrator-fast-dacs

    @bleykauf
    bleykauf committed Mar 19, 2023
    Configuration menu
    Copy the full SHA
    bf522cf View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2023

  1. fix KeyError

    @bleykauf
    bleykauf committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    055ed39 View commit details
    Browse the repository at this point in the history

  2. fix renaming

    @bleykauf
    bleykauf committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    e0824d7 View commit details
    Browse the repository at this point in the history

  3. simplify aquisition

    @bleykauf
    bleykauf committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    85de256 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2023

  1. simplify and fix PID chain connections

    @bleykauf
    bleykauf committed Mar 21, 2023
    Configuration menu
    Copy the full SHA
    fcf1029 View commit details
    Browse the repository at this point in the history

  2. remove f-strings from server again

    @bleykauf
    bleykauf committed Mar 21, 2023
    Configuration menu
    Copy the full SHA
    3a403f9 View commit details
    Browse the repository at this point in the history

  3. convert generators to tuples

    @bleykauf
    bleykauf committed Mar 21, 2023
    Configuration menu
    Copy the full SHA
    ecaf7c4 View commit details
    Browse the repository at this point in the history

  4. update copyright notices

    @bleykauf
    bleykauf committed Mar 21, 2023
    Configuration menu
    Copy the full SHA
    44d6098 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into feature/slow-integrator-fast-dacs

    @bleykauf
    bleykauf authored Mar 21, 2023
    Configuration menu
    Copy the full SHA
    a358fe7 View commit details
    Browse the repository at this point in the history