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

Siglent sds hd support #245

Open
wants to merge 16 commits into
base: master
Choose a base branch
from

Conversation

fredzo
Copy link

@fredzo fredzo commented Aug 29, 2024

Hi,
This PR is based on the work of Eric Kuzmenko (#176).
It's been discussed on EEVblog forum and tested by different users on SDS 2000X HD, 800X HD, 1000X HD, and 2000X plus : https://www.eevblog.com/forum/testgear/new-sigrokpulseview-hardware-support-(siglent-sds-hd-rigol-dho800-)/
I've tried not to change any behavior of the original driver.
There are known limitations on digital channels of 2000X HD for memory depth > 5Mpts due to a bug in Siglent's firmware. I am exchanging with Siglent support team about that.
Please let me know if you have any comment.
Best regard,
Frederic.

Frederic Borry and others added 12 commits June 27, 2024 00:30
…c Kuzmenko) in this PR : github.com/sigrokproject/pull/176/

Created a new protocol version "E11" matching the latest Siglent SDS Scope programming guide.
Reduced the read-wait time from 7sec to 50ms for better performance (achived by looping on read sample logic to consume the data has it arrives).
Tested with SDS2504X HD model connected via Ethernet cable.
…ing communication stack to get the data from the device.
Fixed compilation warnings.
Read block length from block header for both analog and digital channels.
Added use of WAV:POIN to specify block length as suggested in Siglent code exmaples.
…isition.

Removed unused SCPI commands for E11 prtocol
…o 5mV instead of 500 uV).

Fixed vertical ranges lower than 10mV for E11 models.
.gitignore Outdated
@@ -80,3 +80,4 @@ stamp-h?
/tests/*.log
/tests/*.trs
/tests/main
.vscode/

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd suggest moving this to line 18, it might help accelerate the merging

@@ -106,7 +106,7 @@ static const uint64_t timebases[][2] = {

static const uint64_t vdivs[][2] = {
/* microvolts */
{ 500, 100000 },
{ 500, 1000000 },

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we'd want to split this to another bugfix PR, although it depends on the maintainers.

Comment on lines -186 to +206
{ 50, 1 }, { 2, 1000 }, 18, 8, 1400363},
{ 50, 1 }, { 2, 1000 }, 18, 8, 25, 1400363},
[SDS1000CNL] = {VENDOR(SIGLENT), "SDS1000CNL", NON_SPO_MODEL,
{ 50, 1 }, { 2, 1000 }, 18, 8, 1400363},
{ 50, 1 }, { 2, 1000 }, 18, 8, 25, 1400363},
[SDS1000DL] = {VENDOR(SIGLENT), "SDS1000DL", NON_SPO_MODEL,
{ 50, 1 }, { 2, 1000 }, 18, 8, 1400363},
{ 50, 1 }, { 2, 1000 }, 18, 8, 25, 1400363},
[SDS1000X] = {VENDOR(SIGLENT), "SDS1000X", SPO_MODEL,
{ 50, 1 }, { 500, 100000 }, 14, 8, 14000363},
{ 50, 1 }, { 500, 1000000 }, 14, 8, 25, 14000363},
[SDS1000XP] = {VENDOR(SIGLENT), "SDS1000X+", SPO_MODEL,
{ 50, 1 }, { 500, 100000 }, 14, 8, 14000363},
{ 50, 1 }, { 500, 1000000 }, 14, 8, 25, 14000363},
[SDS1000XE] = {VENDOR(SIGLENT), "SDS1000XE", ESERIES,
{ 50, 1 }, { 500, 100000 }, 14, 8, 14000363},
{ 50, 1 }, { 500, 1000000 }, 14, 8, 25, 14000363},

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above, maybe split into another bugfix PR

Comment on lines 729 to 731
case 100000:
cmd = g_strdup_printf("%" PRIu64 "UV", p);
break;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we fixed the bug on uV being 10^5, maybe this should be 1,000,000 too?

Copy link

@doge-gif doge-gif left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the PR!
May I suggest a few changes, so hopefully the merge will be faster?
(And no, I'm not a maintainer. Just another fella owning one of those scopes)

@fredzo
Copy link
Author

fredzo commented Oct 10, 2024

Thanks for the PR! May I suggest a few changes, so hopefully the merge will be faster? (And no, I'm not a maintainer. Just another fella owning one of those scopes)

Thanks for the feedback @doge-gif ! I'll take your proposals (but I'm not creating a separate PR).
I had a few exchanges on Discord with maintainers, they're looking at it.
In the mean time, builds with this patch and the Rigol driver update are available on eevblog forum for Mac and Windows (see link in the PR text).
Best,
Frederic.

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