Skip to content

scpi-dmm: add meas_rate option for OWON XDM1041, XDM1241, XDM2041 #9

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 1 commit into
base: feature/owon-dmm-improvements-1
Choose a base branch
from
Open

scpi-dmm: add meas_rate option for OWON XDM1041, XDM1241, XDM2041 #9

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
5 changes: 5 additions & 0 deletions include/libsigrok/libsigrok.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1267,6 +1267,11 @@ enum sr_configkey {
*/
SR_CONF_GATE_TIME,

/**
* measurement rate
*/
SR_CONF_MEAS_RATE,

/* Update sr_key_info_config[] (hwdriver.c) upon changes! */
};

Expand Down
74 changes: 59 additions & 15 deletions src/hardware/scpi-dmm/api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,16 @@ static const uint32_t devopts_generic_range[] = {
SR_CONF_RANGE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
};

static const uint32_t devopts_owon_range[] = {
SR_CONF_CONTINUOUS,
SR_CONF_CONN | SR_CONF_GET,
SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
SR_CONF_MEASURED_QUANTITY | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
SR_CONF_RANGE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
SR_CONF_MEAS_RATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
};

static const struct scpi_command cmdset_agilent[] = {
{ DMM_CMD_SETUP_REMOTE, "\n", },
{ DMM_CMD_SETUP_LOCAL, "SYST:LOC", },
Expand Down Expand Up @@ -126,6 +136,8 @@ static const struct scpi_command cmdset_owon[] = {
{ DMM_CMD_SETUP_RANGE, "CONF:%s %s", },
{ DMM_CMD_QUERY_RANGE, "RANGE?", },
{ DMM_CMD_QUERY_RANGE_AUTO, "AUTO?", },
{ DMM_CMD_SETUP_MEAS_RATE, "RATE %s", },
{ DMM_CMD_QUERY_MEAS_RATE, "RATE?", },
ALL_ZERO,
};

Expand Down Expand Up @@ -189,11 +201,11 @@ static const struct mqopt_item mqopts_gwinstek_gdm906x[] = {
};

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_VOLTAGE, SR_MQFLAG_AC, "VOLT:AC", "VOLT AC", NO_DFLT_PREC, FLAG_HAS_MEAS_RATE, },
{ SR_MQ_VOLTAGE, SR_MQFLAG_DC, "VOLT:DC", "VOLT", NO_DFLT_PREC, FLAG_HAS_MEAS_RATE, },
{ SR_MQ_CURRENT, SR_MQFLAG_AC, "CURR:AC", "CURR AC", NO_DFLT_PREC, FLAG_HAS_MEAS_RATE, },
{ SR_MQ_CURRENT, SR_MQFLAG_DC, "CURR:DC", "CURR", NO_DFLT_PREC, FLAG_HAS_MEAS_RATE, },
{ SR_MQ_RESISTANCE, 0, "RES", "RES", NO_DFLT_PREC, FLAG_HAS_MEAS_RATE, },
{ 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, },
Expand All @@ -203,12 +215,12 @@ static const struct mqopt_item mqopts_owon_xdm1041[] = {
};

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_VOLTAGE, SR_MQFLAG_AC, "VOLT:AC", "VOLT AC", NO_DFLT_PREC, FLAG_HAS_MEAS_RATE, },
{ SR_MQ_VOLTAGE, SR_MQFLAG_DC, "VOLT:DC", "VOLT", NO_DFLT_PREC, FLAG_HAS_MEAS_RATE, },
{ SR_MQ_CURRENT, SR_MQFLAG_AC, "CURR:AC", "CURR AC", NO_DFLT_PREC, FLAG_HAS_MEAS_RATE, },
{ SR_MQ_CURRENT, SR_MQFLAG_DC, "CURR:DC", "CURR", NO_DFLT_PREC, FLAG_HAS_MEAS_RATE, },
{ SR_MQ_RESISTANCE, 0, "RES", "RES", NO_DFLT_PREC, FLAG_HAS_MEAS_RATE, },
{ SR_MQ_RESISTANCE, SR_MQFLAG_FOUR_WIRE, "FRES", "FRES", NO_DFLT_PREC, FLAG_HAS_MEAS_RATE, },
{ 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, },
Expand Down Expand Up @@ -239,6 +251,7 @@ SR_PRIV const struct scpi_dmm_model models[] = {
ARRAY_AND_SIZE(devopts_generic_range),
0, 200 * 1000, 2500 * 1000, 0, FALSE,
scpi_dmm_get_range_text, scpi_dmm_set_range_from_text, NULL,
NULL, NULL, NULL,
},
{
"Agilent", "34410A",
Expand All @@ -247,6 +260,7 @@ SR_PRIV const struct scpi_dmm_model models[] = {
ARRAY_AND_SIZE(devopts_generic),
0, 0, 0, 0, FALSE,
NULL, NULL, NULL,
NULL, NULL, NULL,
},
{
"Agilent", "34460A",
Expand All @@ -255,6 +269,7 @@ SR_PRIV const struct scpi_dmm_model models[] = {
ARRAY_AND_SIZE(devopts_generic_range),
0, 0, 10 * 1000, 0, FALSE,
scpi_dmm_get_range_text, scpi_dmm_set_range_from_text, NULL,
NULL, NULL, NULL,
},
{
"GW", "GDM8251A",
Expand All @@ -263,6 +278,7 @@ SR_PRIV const struct scpi_dmm_model models[] = {
ARRAY_AND_SIZE(devopts_generic),
2500 * 1000, 0, 0, 0, FALSE,
NULL, NULL, NULL,
NULL, NULL, NULL,
},
{
"GW", "GDM8255A",
Expand All @@ -271,6 +287,7 @@ SR_PRIV const struct scpi_dmm_model models[] = {
ARRAY_AND_SIZE(devopts_generic),
2500 * 1000, 0, 0, 0, FALSE,
NULL, NULL, NULL,
NULL, NULL, NULL,
},
{
"GWInstek", "GDM9060",
Expand All @@ -279,6 +296,7 @@ SR_PRIV const struct scpi_dmm_model models[] = {
ARRAY_AND_SIZE(devopts_generic),
0, 0, 0, 0, FALSE,
NULL, NULL, NULL,
NULL, NULL, NULL,
},
{
"GWInstek", "GDM9061",
Expand All @@ -287,6 +305,7 @@ SR_PRIV const struct scpi_dmm_model models[] = {
ARRAY_AND_SIZE(devopts_generic),
0, 0, 0, 0, FALSE,
NULL, NULL, NULL,
NULL, NULL, NULL,
},
{
"HP", "34401A",
Expand All @@ -296,6 +315,7 @@ SR_PRIV const struct scpi_dmm_model models[] = {
/* 34401A: typ. 1020ms for AC readings (default is 1000ms). */
1500 * 1000, 0, 0, 0, FALSE,
NULL, NULL, NULL,
NULL, NULL, NULL,
},
{
"Keysight", "34465A",
Expand All @@ -304,30 +324,33 @@ SR_PRIV const struct scpi_dmm_model models[] = {
ARRAY_AND_SIZE(devopts_generic_range),
0, 0, 10 * 1000, 0, FALSE,
scpi_dmm_get_range_text, scpi_dmm_set_range_from_text, NULL,
NULL, NULL, NULL,
},
{
"OWON", "XDM1041",
1, 5, cmdset_owon, ARRAY_AND_SIZE(mqopts_owon_xdm1041),
scpi_dmm_get_meas_gwinstek,
ARRAY_AND_SIZE(devopts_generic_range),
ARRAY_AND_SIZE(devopts_owon_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,
},
scpi_dmm_owon_get_meas_rate_text, scpi_dmm_owon_set_meas_rate_from_text, scpi_dmm_owon_get_meas_rate_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),
ARRAY_AND_SIZE(devopts_owon_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,
scpi_dmm_owon_get_meas_rate_text, scpi_dmm_owon_set_meas_rate_from_text, scpi_dmm_owon_get_meas_rate_text_list,
},
{
"OWON", "XDM2041",
1, 5, cmdset_owon, ARRAY_AND_SIZE(mqopts_owon_xdm2041),
scpi_dmm_get_meas_gwinstek,
ARRAY_AND_SIZE(devopts_generic_range),
ARRAY_AND_SIZE(devopts_owon_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,
scpi_dmm_owon_get_meas_rate_text, scpi_dmm_owon_set_meas_rate_from_text, scpi_dmm_owon_get_meas_rate_text_list,
},
{
"Siglent", "SDM3055",
Expand All @@ -336,6 +359,7 @@ SR_PRIV const struct scpi_dmm_model models[] = {
ARRAY_AND_SIZE(devopts_generic),
0, 0, 0, 0, FALSE,
NULL, NULL, NULL,
NULL, NULL, NULL,
},
};

Expand Down Expand Up @@ -501,6 +525,7 @@ static int config_get(uint32_t key, GVariant **data,
GVariant *arr[2];
int ret;
const char *range;
const char *meas_rate;

(void)cg;

Expand Down Expand Up @@ -531,6 +556,14 @@ static int config_get(uint32_t key, GVariant **data,
return SR_ERR_NA;
*data = g_variant_new_string(range);
return SR_OK;
case SR_CONF_MEAS_RATE:
if (!devc || !devc->model->get_meas_rate_text)
return SR_ERR_NA;
meas_rate = devc->model->get_meas_rate_text(sdi);
if (!meas_rate || !*meas_rate)
return SR_ERR_NA;
*data = g_variant_new_string(meas_rate);
return SR_OK;
default:
return SR_ERR_NA;
}
Expand All @@ -544,6 +577,7 @@ static int config_set(uint32_t key, GVariant *data,
enum sr_mqflag mqflag;
GVariant *tuple_child;
const char *range;
const char *meas_rate;

(void)cg;

Expand All @@ -566,6 +600,11 @@ static int config_set(uint32_t key, GVariant *data,
return SR_ERR_NA;
range = g_variant_get_string(data, NULL);
return devc->model->set_range_from_text(sdi, range);
case SR_CONF_MEAS_RATE:
if (!devc || !devc->model->set_meas_rate_from_text)
return SR_ERR_NA;
meas_rate = g_variant_get_string(data, NULL);
return devc->model->set_meas_rate_from_text(sdi, meas_rate);
default:
return SR_ERR_NA;
}
Expand Down Expand Up @@ -610,6 +649,11 @@ static int config_list(uint32_t key, GVariant **data,
return SR_ERR_NA;
*data = devc->model->get_range_text_list(sdi);
return SR_OK;
case SR_CONF_MEAS_RATE:
if (!devc || !devc->model->get_meas_rate_text_list)
return SR_ERR_NA;
*data = devc->model->get_meas_rate_text_list(sdi);
return SR_OK;
default:
(void)devc;
return SR_ERR_NA;
Expand Down
Loading