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

Fix: Rework on acq2106_435st trigger selection. #2284

Merged
merged 1 commit into from
Apr 14, 2021

Conversation

santorofer
Copy link
Contributor

Remove new TRIG_SRC node
Move functionality into existing TRIG_MODE node
TRIG_MODE can now be

  • hard, soft
  • master:hard, solo:soft, etc
  • master:ext, solo:wrtt0, fpmaster:fp_sync, etc.

Refactor .format() to % format
Move getUUT() to parent 435st class (overridden in 435sc)

Removed legacy trig_types

Moved constants to class scope

  • MIN_FREQUENCY
  • TRIG_SRC_OPTS_0
  • TRIG_SRC_OPTS_1

Removed initializing trigger sources to 'NONE'
Should be set automatically by sync_role

Wrap debug statements in if self.debug

Remove new `TRIG_SRC` node
Move functionality into existing `TRIG_MODE` node
`TRIG_MODE` can now be
* hard, soft
* master:hard, solo:soft, etc
* master:ext, solo:wrtt0, fpmaster:fp_sync, etc.

Refactor .format() to % format
Move `getUUT()` to parent 435st class (overridden in 435sc)

Removed legacy `trig_types`

Moved constants to class scope
* MIN_FREQUENCY
* TRIG_SRC_OPTS_0
* TRIG_SRC_OPTS_1

Removed initializing trigger sources to 'NONE'
Should be set automatically by sync_role

Wrap debug statements in `if self.debug`
@joshStillerman joshStillerman merged commit 8b4cdee into MDSplus:alpha Apr 14, 2021
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.

3 participants