Skip to content

Feature/owon dmm improvements 1 rebase #4

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

Merged
merged 6 commits into from
Aug 18, 2025
Merged

Feature/owon dmm improvements 1 rebase #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1ce1c88
scpi-dmm: remove unsupported 4W mode on OWON XDM1041
evgeny-boger Jun 17, 2025
b581210
scpi-dmm: support for ranges for OWON XDM DMMs
evgeny-boger Jun 17, 2025
559c24b
scpi-dmm: add period measurement support for XDM2041
evgeny-boger Jun 17, 2025
24652db
scpi-dmm: add support for OWON XDM1241
evgeny-boger Jun 17, 2025
81a2eb0
Update changelog
sikmir Aug 18, 2025
a0d3aba
Fix compatibility with glibc<2.68
sikmir Aug 18, 2025
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
6 changes: 6 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
libsigrok (0.5.2-3+wb101) stable; urgency=medium

* Enhanced Support for OWON XDM Series DMMs: Range Management and XDM1241 Integration

-- Evgeny Boger <[email protected]> Mon, 18 Aug 2025 15:00:00 +0300

libsigrok (0.5.2-3+wb100) stable; urgency=medium

* Fork for the Wiren Board.
Expand Down
42 changes: 34 additions & 8 deletions src/hardware/scpi-dmm/api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,9 @@ static const struct scpi_command cmdset_owon[] = {
{ DMM_CMD_SETUP_FUNC, "CONF:%s", },
{ DMM_CMD_QUERY_FUNC, "FUNC?", },
{ DMM_CMD_QUERY_VALUE, "MEAS1?", },
{ DMM_CMD_SETUP_RANGE, "CONF:%s %s", },
{ DMM_CMD_QUERY_RANGE, "RANGE?", },
{ DMM_CMD_QUERY_RANGE_AUTO, "AUTO?", },
ALL_ZERO,
};

Expand Down Expand Up @@ -185,17 +188,32 @@ static const struct mqopt_item mqopts_gwinstek_gdm906x[] = {
{ SR_MQ_CAPACITANCE, 0, "CAP", "CAP", NO_DFLT_PREC, FLAGS_NONE, },
};

static const struct mqopt_item mqopts_owon_xdm1041[] = {
{ SR_MQ_VOLTAGE, SR_MQFLAG_AC, "VOLT:AC", "VOLT AC", NO_DFLT_PREC, FLAGS_NONE, },
{ SR_MQ_VOLTAGE, SR_MQFLAG_DC, "VOLT:DC", "VOLT", NO_DFLT_PREC, FLAGS_NONE, },
{ SR_MQ_CURRENT, SR_MQFLAG_AC, "CURR:AC", "CURR AC", NO_DFLT_PREC, FLAGS_NONE, },
{ SR_MQ_CURRENT, SR_MQFLAG_DC, "CURR:DC", "CURR", NO_DFLT_PREC, FLAGS_NONE, },
{ SR_MQ_RESISTANCE, 0, "RES", "RES", NO_DFLT_PREC, FLAGS_NONE, },
{ SR_MQ_CONTINUITY, 0, "CONT", "CONT", -1, FLAG_NO_RANGE, },
{ SR_MQ_VOLTAGE, SR_MQFLAG_DC | SR_MQFLAG_DIODE, "DIOD", "DIOD", -4, FLAG_NO_RANGE, },
{ SR_MQ_TEMPERATURE, 0, "TEMP", "TEMP", NO_DFLT_PREC, FLAGS_NONE, },
{ SR_MQ_FREQUENCY, 0, "FREQ", "FREQ", NO_DFLT_PREC, FLAG_NO_RANGE, },
{ SR_MQ_TIME, 0, "PER", "PER", NO_DFLT_PREC, FLAG_NO_RANGE, },
{ SR_MQ_CAPACITANCE, 0, "CAP", "CAP", NO_DFLT_PREC, FLAGS_NONE, },
};

static const struct mqopt_item mqopts_owon_xdm2041[] = {
{ SR_MQ_VOLTAGE, SR_MQFLAG_AC, "VOLT:AC", "VOLT AC", NO_DFLT_PREC, FLAGS_NONE, },
{ SR_MQ_VOLTAGE, SR_MQFLAG_DC, "VOLT:DC", "VOLT", NO_DFLT_PREC, FLAGS_NONE, },
{ SR_MQ_CURRENT, SR_MQFLAG_AC, "CURR:AC", "CURR AC", NO_DFLT_PREC, FLAGS_NONE, },
{ SR_MQ_CURRENT, SR_MQFLAG_DC, "CURR:DC", "CURR", NO_DFLT_PREC, FLAGS_NONE, },
{ SR_MQ_RESISTANCE, 0, "RES", "RES", NO_DFLT_PREC, FLAGS_NONE, },
{ SR_MQ_RESISTANCE, SR_MQFLAG_FOUR_WIRE, "FRES", "FRES", NO_DFLT_PREC, FLAGS_NONE, },
{ SR_MQ_CONTINUITY, 0, "CONT", "CONT", -1, FLAGS_NONE, },
{ SR_MQ_VOLTAGE, SR_MQFLAG_DC | SR_MQFLAG_DIODE, "DIOD", "DIOD", -4, FLAGS_NONE, },
{ SR_MQ_CONTINUITY, 0, "CONT", "CONT", -1, FLAG_NO_RANGE, },
{ SR_MQ_VOLTAGE, SR_MQFLAG_DC | SR_MQFLAG_DIODE, "DIOD", "DIOD", -4, FLAG_NO_RANGE, },
{ SR_MQ_TEMPERATURE, 0, "TEMP", "TEMP", NO_DFLT_PREC, FLAGS_NONE, },
{ SR_MQ_FREQUENCY, 0, "FREQ", "FREQ", NO_DFLT_PREC, FLAGS_NONE, },
{ SR_MQ_FREQUENCY, 0, "FREQ", "FREQ", NO_DFLT_PREC, FLAG_NO_RANGE, },
{ SR_MQ_TIME, 0, "PER", "PER", NO_DFLT_PREC, FLAG_NO_RANGE, },
{ SR_MQ_CAPACITANCE, 0, "CAP", "CAP", NO_DFLT_PREC, FLAGS_NONE, },
};

Expand Down Expand Up @@ -289,19 +307,27 @@ SR_PRIV const struct scpi_dmm_model models[] = {
},
{
"OWON", "XDM1041",
1, 5, cmdset_owon, ARRAY_AND_SIZE(mqopts_owon_xdm2041),
1, 5, cmdset_owon, ARRAY_AND_SIZE(mqopts_owon_xdm1041),
scpi_dmm_get_meas_gwinstek,
ARRAY_AND_SIZE(devopts_generic),
ARRAY_AND_SIZE(devopts_generic_range),
0, 0, 0, 1e9, TRUE,
NULL, NULL, NULL,
scpi_dmm_owon_get_range_text, scpi_dmm_owon_set_range_from_text, scpi_dmm_owon_get_range_text_list,
},
{
"OWON", "XDM1241",
1, 5, cmdset_owon, ARRAY_AND_SIZE(mqopts_owon_xdm1041),
scpi_dmm_get_meas_gwinstek,
ARRAY_AND_SIZE(devopts_generic_range),
0, 0, 0, 1e9, TRUE,
scpi_dmm_owon_get_range_text, scpi_dmm_owon_set_range_from_text, scpi_dmm_owon_get_range_text_list,
},
{
"OWON", "XDM2041",
1, 5, cmdset_owon, ARRAY_AND_SIZE(mqopts_owon_xdm2041),
scpi_dmm_get_meas_gwinstek,
ARRAY_AND_SIZE(devopts_generic),
ARRAY_AND_SIZE(devopts_generic_range),
0, 0, 0, 1e9, TRUE,
NULL, NULL, NULL,
scpi_dmm_owon_get_range_text, scpi_dmm_owon_set_range_from_text, scpi_dmm_owon_get_range_text_list,
},
{
"Siglent", "SDM3055",
Expand Down
Loading