X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fanalog.c;h=7090d0feb42f49fd7134e17f47fcfeab9e5da3b0;hb=33e8a3c5258d9ac92841cf47abd1e1f7528d640b;hp=d1fd7be6b17b2924ab72f49d761019d3f52f83ef;hpb=d713e561814558d9f07c4186aef35a23df8b8445;p=libsigrok.git

diff --git a/output/analog.c b/output/analog.c
index d1fd7be6..7090d0fe 100644
--- a/output/analog.c
+++ b/output/analog.c
@@ -20,7 +20,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "config.h"
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 #include <math.h>
@@ -31,7 +30,6 @@ struct context {
 	GString *out;
 };
 
-
 static int init(struct sr_output *o)
 {
 	struct context *ctx;
@@ -42,8 +40,10 @@ static int init(struct sr_output *o)
 	if (!o || !o->sdi)
 		return SR_ERR_ARG;
 
-	if (!(ctx = g_try_malloc0(sizeof(struct context))))
+	if (!(ctx = g_try_malloc0(sizeof(struct context)))) {
+		sr_err("output/analog: Context malloc failed.");
 		return SR_ERR_MALLOC;
+	}
 	o->internal = ctx;
 
 	/* Get the number of probes and their names. */
@@ -137,6 +137,35 @@ static void fancyprint(int unit, int mqflags, float value, GString *out)
 		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, "");
 	}
 	if ((mqflags & (SR_MQFLAG_AC | SR_MQFLAG_DC)) == (SR_MQFLAG_AC | SR_MQFLAG_DC))
 		g_string_append_printf(out, " AC+DC");
@@ -156,6 +185,7 @@ static GString *receive(struct sr_output *o, const struct sr_dev_inst *sdi,
 	float *fdata;
 	int i, j;
 
+	(void)sdi;
 	if (!o || !o->sdi)
 		return NULL;
 	ctx = o->internal;