X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-dmm%2Fprotocol.c;h=d0cafd829f05d82463e1a91b8f388f65e76b3af8;hb=599f9e1deb6b6a4a75e00e29d86935845164eeed;hp=954e6c98feaf983be9c269508bfba88d6c291135;hpb=08f3b427b620a7a0308b0ee2e61f443a00f3d49c;p=libsigrok.git

diff --git a/src/hardware/scpi-dmm/protocol.c b/src/hardware/scpi-dmm/protocol.c
index 954e6c98..d0cafd82 100644
--- a/src/hardware/scpi-dmm/protocol.c
+++ b/src/hardware/scpi-dmm/protocol.c
@@ -90,12 +90,12 @@ SR_PRIV int scpi_dmm_get_mq(const struct sr_dev_inst *sdi,
 	if (mqitem)
 		*mqitem = NULL;
 
+	scpi_dmm_cmd_delay(sdi->conn);
 	command = sr_scpi_cmd_get(devc->cmdset, DMM_CMD_QUERY_FUNC);
 	if (!command || !*command)
 		return SR_ERR_NA;
 	response = NULL;
 	ret = sr_scpi_get_string(sdi->conn, command, &response);
-	scpi_dmm_cmd_delay(sdi->conn);
 	if (ret != SR_OK)
 		return ret;
 	if (!response || !*response)
@@ -140,10 +140,12 @@ SR_PRIV int scpi_dmm_set_mq(const struct sr_dev_inst *sdi,
 
 	mode = item->scpi_func_setup;
 	command = sr_scpi_cmd_get(devc->cmdset, DMM_CMD_SETUP_FUNC);
-	ret = sr_scpi_send(sdi->conn, command, mode);
 	scpi_dmm_cmd_delay(sdi->conn);
+	ret = sr_scpi_send(sdi->conn, command, mode);
+	if (ret != SR_OK)
+		return ret;
 
-	return ret;
+	return SR_OK;
 }
 
 SR_PRIV int scpi_dmm_get_meas_agilent(const struct sr_dev_inst *sdi, size_t ch)
@@ -267,8 +269,8 @@ SR_PRIV int scpi_dmm_get_meas_agilent(const struct sr_dev_inst *sdi, size_t ch)
 	command = sr_scpi_cmd_get(devc->cmdset, DMM_CMD_QUERY_VALUE);
 	if (!command || !*command)
 		return SR_ERR_NA;
-	ret = sr_scpi_get_string(scpi, command, &response);
 	scpi_dmm_cmd_delay(scpi);
+	ret = sr_scpi_get_string(scpi, command, &response);
 	if (ret != SR_OK)
 		return ret;
 	g_strstrip(response);
@@ -384,6 +386,9 @@ SR_PRIV int scpi_dmm_get_meas_agilent(const struct sr_dev_inst *sdi, size_t ch)
 	case SR_MQ_FREQUENCY:
 		unit = SR_UNIT_HERTZ;
 		break;
+	case SR_MQ_TIME:
+		unit = SR_UNIT_SECOND;
+		break;
 	default:
 		return SR_ERR_NA;
 	}