Skip to content

Master #278

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.

Sign up for GitHub

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

Open
martinboller wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Master #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/hardware/rigol-dg/api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,14 @@ static const struct device_spec device_models[] = {
TRUE,
},
/* MSO5000 devices*/
{ "Rigol Technologies", "MSO5504",
ARRAY_AND_SIZE(mso5000_devopts),
ARRAY_AND_SIZE(mso5000_devopts_cg),
ARRAY_AND_SIZE(mso5000_channels),
cmdset_mso5000,
FALSE,
},

{ "Rigol Technologies", "MSO5354",
ARRAY_AND_SIZE(mso5000_devopts),
ARRAY_AND_SIZE(mso5000_devopts_cg),
Expand Down
1 change: 1 addition & 0 deletions src/hardware/rigol-ds/api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@ static const struct rigol_ds_model supported_models[] = {
{SERIES(MSO5000), "MSO5104", {1, 1000000000}, CH_INFO(4, true), std_cmd},
{SERIES(MSO5000), "MSO5204", {1, 1000000000}, CH_INFO(4, true), std_cmd},
{SERIES(MSO5000), "MSO5354", {1, 1000000000}, CH_INFO(4, true), std_cmd},
{SERIES(MSO5000), "MSO5504", {1, 1000000000}, CH_INFO(4, true), std_cmd},
/* TODO: Digital channels are not yet supported on MSO7000A. */
{SERIES(MSO7000A), "MSO7034A", {2, 1000000000}, CH_INFO(4, false), mso7000a_cmd},
};
Expand Down