X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fscpi-dmm%2Fapi.c;h=7bd1db945de440ce07b94916b241f5b6fd54e567;hb=cae328b54c7b9679bafa6cd4fb00eb0f5894e8a3;hp=18fd6045f6d369e1aeeba0f3a132cdf6d40a3c64;hpb=4c80a272842271ace8f8a44f027615903ba8baee;p=libsigrok.git

diff --git a/src/hardware/scpi-dmm/api.c b/src/hardware/scpi-dmm/api.c
index 18fd6045..7bd1db94 100644
--- a/src/hardware/scpi-dmm/api.c
+++ b/src/hardware/scpi-dmm/api.c
@@ -33,6 +33,7 @@ static const uint32_t drvopts[] = {
 
 static const uint32_t devopts_generic[] = {
 	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,
@@ -86,7 +87,6 @@ static const struct scpi_command cmdset_gwinstek[] = {
 	{ DMM_CMD_SETUP_FUNC, "CONF:%s", },
 	{ DMM_CMD_QUERY_FUNC, "CONF:STAT:FUNC?", },
 	{ DMM_CMD_START_ACQ, "*CLS;SYST:REM", },
-	{ DMM_CMD_STOP_ACQ, "SYST:LOC", },
 	{ DMM_CMD_QUERY_VALUE, "VAL1?", },
 	{ DMM_CMD_QUERY_PREC, "SENS:DET:RATE?", },
 	ALL_ZERO,
@@ -97,13 +97,22 @@ static const struct scpi_command cmdset_gwinstek_906x[] = {
 	{ DMM_CMD_SETUP_LOCAL, "SYST:LOC", },
 	{ DMM_CMD_SETUP_FUNC, "CONF:%s", },
 	{ DMM_CMD_QUERY_FUNC, "CONF?", },
-	{ DMM_CMD_START_ACQ, "*CLS;SYST:REM", },
-	{ DMM_CMD_STOP_ACQ, "SYST:LOC", },
+	{ DMM_CMD_START_ACQ, "INIT", },
+	{ DMM_CMD_STOP_ACQ, "ABORT", },
 	{ DMM_CMD_QUERY_VALUE, "VAL1?", },
 	{ DMM_CMD_QUERY_PREC, "SENS:DET:RATE?", },
 	ALL_ZERO,
 };
 
+static const struct scpi_command cmdset_owon[] = {
+	{ DMM_CMD_SETUP_REMOTE, "SYST:REM", },
+	{ DMM_CMD_SETUP_LOCAL, "SYST:LOC", },
+	{ DMM_CMD_SETUP_FUNC, "CONF:%s", },
+	{ DMM_CMD_QUERY_FUNC, "FUNC?", },
+	{ DMM_CMD_QUERY_VALUE, "MEAS1?", },
+	ALL_ZERO,
+};
+
 static const struct mqopt_item mqopts_agilent_34405a[] = {
 	{ SR_MQ_VOLTAGE, SR_MQFLAG_DC, "VOLT:DC", "VOLT ", NO_DFLT_PREC, },
 	{ SR_MQ_VOLTAGE, SR_MQFLAG_AC, "VOLT:AC", "VOLT:AC ", NO_DFLT_PREC, },
@@ -162,48 +171,62 @@ static const struct mqopt_item mqopts_gwinstek_gdm906x[] = {
 	{ SR_MQ_CAPACITANCE, 0, "CAP", "CAP", NO_DFLT_PREC, },
 };
 
+static const struct mqopt_item mqopts_owon_xdm2041[] = {
+	{ SR_MQ_VOLTAGE, SR_MQFLAG_AC, "VOLT:AC", "VOLT AC", NO_DFLT_PREC, },
+	{ SR_MQ_VOLTAGE, SR_MQFLAG_DC, "VOLT:DC", "VOLT", NO_DFLT_PREC, },
+	{ SR_MQ_CURRENT, SR_MQFLAG_AC, "CURR:AC", "CURR AC", NO_DFLT_PREC, },
+	{ SR_MQ_CURRENT, SR_MQFLAG_DC, "CURR:DC", "CURR", NO_DFLT_PREC, },
+	{ SR_MQ_RESISTANCE, 0, "RES", "RES", NO_DFLT_PREC, },
+	{ SR_MQ_RESISTANCE, SR_MQFLAG_FOUR_WIRE, "FRES", "FRES", NO_DFLT_PREC, },
+	{ SR_MQ_CONTINUITY, 0, "CONT", "CONT", -1, },
+	{ SR_MQ_VOLTAGE, SR_MQFLAG_DC | SR_MQFLAG_DIODE, "DIOD", "DIOD", -4, },
+	{ SR_MQ_TEMPERATURE, 0, "TEMP", "TEMP", NO_DFLT_PREC, },
+	{ SR_MQ_FREQUENCY, 0, "FREQ", "FREQ", NO_DFLT_PREC, },
+	{ SR_MQ_CAPACITANCE, 0, "CAP", "CAP", NO_DFLT_PREC, },
+};
+
 SR_PRIV const struct scpi_dmm_model models[] = {
 	{
 		"Agilent", "34405A",
 		1, 5, cmdset_agilent, ARRAY_AND_SIZE(mqopts_agilent_34405a),
 		scpi_dmm_get_meas_agilent,
 		ARRAY_AND_SIZE(devopts_generic),
-		0,
+		0, 0, FALSE,
 	},
 	{
 		"Agilent", "34410A",
 		1, 6, cmdset_hp, ARRAY_AND_SIZE(mqopts_agilent_34405a),
 		scpi_dmm_get_meas_agilent,
 		ARRAY_AND_SIZE(devopts_generic),
-		0,
+		0, 0, FALSE,
 	},
 	{
 		"GW", "GDM8251A",
 		1, 6, cmdset_gwinstek, ARRAY_AND_SIZE(mqopts_gwinstek_gdm8200a),
 		scpi_dmm_get_meas_gwinstek,
 		ARRAY_AND_SIZE(devopts_generic),
-		1000 * 2500,
+		1000 * 2500, 0, FALSE,
 	},
 	{
 		"GW", "GDM8255A",
 		1, 6, cmdset_gwinstek, ARRAY_AND_SIZE(mqopts_gwinstek_gdm8200a),
 		scpi_dmm_get_meas_gwinstek,
 		ARRAY_AND_SIZE(devopts_generic),
-		1000 * 2500,
+		1000 * 2500, 0, FALSE,
 	},
 	{
 		"GWInstek", "GDM9060",
 		1, 6, cmdset_gwinstek_906x, ARRAY_AND_SIZE(mqopts_gwinstek_gdm906x),
 		scpi_dmm_get_meas_agilent,
 		ARRAY_AND_SIZE(devopts_generic),
-		0,
+		0, 0, FALSE,
 	},
 	{
 		"GWInstek", "GDM9061",
 		1, 6, cmdset_gwinstek_906x, ARRAY_AND_SIZE(mqopts_gwinstek_gdm906x),
 		scpi_dmm_get_meas_agilent,
 		ARRAY_AND_SIZE(devopts_generic),
-		0,
+		0, 0, FALSE,
 	},
 	{
 		"HP", "34401A",
@@ -211,14 +234,21 @@ SR_PRIV const struct scpi_dmm_model models[] = {
 		scpi_dmm_get_meas_agilent,
 		ARRAY_AND_SIZE(devopts_generic),
 		/* 34401A: typ. 1020ms for AC readings (default is 1000ms). */
-		1000 * 1500,
+		1000 * 1500, 0, FALSE,
 	},
 	{
 		"Keysight", "34465A",
 		1, 5, cmdset_agilent, ARRAY_AND_SIZE(mqopts_agilent_34405a),
 		scpi_dmm_get_meas_agilent,
 		ARRAY_AND_SIZE(devopts_generic),
-		0,
+		0, 0, FALSE,
+	},
+	{
+		"OWON", "XDM2041",
+		1, 5, cmdset_owon, ARRAY_AND_SIZE(mqopts_owon_xdm2041),
+		scpi_dmm_get_meas_gwinstek,
+		ARRAY_AND_SIZE(devopts_generic),
+		0, 1e9, TRUE,
 	},
 };
 
@@ -241,6 +271,25 @@ static const struct scpi_dmm_model *is_compatible(const char *vendor, const char
 	return NULL;
 }
 
+/*
+ * Some devices (such as Owon XDM2041) do not support the standard
+ * OPeration Complete? command. This function tests the command with
+ * a short timeout, and returns TRUE if any reply (busy or not) is received.
+ */
+static gboolean probe_opc_support(struct sr_scpi_dev_inst *scpi)
+{
+	gboolean result;
+	GString *response;
+
+	response = g_string_sized_new(128);
+	result = TRUE;
+	if (sr_scpi_get_data(scpi, SCPI_CMD_OPC, &response) != SR_OK)
+		result = FALSE;
+	g_string_free(response, TRUE);
+
+	return result;
+}
+
 static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 {
 	struct sr_scpi_hw_info *hw_info;
@@ -253,7 +302,6 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 	gchar *channel_name;
 	const char *command;
 
-	scpi_dmm_cmd_delay(scpi);
 	ret = sr_scpi_get_hw_id(scpi, &hw_info);
 	if (ret != SR_OK) {
 		sr_info("Could not get IDN response.");
@@ -266,6 +314,9 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 		return NULL;
 	}
 
+	if (model->check_opc && !probe_opc_support(scpi))
+		scpi->no_opc_command = TRUE;
+
 	sdi = g_malloc0(sizeof(*sdi));
 	sdi->vendor = g_strdup(hw_info->manufacturer);
 	sdi->model = g_strdup(hw_info->model);
@@ -274,6 +325,11 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 	sdi->conn = scpi;
 	sdi->driver = &scpi_dmm_driver_info;
 	sdi->inst_type = SR_INST_SCPI;
+	ret = sr_scpi_connection_id(scpi, &sdi->connection_id);
+	if (ret != SR_OK) {
+		g_free(sdi->connection_id);
+		sdi->connection_id = NULL;
+	}
 	sr_scpi_hw_info_free(hw_info);
 	if (model->read_timeout_us)  /* non-default read timeout */
 		scpi->read_timeout_us = model->read_timeout_us;
@@ -363,6 +419,11 @@ static int config_get(uint32_t key, GVariant **data,
 	devc = sdi->priv;
 
 	switch (key) {
+	case SR_CONF_CONN:
+		if (!sdi || !sdi->connection_id)
+			return SR_ERR_NA;
+		*data = g_variant_new_string(sdi->connection_id);
+		return SR_OK;
 	case SR_CONF_LIMIT_SAMPLES:
 	case SR_CONF_LIMIT_MSEC:
 		return sr_sw_limits_config_get(&devc->limits, key, data);