]> sigrok.org Git - libsigrok.git/commitdiff
hp-3478a: Fix range strings for current and resistance mode
authorFrank Stettner <redacted>
Sun, 12 Feb 2023 12:10:43 +0000 (13:10 +0100)
committerGerhard Sittig <redacted>
Sun, 19 Feb 2023 16:40:02 +0000 (17:40 +0100)
The range strings for the resistance mode were missing the unit (R). The
range strings for both current modes (DC and AC) were wrongly using volts
instead of amps.

src/hardware/hp-3478a/api.c

index 19d96ee155f352a0cc2e86b04931df1d7c7a30b0..c21546f2562267cfd788560f782fb5d66da97c94 100644 (file)
@@ -71,21 +71,21 @@ static const struct {
        {SR_MQ_VOLTAGE, SR_MQFLAG_AC,               2,   "300V"},
        /* -99 is a dummy exponent for auto ranging. */
        {SR_MQ_CURRENT, SR_MQFLAG_DC,             -99,   "Auto"},
-       {SR_MQ_CURRENT, SR_MQFLAG_DC,              -1,   "300mV"},
-       {SR_MQ_CURRENT, SR_MQFLAG_DC,               0,   "3V"},
+       {SR_MQ_CURRENT, SR_MQFLAG_DC,              -1,   "300mA"},
+       {SR_MQ_CURRENT, SR_MQFLAG_DC,               0,   "3A"},
        /* -99 is a dummy exponent for auto ranging. */
        {SR_MQ_CURRENT, SR_MQFLAG_AC,             -99,   "Auto"},
-       {SR_MQ_CURRENT, SR_MQFLAG_AC,              -1,   "300mV"},
-       {SR_MQ_CURRENT, SR_MQFLAG_AC,               0,   "3V"},
+       {SR_MQ_CURRENT, SR_MQFLAG_AC,              -1,   "300mA"},
+       {SR_MQ_CURRENT, SR_MQFLAG_AC,               0,   "3A"},
        /* -99 is a dummy exponent for auto ranging. */
        {SR_MQ_RESISTANCE, 0,                     -99,   "Auto"},
-       {SR_MQ_RESISTANCE, 0,                       1,   "30"},
-       {SR_MQ_RESISTANCE, 0,                       2,   "300"},
-       {SR_MQ_RESISTANCE, 0,                       3,   "3k"},
-       {SR_MQ_RESISTANCE, 0,                       4,   "30k"},
-       {SR_MQ_RESISTANCE, 0,                       5,   "300k"},
-       {SR_MQ_RESISTANCE, 0,                       6,   "3M"},
-       {SR_MQ_RESISTANCE, 0,                       7,   "30M"},
+       {SR_MQ_RESISTANCE, 0,                       1,   "30R"},
+       {SR_MQ_RESISTANCE, 0,                       2,   "300R"},
+       {SR_MQ_RESISTANCE, 0,                       3,   "3kR"},
+       {SR_MQ_RESISTANCE, 0,                       4,   "30kR"},
+       {SR_MQ_RESISTANCE, 0,                       5,   "300kR"},
+       {SR_MQ_RESISTANCE, 0,                       6,   "3MR"},
+       {SR_MQ_RESISTANCE, 0,                       7,   "30MR"},
        /* -99 is a dummy exponent for auto ranging. */
        {SR_MQ_RESISTANCE, SR_MQFLAG_FOUR_WIRE,   -99,   "Auto"},
        {SR_MQ_RESISTANCE, SR_MQFLAG_FOUR_WIRE,     1,   "30R"},