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

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

This commit is contained in:
Frank Stettner 2018-03-06 14:11:29 +01:00 committed by Uwe Hermann
parent c3f8e1abf0
commit acc587ff24
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/hardware/hp-3478a/protocol.c
View File

@ -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) 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 */ /* Function + Range */
devc->measurement_mq_flags = 0;
if ((function_byte & SB1_FUNCTION_BLOCK) == FUNCTION_VDC) { if ((function_byte & SB1_FUNCTION_BLOCK) == FUNCTION_VDC) {
devc->measurement_mq = SR_MQ_VOLTAGE; devc->measurement_mq = SR_MQ_VOLTAGE;
devc->measurement_mq_flags |= SR_MQFLAG_DC; 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); 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; return SR_OK;
} }