From bf03e06d57c3189458cc6d6c613afb28a586ce1e Mon Sep 17 00:00:00 2001 From: Gerhard Sittig Date: Sat, 22 May 2021 10:08:23 +0200 Subject: [PATCH] scpi-dmm: rephrase read timeout decls, put "unit" after "ms value" 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/hardware/scpi-dmm/api.c b/src/hardware/scpi-dmm/api.c index b13d8f6d..b0689516 100644 --- a/src/hardware/scpi-dmm/api.c +++ b/src/hardware/scpi-dmm/api.c @@ -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, }, { -- 2.30.2