X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Fanalog.c;h=88b85d18eddf81b489c011a94918ecb9efb30da5;hb=d0fa4ac1e786490b47b9f4284ad045f65d1e058d;hp=16ae0bd32f620453ce1bd85a397fb13551bea1be;hpb=820c48f8c294d29660bfb2d081c575e138568909;p=libsigrok.git
diff --git a/src/output/analog.c b/src/output/analog.c
index 16ae0bd3..88b85d18 100644
--- a/src/output/analog.c
+++ b/src/output/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"
#define LOG_PREFIX "output/analog"
@@ -47,7 +48,7 @@ static int init(struct sr_output *o, GHashTable *options)
if (!o || !o->sdi)
return SR_ERR_ARG;
- o->priv = ctx = g_try_malloc0(sizeof(struct context));
+ o->priv = ctx = g_malloc0(sizeof(struct context));
s = g_variant_get_string(g_hash_table_lookup(options, "digits"), NULL);
if (!strcmp(s, "all"))
ctx->digits = DIGITS_ALL;
@@ -95,6 +96,7 @@ static void si_printf(float value, GString *out, char *unitstr)
}
+/* Please use the same order as in enum sr_unit (libsigrok.h). */
static void fancyprint(int unit, int mqflags, float value, GString *out)
{
switch (unit) {
@@ -111,9 +113,6 @@ static void fancyprint(int unit, int mqflags, float value, GString *out)
case SR_UNIT_FARAD:
si_printf(value, out, "F");
break;
- case SR_UNIT_HENRY:
- si_printf(value, out, "H");
- break;
case SR_UNIT_KELVIN:
si_printf(value, out, "K");
break;
@@ -151,6 +150,9 @@ static void fancyprint(int unit, int mqflags, float value, GString *out)
case SR_UNIT_DECIBEL_VOLT:
si_printf(value, out, "dBV");
break;
+ case SR_UNIT_UNITLESS:
+ si_printf(value, out, "");
+ break;
case SR_UNIT_DECIBEL_SPL:
if (mqflags & SR_MQFLAG_SPL_FREQ_WEIGHT_A)
si_printf(value, out, "dB(A)");
@@ -173,7 +175,7 @@ static void fancyprint(int unit, int mqflags, float value, GString *out)
g_string_append(out, " %oA");
break;
case SR_UNIT_CONCENTRATION:
- g_string_append_printf(out, "%f ppm", value * 1000000);
+ g_string_append_printf(out, "%f ppm", value * (1000 * 1000));
break;
case SR_UNIT_REVOLUTIONS_PER_MINUTE:
si_printf(value, out, "RPM");
@@ -200,11 +202,48 @@ static void fancyprint(int unit, int mqflags, float value, GString *out)
si_printf(value, out, "");
g_string_append_unichar(out, 0x00b0);
break;
+ case SR_UNIT_HENRY:
+ si_printf(value, out, "H");
+ break;
+ case SR_UNIT_GRAM:
+ si_printf(value, out, "g");
+ break;
+ case SR_UNIT_CARAT:
+ si_printf(value, out, "ct");
+ break;
+ case SR_UNIT_OUNCE:
+ si_printf(value, out, "oz");
+ break;
+ case SR_UNIT_TROY_OUNCE:
+ si_printf(value, out, "oz t");
+ break;
+ case SR_UNIT_POUND:
+ si_printf(value, out, "lb");
+ break;
+ case SR_UNIT_PENNYWEIGHT:
+ si_printf(value, out, "dwt");
+ break;
+ case SR_UNIT_GRAIN:
+ si_printf(value, out, "gr");
+ break;
+ case SR_UNIT_TAEL:
+ si_printf(value, out, "tael");
+ break;
+ case SR_UNIT_MOMME:
+ si_printf(value, out, "momme");
+ break;
+ case SR_UNIT_TOLA:
+ si_printf(value, out, "tola");
+ break;
+ case SR_UNIT_PIECE:
+ si_printf(value, out, "pcs");
+ break;
default:
si_printf(value, out, "");
break;
}
+ /* Please use the same order as in enum sr_mqflag (libsigrok.h). */
if (mqflags & SR_MQFLAG_AC)
g_string_append_printf(out, " AC");
if (mqflags & SR_MQFLAG_DC)
@@ -223,10 +262,15 @@ static void fancyprint(int unit, int mqflags, float value, GString *out)
g_string_append_printf(out, " AUTO");
if (mqflags & SR_MQFLAG_RELATIVE)
g_string_append_printf(out, " REL");
+ /* Note: SR_MQFLAG_SPL_* is handled above. */
+ if (mqflags & SR_MQFLAG_DURATION)
+ g_string_append_printf(out, " DURATION");
if (mqflags & SR_MQFLAG_AVG)
g_string_append_printf(out, " AVG");
if (mqflags & SR_MQFLAG_REFERENCE)
g_string_append_printf(out, " REF");
+ if (mqflags & SR_MQFLAG_UNSTABLE)
+ g_string_append_printf(out, " UNSTABLE");
g_string_append_c(out, '\n');
}
@@ -234,14 +278,14 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
GString **out)
{
struct context *ctx;
+ const struct sr_datafeed_analog_old *analog_old;
const struct sr_datafeed_analog *analog;
- const struct sr_datafeed_analog2 *analog2;
struct sr_channel *ch;
GSList *l;
float *fdata;
unsigned int i;
int num_channels, c, ret, si, digits;
- char number[32], suffix[32];
+ char *number, *suffix;
*out = NULL;
if (!o || !o->sdi)
@@ -255,50 +299,53 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
case SR_DF_FRAME_END:
*out = g_string_new("FRAME-END\n");
break;
- case SR_DF_ANALOG:
- analog = packet->payload;
- fdata = (float *)analog->data;
+ case SR_DF_ANALOG_OLD:
+ analog_old = packet->payload;
+ fdata = (float *)analog_old->data;
*out = g_string_sized_new(512);
- num_channels = g_slist_length(analog->channels);
- for (si = 0; si < analog->num_samples; si++) {
- for (l = analog->channels, c = 0; l; l = l->next, c++) {
+ num_channels = g_slist_length(analog_old->channels);
+ for (si = 0; si < analog_old->num_samples; si++) {
+ for (l = analog_old->channels, c = 0; l; l = l->next, c++) {
ch = l->data;
g_string_append_printf(*out, "%s: ", ch->name);
- fancyprint(analog->unit, analog->mqflags,
+ fancyprint(analog_old->unit, analog_old->mqflags,
fdata[si * num_channels + c], *out);
}
}
break;
- case SR_DF_ANALOG2:
- analog2 = packet->payload;
- if (!(fdata = g_try_malloc(analog2->num_samples * sizeof(float))))
+ case SR_DF_ANALOG:
+ analog = packet->payload;
+ num_channels = g_slist_length(analog->meaning->channels);
+ if (!(fdata = g_try_malloc(
+ analog->num_samples * num_channels * sizeof(float))))
return SR_ERR_MALLOC;
- if ((ret = sr_analog_to_float(analog2, fdata)) != SR_OK)
+ if ((ret = sr_analog_to_float(analog, fdata)) != SR_OK)
return ret;
*out = g_string_sized_new(512);
- if (analog2->encoding->is_digits_decimal) {
+ if (analog->encoding->is_digits_decimal) {
if (ctx->digits == DIGITS_ALL)
- digits = analog2->encoding->digits;
+ digits = analog->encoding->digits;
else
- digits = analog2->spec->spec_digits;
+ digits = analog->spec->spec_digits;
} else {
/* TODO we don't know how to print by number of bits yet. */
digits = 6;
}
- sr_analog_unit_to_string(analog2, suffix, sizeof(suffix));
- num_channels = g_slist_length(analog2->meaning->channels);
- for (i = 0; i < analog2->num_samples; i++) {
- for (l = analog2->meaning->channels, c = 0; l; l = l->next, c++) {
+ sr_analog_unit_to_string(analog, &suffix);
+ for (i = 0; i < analog->num_samples; i++) {
+ for (l = analog->meaning->channels, c = 0; l; l = l->next, c++) {
ch = l->data;
g_string_append_printf(*out, "%s: ", ch->name);
- sr_analog_float_to_string(fdata[i * num_channels + c],
- digits, number, sizeof(number));
+ number = g_strdup_printf("%.*f", digits,
+ fdata[i * num_channels + c]);
g_string_append(*out, number);
+ g_free(number);
g_string_append(*out, " ");
g_string_append(*out, suffix);
g_string_append(*out, "\n");
}
}
+ g_free(suffix);
break;
}
@@ -342,6 +389,8 @@ SR_PRIV struct sr_output_module output_analog = {
.id = "analog",
.name = "Analog",
.desc = "Analog data and types",
+ .exts = NULL,
+ .flags = 0,
.options = get_options,
.init = init,
.receive = receive,