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

Trigger mechanism for pattern and signal generator #149

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from

Conversation

teoperisanu
Copy link

@teoperisanu teoperisanu commented May 15, 2020

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.

@teoperisanu teoperisanu marked this pull request as draft May 15, 2020 11:32
@teoperisanu teoperisanu force-pushed the pattern-generator-trigger branch 2 times, most recently from 785646b to a946357 Compare May 21, 2020 13:51
@adisuciu
Copy link
Contributor

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.

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
Copy link
Contributor

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 teoperisanu force-pushed the pattern-generator-trigger branch from a946357 to 3696e12 Compare June 24, 2020 07:04
@teoperisanu teoperisanu changed the title Pattern generator trigger Trigger mechanism for pattern and signal generator Jun 24, 2020
@teoperisanu teoperisanu force-pushed the pattern-generator-trigger branch from 3696e12 to 4ccbbab Compare December 10, 2020 07:32
@cristina-suteu cristina-suteu force-pushed the pattern-generator-trigger branch from 9d1c9bf to 4ccbbab Compare January 27, 2021 11:37
Teo Perisanu added 3 commits February 4, 2021 18:12
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 cristina-suteu force-pushed the pattern-generator-trigger branch from 9918ca6 to 9d8c31d Compare February 4, 2021 16:13
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.

2 participants