From: Frank Stettner <redacted>
Date: Tue, 6 Mar 2018 13:11:29 +0000 (+0100)
Subject: hp-3478a: spec_digits must be parsed before range parsing.
X-Git-Url: https://sigrok.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=acc587ff24ed9d4e60486478ead326b2ed49c3bb;hp=c3f8e1abf04772a359f22ff1609b6a55f6b3ef38;p=libsigrok.git

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 de384219..265889c6 100644
--- 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;
 }