scpi-dmm: use different Agilent SCPI command for range and measurment

[libsigrok.git] / src / hardware / scpi-dmm / api.c

diff --git a/src/hardware/scpi-dmm/api.c b/src/hardware/scpi-dmm/api.c
index b13d8f6d49d712a5f2468865937e30b7cc33da08..a462fdcf5ef6830fac9af99ce9c3cbb3189445c4 100644 (file)
--- a/src/hardware/scpi-dmm/api.c
+++ b/src/hardware/scpi-dmm/api.c
@@ -54,12 +54,11 @@ static const struct scpi_command cmdset_agilent[] = {
        { DMM_CMD_QUERY_FUNC, "CONF?", },
        { DMM_CMD_START_ACQ, "INIT", },
        { DMM_CMD_STOP_ACQ, "ABORT", },
-       { DMM_CMD_QUERY_VALUE, "READ?", },
+       { DMM_CMD_QUERY_VALUE, "FETCH?", },
        { DMM_CMD_QUERY_PREC, "CONF?", },
        { DMM_CMD_QUERY_RANGE_AUTO, "%s:RANGE:AUTO?", },
        { DMM_CMD_QUERY_RANGE, "%s:RANGE?", },
-       { DMM_CMD_SETUP_RANGE_AUTO, "%s:RANGE:AUTO ON", },
-       { DMM_CMD_SETUP_RANGE, "%s:RANGE %s", },
+       { DMM_CMD_SETUP_RANGE, "CONF:%s %s", },
        ALL_ZERO,
 };
 
@@ -221,7 +220,7 @@ SR_PRIV const struct scpi_dmm_model models[] = {
                1, 6, cmdset_gwinstek, ARRAY_AND_SIZE(mqopts_gwinstek_gdm8200a),
                scpi_dmm_get_meas_gwinstek,
                ARRAY_AND_SIZE(devopts_generic),
-               1000 * 2500, 0, FALSE,
+               2500 * 1000, 0, FALSE,
                NULL, NULL, NULL,
        },
        {
@@ -229,7 +228,7 @@ SR_PRIV const struct scpi_dmm_model models[] = {
                1, 6, cmdset_gwinstek, ARRAY_AND_SIZE(mqopts_gwinstek_gdm8200a),
                scpi_dmm_get_meas_gwinstek,
                ARRAY_AND_SIZE(devopts_generic),
-               1000 * 2500, 0, FALSE,
+               2500 * 1000, 0, FALSE,
                NULL, NULL, NULL,
        },
        {
@@ -254,7 +253,7 @@ SR_PRIV const struct scpi_dmm_model models[] = {
                scpi_dmm_get_meas_agilent,
                ARRAY_AND_SIZE(devopts_generic),
                /* 34401A: typ. 1020ms for AC readings (default is 1000ms). */
-               1000 * 1500, 0, FALSE,
+               1500 * 1000, 0, FALSE,
                NULL, NULL, NULL,
        },
        {