X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-dmm%2Fapi.c;h=69f6fa2aef33debbaabddc3ed6d9dc6954b0c876;hb=25879a34e925ce58e62a59382b9a287a75350564;hp=a8b46d027ebb31147d38fcca88cec4b69ceabd81;hpb=33aa8117e3640ab5d7663d5e974ae2de2b3d0239;p=libsigrok.git diff --git a/src/hardware/scpi-dmm/api.c b/src/hardware/scpi-dmm/api.c index a8b46d02..69f6fa2a 100644 --- a/src/hardware/scpi-dmm/api.c +++ b/src/hardware/scpi-dmm/api.c @@ -175,21 +175,6 @@ SR_PRIV const struct scpi_dmm_model models[] = { ARRAY_AND_SIZE(devopts_generic), 0, }, - { - "Keysight", "34465A", - 1, 5, cmdset_agilent, ARRAY_AND_SIZE(mqopts_agilent_34405a), - scpi_dmm_get_meas_agilent, - ARRAY_AND_SIZE(devopts_generic), - 0, - }, - { - "HP", "34401A", - 1, 6, cmdset_hp, ARRAY_AND_SIZE(mqopts_agilent_34401a), - scpi_dmm_get_meas_agilent, - ARRAY_AND_SIZE(devopts_generic), - /* 34401A: typ. 1020ms for AC readings (default is 1000ms). */ - 1000 * 1500, - }, { "GW", "GDM8251A", 1, 6, cmdset_gwinstek, ARRAY_AND_SIZE(mqopts_gwinstek_gdm8200a), @@ -218,6 +203,21 @@ SR_PRIV const struct scpi_dmm_model models[] = { ARRAY_AND_SIZE(devopts_generic), 0, }, + { + "HP", "34401A", + 1, 6, cmdset_hp, ARRAY_AND_SIZE(mqopts_agilent_34401a), + scpi_dmm_get_meas_agilent, + ARRAY_AND_SIZE(devopts_generic), + /* 34401A: typ. 1020ms for AC readings (default is 1000ms). */ + 1000 * 1500, + }, + { + "Keysight", "34465A", + 1, 5, cmdset_agilent, ARRAY_AND_SIZE(mqopts_agilent_34405a), + scpi_dmm_get_meas_agilent, + ARRAY_AND_SIZE(devopts_generic), + 0, + }, }; static const struct scpi_dmm_model *is_compatible(const char *vendor, const char *model)