Skip to content

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

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
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b5db68
scpi-dmm: remove unsupported 4W mode on OWON XDM1041
evgeny-boger Jun 17, 2025
0d05eb1
scpi-dmm: support for ranges for OWON XDM DMMs
evgeny-boger Jun 17, 2025
fd2eb83
scpi-dmm: add period measurement support for XDM2041
evgeny-boger Jun 17, 2025
dfcd18d
scpi-dmm: add support for OWON XDM1241
evgeny-boger Jun 17, 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
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
292 changes: 292 additions & 0 deletions src/hardware/scpi-dmm/protocol.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,35 @@

#define WITH_CMD_DELAY 0 /* TODO See which devices need delays. */

/* OWON XDM range definitions */
static const char *owon_dcv_ranges[] = {
"auto", "50 mV", "500 mV", "5 V", "50 V", "500 V", "1000 V", NULL
};

static const char *owon_acv_ranges[] = {
"auto", "500 mV", "5 V", "50 V", "500 V", "750 V", NULL
};

static const char *owon_dci_ranges[] = {
"auto", "500 uA", "5 mA", "50 mA", "500 mA", "5 A", "10 A", NULL
};

static const char *owon_aci_ranges[] = {
"auto", "500 uA", "5 mA", "50 mA", "500 mA", "5 A", "10 A", NULL
};

static const char *owon_res_ranges[] = {
"auto", "500 Ohm", "5 kOhm", "50 kOhm", "500 kOhm", "5 MOhm", "50 MOhm", NULL
};

static const char *owon_cap_ranges[] = {
"auto", "50 nF", "500 nF", "5 uF", "50 uF", "500 uF", "5 mF", "50 mF", NULL
};

static const char *owon_temp_ranges[] = {
"KITS90", "Pt100", NULL /* no auto here */
};

SR_PRIV void scpi_dmm_cmd_delay(struct sr_scpi_dev_inst *scpi)
{
if (WITH_CMD_DELAY)
Expand Down Expand Up @@ -216,6 +245,99 @@ SR_PRIV const char *scpi_dmm_get_range_text(const struct sr_dev_inst *sdi)
return devc->range_text;
}

/*
* We use human-readable range texts, including the unit. They are mostly the same
* as displayed on the device, but with some differences:
* - The unit is always separated from the number by a space.
* - The Unicode Omega symbol (0xCE 0xA9) is replaced with "Ohm".
*
* Here is all the possible range answers, that I got from XDM1041 over SCPI:
* DCV: 1000 V␍␊ 500 V␍␊ 50 V␍␊ 5 V␍␊ 500 mV␍␊ 50 mV␍␊
* ACV 750 V␍␊500 V␍␊ 50 V␍␊5 V␍␊500 mV␍␊
* DCI: 10 A␍␊5 A␍␊ 500 mA␍␊50 mA␍␊5 mA␍␊500 uA␍␊
* ACI: 10 A␍␊5 A␍␊500 mA␍␊50 mA␍␊5 mA␍␊500 uA␍␊
* RES: 50 M<0xce><0xa9>␍␊5 M<0xce><0xa9>␍␊500 K<0xce><0xa9>␍␊50 K<0xce><0xa9>␍␊5 K<0xce><0xa9>␍␊500 <0xce><0xa9>␍␊500 <0xce><0xa9>␍␊500 <0xce><0xa9>␍␊
* CAP: 50 mF␍␊5 mF␍␊500uF␍␊50uF␍␊5uF␍␊500 nF␍␊50 nF␍␊
* Freq: Hz␍␊
* Period: s␍␊
* Temp: KITS90␍␊Pt100␍␊
*/
SR_PRIV const char *scpi_dmm_owon_get_range_text(const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
int ret;
const struct mqopt_item *mqitem;
gboolean is_auto;
char *response, *pos;

devc = sdi->priv;

ret = scpi_dmm_get_mq(sdi, NULL, NULL, NULL, &mqitem);
if (ret != SR_OK)
return NULL;
if (!mqitem || !mqitem->scpi_func_setup)
return NULL;
if (mqitem->drv_flags & FLAG_NO_RANGE)
return NULL;

scpi_dmm_cmd_delay(sdi->conn);
ret = sr_scpi_cmd(sdi, devc->cmdset, 0, NULL,
DMM_CMD_QUERY_RANGE_AUTO, mqitem->scpi_func_setup);
if (ret != SR_OK)
return NULL;
ret = sr_scpi_get_bool(sdi->conn, NULL, &is_auto);
if (ret != SR_OK)
return NULL;
if (is_auto)
return "auto";

scpi_dmm_cmd_delay(sdi->conn);
ret = sr_scpi_cmd(sdi, devc->cmdset, 0, NULL,
DMM_CMD_QUERY_RANGE, mqitem->scpi_func_setup);
if (ret != SR_OK)
return NULL;
response = NULL;
ret = sr_scpi_get_string(sdi->conn, NULL, &response);
if (ret != SR_OK) {
g_free(response);
return NULL;
}
/* Replace Unicode Omega symbol (0xCE 0xA9) with "Ohm". */
GString *response_str = g_string_new(response);
g_string_replace(response_str, "\xCE\xA9", "Ohm", 0);
g_free(response);
response = g_string_free(response_str, FALSE);

/* Check if space is needed between number and units. */
pos = response;

/* Skip leading whitespace. */
while (*pos && g_ascii_isspace(*pos))
pos++;

/* Find where the number ends. */
char *number_end = pos;
while (*number_end && (g_ascii_isdigit(*number_end) || *number_end == '.' ||
*number_end == '+' || *number_end == '-' || *number_end == 'e' ||
*number_end == 'E'))
number_end++;

/* Check if we found a number and there's a unit character immediately after (no space). */
if (number_end > pos && *number_end && !g_ascii_isspace(*number_end)) {
/* Need to insert space between number and units. */
size_t number_len = number_end - pos;
snprintf(devc->range_text, sizeof(devc->range_text), "%.*s %s",
(int)number_len, pos, number_end);
g_free(response);
return devc->range_text;
} else {
/* Response is fine as is, just copy it. */
snprintf(devc->range_text, sizeof(devc->range_text), "%s", response);
g_free(response);
return devc->range_text;
}
}

SR_PRIV int scpi_dmm_set_range_from_text(const struct sr_dev_inst *sdi,
const char *range)
{
Expand Down Expand Up @@ -249,6 +371,107 @@ SR_PRIV int scpi_dmm_set_range_from_text(const struct sr_dev_inst *sdi,
return SR_OK;
}

/* OWON XDM DMMs have two different methods to set range:
* "CONF:VOLT 0.05" will set the range to 50 mV (note the absence of units)
* "RANGE 5" will set the range to fifth option in a list of possible ranges for current measurement mode
* Although the second one would be easier to implement, the first one should not be affected by future changes in firmware
*/
SR_PRIV int scpi_dmm_owon_set_range_from_text(const struct sr_dev_inst *sdi,
const char *range)
{
struct dev_context *devc;
int ret;
const struct mqopt_item *item;
gboolean is_auto;
char processed_range[64];

devc = sdi->priv;

if (!range || !*range)
return SR_ERR_ARG;

ret = scpi_dmm_get_mq(sdi, NULL, NULL, NULL, &item);
if (ret != SR_OK)
return ret;
if (!item || !item->scpi_func_setup)
return SR_ERR_ARG;
if (item->drv_flags & FLAG_NO_RANGE)
return SR_ERR_NA;

is_auto = g_ascii_strcasecmp(range, "auto") == 0;

/* Preprocess range text to handle SI prefixes */
const char *space_pos = strchr(range, ' ');
if (space_pos && *(space_pos + 1)) {
/* Extract the numeric part */
size_t num_len = space_pos - range;
char num_str[32];
strncpy(num_str, range, num_len);
num_str[num_len] = '\0';

/* Parse the numeric value */
double value;
ret = sr_atod_ascii(num_str, &value);
if (ret == SR_OK) {
/* Check for SI prefix after the space */
char prefix = *(space_pos + 1);
double multiplier = 1.0;

switch (prefix) {
case 'k':
case 'K':
multiplier = 1e3;
break;
case 'm':
multiplier = 1e-3;
break;
case 'u':
multiplier = 1e-6;
break;
case 'n':
multiplier = 1e-9;
break;
case 'p':
multiplier = 1e-12;
break;
case 'M':
multiplier = 1e6;
break;
case 'G':
multiplier = 1e9;
break;
default:
/* No recognized SI prefix, use original range */
snprintf(processed_range, sizeof(processed_range), "%s", range);
multiplier = 0.0; /* Flag to use original range */
break;
}

if (multiplier != 0.0) {
/* Apply the multiplier and format the result with locale-independent formatting */
value *= multiplier;
g_ascii_dtostr(processed_range, sizeof(processed_range), value);
}
} else {
/* Failed to parse number, use original range */
snprintf(processed_range, sizeof(processed_range), "%s", range);
}
} else {
/* No space found, use original range */
snprintf(processed_range, sizeof(processed_range), "%s", range);
}

scpi_dmm_cmd_delay(sdi->conn);
ret = sr_scpi_cmd(sdi, devc->cmdset, 0, NULL, DMM_CMD_SETUP_RANGE,
item->scpi_func_setup, is_auto ? "AUTO" : processed_range);
if (ret != SR_OK)
return ret;
if (item->drv_flags & FLAG_CONF_DELAY)
g_usleep(devc->model->conf_delay_us);

return SR_OK;
}

SR_PRIV GVariant *scpi_dmm_get_range_text_list(const struct sr_dev_inst *sdi)
{
GVariantBuilder gvb;
Expand All @@ -269,6 +492,75 @@ SR_PRIV GVariant *scpi_dmm_get_range_text_list(const struct sr_dev_inst *sdi)
return list;
}

SR_PRIV GVariant *scpi_dmm_owon_get_range_text_list(const struct sr_dev_inst *sdi)
{
GVariantBuilder gvb;
GVariant *list;
int ret;
enum sr_mq mq;
enum sr_mqflag mqflag;
const char **ranges = NULL;
const struct mqopt_item *mqitem;
int i;

/* Explicitly use string array type, otherwise empty array won't be typed */
g_variant_builder_init(&gvb, G_VARIANT_TYPE_STRING_ARRAY);

/* Get current measurement quantity to return appropriate ranges */
ret = scpi_dmm_get_mq(sdi, &mq, &mqflag, NULL, &mqitem);
if (ret != SR_OK) {
/* Return empty list if we can't determine current mode */
list = g_variant_builder_end(&gvb);
return list;
}

/* Check if current mode has no range support */
if (mqitem && (mqitem->drv_flags & FLAG_NO_RANGE)) {
/* Return empty list for modes that don't support ranges */
list = g_variant_builder_end(&gvb);
return list;
}
/* Select appropriate range array based on current measurement type */
switch (mq) {
case SR_MQ_VOLTAGE:
if (mqflag & SR_MQFLAG_DC) {
ranges = owon_dcv_ranges;
} else if (mqflag & SR_MQFLAG_AC) {
ranges = owon_acv_ranges;
}
break;
case SR_MQ_CURRENT:
if (mqflag & SR_MQFLAG_DC) {
ranges = owon_dci_ranges;
} else if (mqflag & SR_MQFLAG_AC) {
ranges = owon_aci_ranges;
}
break;
case SR_MQ_RESISTANCE:
ranges = owon_res_ranges;
break;
case SR_MQ_CAPACITANCE:
ranges = owon_cap_ranges;
break;
case SR_MQ_TEMPERATURE:
ranges = owon_temp_ranges;
break;
default:
/* For other modes, just provide auto */
break;
}

/* Add all ranges from the selected array */
if (ranges) {
for (i = 0; ranges[i] != NULL; i++) {
g_variant_builder_add(&gvb, "s", ranges[i]);
}
}

list = g_variant_builder_end(&gvb);
return list;
}

SR_PRIV int scpi_dmm_get_meas_agilent(const struct sr_dev_inst *sdi, size_t ch)
{
struct sr_scpi_dev_inst *scpi;
Expand Down
Loading