BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Gerhard Sittig 2021-05-22 10:08:23 +02:00
parent a36b21fb89
commit bf03e06d57
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hardware/scpi-dmm/api.c
View File

@ -221,7 +221,7 @@ SR_PRIV const struct scpi_dmm_model models[] = {
1, 6, cmdset_gwinstek, ARRAY_AND_SIZE(mqopts_gwinstek_gdm8200a), 1, 6, cmdset_gwinstek, ARRAY_AND_SIZE(mqopts_gwinstek_gdm8200a),
scpi_dmm_get_meas_gwinstek, scpi_dmm_get_meas_gwinstek,
ARRAY_AND_SIZE(devopts_generic), ARRAY_AND_SIZE(devopts_generic),
1000 * 2500, 0, FALSE, 2500 * 1000, 0, FALSE,
NULL, NULL, NULL, 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), 1, 6, cmdset_gwinstek, ARRAY_AND_SIZE(mqopts_gwinstek_gdm8200a),
scpi_dmm_get_meas_gwinstek, scpi_dmm_get_meas_gwinstek,
ARRAY_AND_SIZE(devopts_generic), ARRAY_AND_SIZE(devopts_generic),
1000 * 2500, 0, FALSE, 2500 * 1000, 0, FALSE,
NULL, NULL, NULL, NULL, NULL, NULL,
}, },
{ {
@ -254,7 +254,7 @@ SR_PRIV const struct scpi_dmm_model models[] = {
scpi_dmm_get_meas_agilent, scpi_dmm_get_meas_agilent,
ARRAY_AND_SIZE(devopts_generic), ARRAY_AND_SIZE(devopts_generic),
/* 34401A: typ. 1020ms for AC readings (default is 1000ms). */ /* 34401A: typ. 1020ms for AC readings (default is 1000ms). */
1000 * 1500, 0, FALSE, 1500 * 1000, 0, FALSE,
NULL, NULL, NULL, NULL, NULL, NULL,
}, },
{ {