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

deree-de5000: properly set encoding digits

This commit is contained in:
Aurelien Jacobs 2016-08-21 16:55:06 +02:00 committed by Uwe Hermann
parent b8f07f4221
commit 24b6882ffa
1 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/lcr/es51919.c
View File

@ -470,15 +470,16 @@ static int parse_mq(const uint8_t *pkt, int is_secondary, int is_parallel)
return 0; return 0;
} }
static float parse_value(const uint8_t *buf) static float parse_value(const uint8_t *buf, int *digits)
{ {
static const float decimals[] = { static const int exponents[] = {0, -1, -2, -3, -4, -5, -6, -7};
1, 1e-1, 1e-2, 1e-3, 1e-4, 1e-5, 1e-6, 1e-7 int exponent;
};
int16_t val; int16_t val;
exponent = exponents[buf[3] & 7];
*digits = -exponent;
val = (buf[1] << 8) | buf[2]; val = (buf[1] << 8) | buf[2];
return (float)val * decimals[buf[3] & 7]; return (float)val * powf(10, exponent);
} }
static void parse_measurement(const uint8_t *pkt, float *floatval, static void parse_measurement(const uint8_t *pkt, float *floatval,
@ -487,25 +488,26 @@ static void parse_measurement(const uint8_t *pkt, float *floatval,
{ {
static const struct { static const struct {
int unit; int unit;
float mult; int exponent;
} units[] = { } units[] = {
{ SR_UNIT_UNITLESS, 1 }, /* no unit */ { SR_UNIT_UNITLESS, 0 }, /* no unit */
{ SR_UNIT_OHM, 1 }, /* Ohm */ { SR_UNIT_OHM, 0 }, /* Ohm */
{ SR_UNIT_OHM, 1e3 }, /* kOhm */ { SR_UNIT_OHM, 3 }, /* kOhm */
{ SR_UNIT_OHM, 1e6 }, /* MOhm */ { SR_UNIT_OHM, 6 }, /* MOhm */
{ -1, 0 }, /* ??? */ { -1, 0 }, /* ??? */
{ SR_UNIT_HENRY, 1e-6 }, /* uH */ { SR_UNIT_HENRY, -6 }, /* uH */
{ SR_UNIT_HENRY, 1e-3 }, /* mH */ { SR_UNIT_HENRY, -3 }, /* mH */
{ SR_UNIT_HENRY, 1 }, /* H */ { SR_UNIT_HENRY, 0 }, /* H */
{ SR_UNIT_HENRY, 1e3 }, /* kH */ { SR_UNIT_HENRY, 3 }, /* kH */
{ SR_UNIT_FARAD, 1e-12 }, /* pF */ { SR_UNIT_FARAD, -12 }, /* pF */
{ SR_UNIT_FARAD, 1e-9 }, /* nF */ { SR_UNIT_FARAD, -9 }, /* nF */
{ SR_UNIT_FARAD, 1e-6 }, /* uF */ { SR_UNIT_FARAD, -6 }, /* uF */
{ SR_UNIT_FARAD, 1e-3 }, /* mF */ { SR_UNIT_FARAD, -3 }, /* mF */
{ SR_UNIT_PERCENTAGE, 1 }, /* % */ { SR_UNIT_PERCENTAGE, 0 }, /* % */
{ SR_UNIT_DEGREE, 1 } /* degree */ { SR_UNIT_DEGREE, 0 }, /* degree */
}; };
const uint8_t *buf; const uint8_t *buf;
int digits, exponent;
int state; int state;
buf = pkt_to_buf(pkt, is_secondary); buf = pkt_to_buf(pkt, is_secondary);
@ -544,8 +546,11 @@ static void parse_measurement(const uint8_t *pkt, float *floatval,
analog->meaning->unit = units[buf[3] >> 3].unit; analog->meaning->unit = units[buf[3] >> 3].unit;
*floatval = parse_value(buf); exponent = units[buf[3] >> 3].exponent;
*floatval *= (state == 0) ? units[buf[3] >> 3].mult : INFINITY; *floatval = parse_value(buf, &digits);
*floatval *= (state == 0) ? powf(10, exponent) : INFINITY;
analog->encoding->digits = digits - exponent;
analog->spec->spec_digits = digits - exponent;
} }
static unsigned int parse_freq(const uint8_t *pkt) static unsigned int parse_freq(const uint8_t *pkt)