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

kern-scale: properly set encoding digits

This commit is contained in:
Aurelien Jacobs 2016-08-21 16:58:10 +02:00 committed by Uwe Hermann
parent 3be044aa90
commit 0b8205504b
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/scale/kern.c
View File

@ -44,9 +44,9 @@ static int get_buflen(const uint8_t *buf)
} }
static int parse_value(const uint8_t *buf, float *result, static int parse_value(const uint8_t *buf, float *result,
const struct kern_info *info) int *digits, const struct kern_info *info)
{ {
char *strval; char *strval, *ptrdot;
float floatval; float floatval;
int s2, len; int s2, len;
@ -62,6 +62,9 @@ static int parse_value(const uint8_t *buf, float *result,
strval = g_strndup((const char *)buf, len); strval = g_strndup((const char *)buf, len);
floatval = g_ascii_strtod(strval, NULL); floatval = g_ascii_strtod(strval, NULL);
ptrdot = strchr(strval, '.');
if (ptrdot)
*digits = len - (ptrdot - strval + 1);
g_free(strval); g_free(strval);
*result = floatval; *result = floatval;
@ -199,18 +202,21 @@ SR_PRIV gboolean sr_kern_packet_valid(const uint8_t *buf)
SR_PRIV int sr_kern_parse(const uint8_t *buf, float *floatval, SR_PRIV int sr_kern_parse(const uint8_t *buf, float *floatval,
struct sr_datafeed_analog *analog, void *info) struct sr_datafeed_analog *analog, void *info)
{ {
int ret; int ret, digits = 0;
struct kern_info *info_local; struct kern_info *info_local;
info_local = (struct kern_info *)info; info_local = (struct kern_info *)info;
info_local->buflen = get_buflen(buf); info_local->buflen = get_buflen(buf);
if ((ret = parse_value(buf, floatval, info_local)) != SR_OK) { if ((ret = parse_value(buf, floatval, &digits, info_local)) != SR_OK) {
sr_dbg("Error parsing value: %d.", ret); sr_dbg("Error parsing value: %d.", ret);
return ret; return ret;
} }
analog->encoding->digits = digits;
analog->spec->spec_digits = digits;
parse_flags(buf, info_local); parse_flags(buf, info_local);
handle_flags(analog, floatval, info_local); handle_flags(analog, floatval, info_local);