]> sigrok.org Git - libsigrok.git/commitdiff
scpi-dmm: Remove SYST:LOC hack for GWInstek meters.
authorTimo Kokkonen <redacted>
Wed, 19 Aug 2020 06:52:19 +0000 (23:52 -0700)
committerTimo Kokkonen <redacted>
Thu, 20 Aug 2020 19:48:13 +0000 (12:48 -0700)
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.

src/hardware/scpi-dmm/api.c

index 18fd6045f6d369e1aeeba0f3a132cdf6d40a3c64..b6a568211b7fea1a899c7b0b56eb9c1f95d65bf7 100644 (file)
@@ -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,