/*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
*
* Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
*
#include <stdlib.h>
#include <string.h>
+#include <math.h>
#include <glib.h>
#include "libsigrok.h"
#include "libsigrok-internal.h"
-#include <math.h>
+
+#define LOG_PREFIX "output/analog"
struct context {
- int num_enabled_probes;
- GPtrArray *probelist;
- GString *out;
+ int num_enabled_channels;
+ GPtrArray *channellist;
};
static int init(struct sr_output *o)
{
struct context *ctx;
- struct sr_probe *probe;
+ struct sr_channel *ch;
GSList *l;
- sr_spew("output/analog: initializing");
+ sr_spew("Initializing output module.");
+
if (!o || !o->sdi)
return SR_ERR_ARG;
if (!(ctx = g_try_malloc0(sizeof(struct context)))) {
- sr_err("output/analog: Context malloc failed.");
+ sr_err("Output module context malloc failed.");
return SR_ERR_MALLOC;
}
o->internal = ctx;
- /* Get the number of probes and their names. */
- ctx->probelist = g_ptr_array_new();
- for (l = o->sdi->probes; l; l = l->next) {
- probe = l->data;
- if (!probe || !probe->enabled)
+ /* Get the number of channels and their names. */
+ ctx->channellist = g_ptr_array_new();
+ for (l = o->sdi->channels; l; l = l->next) {
+ ch = l->data;
+ if (!ch || !ch->enabled)
continue;
- g_ptr_array_add(ctx->probelist, probe->name);
- ctx->num_enabled_probes++;
+ g_ptr_array_add(ctx->channellist, ch->name);
+ ctx->num_enabled_channels++;
}
- ctx->out = g_string_sized_new(512);
-
return SR_OK;
}
static void fancyprint(int unit, int mqflags, float value, GString *out)
{
-
switch (unit) {
- case SR_UNIT_VOLT:
- si_printf(value, out, "V");
- break;
- case SR_UNIT_AMPERE:
- si_printf(value, out, "A");
- break;
- case SR_UNIT_OHM:
- si_printf(value, out, "");
- g_string_append_unichar(out, 0x2126);
- break;
- case SR_UNIT_FARAD:
- si_printf(value, out, "F");
- break;
- case SR_UNIT_KELVIN:
- si_printf(value, out, "K");
- break;
- case SR_UNIT_CELSIUS:
- si_printf(value, out, "");
- g_string_append_unichar(out, 0x00b0);
- g_string_append_c(out, 'C');
- break;
- case SR_UNIT_FAHRENHEIT:
- si_printf(value, out, "");
- g_string_append_unichar(out, 0x00b0);
- g_string_append_c(out, 'F');
- break;
- case SR_UNIT_HERTZ:
- si_printf(value, out, "Hz");
- break;
- case SR_UNIT_PERCENTAGE:
- g_string_append_printf(out, "%f%%", value);
- break;
- case SR_UNIT_BOOLEAN:
- if (value > 0)
- g_string_append_printf(out, "TRUE");
- else
- g_string_append_printf(out, "FALSE");
- break;
- case SR_UNIT_SECOND:
- si_printf(value, out, "s");
- break;
- case SR_UNIT_SIEMENS:
- si_printf(value, out, "S");
- break;
- case SR_UNIT_DECIBEL_MW:
- si_printf(value, out, "dBu");
- break;
- case SR_UNIT_DECIBEL_VOLT:
- si_printf(value, out, "dBV");
- break;
- case SR_UNIT_DECIBEL_SPL:
- if (mqflags & SR_MQFLAG_SPL_FREQ_WEIGHT_A)
- si_printf(value, out, "dB(A)");
- else if (mqflags & SR_MQFLAG_SPL_FREQ_WEIGHT_C)
- si_printf(value, out, "dB(C)");
- else if (mqflags & SR_MQFLAG_SPL_FREQ_WEIGHT_Z)
- si_printf(value, out, "dB(Z)");
- else
- /* No frequency weighting, or non-standard "flat" */
- si_printf(value, out, "dB(SPL)");
- if (mqflags & SR_MQFLAG_SPL_TIME_WEIGHT_S)
- g_string_append(out, " S");
- else if (mqflags & SR_MQFLAG_SPL_TIME_WEIGHT_F)
- g_string_append(out, " F");
- if (mqflags & SR_MQFLAG_SPL_LAT)
- g_string_append(out, " LAT");
- else if (mqflags & SR_MQFLAG_SPL_PCT_OVER_ALARM)
- /* Not a standard function for SLMs, so this is
- * a made-up notation. */
- g_string_append(out, " %oA");
- break;
- default:
- si_printf(value, out, "");
+ case SR_UNIT_VOLT:
+ si_printf(value, out, "V");
+ break;
+ case SR_UNIT_AMPERE:
+ si_printf(value, out, "A");
+ break;
+ case SR_UNIT_OHM:
+ si_printf(value, out, "");
+ g_string_append_unichar(out, 0x2126);
+ break;
+ case SR_UNIT_FARAD:
+ si_printf(value, out, "F");
+ break;
+ case SR_UNIT_KELVIN:
+ si_printf(value, out, "K");
+ break;
+ case SR_UNIT_CELSIUS:
+ si_printf(value, out, "");
+ g_string_append_unichar(out, 0x00b0);
+ g_string_append_c(out, 'C');
+ break;
+ case SR_UNIT_FAHRENHEIT:
+ si_printf(value, out, "");
+ g_string_append_unichar(out, 0x00b0);
+ g_string_append_c(out, 'F');
+ break;
+ case SR_UNIT_HERTZ:
+ si_printf(value, out, "Hz");
+ break;
+ case SR_UNIT_PERCENTAGE:
+ g_string_append_printf(out, "%f %%", value);
+ break;
+ case SR_UNIT_BOOLEAN:
+ if (value > 0)
+ g_string_append_printf(out, "TRUE");
+ else
+ g_string_append_printf(out, "FALSE");
+ break;
+ case SR_UNIT_SECOND:
+ si_printf(value, out, "s");
+ break;
+ case SR_UNIT_SIEMENS:
+ si_printf(value, out, "S");
+ break;
+ case SR_UNIT_DECIBEL_MW:
+ si_printf(value, out, "dBu");
+ break;
+ case SR_UNIT_DECIBEL_VOLT:
+ si_printf(value, out, "dBV");
+ break;
+ case SR_UNIT_DECIBEL_SPL:
+ if (mqflags & SR_MQFLAG_SPL_FREQ_WEIGHT_A)
+ si_printf(value, out, "dB(A)");
+ else if (mqflags & SR_MQFLAG_SPL_FREQ_WEIGHT_C)
+ si_printf(value, out, "dB(C)");
+ else if (mqflags & SR_MQFLAG_SPL_FREQ_WEIGHT_Z)
+ si_printf(value, out, "dB(Z)");
+ else
+ /* No frequency weighting, or non-standard "flat" */
+ si_printf(value, out, "dB(SPL)");
+ if (mqflags & SR_MQFLAG_SPL_TIME_WEIGHT_S)
+ g_string_append(out, " S");
+ else if (mqflags & SR_MQFLAG_SPL_TIME_WEIGHT_F)
+ g_string_append(out, " F");
+ if (mqflags & SR_MQFLAG_SPL_LAT)
+ g_string_append(out, " LAT");
+ else if (mqflags & SR_MQFLAG_SPL_PCT_OVER_ALARM)
+ /* Not a standard function for SLMs, so this is
+ * a made-up notation. */
+ g_string_append(out, " %oA");
+ break;
+ case SR_UNIT_CONCENTRATION:
+ g_string_append_printf(out, "%f ppm", value * 1000000);
+ break;
+ case SR_UNIT_REVOLUTIONS_PER_MINUTE:
+ si_printf(value, out, "RPM");
+ break;
+ case SR_UNIT_VOLT_AMPERE:
+ si_printf(value, out, "VA");
+ break;
+ case SR_UNIT_WATT:
+ si_printf(value, out, "W");
+ break;
+ case SR_UNIT_WATT_HOUR:
+ si_printf(value, out, "Wh");
+ break;
+ case SR_UNIT_METER_SECOND:
+ si_printf(value, out, "m/s");
+ break;
+ case SR_UNIT_HECTOPASCAL:
+ si_printf(value, out, "hPa");
+ break;
+ case SR_UNIT_HUMIDITY_293K:
+ si_printf(value, out, "%rF");
+ break;
+ default:
+ si_printf(value, out, "");
+ break;
}
- if ((mqflags & (SR_MQFLAG_AC | SR_MQFLAG_DC)) == (SR_MQFLAG_AC | SR_MQFLAG_DC))
- g_string_append_printf(out, " AC+DC");
- else if (mqflags & SR_MQFLAG_AC)
+
+ if (mqflags & SR_MQFLAG_AC)
g_string_append_printf(out, " AC");
- else if (mqflags & SR_MQFLAG_DC)
+ if (mqflags & SR_MQFLAG_DC)
g_string_append_printf(out, " DC");
+ if (mqflags & SR_MQFLAG_RMS)
+ g_string_append_printf(out, " RMS");
+ if (mqflags & SR_MQFLAG_DIODE)
+ g_string_append_printf(out, " DIODE");
+ if (mqflags & SR_MQFLAG_HOLD)
+ g_string_append_printf(out, " HOLD");
+ if (mqflags & SR_MQFLAG_MAX)
+ g_string_append_printf(out, " MAX");
+ if (mqflags & SR_MQFLAG_MIN)
+ g_string_append_printf(out, " MIN");
+ if (mqflags & SR_MQFLAG_AUTORANGE)
+ g_string_append_printf(out, " AUTO");
+ if (mqflags & SR_MQFLAG_RELATIVE)
+ g_string_append_printf(out, " REL");
+ if (mqflags & SR_MQFLAG_AVG)
+ g_string_append_printf(out, " AVG");
g_string_append_c(out, '\n');
-
}
-static GString *receive(struct sr_output *o, const struct sr_dev_inst *sdi,
- struct sr_datafeed_packet *packet)
+static int receive(struct sr_output *o, const struct sr_datafeed_packet *packet,
+ GString **out)
{
- struct sr_datafeed_analog *analog;
- struct context *ctx;
- float *fdata;
- int i, j;
+ const struct sr_datafeed_analog *analog;
+ struct sr_channel *ch;
+ GSList *l;
+ const float *fdata;
+ int i, p;
- (void)sdi;
+ *out = NULL;
if (!o || !o->sdi)
- return NULL;
- ctx = o->internal;
+ return SR_ERR_ARG;
- g_string_set_size(ctx->out, 0);
switch (packet->type) {
- case SR_DF_HEADER:
- break;
case SR_DF_FRAME_BEGIN:
- g_string_append_printf(ctx->out, "FRAME-BEGIN\n");
+ *out = g_string_new("FRAME-BEGIN\n");
break;
case SR_DF_FRAME_END:
- g_string_append_printf(ctx->out, "FRAME-END\n");
+ *out = g_string_new("FRAME-END\n");
break;
case SR_DF_ANALOG:
analog = packet->payload;
- fdata = (float *)analog->data;
+ fdata = (const float *)analog->data;
+ *out = g_string_sized_new(512);
for (i = 0; i < analog->num_samples; i++) {
- for (j = 0; j < ctx->num_enabled_probes; j++) {
- g_string_append_printf(ctx->out, "%s: ",
- (char *)g_ptr_array_index(ctx->probelist, j));
+ for (l = analog->channels, p = 0; l; l = l->next, p++) {
+ ch = l->data;
+ g_string_append_printf(*out, "%s: ", ch->name);
fancyprint(analog->unit, analog->mqflags,
- fdata[i + j], ctx->out);
+ fdata[i + p], *out);
}
}
break;
}
- return ctx->out;
+ return SR_OK;
}
static int cleanup(struct sr_output *o)
return SR_ERR_ARG;
ctx = o->internal;
- g_ptr_array_free(ctx->probelist, 1);
- g_string_free(ctx->out, 1);
+ g_ptr_array_free(ctx->channellist, 1);
g_free(ctx);
o->internal = NULL;
return SR_OK;
}
-
SR_PRIV struct sr_output_format output_analog = {
.id = "analog",
.description = "Analog data",
- .df_type = SR_DF_ANALOG,
.init = init,
- .recv = receive,
+ .receive = receive,
.cleanup = cleanup
};
projects / libsigrok.git / blobdiff