From: Timo Kokkonen <redacted>
Date: Wed, 19 Aug 2020 06:52:19 +0000 (-0700)
Subject: scpi-dmm: Remove SYST:LOC hack for GWInstek meters.
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=860ee00ab12165f076184c96b0eee23fa5e0e967;p=libsigrok.git

scpi-dmm: Remove SYST:LOC hack for GWInstek meters.

No need for this hack anymymore as there is now DMM_CMD_SETUP_LOCAL
command that can be used to return unit back to "local" mode properly.
---

diff --git a/src/hardware/scpi-dmm/api.c b/src/hardware/scpi-dmm/api.c
index 18fd6045..b6a56821 100644
--- a/src/hardware/scpi-dmm/api.c
+++ b/src/hardware/scpi-dmm/api.c
@@ -86,7 +86,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,8 +96,8 @@ 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,