X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-dmm%2Fapi.c;h=7bb134c645cdd92f8f3b7bc94dd74f37ee30a498;hb=f6129c8f0c92e45de5d70b4101bf2bd759a5fdf7;hp=cb70423f2123929d21fd6f402de51c6504c38f45;hpb=0617bb5a4e22c78c9603ae8a7d93506cfacde246;p=libsigrok.git

diff --git a/src/hardware/scpi-dmm/api.c b/src/hardware/scpi-dmm/api.c
index cb70423f..7bb134c6 100644
--- a/src/hardware/scpi-dmm/api.c
+++ b/src/hardware/scpi-dmm/api.c
@@ -24,13 +24,14 @@ static struct sr_dev_driver scpi_dmm_driver_info;
 
 static const uint32_t scanopts[] = {
 	SR_CONF_CONN,
+	SR_CONF_SERIALCOMM,
 };
 
 static const uint32_t drvopts[] = {
 	SR_CONF_MULTIMETER,
 };
 
-static const uint32_t devopts[] = {
+static const uint32_t devopts_generic[] = {
 	SR_CONF_CONTINUOUS,
 	SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
 	SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
@@ -48,13 +49,12 @@ static const struct scpi_command cmdset_agilent[] = {
 	ALL_ZERO,
 };
 
-static const struct mqopt_item mqopts_agilent_5digit[] = {
+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, },
 	{ SR_MQ_CURRENT, SR_MQFLAG_DC, "CURR:DC", "CURR ", NO_DFLT_PREC, },
 	{ SR_MQ_CURRENT, SR_MQFLAG_AC, "CURR:AC", "CURR:AC ", 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_CAPACITANCE, 0, "CAP", "CAP ", NO_DFLT_PREC, },
 	{ SR_MQ_VOLTAGE, SR_MQFLAG_DC | SR_MQFLAG_DIODE, "DIOD", "DIOD", -4, },
@@ -65,8 +65,15 @@ static const struct mqopt_item mqopts_agilent_5digit[] = {
 SR_PRIV const struct scpi_dmm_model models[] = {
 	{
 		"Agilent", "34405A",
-		1, 5, cmdset_agilent, ARRAY_AND_SIZE(mqopts_agilent_5digit),
+		1, 5, cmdset_agilent, ARRAY_AND_SIZE(mqopts_agilent_34405a),
 		scpi_dmm_get_meas_agilent,
+		ARRAY_AND_SIZE(devopts_generic),
+	},
+	{
+		"Keysight", "34465A",
+		1, 5, cmdset_agilent, ARRAY_AND_SIZE(mqopts_agilent_34405a),
+		scpi_dmm_get_meas_agilent,
+		ARRAY_AND_SIZE(devopts_generic),
 	},
 };
 
@@ -100,8 +107,8 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 	size_t i;
 	gchar *channel_name;
 
-	ret = sr_scpi_get_hw_id(scpi, &hw_info);
 	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.");
 		return NULL;
@@ -190,7 +197,7 @@ static int config_get(uint32_t key, GVariant **data,
 	case SR_CONF_LIMIT_MSEC:
 		return sr_sw_limits_config_get(&devc->limits, key, data);
 	case SR_CONF_MEASURED_QUANTITY:
-		ret = scpi_dmm_get_mq(sdi, &mq, &mqflag, NULL);
+		ret = scpi_dmm_get_mq(sdi, &mq, &mqflag, NULL, NULL);
 		if (ret != SR_OK)
 			return ret;
 		arr[0] = g_variant_new_uint32(mq);
@@ -245,7 +252,12 @@ static int config_list(uint32_t key, GVariant **data,
 	switch (key) {
 	case SR_CONF_SCAN_OPTIONS:
 	case SR_CONF_DEVICE_OPTIONS:
-		return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
+		if (!devc)
+			return STD_CONFIG_LIST(key, data, sdi, cg,
+				scanopts, drvopts, devopts_generic);
+		return std_opts_config_list(key, data, sdi, cg,
+			ARRAY_AND_SIZE(scanopts), ARRAY_AND_SIZE(drvopts),
+			devc->model->devopts, devc->model->devopts_size);
 	case SR_CONF_MEASURED_QUANTITY:
 		/* TODO Use std_gvar_measured_quantities() when available. */
 		if (!devc)
@@ -270,20 +282,21 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	struct sr_scpi_dev_inst *scpi;
 	struct dev_context *devc;
 	int ret;
+	const struct mqopt_item *item;
 	const char *command;
 
 	scpi = sdi->conn;
 	devc = sdi->priv;
 
 	ret = scpi_dmm_get_mq(sdi, &devc->start_acq_mq.curr_mq,
-		&devc->start_acq_mq.curr_mqflag, NULL);
+		&devc->start_acq_mq.curr_mqflag, NULL, &item);
 	if (ret != SR_OK)
 		return ret;
 
 	command = sr_scpi_cmd_get(devc->cmdset, DMM_CMD_START_ACQ);
 	if (command && *command) {
-		ret = sr_scpi_send(scpi, command);
 		scpi_dmm_cmd_delay(scpi);
+		ret = sr_scpi_send(scpi, command);
 		if (ret != SR_OK)
 			return ret;
 	}
@@ -312,8 +325,8 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 
 	command = sr_scpi_cmd_get(devc->cmdset, DMM_CMD_STOP_ACQ);
 	if (command && *command) {
-		(void)sr_scpi_send(scpi, command);
 		scpi_dmm_cmd_delay(scpi);
+		(void)sr_scpi_send(scpi, command);
 	}
 	sr_scpi_source_remove(sdi->session, scpi);