X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Fanalog.c;h=72d1eb87efa744756f02fe9ae747c17006706cf5;hb=88a0265ebcb265ba839c02cc5bcd39e359c9f60f;hp=b4985a4eaf50a2c7b9384239c85539737c608ebc;hpb=d686c5ec462a4044e049931e57d60e9d08df8cde;p=libsigrok.git
diff --git a/src/output/analog.c b/src/output/analog.c
index b4985a4e..72d1eb87 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"
@@ -29,6 +30,13 @@
struct context {
int num_enabled_channels;
GPtrArray *channellist;
+ int digits;
+ float *fdata;
+};
+
+enum {
+ DIGITS_ALL,
+ DIGITS_SPEC,
};
static int init(struct sr_output *o, GHashTable *options)
@@ -36,17 +44,17 @@ static int init(struct sr_output *o, GHashTable *options)
struct context *ctx;
struct sr_channel *ch;
GSList *l;
-
- (void)options;
+ const char *s;
if (!o || !o->sdi)
return SR_ERR_ARG;
- if (!(ctx = g_try_malloc0(sizeof(struct context)))) {
- sr_err("Output module context malloc failed.");
- return SR_ERR_MALLOC;
- }
- o->priv = ctx;
+ 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;
+ else
+ ctx->digits = DIGITS_SPEC;
/* Get the number of channels and their names. */
ctx->channellist = g_ptr_array_new();
@@ -57,11 +65,12 @@ static int init(struct sr_output *o, GHashTable *options)
g_ptr_array_add(ctx->channellist, ch->name);
ctx->num_enabled_channels++;
}
+ ctx->fdata = NULL;
return SR_OK;
}
-static void si_printf(float value, GString *out, char *unitstr)
+static void si_printf(float value, GString *out, const char *unitstr)
{
float v;
@@ -89,6 +98,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) {
@@ -142,6 +152,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)");
@@ -164,7 +177,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");
@@ -187,11 +200,52 @@ static void fancyprint(int unit, int mqflags, float value, GString *out)
case SR_UNIT_HUMIDITY_293K:
si_printf(value, out, "%rF");
break;
+ case SR_UNIT_DEGREE:
+ 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)
@@ -210,23 +264,37 @@ 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");
+ if (mqflags & SR_MQFLAG_FOUR_WIRE)
+ g_string_append_printf(out, " 4-WIRE");
g_string_append_c(out, '\n');
}
static int receive(const struct sr_output *o, const struct sr_datafeed_packet *packet,
GString **out)
{
+ struct context *ctx;
+ const struct sr_datafeed_analog_old *analog_old;
const struct sr_datafeed_analog *analog;
struct sr_channel *ch;
GSList *l;
- const float *fdata;
- int i, p;
+ float *fdata;
+ unsigned int i;
+ int num_channels, c, ret, si, digits;
+ char *number, *suffix;
*out = NULL;
if (!o || !o->sdi)
return SR_ERR_ARG;
+ ctx = o->priv;
switch (packet->type) {
case SR_DF_FRAME_BEGIN:
@@ -235,24 +303,78 @@ 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_OLD:
+ analog_old = packet->payload;
+ fdata = (float *)analog_old->data;
+ *out = g_string_sized_new(512);
+ 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_old->unit, analog_old->mqflags,
+ fdata[si * num_channels + c], *out);
+ }
+ }
+ break;
case SR_DF_ANALOG:
analog = packet->payload;
- fdata = (const float *)analog->data;
+ num_channels = g_slist_length(analog->meaning->channels);
+ if (!(fdata = g_try_realloc(ctx->fdata,
+ analog->num_samples * num_channels * sizeof(float))))
+ return SR_ERR_MALLOC;
+ ctx->fdata = fdata;
+ if ((ret = sr_analog_to_float(analog, fdata)) != SR_OK)
+ return ret;
*out = g_string_sized_new(512);
+ if (analog->encoding->is_digits_decimal) {
+ if (ctx->digits == DIGITS_ALL)
+ digits = analog->encoding->digits;
+ else
+ 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(analog, &suffix);
for (i = 0; i < analog->num_samples; i++) {
- for (l = analog->channels, p = 0; l; l = l->next, p++) {
+ for (l = analog->meaning->channels, c = 0; l; l = l->next, c++) {
ch = l->data;
g_string_append_printf(*out, "%s: ", ch->name);
- fancyprint(analog->unit, analog->mqflags,
- fdata[i + p], *out);
+ 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;
}
return SR_OK;
}
+static struct sr_option options[] = {
+ { "digits", "Digits", "Digits to show", NULL, NULL },
+ ALL_ZERO
+};
+
+static const struct sr_option *get_options(void)
+{
+ if (!options[0].def) {
+ options[0].def = g_variant_ref_sink(g_variant_new_string("all"));
+ options[0].values = g_slist_append(options[0].values,
+ g_variant_ref_sink(g_variant_new_string("all")));
+ options[0].values = g_slist_append(options[0].values,
+ g_variant_ref_sink(g_variant_new_string("spec")));
+ }
+
+ return options;
+}
+
static int cleanup(struct sr_output *o)
{
struct context *ctx;
@@ -262,6 +384,9 @@ static int cleanup(struct sr_output *o)
ctx = o->priv;
g_ptr_array_free(ctx->channellist, 1);
+ g_variant_unref(options[0].def);
+ g_slist_free_full(options[0].values, (GDestroyNotify)g_variant_unref);
+ g_free(ctx->fdata);
g_free(ctx);
o->priv = NULL;
@@ -272,7 +397,9 @@ SR_PRIV struct sr_output_module output_analog = {
.id = "analog",
.name = "Analog",
.desc = "Analog data and types",
- .options = NULL,
+ .exts = NULL,
+ .flags = 0,
+ .options = get_options,
.init = init,
.receive = receive,
.cleanup = cleanup