R&S RTB2000 oscilloscope driver - class 'Trigger' new variables#1048
Merged
azonenberg merged 3 commits intongscopeclient:masterfrom Jan 26, 2026
Merged
R&S RTB2000 oscilloscope driver - class 'Trigger' new variables#1048azonenberg merged 3 commits intongscopeclient:masterfrom
azonenberg merged 3 commits intongscopeclient:masterfrom
Conversation
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
The ‘Trigger’ class has been extended by two variables, ‘m_triggerLevel’ and ‘m_upperLevel’. The variables or parameters are not displayed in the trigger dialogs because they are marked as invisible. This should not have any effect on the trigger dialogs.
These variables contain the same value as ‘m_level’ and are used for correct labeling in the RTB2000 trigger dialogs.
To display these parameters in the trigger dialogs, the procedure ‘MarkHidden(bool hidden = true)’ has been extended with the optional argument ‘hidden’.
In the RTB2000 triggers, the designation for the trigger ‘Lower Level’ is not appropriate. The designation is either ‘Trigger Level’ or ‘Upper Level’. The second setting is then ‘Lower Level’, which is not the trigger level, e.g., for the rise or runt trigger.
Since the parameters are arranged alphabetically, the designations ‘Level Trigger’ and ‘Level Upper’ are used.
Modified files:
scopehal/FilterParameter.h
scopehal/Trigger.cpp
scopehal/Trigger.h