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

rs9lcd: properly set encoding digits

This commit is contained in:
Aurelien Jacobs 2016-08-17 01:33:35 +02:00 committed by Uwe Hermann
parent e677490e58
commit 96a06b4203
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/dmm/rs9lcd.c
View File

@ -254,13 +254,16 @@ static uint8_t decode_digit(uint8_t raw_digit)
} }
} }
static double lcd_to_double(const struct rs9lcd_packet *rs_packet, int type) static double lcd_to_double(const struct rs9lcd_packet *rs_packet, int type,
int *exponent)
{ {
double rawval = 0, multiplier = 1; double rawval = 0;
uint8_t digit, raw_digit; uint8_t digit, raw_digit;
gboolean dp_reached = FALSE; gboolean dp_reached = FALSE;
int i, end; int i, end;
*exponent = 0;
/* end = 1: Don't parse last digit. end = 0: Parse all digits. */ /* end = 1: Don't parse last digit. end = 0: Parse all digits. */
end = (type == READ_TEMP) ? 1 : 0; end = (type == READ_TEMP) ? 1 : 0;
@ -279,26 +282,25 @@ static double lcd_to_double(const struct rs9lcd_packet *rs_packet, int type)
if ((i < 3) && (raw_digit & DP_MASK)) if ((i < 3) && (raw_digit & DP_MASK))
dp_reached = TRUE; dp_reached = TRUE;
if (dp_reached) if (dp_reached)
multiplier /= 10; *exponent -= 1;
rawval = rawval * 10 + digit; rawval = rawval * 10 + digit;
} }
rawval *= multiplier;
if (rs_packet->info & INFO_NEG) if (rs_packet->info & INFO_NEG)
rawval *= -1; rawval *= -1;
/* See if we need to multiply our raw value by anything. */ /* See if we need to multiply our raw value by anything. */
if (rs_packet->indicatrix2 & IND2_NANO) if (rs_packet->indicatrix2 & IND2_NANO)
rawval *= 1E-9; *exponent -= 9;
else if (rs_packet->indicatrix2 & IND2_MICRO) else if (rs_packet->indicatrix2 & IND2_MICRO)
rawval *= 1E-6; *exponent -= 6;
else if (rs_packet->indicatrix1 & IND1_MILI) else if (rs_packet->indicatrix1 & IND1_MILI)
rawval *= 1E-3; *exponent -= 3;
else if (rs_packet->indicatrix1 & IND1_KILO) else if (rs_packet->indicatrix1 & IND1_KILO)
rawval *= 1E3; *exponent += 3;
else if (rs_packet->indicatrix1 & IND1_MEGA) else if (rs_packet->indicatrix1 & IND1_MEGA)
rawval *= 1E6; *exponent += 6;
return rawval; return rawval * powf(10, *exponent);
} }
static gboolean is_celsius(const struct rs9lcd_packet *rs_packet) static gboolean is_celsius(const struct rs9lcd_packet *rs_packet)
@ -321,11 +323,12 @@ SR_PRIV int sr_rs9lcd_parse(const uint8_t *buf, float *floatval,
struct sr_datafeed_analog *analog, void *info) struct sr_datafeed_analog *analog, void *info)
{ {
const struct rs9lcd_packet *rs_packet = (void *)buf; const struct rs9lcd_packet *rs_packet = (void *)buf;
int exponent;
double rawval; double rawval;
(void)info; (void)info;
rawval = lcd_to_double(rs_packet, READ_ALL); rawval = lcd_to_double(rs_packet, READ_ALL, &exponent);
switch (rs_packet->mode) { switch (rs_packet->mode) {
case MODE_DC_V: case MODE_DC_V:
@ -410,7 +413,7 @@ SR_PRIV int sr_rs9lcd_parse(const uint8_t *buf, float *floatval,
case MODE_TEMP: case MODE_TEMP:
analog->meaning->mq = SR_MQ_TEMPERATURE; analog->meaning->mq = SR_MQ_TEMPERATURE;
/* We need to reparse. */ /* We need to reparse. */
rawval = lcd_to_double(rs_packet, READ_TEMP); rawval = lcd_to_double(rs_packet, READ_TEMP, &exponent);
analog->meaning->unit = is_celsius(rs_packet) ? analog->meaning->unit = is_celsius(rs_packet) ?
SR_UNIT_CELSIUS : SR_UNIT_FAHRENHEIT; SR_UNIT_CELSIUS : SR_UNIT_FAHRENHEIT;
break; break;
@ -434,5 +437,9 @@ SR_PRIV int sr_rs9lcd_parse(const uint8_t *buf, float *floatval,
analog->meaning->mqflags |= SR_MQFLAG_AUTORANGE; analog->meaning->mqflags |= SR_MQFLAG_AUTORANGE;
*floatval = rawval; *floatval = rawval;
analog->encoding->digits = -exponent;
analog->spec->spec_digits = -exponent;
return SR_OK; return SR_OK;
} }