Rigol MSO5000 Fixes #696
Merged
Rigol MSO5000 Fixes #696
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
If we ask for waveform data too quickly after a trigger event, my MSO5074 won't respond with any data. Experimentally, I've found two ways to avoid this: 1. Stop using `SO_RCVTIMEO` on the MSO5000's LAN socket and re-send our :WAV:DATA? request on reception of no response following the header 2. Send a *WAI request prior to sending :WAV:DATA?. The MSO5000 programming guide seems to suggest *WAI does nothing at all, but I have not been able to reproduce any waveform reception failures after adding it to the AcquireData sequence. This commit adopts approach 2, as it avoids polluting the code with any assumptions or special handling for certain SCPI transport methods. Thanks to @bvernoux for his nice standalone "rigol_mso5000" utility which made verifying this change exceptionally simple.
The current rigol constructor for MSO5000 series scopes runs through an iterative process to determine what the actual bandwidth of a connected device is by setting progressive channel bandwidth limits and seeing if they take effect. We were not restoring the previously-set bandwidth limit after this process, which might cause some user confusion.
The MSO5000 will annoyingly only update its programmed sample depth while in normal or auto run modes. To accommodate this limitation, we temporarily go into auto mode and run the scope while setting a new sample depth, then restore the scope state as best we can once the new settings have been programmed.
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 PR fixes a crash with the Rigol MSO5000 where if waveform data was requested too quickly after a trigger event, the scope would send a response header but no waveform data to follow it. Additionally, there are some quality-of-life improvements/bugfixes.