scpi-dmm: rephrase read timeout decls, put "unit" after "ms value"
authorGerhard Sittig <gerhard.sittig@gmx.net>
Sat, 22 May 2021 08:08:23 +0000 (10:08 +0200)
committerGerhard Sittig <gerhard.sittig@gmx.net>
Tue, 1 Jun 2021 06:20:59 +0000 (08:20 +0200)
Rephrase the SCPI read timeouts in scpi-dmm model declarations. Shuffle
the order of product terms such that the milliseconds "unit" goes last,
and the milliseconds value goes first. Assume that "2500 * 1000 [us]"
better reflects the intention than "1000 * 2500" does.

src/hardware/scpi-dmm/api.c

index b13d8f6d49d712a5f2468865937e30b7cc33da08..b0689516fb3cf417d2b11c1c6117c2ce3607896f 100644 (file)
@@ -221,7 +221,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 +229,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 +254,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,
        },
        {