From: Gerhard Sittig <redacted>
Date: Sat, 3 Nov 2018 13:34:28 +0000 (+0100)
Subject: fluke-45: disable ECHO test, it confuses other SCPI devices
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=71db2d4d06c2d7dd52cfda2d737120ef8648afd5;p=libsigrok.git

fluke-45: disable ECHO test, it confuses other SCPI devices

Disable the ECHO test in the Fluke 45 probe routine which violates the
SCPI protocol and makes other devices unavailable. This fixes bug #1272.
---

diff --git a/src/hardware/fluke-45/api.c b/src/hardware/fluke-45/api.c
index 164cd5f9..9e045f07 100644
--- a/src/hardware/fluke-45/api.c
+++ b/src/hardware/fluke-45/api.c
@@ -31,6 +31,12 @@
 #include "scpi.h"
 #include "protocol.h"
 
+/*
+ * This test violates the SCPI protocol, and confuses other devices.
+ * Disable it for now, until a better location was found.
+ */
+#define ECHO_TEST 0
+
 static const uint32_t scanopts[] = {
 	SR_CONF_CONN,
 	SR_CONF_SERIALCOMM,
@@ -62,11 +68,14 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 	unsigned int i;
 	const struct fluke_scpi_dmm_model *model = NULL;
 	gchar *channel_name;
+#if ECHO_TEST
 	char *response;
+#endif
 
 	sdi = g_malloc0(sizeof(struct sr_dev_inst));
 	sdi->conn = scpi;
 
+#if ECHO_TEST
 	/* Test for serial port ECHO enabled. */
 	response = NULL;
 	sr_scpi_get_string(scpi, "ECHO-TEST", &response);
@@ -74,6 +83,7 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 		sr_err("Serial port ECHO is ON. Please turn it OFF!");
 		return NULL;
 	}
+#endif
 
 	/* Get device IDN. */
 	if (sr_scpi_get_hw_id(scpi, &hw_info) != SR_OK) {