X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fanalog.c;h=dd23d4b48cf5f5f53fe95575159c871c6c34b3a9;hb=5eff221e8c9a84be71a564441c6edf705f8ba8fa;hp=2116ad7585af721b53e7511beea9ad57a85bbb78;hpb=f7bcc68604cea023043c3067d8bd952d86d69a89;p=libsigrok.git
diff --git a/src/analog.c b/src/analog.c
index 2116ad75..dd23d4b4 100644
--- a/src/analog.c
+++ b/src/analog.c
@@ -17,6 +17,7 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include
@@ -47,6 +48,7 @@ struct unit_mq_string {
char *str;
};
+/* Please use the same order as in enum sr_unit (libsigrok.h). */
static struct unit_mq_string unit_strings[] = {
{ SR_UNIT_VOLT, "V" },
{ SR_UNIT_AMPERE, "A" },
@@ -88,6 +90,7 @@ static struct unit_mq_string unit_strings[] = {
ALL_ZERO
};
+/* Please use the same order as in enum sr_mqflag (libsigrok.h). */
static struct unit_mq_string mq_strings[] = {
{ SR_MQFLAG_AC, " AC" },
{ SR_MQFLAG_DC, " DC" },
@@ -154,6 +157,8 @@ SR_API int sr_analog_to_float(const struct sr_datafeed_analog2 *analog,
float offset;
unsigned int b, i;
gboolean bigendian;
+ unsigned int count = (analog->num_samples
+ * g_slist_length(analog->meaning->channels));
#ifdef WORDS_BIGENDIAN
bigendian = TRUE;
@@ -168,19 +173,23 @@ SR_API int sr_analog_to_float(const struct sr_datafeed_analog2 *analog,
if (analog->encoding->unitsize == sizeof(float)
&& analog->encoding->is_bigendian == bigendian
- && (analog->encoding->scale.p == analog->encoding->scale.q)
+ && analog->encoding->scale.p == 1
+ && analog->encoding->scale.q == 1
&& analog->encoding->offset.p / (float)analog->encoding->offset.q == 0) {
/* 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 {
- 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++) {
if (analog->encoding->is_bigendian == bigendian)
- outbuf[i + b] = ((float *)analog->data)[i * analog->encoding->unitsize + b];
+ ((uint8_t *)outbuf)[i + b] =
+ ((uint8_t *)analog->data)[i * analog->encoding->unitsize + b];
else
- outbuf[i + (analog->encoding->unitsize - b)] = ((float *)analog->data)[i * analog->encoding->unitsize + b];
+ ((uint8_t *)outbuf)[i + (analog->encoding->unitsize - b)] =
+ ((uint8_t *)analog->data)[i * analog->encoding->unitsize + b];
}
- if (analog->encoding->scale.p != analog->encoding->scale.q)
+ if (analog->encoding->scale.p != 1
+ || analog->encoding->scale.q != 1)
outbuf[i] = (outbuf[i] * analog->encoding->scale.p) / analog->encoding->scale.q;
offset = ((float)analog->encoding->offset.p / (float)analog->encoding->offset.q);
outbuf[i] += offset;
@@ -266,7 +275,7 @@ SR_API int sr_analog_unit_to_string(const struct sr_datafeed_analog2 *analog,
* @param p Numerator
* @param q Denominator
*/
-SR_API void sr_rational_set(struct sr_rational *r, uint64_t p, uint64_t q)
+SR_API void sr_rational_set(struct sr_rational *r, int64_t p, uint64_t q)
{
r->p = p;
r->q = q;