-
Notifications
You must be signed in to change notification settings - Fork 32
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
Trigger mechanism for pattern and signal generator #149
Draft
teoperisanu
wants to merge
3
commits into
master
Choose a base branch
from
pattern-generator-trigger
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+415
−3
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
teoperisanu
force-pushed
the
pattern-generator-trigger
branch
2 times, most recently
from
May 21, 2020 13:51
785646b
to
a946357
Compare
Trigger out is a different functionality of the external trigger. I think this functionality is coherent with the rest of the triggers and should be in the same class - not separate classes - they should be merged. |
adisuciu
reviewed
May 28, 2020
include/libm2k/enums.hpp
Outdated
enum M2K_TRIGGER_OUT_SOURCE_DIGITAL { | ||
DIGITAL_OUT_SRC_NONE = 0, ///< DIGITAL_OUT_SRC_NONE - no trigger events | ||
DIGITAL_OUT_SRC_TRIGGER_IN = 1, ///< DIGITAL_OUT_SRC_TRIGGER_IN - trigger events on the TI(trigger in) pin trigger the DigitalOut interface | ||
DIGITAL_OUT_SRC_TRIGGER_OUT = 2, ///< DIGITAL_OUT_SRC_TRIGGER_OUT - trigger events on the TO(trigger out) pin trigger the DigitalOut interface |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These enums should be named TRIGGER_OUT_SRC_*
teoperisanu
force-pushed
the
pattern-generator-trigger
branch
from
June 24, 2020 07:04
a946357
to
3696e12
Compare
teoperisanu
changed the title
Pattern generator trigger
Trigger mechanism for pattern and signal generator
Jun 24, 2020
teoperisanu
force-pushed
the
pattern-generator-trigger
branch
from
December 10, 2020 07:32
3696e12
to
4ccbbab
Compare
cristina-suteu
force-pushed
the
pattern-generator-trigger
branch
from
January 27, 2021 11:37
9d1c9bf
to
4ccbbab
Compare
Both DACs and pattern generator share common functionalities. These features will be available in a future firmware version, so we have separated these from the others, in a new class - M2kHwTrigger_v0.26. Signed-off-by: Teo Perisanu <[email protected]>
Add the digital device. Implement the functionalities based on the generic definitions. Signed-off-by: Teo Perisanu <[email protected]>
Both DACs share the same trigger mechanism - only one DAC should be used in order to configure the triggering system. Implement the functionalities based on the generic definitions. Signed-off-by: Teo Perisanu <[email protected]>
cristina-suteu
force-pushed
the
pattern-generator-trigger
branch
from
February 4, 2021 16:13
9918ca6
to
9d8c31d
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request is only a draft. The merge can be performed only after the official firmware is released.
Add the functionality of setting a trigger for the DigitalOut and AnalogOut interface. This enhancement is described in #148.