X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fanalog.c;h=dd23d4b48cf5f5f53fe95575159c871c6c34b3a9;hb=b1cadcfbef49ab24dbcf0987b927c4bffa207fcc;hp=10c4c1c7ac25ff145dbab628d14135e2a33753a2;hpb=e00b3f5897d9b5b85b552f9f8da7684229b9bdfc;p=libsigrok.git
diff --git a/src/analog.c b/src/analog.c
index 10c4c1c7..dd23d4b4 100644
--- a/src/analog.c
+++ b/src/analog.c
@@ -17,11 +17,12 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include
#include
-#include "libsigrok.h"
+#include
#include "libsigrok-internal.h"
/** @cond PRIVATE */
@@ -47,21 +48,23 @@ 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" },
{ SR_UNIT_OHM, "\xe2\x84\xa6" },
{ SR_UNIT_FARAD, "F" },
- { SR_UNIT_HENRY, "H" },
{ SR_UNIT_KELVIN, "K" },
{ SR_UNIT_CELSIUS, "\xc2\xb0""C" },
{ SR_UNIT_FAHRENHEIT, "\xc2\xb0""F" },
{ SR_UNIT_HERTZ, "Hz" },
{ SR_UNIT_PERCENTAGE, "%" },
+ { SR_UNIT_BOOLEAN, "" },
{ SR_UNIT_SECOND, "s" },
{ SR_UNIT_SIEMENS, "S" },
{ SR_UNIT_DECIBEL_MW, "dBu" },
{ SR_UNIT_DECIBEL_VOLT, "dBv" },
+ { SR_UNIT_UNITLESS, "" },
{ SR_UNIT_DECIBEL_SPL, "dB" },
{ SR_UNIT_CONCENTRATION, "ppm" },
{ SR_UNIT_REVOLUTIONS_PER_MINUTE, "RPM" },
@@ -72,19 +75,23 @@ static struct unit_mq_string unit_strings[] = {
{ SR_UNIT_HECTOPASCAL, "hPa" },
{ SR_UNIT_HUMIDITY_293K, "%rF" },
{ SR_UNIT_DEGREE, "\xc2\xb0" },
+ { SR_UNIT_HENRY, "H" },
+ { SR_UNIT_GRAM, "g" },
+ { SR_UNIT_CARAT, "ct" },
+ { SR_UNIT_OUNCE, "oz" },
+ { SR_UNIT_TROY_OUNCE, "oz t" },
+ { SR_UNIT_POUND, "lb" },
+ { SR_UNIT_PENNYWEIGHT, "dwt" },
+ { SR_UNIT_GRAIN, "gr" },
+ { SR_UNIT_TAEL, "tael" },
+ { SR_UNIT_MOMME, "momme" },
+ { SR_UNIT_TOLA, "tola" },
+ { SR_UNIT_PIECE, "pcs" },
ALL_ZERO
};
+/* Please use the same order as in enum sr_mqflag (libsigrok.h). */
static struct unit_mq_string mq_strings[] = {
- { SR_MQFLAG_SPL_FREQ_WEIGHT_A, "(A)" },
- { SR_MQFLAG_SPL_FREQ_WEIGHT_C, "(C)" },
- { SR_MQFLAG_SPL_FREQ_WEIGHT_Z, "(Z)" },
- { SR_MQFLAG_SPL_FREQ_WEIGHT_FLAT, "(SPL)" },
- { SR_MQFLAG_SPL_TIME_WEIGHT_S, " S" },
- { SR_MQFLAG_SPL_TIME_WEIGHT_F, " F" },
- { SR_MQFLAG_SPL_LAT, " LAT" },
- /* Not a standard function for SLMs, so this is a made-up notation. */
- { SR_MQFLAG_SPL_PCT_OVER_ALARM, "%oA" },
{ SR_MQFLAG_AC, " AC" },
{ SR_MQFLAG_DC, " DC" },
{ SR_MQFLAG_RMS, " RMS" },
@@ -94,8 +101,19 @@ static struct unit_mq_string mq_strings[] = {
{ SR_MQFLAG_MIN, " MIN" },
{ SR_MQFLAG_AUTORANGE, " AUTO" },
{ SR_MQFLAG_RELATIVE, " REL" },
+ { SR_MQFLAG_SPL_FREQ_WEIGHT_A, "(A)" },
+ { SR_MQFLAG_SPL_FREQ_WEIGHT_C, "(C)" },
+ { SR_MQFLAG_SPL_FREQ_WEIGHT_Z, "(Z)" },
+ { SR_MQFLAG_SPL_FREQ_WEIGHT_FLAT, "(SPL)" },
+ { SR_MQFLAG_SPL_TIME_WEIGHT_S, " S" },
+ { SR_MQFLAG_SPL_TIME_WEIGHT_F, " F" },
+ { SR_MQFLAG_SPL_LAT, " LAT" },
+ /* Not a standard function for SLMs, so this is a made-up notation. */
+ { SR_MQFLAG_SPL_PCT_OVER_ALARM, "%oA" },
+ { SR_MQFLAG_DURATION, " DURATION" },
{ SR_MQFLAG_AVG, " AVG" },
{ SR_MQFLAG_REFERENCE, " REF" },
+ { SR_MQFLAG_UNSTABLE, " UNSTABLE" },
ALL_ZERO
};
@@ -139,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;
@@ -153,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;
@@ -251,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;