Fix data aquisition and Rohde & Schwarz support in hameg-hmo #259
+108
−26
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
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.
Right now, the
sr_analog_init-function is called after the data is transferred to the struct, which overwrites it with zeros again. As a result, data aquisition is not possible with this driver. This PR moves thesr_analog_init-call to before the data transfer.Also, R&S oscilloscopes don't support enabling or disabling individual logic channels, some don't even support enabling or disabling PODs. I implemented a flag system that allows disabling of such capabilities per device, let me know if you think this should be solved differently though.
Finally, i changed the data output format to
MAX, which allows to transfer the entire oscilloscope memory contents (otherwise, data is downsampled according to the horizontal zoom settings). This only works while aquisition is stopped on the device, otherwise it falls back to the default output format. This way, data aquisition is still just as fast while the scope is in RUN mode, but is also able to aquire large data blocks while it's stopped (much slower).