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

sr_analog_to_float: Support packets with multiple channels.

This commit is contained in:
Martin Ling 2015-09-17 18:14:09 +01:00 committed by Uwe Hermann
parent 3e27754989
commit 7d65dd3a86
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/analog.c
View File

@ -157,6 +157,8 @@ SR_API int sr_analog_to_float(const struct sr_datafeed_analog2 *analog,
float offset; float offset;
unsigned int b, i; unsigned int b, i;
gboolean bigendian; gboolean bigendian;
unsigned int count = (analog->num_samples
* g_slist_length(analog->meaning->channels));
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
bigendian = TRUE; bigendian = TRUE;
@ -174,9 +176,9 @@ SR_API int sr_analog_to_float(const struct sr_datafeed_analog2 *analog,
&& (analog->encoding->scale.p == analog->encoding->scale.q) && (analog->encoding->scale.p == analog->encoding->scale.q)
&& analog->encoding->offset.p / (float)analog->encoding->offset.q == 0) { && analog->encoding->offset.p / (float)analog->encoding->offset.q == 0) {
/* The data is already in the right format. */ /* The data is already in the right format. */
memcpy(outbuf, analog->data, analog->num_samples * sizeof(float)); memcpy(outbuf, analog->data, count * sizeof(float));
} else { } else {
for (i = 0; i < analog->num_samples; i += analog->encoding->unitsize) { for (i = 0; i < count; i += analog->encoding->unitsize) {
for (b = 0; b < analog->encoding->unitsize; b++) { for (b = 0; b < analog->encoding->unitsize; b++) {
if (analog->encoding->is_bigendian == bigendian) if (analog->encoding->is_bigendian == bigendian)
((uint8_t *)outbuf)[i + b] = ((uint8_t *)outbuf)[i + b] =