hp-3478a: spec_digits must be parsed before range parsing.

diff --git a/src/hardware/hp-3478a/protocol.c b/src/hardware/hp-3478a/protocol.c
index de384219b1c52f6a202aad1cbad66b8aadc45877..265889c676f73c708d23cb7ad43c776421b2c4fc 100644 (file)
--- a/src/hardware/hp-3478a/protocol.c
+++ b/src/hardware/hp-3478a/protocol.c
@@ -163,9 +163,17 @@ static int parse_range_ohm(struct dev_context *devc, uint8_t range_byte)
 
 static int parse_function_byte(struct dev_context *devc, uint8_t function_byte)
 {
-       devc->measurement_mq_flags = 0;
+       /* Digits / Resolution (spec_digits must be set before range parsing) */
+       if ((function_byte & SB1_DIGITS_BLOCK) == DIGITS_5_5) {
+               devc->spec_digits = 5;
+       } else if ((function_byte & SB1_DIGITS_BLOCK) == DIGITS_4_5) {
+               devc->spec_digits = 4;
+       } else if ((function_byte & SB1_DIGITS_BLOCK) == DIGITS_3_5) {
+               devc->spec_digits = 3;
+       }
 
        /* Function + Range */
+       devc->measurement_mq_flags = 0;
        if ((function_byte & SB1_FUNCTION_BLOCK) == FUNCTION_VDC) {
                devc->measurement_mq = SR_MQ_VOLTAGE;
                devc->measurement_mq_flags |= SR_MQFLAG_DC;
@@ -201,15 +209,6 @@ static int parse_function_byte(struct dev_context *devc, uint8_t function_byte)
                parse_range_ohm(devc, function_byte);
        }
 
-       /* Digits / Resolution */
-       if ((function_byte & SB1_DIGITS_BLOCK) == DIGITS_5_5) {
-               devc->spec_digits = 5;
-       } else if ((function_byte & SB1_DIGITS_BLOCK) == DIGITS_4_5) {
-               devc->spec_digits = 4;
-       } else if ((function_byte & SB1_DIGITS_BLOCK) == DIGITS_3_5) {
-               devc->spec_digits = 3;
-       }
-
        return SR_OK;
 }