X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Fanalog.c;h=5e2b7cd527b6ce0c60c7b1f3bafbb44e60d862ed;hb=962172e4950f3fbc42d5a79cdf63dc179d7513be;hp=fbc41d88ffa9e52e1f010fcd705aeca52b203f16;hpb=155b680da482cea2381becb73c51cfb838bff31e;p=libsigrok.git

diff --git a/src/output/analog.c b/src/output/analog.c
index fbc41d88..5e2b7cd5 100644
--- a/src/output/analog.c
+++ b/src/output/analog.c
@@ -17,11 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/analog"
@@ -29,24 +30,31 @@
 struct context {
 	int num_enabled_channels;
 	GPtrArray *channellist;
+	int digits;
+	float *fdata;
 };
 
-static int init(struct sr_output *o)
+enum {
+	DIGITS_ALL,
+	DIGITS_SPEC,
+};
+
+static int init(struct sr_output *o, GHashTable *options)
 {
 	struct context *ctx;
 	struct sr_channel *ch;
 	GSList *l;
-
-	sr_spew("Initializing output module.");
+	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->internal = 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,176 +65,27 @@ static int init(struct sr_output *o)
 		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)
-{
-	float v;
-
-	if (signbit(value))
-		v = -(value);
-	else
-		v = value;
-
-	if (v < 1e-12 || v > 1e+12)
-		g_string_append_printf(out, "%f %s", value, unitstr);
-	else if (v > 1e+9)
-		g_string_append_printf(out, "%f G%s", value / 1e+9, unitstr);
-	else if (v > 1e+6)
-		g_string_append_printf(out, "%f M%s", value / 1e+6, unitstr);
-	else if (v > 1e+3)
-		g_string_append_printf(out, "%f k%s", value / 1e+3, unitstr);
-	else if (v < 1e-9)
-		g_string_append_printf(out, "%f n%s", value * 1e+9, unitstr);
-	else if (v < 1e-6)
-		g_string_append_printf(out, "%f u%s", value * 1e+6, unitstr);
-	else if (v < 1e-3)
-		g_string_append_printf(out, "%f m%s", value * 1e+3, unitstr);
-	else
-		g_string_append_printf(out, "%f %s", value, unitstr);
-
-}
-
-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;
-	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)
-		g_string_append_printf(out, " AC");
-	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 int receive(struct sr_output *o, const struct sr_datafeed_packet *packet,
+static int receive(const struct sr_output *o, const struct sr_datafeed_packet *packet,
 		GString **out)
 {
+	struct context *ctx;
 	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, 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:
@@ -237,40 +96,89 @@ static int receive(struct sr_output *o, const struct sr_datafeed_packet *packet,
 		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++) {
+				float value = fdata[i * num_channels + c];
+				const char *prefix = sr_analog_si_prefix(&value, &digits);
 				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", MAX(digits, 0), value);
+				g_string_append(*out, number);
+				g_free(number);
+				g_string_append(*out, " ");
+				g_string_append(*out, prefix);
+				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;
 
 	if (!o || !o->sdi)
 		return SR_ERR_ARG;
-	ctx = o->internal;
+	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->internal = NULL;
+	o->priv = NULL;
 
 	return SR_OK;
 }
 
-SR_PRIV struct sr_output_format output_analog = {
+SR_PRIV struct sr_output_module output_analog = {
 	.id = "analog",
-	.description = "Analog data",
+	.name = "Analog",
+	.desc = "Analog data and types",
+	.exts = NULL,
+	.flags = 0,
+	.options = get_options,
 	.init = init,
 	.receive = receive,
 	.cleanup = cleanup