Skip to content

Commit 61b7068

Browse files
evgeny-bogersikmir
authored andcommitted
scpi-dmm: remove unsupported 4W mode on OWON XDM1041
XDM1041 is basically the same as XDM2041, although it doesn't support resistance/four_wire. This commit make a distinct struct for XDM1041 instead using the same one for XDM1041 and XDM2041
1 parent 8bcbc03 commit 61b7068

File tree

1 file changed

+15
-1
lines changed
  • src/hardware/scpi-dmm

1 file changed

+15
-1
lines changed

src/hardware/scpi-dmm/api.c

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,20 @@ static const struct mqopt_item mqopts_gwinstek_gdm906x[] = {
185185
{ SR_MQ_CAPACITANCE, 0, "CAP", "CAP", NO_DFLT_PREC, FLAGS_NONE, },
186186
};
187187

188+
static const struct mqopt_item mqopts_owon_xdm1041[] = {
189+
{ SR_MQ_VOLTAGE, SR_MQFLAG_AC, "VOLT:AC", "VOLT AC", NO_DFLT_PREC, FLAGS_NONE, },
190+
{ SR_MQ_VOLTAGE, SR_MQFLAG_DC, "VOLT:DC", "VOLT", NO_DFLT_PREC, FLAGS_NONE, },
191+
{ SR_MQ_CURRENT, SR_MQFLAG_AC, "CURR:AC", "CURR AC", NO_DFLT_PREC, FLAGS_NONE, },
192+
{ SR_MQ_CURRENT, SR_MQFLAG_DC, "CURR:DC", "CURR", NO_DFLT_PREC, FLAGS_NONE, },
193+
{ SR_MQ_RESISTANCE, 0, "RES", "RES", NO_DFLT_PREC, FLAGS_NONE, },
194+
{ SR_MQ_CONTINUITY, 0, "CONT", "CONT", -1, FLAG_NO_RANGE, },
195+
{ SR_MQ_VOLTAGE, SR_MQFLAG_DC | SR_MQFLAG_DIODE, "DIOD", "DIOD", -4, FLAG_NO_RANGE, },
196+
{ SR_MQ_TEMPERATURE, 0, "TEMP", "TEMP", NO_DFLT_PREC, FLAGS_NONE, },
197+
{ SR_MQ_FREQUENCY, 0, "FREQ", "FREQ", NO_DFLT_PREC, FLAG_NO_RANGE, },
198+
{ SR_MQ_TIME, 0, "PER", "PER", NO_DFLT_PREC, FLAG_NO_RANGE, },
199+
{ SR_MQ_CAPACITANCE, 0, "CAP", "CAP", NO_DFLT_PREC, FLAGS_NONE, },
200+
};
201+
188202
static const struct mqopt_item mqopts_owon_xdm2041[] = {
189203
{ SR_MQ_VOLTAGE, SR_MQFLAG_AC, "VOLT:AC", "VOLT AC", NO_DFLT_PREC, FLAGS_NONE, },
190204
{ SR_MQ_VOLTAGE, SR_MQFLAG_DC, "VOLT:DC", "VOLT", NO_DFLT_PREC, FLAGS_NONE, },
@@ -289,7 +303,7 @@ SR_PRIV const struct scpi_dmm_model models[] = {
289303
},
290304
{
291305
"OWON", "XDM1041",
292-
1, 5, cmdset_owon, ARRAY_AND_SIZE(mqopts_owon_xdm2041),
306+
1, 5, cmdset_owon, ARRAY_AND_SIZE(mqopts_owon_xdm1041),
293307
scpi_dmm_get_meas_gwinstek,
294308
ARRAY_AND_SIZE(devopts_generic),
295309
0, 0, 0, 1e9, TRUE,

0 commit comments

Comments
 (0)