From: Mike Walters <redacted>
Date: Mon, 27 Jul 2020 00:10:57 +0000 (+0100)
Subject: scpi-dmm: Add Agilent 34410A.
X-Git-Url: https://sigrok.org/gitweb/?a=commitdiff_plain;h=85cff5cfba13663eb673fceb1ae8e80954b0862f;hp=cb828f1b3e00ccd0ad23d7cb98dca4d0d4749b07;p=libsigrok.git

scpi-dmm: Add Agilent 34410A.
---

diff --git a/src/hardware/scpi-dmm/api.c b/src/hardware/scpi-dmm/api.c
index 74f971e3..9cf4c339 100644
--- a/src/hardware/scpi-dmm/api.c
+++ b/src/hardware/scpi-dmm/api.c
@@ -57,6 +57,9 @@ static const struct scpi_command cmdset_agilent[] = {
  * I'm surprised the same instruction sequence doesn't work and INIT may
  * work for both, but I don't have the others to re-test.
  *
+ * cmdset_hp also works well for the 34410A, using cmdset_agilent throws an
+ * error on 'MEAS' without a '?'.
+ *
  * On the 34401A,
  *  MEAS <optional parameters> ? configures, arms, triggers and waits
  *       for a reading
@@ -111,6 +114,13 @@ SR_PRIV const struct scpi_dmm_model models[] = {
 		ARRAY_AND_SIZE(devopts_generic),
 		0,
 	},
+	{
+		"Agilent", "34410A",
+		1, 6, cmdset_hp, ARRAY_AND_SIZE(mqopts_agilent_34405a),
+		scpi_dmm_get_meas_agilent,
+		ARRAY_AND_SIZE(devopts_generic),
+		0,
+	},
 	{
 		"Keysight", "34465A",
 		1, 5, cmdset_agilent, ARRAY_AND_SIZE(mqopts_agilent_34405a),